diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-25 23:06:36 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-25 23:06:36 (GMT) |
| commit | 8484fc497f9d02b708cb23adb8ab6102d63a7753 (patch) | |
| tree | eb6aacda7fda551bcfbcfd6b0d192b2389bd094e /examples/examples.pro | |
| parent | 314c6ec54e4cb4e2ec936ada7e0a112a60b87832 (diff) | |
| parent | 1470504e15662acf37bacc58359527f88efc43ab (diff) | |
| download | Qt-8484fc497f9d02b708cb23adb8ab6102d63a7753.zip Qt-8484fc497f9d02b708cb23adb8ab6102d63a7753.tar.gz Qt-8484fc497f9d02b708cb23adb8ab6102d63a7753.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
configure
configure.exe
mkspecs/features/qt.prf
tools/configure/configureapp.cpp
Diffstat (limited to 'examples/examples.pro')
| -rw-r--r-- | examples/examples.pro | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index 16d72a7..4f4105b 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -4,6 +4,7 @@ SUBDIRS = \ desktop \ dialogs \ draganddrop \ + effects \ graphicsview \ ipc \ itemviews \ @@ -23,15 +24,32 @@ SUBDIRS = \ uitools \ declarative \ xml \ - script \ multitouch \ gestures -contains(QT_CONFIG, multimedia):!static: SUBDIRS += multimedia +symbian: SUBDIRS = \ + graphicsview \ + itemviews \ + network \ + painting \ + widgets \ + draganddrop \ + mainwindows \ + sql \ + uitools \ + xml + +contains(QT_CONFIG, multimedia) { + SUBDIRS += video + !static: SUBDIRS += multimedia +} + +contains(QT_CONFIG, script): SUBDIRS += script + contains(QT_CONFIG, phonon):!static: SUBDIRS += phonon contains(QT_CONFIG, webkit): SUBDIRS += webkit embedded:SUBDIRS += qws -!wince*: { +!wince*:!symbian: { !contains(QT_EDITION, Console):contains(QT_BUILD_PARTS, tools):SUBDIRS += designer contains(QT_BUILD_PARTS, tools):SUBDIRS += assistant qtestlib help } else { @@ -48,3 +66,5 @@ contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows sources.files = README *.pro sources.path = $$[QT_INSTALL_EXAMPLES] INSTALLS += sources + +symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) |