From a0309a7a43a404ebb1bf1a193732860bd3edfe9b Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Fri, 9 Oct 2015 18:41:37 +0200 Subject: Fix dependency order for qtlocation and qtwebview Change-Id: Ie61b69be3b38975675fff3553d1f5c9510e7865e Reviewed-by: Alex Blasche Reviewed-by: Oswald Buddenhagen --- qt.pro | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'qt.pro') diff --git a/qt.pro b/qt.pro index 6e7096d3..d96659e2 100644 --- 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) -- cgit v1.2.3