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
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
|
From f4e625d840a1d623c4aa12dbf84b444000827bff Mon Sep 17 00:00:00 2001
From: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Date: Wed, 24 Nov 2010 22:20:01 -0600
Subject: [PATCH] Make qt.prf use new qt_module.pri structure for QT variable
This change requires the new resolve_depends(var, prefix) function in qmake.
---
qtbase/mkspecs/features/qt.prf | 87 ++++++------------------------
qtbase/mkspecs/features/qt_functions.prf | 63 +++++++++++++++++++++
qtbase/src/qbase.pri | 4 +-
3 files changed, 82 insertions(+), 72 deletions(-)
diff --git a/qtbase/mkspecs/features/qt.prf b/qtbase/mkspecs/features/qt.prf
index 191a449..4d8e465 100644
--- a/qtbase/mkspecs/features/qt.prf
+++ b/qtbase/mkspecs/features/qt.prf
@@ -35,19 +35,6 @@ plugin { #Qt plugins
INCLUDEPATH = $$QMAKE_INCDIR_QT $$INCLUDEPATH #prepending prevents us from picking up "stale" includes
win32:INCLUDEPATH += $$QMAKE_INCDIR_QT/ActiveQt
-# As order does matter for static libs, we reorder the QT variable here
-TMPLIBS = declarative webkit phonon multimedia dbus testlib script scripttools svg qt3support sql xmlpatterns xml egl opengl openvg gui network core meegographicssystemhelper
-for(QTLIB, $$list($$TMPLIBS)) {
- contains(QT, $$QTLIB): QT_ORDERED += $$QTLIB
-}
-
-QT_UNKNOWN = $$QT
-QT_UNKNOWN -= $$QT_ORDERED
-QT = $$QT_ORDERED
-for(QTLIB, $$list($$QT_UNKNOWN)) {
- !contains(TMPLIBS, $$QTLIB):message("Warning: unknown QT: $$QTLIB")
-}
-
QT_PLUGIN_VERIFY = QTPLUGIN DEPLOYMENT_PLUGIN
for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) {
for(QTPLUG, $$list($$lower($$unique($$QT_CURRENT_VERIFY)))) {
@@ -128,69 +115,27 @@ for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) {
}
}
}
+
+
+
#specific module settings
!isEmpty(QT_BUILD_TREE):QMAKE_LIBDIR = $$QT_BUILD_TREE/lib $$QMAKE_LIBDIR #as above, prepending prevents us from picking up "stale" libs
QMAKE_LIBDIR += $$QMAKE_LIBDIR_QT
+
+# Topological ordering of modules based on their QT.<module>.depends variable
+QT = $$resolve_depends($$QT, "QT.")
+
for(QTLIB, $$list($$lower($$unique(QT)))) {
- unset(qlib_style)
- !qt_debug:!qt_release {
- CONFIG(debug, debug|release):qlib_style = debug
- else:qlib_style = release
- } else:CONFIG(qt_debug, qt_debug|qt_release) {
- qlib_style = debug
- } else {
- qlib_style = release
- }
+ isEmpty(QT.$${QTLIB}.name) {
+ message("Warning: unknown QT module: $$QTLIB")
+ next()
+ }
- unset(qlib)
- isEqual(QTLIB, gui):qlib = QtGui
- else:isEqual(QTLIB, network):qlib = QtNetwork
- else:isEqual(QTLIB, xml):qlib = QtXml
- else:isEqual(QTLIB, xmlpatterns):qlib = QtXmlPatterns
- else:isEqual(QTLIB, opengl):qlib = QtOpenGL
- else:isEqual(QTLIB, openvg):qlib = QtOpenVG
- else:isEqual(QTLIB, sql):qlib = QtSql
- else:isEqual(QTLIB, core):qlib = QtCore
- else:isEqual(QTLIB, canvas):qlib = QtCanvas
- else:isEqual(QTLIB, qt3support):qlib = Qt3Support
- else:isEqual(QTLIB, svg):qlib = QtSvg
- else:isEqual(QTLIB, script):qlib = QtScript
- else:isEqual(QTLIB, scripttools):qlib = QtScriptTools
- else:isEqual(QTLIB, testlib):qlib = QtTest
- else:isEqual(QTLIB, dbus):qlib = QtDBus
- else:isEqual(QTLIB, phonon) {
- qlib = phonon
- INCLUDEPATH += $$QMAKE_INCDIR_QT/phonon_compat
-
- # The Helix backend requires this. Since we can't let a plugin set it,
- # we bump the values for all Symbian Phonon plugins.
- symbian:isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x040000 0x1600000
-
- } else:isEqual(QTLIB, webkit) {
- qlib = QtWebKit
- aix-xlc {
- # Flags recommended by IBM when using WebKit
- QMAKE_LFLAGS -= -bmaxdata:0x80000000
- QMAKE_LFLAGS += -bmaxdata:0xD0000000/dsa
- }
- } else:isEqual(QTLIB, declarative):qlib = QtDeclarative
- else:isEqual(QTLIB, multimedia):qlib = QtMultimedia
- else:isEqual(QTLIB, meegographicssystemhelper):qlib = QtMeeGoGraphicsSystemHelper
- else:message("Unknown QT: $$QTLIB"):qlib =
- !isEmpty(qlib) {
- target_qt:isEqual(TARGET, qlib) {
- warning($$TARGET cannot have a QT of $$QTLIB)
- } else {
- DEFINES *= $$upper(QT_$${QTLIB}_LIB)
- isEqual(QTLIB, opengl):CONFIG += opengl
- isEqual(QTLIB, openvg):CONFIG += openvg
- isEqual(QTLIB, qt3support):DEFINES *= QT3_SUPPORT
- isEqual(QTLIB, testlib):CONFIG += console
- isEqual(QTLIB, dbus):CONFIG += dbusadaptors dbusinterfaces
-
- qtAddLibrary($$qlib)
- }
- }
+ target_qt:isEqual(TARGET, QTLIB) {
+ warning($$TARGET cannot have a QT of $$QTLIB)
+ next()
+ }
+ qtAddModule($$QTLIB)
}
qt_compat {
diff --git a/qtbase/mkspecs/features/qt_functions.prf b/qtbase/mkspecs/features/qt_functions.prf
index 5baf7ce..b9b0fd8 100644
--- a/qtbase/mkspecs/features/qt_functions.prf
+++ b/qtbase/mkspecs/features/qt_functions.prf
@@ -92,6 +92,69 @@ defineTest(qtAddLibrary) {
return(true)
}
+defineTest(qtAddModule) {
+ MODULE_NAME = $$eval(QT.$${1}.name)
+ MODULE_INCLUDES = $$eval(QT.$${1}.includes)
+ MODULE_LIBS = $$eval(QT.$${1}.libs)
+
+ CONFIG += $$eval(QT.$${1}.CONFIG)
+ DEFINES += $$eval(QT.$${1}.DEFINES)
+
+ INCLUDEPATH -= $$MODULE_INCLUDES
+ INCLUDEPATH = $$MODULE_INCLUDES $$INCLUDEPATH
+
+ unset(LINKAGE)
+ mac {
+ CONFIG(qt_framework, qt_framework|qt_no_framework) { #forced
+ QMAKE_FRAMEWORKPATH *= $${QMAKE_LIBDIR_QT}
+ FRAMEWORK_INCLUDE = $$MODULE_INCLUDES.framework/Headers
+ !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) {
+ INCLUDEPATH -= $$FRAMEWORK_INCLUDE
+ INCLUDEPATH = $$FRAMEWORK_INCLUDE $$INCLUDEPATH
+ }
+ LINKAGE = -framework $${MODULE_NAME}$${QT_LIBINFIX}
+ } else:!qt_no_framework { #detection
+ for(frmwrk_dir, $$list($$QMAKE_LIBDIR_QT $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH) /Library/Frameworks)) {
+ exists($${frmwrk_dir}/$${MODULE_NAME}.framework) {
+ QMAKE_FRAMEWORKPATH *= $${frmwrk_dir}
+ FRAMEWORK_INCLUDE = $$frmwrk_dir/$${MODULE_NAME}.framework/Headers
+ !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) {
+ INCLUDEPATH -= $$FRAMEWORK_INCLUDE
+ INCLUDEPATH = $$FRAMEWORK_INCLUDE $$INCLUDEPATH
+ }
+ LINKAGE = -framework $${MODULE_NAME}
+ break()
+ }
+ }
+ }
+ }
+ isEmpty(LINKAGE) {
+ # Make sure we can link to uninstalled libraries
+ !isEqual(MODULE_LIBS, $[QT_INSTALL_LIBS]) {
+ QMAKE_LFLAGS *= -L$$MODULE_LIBS
+ unix:QMAKE_LFLAGS *= "-Wl,-rpath-link,$$MODULE_LIBS"
+ }
+ if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
+ win32:LINKAGE = -l$${MODULE_NAME}$${QT_LIBINFIX}d
+ mac:LINKAGE = -l$${MODULE_NAME}$${QT_LIBINFIX}_debug
+ }
+ isEmpty(LINKAGE):LINKAGE = -l$${MODULE_NAME}$${QT_LIBINFIX}
+ }
+ !isEmpty(QMAKE_LSB) {
+ QMAKE_LFLAGS *= --lsb-libpath=$$$$QMAKE_LIBDIR_QT
+ QMAKE_LFLAGS *= -L/opt/lsb/lib
+ QMAKE_LFLAGS *= --lsb-shared-libs=$${MODULE_NAME}$${QT_LIBINFIX}
+ }
+ LIBS += $$LINKAGE
+ export(CONFIG)
+ export(DEFINES)
+ export(LIBS)
+ export(INCLUDEPATH)
+ export(QMAKE_FRAMEWORKPATH)
+ export(QMAKE_LFLAGS)
+ return(true)
+}
+
# variable, default
defineTest(qtPrepareTool) {
isEmpty($$1) {
diff --git a/qtbase/src/qbase.pri b/qtbase/src/qbase.pri
index ce69757..8b29eae 100644
--- a/qtbase/src/qbase.pri
+++ b/qtbase/src/qbase.pri
@@ -1,5 +1,7 @@
isEmpty(TARGET):error("You must set TARGET before include()'ing $${_FILE_}")
-INCLUDEPATH *= $$QMAKE_INCDIR_QT/$$TARGET #just for today to have some compat
+
+MODULE_INCLUDES = $$eval(QT.$${MODULE}.includes)
+INCLUDEPATH *= $$MODULE_INCLUDES $$MODULE_INCLUDES/.. #just for today to have some compat
!isEmpty(RCC_DIR): INCLUDEPATH += $$RCC_DIR
isEmpty(QT_ARCH):!isEmpty(ARCH):QT_ARCH=$$ARCH #another compat that will rot for change #215700
TEMPLATE = lib
--
1.7.3.2.343.g7d43d
|
