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
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
|
Add -qt5 name extension to Qt5 libraries and enable verbose build.
Add pkg-config files
--- a/qwtconfig.pri
+++ b/qwtconfig.pri
@@ -7,7 +7,20 @@
# modify it under the terms of the Qwt License, Version 1.0
################################################################
-QWT_VER_MAJ = 6
+QMAKE_CPPFLAGS *= $(shell dpkg-buildflags --get CPPFLAGS)
+QMAKE_CFLAGS *= $(shell dpkg-buildflags --get CFLAGS)
+QMAKE_CFLAGS += -D_FORTIFY_SOURCE=2
+QMAKE_CXXFLAGS *= $(shell dpkg-buildflags --get CXXFLAGS)
+QMAKE_CXXFLAGS += -D_FORTIFY_SOURCE=2
+QMAKE_LFLAGS *= $(shell dpkg-buildflags --get LDFLAGS)
+
+
+greaterThan(QT_MAJOR_VERSION, 4) {
+ QWT_VER_MAJ = 6
+}
+else {
+ QWT_VER_MAJ = 6abi1
+}
QWT_VER_MIN = 1
QWT_VER_PAT = 4
QWT_VERSION = $${QWT_VER_MAJ}.$${QWT_VER_MIN}.$${QWT_VER_PAT}
@@ -109,7 +122,7 @@
# to your qmake project file.
######################################################################
-#QWT_CONFIG += QwtMathML
+QWT_CONFIG += QwtMathML
######################################################################
# If you want to build the Qwt designer plugin,
@@ -170,5 +183,5 @@
unix {
- #QWT_CONFIG += QwtPkgConfig
+ QWT_CONFIG += QwtPkgConfig
}
--- a/src/src.pro
+++ b/src/src.pro
@@ -17,7 +17,12 @@
QWT_OUT_ROOT = $${OUT_PWD}/..
TEMPLATE = lib
-TARGET = $$qwtLibraryTarget(qwt)
+greaterThan(QT_MAJOR_VERSION, 4) {
+ TARGET = $$qwtLibraryTarget(qwt-qt5)
+}
+else {
+ TARGET = $$qwtLibraryTarget(qwt)
+}
DESTDIR = $${QWT_OUT_ROOT}/lib
--- a/textengines/mathml/mathml.pro
+++ b/textengines/mathml/mathml.pro
@@ -12,7 +12,13 @@
include( $${PWD}/../textengines.pri )
-TARGET = $$qwtLibraryTarget(qwtmathml)
+greaterThan(QT_MAJOR_VERSION, 4) {
+ TARGET = $$qwtLibraryTarget(qwtmathml-qt5)
+}
+else {
+ TARGET = $$qwtLibraryTarget(qwtmathml)
+}
+
QT += xml
greaterThan(QT_MAJOR_VERSION, 4) {
--- a/textengines/textengines.pri
+++ b/textengines/textengines.pri
@@ -34,7 +34,12 @@
CONFIG += lib_bundle
}
-qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt)
+greaterThan(QT_MAJOR_VERSION, 4) {
+ qwtAddLibrary($${QWT_OUT_ROOT}/lib,qwt-qt5)
+}
+else {
+ qwtAddLibrary($${QWT_OUT_ROOT}/lib,qwt)
+}
# Install directives
--- a/qwt.pro
+++ b/qwt.pro
@@ -7,13 +7,6 @@
# modify it under the terms of the Qwt License, Version 1.0
################################################################
-QMAKE_CPPFLAGS *= $(shell dpkg-buildflags --get CPPFLAGS)
-QMAKE_CFLAGS *= $(shell dpkg-buildflags --get CFLAGS)
-QMAKE_CFLAGS += -D_FORTIFY_SOURCE=2
-QMAKE_CXXFLAGS *= $(shell dpkg-buildflags --get CXXFLAGS)
-QMAKE_CXXFLAGS += -D_FORTIFY_SOURCE=2
-QMAKE_LFLAGS *= $(shell dpkg-buildflags --get LDFLAGS)
-
include( qwtconfig.pri )
TEMPLATE = subdirs
--- a/qwt.prf
+++ b/qwt.prf
@@ -10,6 +10,8 @@
include ( ./qwtconfig.pri )
include ( ./qwtfunctions.pri )
+QT += opengl
+
contains(QWT_CONFIG, QwtDll) {
DEFINES *= QWT_DLL
@@ -34,4 +36,9 @@
}
# QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS}
-qwtAddLibrary($${QWT_INSTALL_LIBS}, qwt)
+greaterThan(QT_MAJOR_VERSION, 4) {
+ qwtAddLibrary($${QWT_OUT_ROOT}/lib,qwt-qt5)
+}
+else {
+ qwtAddLibrary($${QWT_OUT_ROOT}/lib,qwt)
+}
--- a/qwtbuild.pri
+++ b/qwtbuild.pri
@@ -14,7 +14,7 @@
CONFIG += qt
CONFIG += warn_on
CONFIG += no_keywords
-CONFIG += silent
+#CONFIG += silent
######################################################################
# release/debug mode
|
