diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-10-09 18:41:37 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-10-22 05:00:55 +0000 |
| commit | a0309a7a43a404ebb1bf1a193732860bd3edfe9b (patch) | |
| tree | 8c03ed19bd8b5ebc078d9dc2fb8f2c56320519cc /qt.pro | |
| parent | 17c6369c9e6846ba303d70d3a1bdf043db5e63ce (diff) | |
| download | qt5-a0309a7a43a404ebb1bf1a193732860bd3edfe9b.tar.gz | |
Fix dependency order for qtlocation and qtwebview
Change-Id: Ie61b69be3b38975675fff3553d1f5c9510e7865e
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'qt.pro')
| -rw-r--r-- | qt.pro | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -59,7 +59,6 @@ ANDROID_EXTRAS = android: ANDROID_EXTRAS = qtandroidextras addModule(qtbase) -addModule(qtwebview, qtdeclarative, qtwebengine) addModule(qtandroidextras, qtbase) addModule(qtmacextras, qtbase) addModule(qtx11extras, qtbase) @@ -79,6 +78,8 @@ addModule(qtfeedback, qtdeclarative, qtmultimedia) addModule(qtpim, qtdeclarative) addModule(qtwebsockets, qtbase, qtdeclarative) addModule(qtwebchannel, qtbase, qtdeclarative qtwebsockets) +addModule(qtserialport, qtbase) +addModule(qtlocation, qtbase, qtdeclarative qtquickcontrols qtserialport qtsystems) addModule(qtwebkit, qtbase, qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns, WebKit.pro) addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit) addModule(qtwebkit-examples, qtwebkit qttools) @@ -90,10 +91,9 @@ addModule(qtquick1, qtscript, qtsvg qtxmlpatterns) addModule(qtdocgallery, qtdeclarative) addModule(qtwayland, qtbase, qtdeclarative) addModule(qtserialbus, qtbase) -addModule(qtserialport, qtbase) -addModule(qtlocation, qtbase, qtdeclarative qtquickcontrols qtserialport qtsystems) addModule(qtenginio, qtdeclarative) addModule(qtwebengine, qtquickcontrols qtwebchannel, qtlocation) +addModule(qtwebview, qtdeclarative, qtwebengine) addModule(qtpurchasing, qtbase, qtdeclarative) addModule(qttranslations, qttools) addModule(qtdoc, qtdeclarative) |