Fix dependency order for qtlocation and qtwebview
authorLaszlo Agocs <laszlo.agocs@theqtcompany.com>
Fri, 9 Oct 2015 16:41:37 +0000 (18:41 +0200)
committerSimon Hausmann <simon.hausmann@theqtcompany.com>
Thu, 22 Oct 2015 05:00:55 +0000 (05:00 +0000)
Change-Id: Ie61b69be3b38975675fff3553d1f5c9510e7865e
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
qt.pro

diff --git a/qt.pro b/qt.pro
index 6e7096d..d96659e 100644 (file)
--- a/qt.pro
+++ b/qt.pro
@@ -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)