diff options
author | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-15 07:57:10 (GMT) |
---|---|---|
committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-15 07:57:35 (GMT) |
commit | a814aba657288942b5beed70a2110446420f981c (patch) | |
tree | dd112e5838b9daf6aeb01d31a409f8a438047e0d /demos/demos.pro | |
parent | e479ba841f62cc4af709e97f8085d7779e14e3e9 (diff) | |
parent | 1a62cb6ba07ef64e5101cbfca85bb539075742d5 (diff) | |
download | Qt-a814aba657288942b5beed70a2110446420f981c.zip Qt-a814aba657288942b5beed70a2110446420f981c.tar.gz Qt-a814aba657288942b5beed70a2110446420f981c.tar.bz2 |
Merge commit origin/4.6 into team-widgets/4.6
Diffstat (limited to 'demos/demos.pro')
-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 4a9d451..5e400ea 100644 --- a/demos/demos.pro +++ b/demos/demos.pro @@ -26,7 +26,7 @@ SUBDIRS += demos_boxes } mac*: SUBDIRS += demos_macmainwindow -wince*|symbian|embedded: SUBDIRS += embedded +wince*|symbian|embedded|x11: SUBDIRS += embedded !contains(QT_EDITION, Console):!cross_compile:!embedded:!wince*:SUBDIRS += demos_arthurplugin |