summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaurice Kalinowski <maurice.kalinowski@digia.com>2014-01-24 10:59:52 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-24 11:11:22 +0100
commit70a8761f6c059d18169b6565886dc9159dabebd3 (patch)
tree3a4c4cc17e6655444213c5e71447be254b3142f1
parent76bdce73b53dd505efa9d6a5bd114465c961517d (diff)
Skip compilation on WinRT
Still allow creating documentation like on other platforms. Change-Id: Ie09ec71bca129d7194c19883cc5f4893fd650663 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
-rw-r--r--qtactiveqt.pro4
-rw-r--r--src/activeqt/activeqt.pro2
-rw-r--r--src/src.pro2
3 files changed, 4 insertions, 4 deletions
diff --git a/qtactiveqt.pro b/qtactiveqt.pro
index 5543434..0e9e462 100644
--- a/qtactiveqt.pro
+++ b/qtactiveqt.pro
@@ -1,7 +1,7 @@
CONFIG += tests_need_tools
load(qt_parts)
-!win32 {
- message("ActiveQt is a Windows-only module. Will just generate a docs target.")
+!win32|winrt {
+ message("ActiveQt is a Windows Desktop-only module. Will just generate a docs target.")
SUBDIRS = src
}
diff --git a/src/activeqt/activeqt.pro b/src/activeqt/activeqt.pro
index 972ce7c..752bd21 100644
--- a/src/activeqt/activeqt.pro
+++ b/src/activeqt/activeqt.pro
@@ -1,4 +1,4 @@
-win32 {
+win32:!winrt {
TEMPLATE = subdirs
CONFIG += ordered
diff --git a/src/src.pro b/src/src.pro
index f8c9d2c..6cff49f 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,4 +1,4 @@
TEMPLATE = subdirs
SUBDIRS = activeqt
-win32: SUBDIRS += tools
+win32:!winrt: SUBDIRS += tools
CONFIG += ordered