diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-22 07:47:06 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-22 07:47:06 (GMT) |
| commit | 9a216c3f7abeacae8b9e9f78e50ddfcfbb5e2fa3 (patch) | |
| tree | ec1eb5ec4225b596dca92df654d58b72a229d8a6 /demos | |
| parent | d22741b4bee0e526aefbbd7b851c2aa1b0b1c5b6 (diff) | |
| parent | 4e6790c8dc21c5287bff6799fb0984a72e2f2766 (diff) | |
| download | Qt-9a216c3f7abeacae8b9e9f78e50ddfcfbb5e2fa3.zip Qt-9a216c3f7abeacae8b9e9f78e50ddfcfbb5e2fa3.tar.gz Qt-9a216c3f7abeacae8b9e9f78e50ddfcfbb5e2fa3.tar.bz2 | |
Merge remote branch 'lighthouse/4.7' into lighthouse-master
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/demos.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/demos.pro b/demos/demos.pro index fdc1e4c..362a3bc 100644 --- a/demos/demos.pro +++ b/demos/demos.pro @@ -44,7 +44,7 @@ contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles1):!contains(QT_CONFIG, SUBDIRS += demos_boxes } -mac*: SUBDIRS += demos_macmainwindow +mac* && !qpa: SUBDIRS += demos_macmainwindow wince*|symbian|embedded|x11: SUBDIRS += demos_embedded !contains(QT_EDITION, Console):!cross_compile:!embedded:!wince*:SUBDIRS += demos_arthurplugin |