diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2014-12-08 08:50:09 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-03-18 07:58:38 +0000 |
| commit | 70c22cb89f1c923c71cbc1a477c862fd947161e6 (patch) | |
| tree | 04f8752ee77c2c64a363e9f69c221de443e290f0 | |
| parent | 294d684d83a7105c44ba3d1298850e21d4505052 (diff) | |
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.
Backport of same change from 5.5 branch
Change-Id: I515c828231d02c3e2016a3a2283d1961ecde8701
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 752bd21..4025987 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 |