summaryrefslogtreecommitdiffstats
path: root/qt.pro
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-09-11 13:31:09 +0200
committerSergio Ahumada <sergio.ahumada@digia.com>2013-09-11 13:31:41 +0200
commit4072c25a70acaa11e7831848c327be7886ef473e (patch)
tree5e586534916bc8a74dc51439c8601940f288606f /qt.pro
parentea9702923e86fc3decadbc831e31b349bd40ac44 (diff)
parent770893c71b179aa87c1bf2d83318ba62c8c2aa96 (diff)
Merge branch 'stable' into dev
Conflicts: qt.pro Change-Id: I21548a5c5c060939c58305bcbc5732d90f90bf82
Diffstat (limited to 'qt.pro')
-rw-r--r--qt.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/qt.pro b/qt.pro
index 10f05dc1..724967dd 100644
--- a/qt.pro
+++ b/qt.pro
@@ -55,12 +55,12 @@ defineTest(addModule) {
addModule(qtbase)
addModule(qtmacextras, qtbase)
-addModule(qtwinextras, qtbase)
addModule(qtx11extras, qtbase)
addModule(qlalr, qtbase)
addModule(qtsvg, qtbase)
addModule(qtxmlpatterns, qtbase)
addModule(qtdeclarative, qtbase, qtsvg qtxmlpatterns)
+addModule(qtwinextras, qtbase, qtdeclarative)
addModule(qtquickcontrols, qtdeclarative)
addModule(qtmultimedia, qtdeclarative)
addModule(qtactiveqt, qtbase)