diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-11 13:31:09 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-11 13:31:41 +0200 |
| commit | 4072c25a70acaa11e7831848c327be7886ef473e (patch) | |
| tree | 5e586534916bc8a74dc51439c8601940f288606f /qt.pro | |
| parent | ea9702923e86fc3decadbc831e31b349bd40ac44 (diff) | |
| parent | 770893c71b179aa87c1bf2d83318ba62c8c2aa96 (diff) | |
Merge branch 'stable' into dev
Conflicts:
qt.pro
Change-Id: I21548a5c5c060939c58305bcbc5732d90f90bf82
Diffstat (limited to 'qt.pro')
| -rw-r--r-- | qt.pro | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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) |