1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
From: "Gudjon I. Gudjonsson" <gudjon@gudjon.org>
Date: Sun, 11 Dec 2022 10:40:34 +0000
Subject: _designer
Remove rpath from library and fix library dependencies
Remove logic to disable building of qt4 plugin
---
designer/designer.pro | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
--- a/designer/designer.pro
+++ b/designer/designer.pro
@@ -29,13 +29,13 @@
contains(QWT_CONFIG, QwtDesigner ) {
- greaterThan(QT_MAJOR_VERSION, 4) {
-
- !qtHaveModule(designer) QWT_CONFIG -= QwtDesigner
- } else {
-
- !exists( $(QTDIR)/include/QtDesigner ) QWT_CONFIG -= QwtDesigner
- }
+# greaterThan(QT_MAJOR_VERSION, 4) {
+#
+# !qtHaveModule(designer) QWT_CONFIG -= QwtDesigner
+# } else {
+#
+# !exists( $(QTDIR)/include/QtDesigner ) QWT_CONFIG -= QwtDesigner
+# }
!contains(QWT_CONFIG, QwtDesigner ) {
warning("QwtDesigner is enabled in qwtconfig.pri, but Qt has not been built with designer support")
@@ -98,8 +98,15 @@
# compile the path for finding the Qwt library
# into the plugin. Not supported on Windows !
- QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS}
- qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt)
+# QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS}
+ contains(QWT_CONFIG, QwtDll) {
+ greaterThan(QT_MAJOR_VERSION, 5) {
+ qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt-qt6)
+ } else {
+ qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt-qt5)
+ }
+ }
+
contains(QWT_CONFIG, QwtDll) {
|
