lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-06 20:35:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

make qtandroidextras a regular optional dependency of qtconnectivity

Browse Source 
we want to move to a purely declarative way to declare submodules, so
the conditional has to go.

instead, use an optional dependency to ensure build order, while the
module excludes itself via requires() if its dependency is missing.

Change-Id: I615382700ff601c9ab003d131b2cc600441c514c
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen
2015-12-18 17:01:12 +01:00
committed by Simon Hausmann
parent cda5de797b
commit 43135d6e33
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
qt.pro
View File

@@ -61,9 +61,6 @@ defineTest(addModule) {
# users responsibility to ensure that all needed dependencies exist, or
# it may not build.
ANDROID_EXTRAS =
android: ANDROID_EXTRAS = qtandroidextras
addModule(qtbase)
addModule(qtandroidextras, qtbase)
addModule(qtmacextras, qtbase)
@@ -79,7 +76,7 @@ addModule(qtwinextras, qtbase, qtdeclarative qtmultimedia)
addModule(qtactiveqt, qtbase)
addModule(qtsystems, qtbase, qtdeclarative)
addModule(qtsensors, qtbase, qtdeclarative)
addModule(qtconnectivity, qtbase $$ANDROID_EXTRAS, qtdeclarative)
addModule(qtconnectivity, qtbase, qtdeclarative qtandroidextras)
addModule(qtfeedback, qtdeclarative, qtmultimedia)
addModule(qtpim, qtdeclarative)
addModule(qtwebsockets, qtbase, qtdeclarative)