summaryrefslogtreecommitdiffstats
path: root/qt.pro
diff options
context:
space:
mode:
authorMilian Wolff <milian.wolff@kdab.com>2014-08-09 13:41:29 +0200
committerJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-08-15 09:03:39 +0200
commitbe6de2088968ba0b4955a32b3ff7a2389b385312 (patch)
treed2c4d1c62553cf609cfa6dc8eeb0aafe7d5c8bc0 /qt.pro
parent633051d095cb8580fb99c625009f965a1efd18f1 (diff)
Add QtWebChannel as optional dependency of QtWebKit.
This is required to prepare the merge of the integration patch. The QtWebChannel and QtWebSockets lines in qt.pro are moved such that they occur before their first use in QtWebKit. Change-Id: Ie8137da57827776fe7b1434538df6b08108b0349 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Diffstat (limited to 'qt.pro')
-rw-r--r--qt.pro6
1 files changed, 3 insertions, 3 deletions
diff --git a/qt.pro b/qt.pro
index 4a0e56ef..3a51f9a5 100644
--- a/qt.pro
+++ b/qt.pro
@@ -76,7 +76,9 @@ addModule(qtsensors, qtbase, qtdeclarative)
addModule(qtconnectivity, qtbase $$ANDROID_EXTRAS, qtdeclarative)
addModule(qtfeedback, qtdeclarative, qtmultimedia)
addModule(qtpim, qtdeclarative)
-addModule(qtwebkit, qtdeclarative, qtlocation qtmultimedia qtsensors, WebKit.pro)
+addModule(qtwebsockets, qtbase, qtdeclarative)
+addModule(qtwebchannel, qtbase, qtdeclarative qtwebsockets)
+addModule(qtwebkit, qtdeclarative, qtlocation qtmultimedia qtsensors qtwebchannel, WebKit.pro)
addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit)
addModule(qtwebkit-examples, qtwebkit qttools)
addModule(qtimageformats, qtbase)
@@ -87,8 +89,6 @@ addModule(qtdocgallery, qtdeclarative, qtjsondb)
linux:!android: addModule(qtwayland, qtbase, qtdeclarative)
addModule(qtserialport, qtbase)
addModule(qtenginio, qtdeclarative)
-addModule(qtwebsockets, qtbase, qtdeclarative)
-addModule(qtwebchannel, qtbase, qtdeclarative qtwebsockets)
addModule(qttranslations, qttools)
addModule(qtdoc, qtdeclarative)
addModule(qtqa, qtbase)