From 9eb4273e4e5721a8f100d4009cd579b5383200f1 Mon Sep 17 00:00:00 2001
From: "Kilic, Deniz" <d.kilic@fz-juelich.de>
Date: Mon, 16 Dec 2019 15:06:11 +0100
Subject: [PATCH] Upgraded to qwt 6.1.4 (built with Qt5) and changed .pro
accordingly (changed Order in .pro for Wiki-tut to work)
---
3rdparty | 2 +-
petrack.pro | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/3rdparty b/3rdparty
index 3b1a48118..4bf9fa0e4 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 3b1a481187c6f70bc8601e866b19ad8d157a47a6
+Subproject commit 4bf9fa0e414735acf45f793495cd1467438eb3cd
diff --git a/petrack.pro b/petrack.pro
index 1d0e40511..cdc59e737 100644
--- a/petrack.pro
+++ b/petrack.pro
@@ -274,8 +274,8 @@ contains(hostname, [zZ][aA][mM]852) {
LIBS += -lopencv_legacy$${CVVERSION}
}
-} else:contains(hostname, ias7176) {
- # Deniz 64-Bit
+} else:contains(hostname, ias7185) {
+ # imotion laptop
# PointGray
PGRPATH = "../petrack/3rdparty/windows/triclops-3.4"
@@ -319,8 +319,8 @@ contains(hostname, [zZ][aA][mM]852) {
message("Build with OpenCV 2.x.x")
LIBS += -lopencv_legacy$${CVVERSION}
}
-} else:contains(hostname, ias7185) {
- # imotion laptop
+} else:contains(hostname, ias7176) {
+ # Deniz 32-Bit
# PointGray
PGRPATH = "../petrack/3rdparty/windows/triclops-3.4"
@@ -338,7 +338,7 @@ contains(hostname, [zZ][aA][mM]852) {
INCLUDEPATH += $${CVPATH}/include/opencv
INCLUDEPATH += $${CVPATH}/include/opencv2
- QWTPATH = "C:/Qwt-6.1.4"
+ QWTPATH = "../petrack/3rdparty/windows/Qwt-6.1.4"
#QWTPATH = "D:/petrack/trunk/3rdparty/windows/qwt-6.1.2"
INCLUDEPATH += $${QWTPATH}/include
--
GitLab