summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-12-18 17:01:12 +0100
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2015-12-25 08:07:00 +0000
commit43135d6e33875d864cc8d34e5ba51cc02ed33840 (patch)
tree2fe8ad7ff7066359958ab5feef5a5c0df1257012
parentcda5de797b1e970257115120bfc814b5b3874c15 (diff)
make qtandroidextras a regular optional dependency of qtconnectivity
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>
-rw-r--r--qt.pro5
1 files changed, 1 insertions, 4 deletions
diff --git a/qt.pro b/qt.pro
index be193c55..5e168fae 100644
--- a/qt.pro
+++ b/qt.pro
@@ -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)