From 4b256e249bbbc3285ec1e9dd971278ca53a957bb Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Thu, 28 Nov 2013 12:12:45 +0100 Subject: Add QtAndroidExtras to dependency list of QtConnectivity We only need it for Android builds though. Change-Id: I760dfd6038da2d4061326dd361ac517c9e674239 Reviewed-by: Oswald Buddenhagen Reviewed-by: Alex Blasche Reviewed-by: Thiago Macieira Reviewed-by: Joerg Bornemann --- qt.pro | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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) -- cgit v1.2.3