diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-02-19 16:13:02 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-02-19 16:13:02 +0100 |
| commit | a3152cb8f1857bf88b211bd0d75c5bfa25c17211 (patch) | |
| tree | 7aadeba3e3148a3a042bfae8422ef91e87569540 /qt.pro | |
| parent | dc199e37d59beb8a4801a599dd5a0ff9ee2c23f8 (diff) | |
| parent | a7dc6fd595f51dcbb8a8c8b2c06a9db64bfa214e (diff) | |
Merge remote-tracking branch 'gerrit/dev' into stable
Change-Id: I7e15ecc9ce71063757677e5c8b07e3c0167c857c
Diffstat (limited to 'qt.pro')
| -rw-r--r-- | qt.pro | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -54,6 +54,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) @@ -71,7 +74,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 qtmultimedia qtsensors, WebKit.pro) @@ -85,6 +88,7 @@ addModule(qtdocgallery, qtdeclarative, qtjsondb) !win32:!mac:addModule(qtwayland, qtbase, qtdeclarative) addModule(qtserialport, qtbase) addModule(qtenginio, qtdeclarative) +addModule(qtwebsockets, qtbase, qtdeclarative) addModule(qttranslations, qttools) addModule(qtdoc, qtdeclarative) addModule(qtqa, qtbase) |