Changeset 9383 in ntrip for trunk/BNC/qwt/src.pri

Timestamp:

Mar 19, 2021, 9:15:03 AM (3 years ago)

Author:

stoecker

Message:

update to qwt verion 6.1.1 to fix build with newer Qt5

File:

• trunk/BNC/qwt/src.pri (modified) (3 diffs)

trunk/BNC/qwt/src.pri

@@ -181 +181 @@
         qwt_series_data.cpp \
         qwt_point_data.cpp \
-        qwt_scale_widget.cpp 
+        qwt_scale_widget.cpp
+
+    contains(QWT_CONFIG, QwtOpenGL) {
+
+        HEADERS += \
+            qwt_plot_glcanvas.h
+
+        SOURCES += \
+            qwt_plot_glcanvas.cpp
+    }
+
+    contains(QWT_CONFIG, QwtSvg) {
+
+        HEADERS += \
+            qwt_plot_svgitem.h
+
+        SOURCES += \
+            qwt_plot_svgitem.cpp
+    }
 }
 
@@ -192 +210 @@
 contains(QWT_CONFIG, QwtSvg) {
 
-    QT += svg
-
-    HEADERS += qwt_plot_svgitem.h
-    SOURCES += qwt_plot_svgitem.cpp 
+    greaterThan(QT_MAJOR_VERSION, 4) {
+
+        qtHaveModule(svg) {
+            QT += svg
+        }
+        else {
+            warning("QwtSvg is enabled in qwtconfig.pri, but Qt has not been built with svg support")
+        }
+    }
+    else {
+        QT += svg
+    }
 }
 else {
@@ -205 +231 @@
 
     QT += opengl
-
-    HEADERS += qwt_plot_glcanvas.h
-    SOURCES += qwt_plot_glcanvas.cpp
 }
 else {