diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-05-26 15:44:12 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-05-26 15:44:48 +0200 |
| commit | 7368b4b1e31aab2ab556463763250e646ec5ef4a (patch) | |
| tree | e7958cb217d124a9c6082ad3b09eac24e042058b /qt.pro | |
| parent | afd8acb9dc0ce1e2f94a8b7b60651887d76e59f1 (diff) | |
| parent | f4479c349b595d28e0dd4985259d7d1ed00bb966 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ib1694808847f26576cc3c7780bd1c6d3689a8a26
Diffstat (limited to 'qt.pro')
| -rw-r--r-- | qt.pro | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -61,12 +61,11 @@ addModule(qtbase) addModule(qtandroidextras, qtbase) addModule(qtmacextras, qtbase) addModule(qtx11extras, qtbase) -addModule(qlalr, qtbase) addModule(qtsvg, qtbase) addModule(qtxmlpatterns, qtbase) addModule(qtdeclarative, qtbase, qtsvg qtxmlpatterns) addModule(qtquickcontrols, qtdeclarative) -addModule(qtmultimedia, qtdeclarative) +addModule(qtmultimedia, qtbase, qtdeclarative) addModule(qtwinextras, qtbase, qtdeclarative qtmultimedia) addModule(qtactiveqt, qtbase) addModule(qt3d, qtdeclarative) |