summaryrefslogtreecommitdiffstats
path: root/qt.pro
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-01-29 13:50:59 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-01-29 13:52:49 +0100
commit76e16b228e0cd76c152f07e249d0e02f800cbd2d (patch)
tree5f4d93f12b6af2b1a4926a13d5782e32f9316c8d /qt.pro
parent4b256e249bbbc3285ec1e9dd971278ca53a957bb (diff)
parent604f330cd22bcb044f43bcd7ce6f4fe0ed2fe057 (diff)
Merge branch 'stable' into dev
Conflicts: qtactiveqt qtandroidextras qtbase qtconnectivity qtdeclarative qtdoc qtgraphicaleffects qtimageformats qtlocation qtmacextras qtmultimedia qtqa qtquick1 qtquickcontrols qtrepotools qtscript qtsensors qtserialport qtsvg qttools qttranslations qtwebkit qtwebkit-examples qtwinextras qtx11extras qtxmlpatterns Change-Id: I404135b8463e4cdfc6a235f8c2203ea8ddfa3df5
Diffstat (limited to 'qt.pro')
-rw-r--r--qt.pro8
1 files changed, 5 insertions, 3 deletions
diff --git a/qt.pro b/qt.pro
index c5192136..426cc871 100644
--- a/qt.pro
+++ b/qt.pro
@@ -3,6 +3,7 @@ cache(, super)
CONFIG += build_pass # hack to disable the .qmake.super auto-add
load(qt_build_config)
+CONFIG -= build_pass # unhack, as it confuses Qt Creator
TEMPLATE = subdirs
@@ -76,16 +77,17 @@ addModule(qtsensors, qtbase, qtdeclarative)
addModule(qtconnectivity, qtbase $$ANDROID_EXTRAS, qtdeclarative)
addModule(qtfeedback, qtdeclarative, qtmultimedia)
addModule(qtpim, qtdeclarative, qtjsondb)
-addModule(qtwebkit, qtdeclarative, qtlocation qtsensors, WebKit.pro)
+addModule(qtwebkit, qtdeclarative, qtlocation qtmultimedia qtsensors, WebKit.pro)
addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit)
addModule(qtwebkit-examples, qtwebkit qttools)
addModule(qtimageformats, qtbase)
addModule(qtgraphicaleffects, qtdeclarative)
-addModule(qtscript, qtbase)
-addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit qttools)
+addModule(qtscript, qtbase, qttools)
+addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit)
addModule(qtdocgallery, qtdeclarative, qtjsondb)
!win32:!mac:addModule(qtwayland, qtbase, qtdeclarative)
addModule(qtserialport, qtbase)
+addModule(qtenginio, qtdeclarative)
addModule(qttranslations, qttools)
addModule(qtdoc, qtdeclarative)
addModule(qtqa, qtbase)