diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-07 13:13:08 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-07 13:14:27 (GMT) |
| commit | 7c8980ee041e874a6c430f01b2daff4955517b03 (patch) | |
| tree | aa19249a7fb469176fb22adfa9a1b702ae3be6c0 /demos/demos.pro | |
| parent | 8031eada2f81963865390b4d899631b09d4ca6f3 (diff) | |
| parent | a05f73499a187c67a394893e2cc74516ccbc46f5 (diff) | |
| download | Qt-7c8980ee041e874a6c430f01b2daff4955517b03.zip Qt-7c8980ee041e874a6c430f01b2daff4955517b03.tar.gz Qt-7c8980ee041e874a6c430f01b2daff4955517b03.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
src/gui/text/qfontengine_mac.mm
tests/auto/qdiriterator/tst_qdiriterator.cpp
Diffstat (limited to 'demos/demos.pro')
| -rw-r--r-- | demos/demos.pro | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/demos/demos.pro b/demos/demos.pro index 362a3bc..f1d5b00 100644 --- a/demos/demos.pro +++ b/demos/demos.pro @@ -22,7 +22,8 @@ symbian: SUBDIRS = \ demos_shared \ demos_deform \ demos_pathstroke - + + wince*: SUBDIRS = \ demos_shared \ demos_deform \ @@ -39,7 +40,7 @@ wince*: SUBDIRS = \ demos_embeddeddialogs \ demos_undo \ demos_sub-attaq - + contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles1):!contains(QT_CONFIG, opengles2):{ SUBDIRS += demos_boxes } @@ -91,6 +92,12 @@ demos_qtdemo.subdir = qtdemo demos_mediaplayer.subdir = qmediaplayer demos_declarative.subdir = declarative +#mobile demos. Requires QtMobility sources. Not included in demo build +demos_guitartuner.subdir = mobile/guitartuner +demos_qcamera.subdir = mobile/qcamera +demos_qtbubblelevel.subdir = mobile/qtbubblelevel +demos_quickhit.subdir = mobile/quickhit + demos_browser.subdir = browser demos_boxes.subdir = boxes |