#3752 Upgrade Qwt to 6.1.3 to support Qt5

ThirdParty/Qwt/textengines/mathml/mathml.pro

@@ -51,3 +51,28 @@ else {
     INSTALLS       += headers
 }
 
+contains(QWT_CONFIG, QwtPkgConfig) {
+
+    CONFIG     += create_pc create_prl no_install_prl
+
+    QMAKE_PKGCONFIG_NAME = qwtmathml
+    QMAKE_PKGCONFIG_DESCRIPTION = Qwt MathML renderer
+
+    QMAKE_PKGCONFIG_LIBDIR = $${QWT_INSTALL_LIBS}
+    QMAKE_PKGCONFIG_INCDIR = $${QWT_INSTALL_HEADERS}
+
+    # QMAKE_PKGCONFIG_DESTDIR is buggy, in combination
+    # with including pri files: better don't use it
+
+    greaterThan(QT_MAJOR_VERSION, 4) {
+
+        QMAKE_PKGCONFIG_REQUIRES = Qt5Gui Qt5Widgets Qt5Xml
+    }
+    else {
+
+        QMAKE_PKGCONFIG_REQUIRES = QtGui QtXml
+    }
+
+    QMAKE_DISTCLEAN += $${DESTDIR}/$${QMAKE_PKGCONFIG_NAME}.pc
+    QMAKE_DISTCLEAN += $${DESTDIR}/libqwtmathml.prl
+}

ThirdParty/Qwt/textengines/mathml/qwtmathml.prf

@@ -8,6 +8,7 @@
 ################################################################
 
 include ( ./qwtconfig.pri )
+include ( ./qwtfunctions.pri )
 
 contains(QWT_CONFIG, QwtDll) {
 
@@ -19,20 +20,10 @@ QT       *= xml
 contains(QWT_CONFIG, QwtFramework) {
 
     INCLUDEPATH *= $${QWT_INSTALL_LIBS}/qwtmathml.framework/Headers
-    LIBS        *= -F$${QWT_INSTALL_LIBS}
 }
 else {
 
     INCLUDEPATH *= $${QWT_INSTALL_HEADERS}
-    LIBS        *= -L$${QWT_INSTALL_LIBS}
 }
 
-INCLUDEPATH_QWTMATHML = $${INCLUDEPATH}
-qtAddLibrary(qwtmathml)
-
-# we don't want qtAddLibrary to expand the 
-# include path, with directories, that might
-# conflict with other installations of qwt
-
-INCLUDEPATH      = $${INCLUDEPATH_QWTMATHML}
-
+qwtAddLibrary($${QWT_INSTALL_LIBS}, qwtmathml)

ThirdParty/Qwt/textengines/textengines.pri

@@ -13,9 +13,11 @@ include( $${QWT_ROOT}/qwtconfig.pri )
 include( $${QWT_ROOT}/qwtbuild.pri )
 include( $${QWT_ROOT}/qwtfunctions.pri )
 
+QWT_OUT_ROOT = $${OUT_PWD}/../..
+
 TEMPLATE  = lib
 
-DESTDIR         = $${QWT_ROOT}/lib
+DESTDIR         = $${QWT_OUT_ROOT}/lib
 INCLUDEPATH    += $${QWT_ROOT}/src
 DEPENDPATH     += $${QWT_ROOT}/src
 
@@ -30,14 +32,9 @@ else {
 contains(QWT_CONFIG, QwtFramework) {
 
     CONFIG += lib_bundle
-    LIBS      += -F$${QWT_ROOT}/lib
-}
-else {
-
-    LIBS      += -L$${QWT_ROOT}/lib
 }
 
-qwtAddLibrary(qwt)
+qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt)
 
 # Install directives