Request 1083627 (accepted)

This request supersedes: request 1083566 (Show diff)

Overview

Request 1083627 accepted

Fixes boo#1210931 by adding Qt6 support (4th attempt)

Created by alois about 1 year ago
In state accepted
Supersedes 1083566

Submit qwt6

Comments for request 1083627 0
Comments for request 1083566 4

Mehdi Chinoune (MehdiChinoune) - about 1 year ago

qwt-6.2.0-qt6-pkgconfig.patch is not complete, It should:

--- a/src/src.pro
+++ b/src/src.pro
@@ -82,14 +83,14 @@
     greaterThan(QT_MAJOR_VERSION, 4) {

         QMAKE_PKGCONFIG_FILE = Qt$${QT_MAJOR_VERSION}$${QMAKE_PKGCONFIG_NAME}
-        QMAKE_PKGCONFIG_REQUIRES = Qt5Widgets Qt5Concurrent Qt5PrintSupport
+        QMAKE_PKGCONFIG_REQUIRES = Qt$${QT_MAJOR_VERSION}Widgets Qt$${QT_MAJOR_VERSION}Concurrent Qt$${QT_MAJOR_VERSION}PrintSupport

         contains(QWT_CONFIG, QwtSvg) {
-            QMAKE_PKGCONFIG_REQUIRES += Qt5Svg
+            QMAKE_PKGCONFIG_REQUIRES += Qt$${QT_MAJOR_VERSION}Svg
         }

         contains(QWT_CONFIG, QwtOpenGL) {
-            QMAKE_PKGCONFIG_REQUIRES += Qt5OpenGL
+            QMAKE_PKGCONFIG_REQUIRES += Qt$${QT_MAJOR_VERSION}OpenGL
         }

         QMAKE_DISTCLEAN += $${DESTDIR}/$${QMAKE_PKGCONFIG_DESTDIR}/$${QMAKE_PKGCONFIG_FILE}.pc

Mehdi Chinoune (MehdiChinoune) - about 1 year ago

qwt.prf which will be installed in share/qt${QT_VERSION}/mkspecs/features should be also patched:

--- a/qwt.prf
+++ b/qwt.prf
@@ -44,4 +44,9 @@
 }   

 # QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS}
-qwtAddLibrary($${QWT_INSTALL_LIBS}, qwt)
+greaterThan(QT_MAJOR_VERSION,5) {
+    qwtAddLibrary($${QWT_OUT_ROOT}/lib,qwt-qt6)
+}
+else {
+    qwtAddLibrary($${QWT_OUT_ROOT}/lib,qwt-qt5)
+}