diff options
| author | axis <qt-info@nokia.com> | 2011-04-27 14:13:27 +0200 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-04-27 14:34:19 +0200 |
| commit | 9e57cd5e6a1793994fc538f410cce0fc64de95c3 (patch) | |
| tree | 25e2c7fbd74d891bb532733a313f3e7e72306bbc /demos/embedded/embedded.pro | |
| parent | eae8fb85997d82ecec0743ba3e470681129bff41 (diff) | |
| parent | 106c57c238294387d6667a753e721687de3f9376 (diff) | |
Merged master into qtquick2.
Diffstat (limited to 'demos/embedded/embedded.pro')
| -rw-r--r-- | demos/embedded/embedded.pro | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/demos/embedded/embedded.pro b/demos/embedded/embedded.pro index efe3af5122..e9a448b1e3 100644 --- a/demos/embedded/embedded.pro +++ b/demos/embedded/embedded.pro @@ -1,32 +1,12 @@ TEMPLATE = subdirs SUBDIRS = styledemo raycasting flickable digiflip -contains(QT_CONFIG, svg) { - SUBDIRS += embeddedsvgviewer \ - desktopservices - fluidlauncher.subdir = fluidlauncher - fluidlauncher.depends = styledemo desktopservices raycasting flickable digiflip lightmaps flightinfo - !vxworks:!qnx:SUBDIRS += fluidlauncher -} - SUBDIRS += lightmaps SUBDIRS += flightinfo -contains(QT_CONFIG, svg) { - SUBDIRS += weatherinfo -} - -contains(QT_CONFIG, webkit) { - SUBDIRS += anomaly -} - -contains(QT_CONFIG, declarative) { - # Qml demos require DEPLOYMENT support. Therefore, only symbian. - symbian:SUBDIRS += qmlcalculator qmlclocks qmldialcontrol qmleasing qmlflickr qmlphotoviewer qmltwitter -} # install sources.files = README *.pro sources.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded INSTALLS += sources -symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) +symbian: CONFIG += qt_demo |