summaryrefslogtreecommitdiffstats
path: root/qt.pro
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@digia.com>2013-11-28 12:12:45 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-14 14:19:38 +0100
commit4b256e249bbbc3285ec1e9dd971278ca53a957bb (patch)
treedfbef7ef645da8f291156ee4c12b75817d4eb002 /qt.pro
parentf37564a74908846d69141b95c7edd938f4fc2379 (diff)
Add QtAndroidExtras to dependency list of QtConnectivity
We only need it for Android builds though. Change-Id: I760dfd6038da2d4061326dd361ac517c9e674239 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qt.pro')
-rw-r--r--qt.pro5
1 files changed, 4 insertions, 1 deletions
diff --git a/qt.pro b/qt.pro
index b92b3c69..c5192136 100644
--- a/qt.pro
+++ b/qt.pro
@@ -53,6 +53,9 @@ 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)
@@ -70,7 +73,7 @@ addModule(qtjsondb, qtdeclarative)
addModule(qtsystems, qtbase, qtdeclarative)
addModule(qtlocation, qtbase, qt3d qtsystems qtmultimedia)
addModule(qtsensors, qtbase, qtdeclarative)
-addModule(qtconnectivity, qtbase, qtdeclarative)
+addModule(qtconnectivity, qtbase $$ANDROID_EXTRAS, qtdeclarative)
addModule(qtfeedback, qtdeclarative, qtmultimedia)
addModule(qtpim, qtdeclarative, qtjsondb)
addModule(qtwebkit, qtdeclarative, qtlocation qtsensors, WebKit.pro)