diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2014-12-08 08:50:09 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2014-12-08 10:13:04 +0100 |
| commit | 7539ff18e650a57665160792da195d86d967906b (patch) | |
| tree | 1f11a8decfd3e6edac7ebe1d0b7f1b4c47b86810 | |
| parent | cece05b212a78b2d98c32be0bcb733aa0cc7fec1 (diff) | |
| download | qtactiveqt-7539ff18e650a57665160792da195d86d967906b.tar.gz | |
Fix broken wince builds
The qmake guards were completely wrong. The wince code was removed
from the source base but qmake was never told to exclude wince from
the build.
Change-Id: I5627d321a64669f642749d353e6c0b51704f1dcc
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| -rw-r--r-- | qtactiveqt.pro | 2 | ||||
| -rw-r--r-- | src/activeqt/activeqt.pro | 2 | ||||
| -rw-r--r-- | src/src.pro | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/qtactiveqt.pro b/qtactiveqt.pro index 039aaad..83d709a 100644 --- a/qtactiveqt.pro +++ b/qtactiveqt.pro @@ -3,5 +3,5 @@ load(qt_parts) !win32|winrt|wince { message("ActiveQt is a Windows Desktop-only module. Will just generate a docs target.") - SUBDIRS = src } +SUBDIRS = src diff --git a/src/activeqt/activeqt.pro b/src/activeqt/activeqt.pro index c1da447..8322bb9 100644 --- a/src/activeqt/activeqt.pro +++ b/src/activeqt/activeqt.pro @@ -1,4 +1,4 @@ -win32:!winrt { +win32:!winrt:!wince { TEMPLATE = subdirs CONFIG += ordered diff --git a/src/src.pro b/src/src.pro index 6cff49f..4248dae 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs SUBDIRS = activeqt -win32:!winrt: SUBDIRS += tools +win32:!winrt:!wince: SUBDIRS += tools CONFIG += ordered |