aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@digia.com>2014-09-05 08:42:01 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2014-12-05 14:50:34 +0100
commita22e673995dd62e9d40bacb93dc23e2c12907622 (patch)
treee959ab677f768e33aa94e909f8f36b512d9f3551
parenta17124e83136988e6fd9dc1d3d6928900e9bdfbc (diff)
Revert "Skip not supported modules on wince."
The decision to exclude wince builds from Qt is one the modules have to do and not the "build system". While there might be justification to do this for some modules the decision is a module decision and as such the individual modules should make it. This reverts commit d870bd65b0de87316007f94f8415c6a0baf4f516. Change-Id: I60fd9944a71968c819a27da91fdc58923bbbb776 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-rw-r--r--qt.pro12
1 files changed, 6 insertions, 6 deletions
diff --git a/qt.pro b/qt.pro
index abcc2be7..c10c7378 100644
--- a/qt.pro
+++ b/qt.pro
@@ -66,16 +66,16 @@ addModule(qtxmlpatterns, qtbase)
addModule(qtdeclarative, qtbase, qtsvg qtxmlpatterns)
addModule(qtquickcontrols, qtdeclarative)
addModule(qtmultimedia, qtbase, qtdeclarative)
-!wince*:addModule(qtwinextras, qtbase, qtdeclarative qtmultimedia)
-!wince*:addModule(qtactiveqt, qtbase)
-!wince*:addModule(qt3d, qtdeclarative)
+addModule(qtwinextras, qtbase, qtdeclarative qtmultimedia)
+addModule(qtactiveqt, qtbase)
+addModule(qt3d, qtdeclarative)
addModule(qtjsondb, qtdeclarative)
-!wince*:addModule(qtsystems, qtbase, qtdeclarative)
-!wince*:addModule(qtlocation, qtbase, qtsystems qtmultimedia)
+addModule(qtsystems, qtbase, qtdeclarative)
+addModule(qtlocation, qtbase, qtsystems qtmultimedia)
addModule(qtsensors, qtbase, qtdeclarative)
addModule(qtconnectivity, qtbase $$ANDROID_EXTRAS, qtdeclarative)
addModule(qtfeedback, qtdeclarative, qtmultimedia)
-!wince*:addModule(qtpim, qtdeclarative)
+addModule(qtpim, qtdeclarative)
addModule(qtwebkit, qtdeclarative, qtlocation qtmultimedia qtsensors, WebKit.pro)
addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit)
addModule(qtwebkit-examples, qtwebkit qttools)