diff options
| author | Martin Smith <martin.smith@nokia.com> | 2011-04-01 11:04:00 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2011-04-01 11:04:00 (GMT) |
| commit | c49a91a9629122f01df285a0b436c7502abc769c (patch) | |
| tree | 446c027aa379b00d3a6b673a4ad5c5600fe2408b /demos/demos.pro | |
| parent | 131f429e43a5c382ae208af39bc5f889c39dee8b (diff) | |
| parent | 85d854855548497d95bef70af4d650af931a26ac (diff) | |
| download | Qt-c49a91a9629122f01df285a0b436c7502abc769c.zip Qt-c49a91a9629122f01df285a0b436c7502abc769c.tar.gz Qt-c49a91a9629122f01df285a0b436c7502abc769c.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'demos/demos.pro')
| -rw-r--r-- | demos/demos.pro | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/demos/demos.pro b/demos/demos.pro index 7f85499..b8b743c 100644 --- a/demos/demos.pro +++ b/demos/demos.pro @@ -21,12 +21,9 @@ SUBDIRS = \ symbian: SUBDIRS = \ demos_shared \ demos_deform \ - demos_pathstroke \ - demos_guitartuner \ - demos_qcamera \ - demos_qtbubblelevel \ - demos_quickhit - + demos_pathstroke + + wince*: SUBDIRS = \ demos_shared \ demos_deform \ @@ -43,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 } @@ -95,11 +92,11 @@ demos_qtdemo.subdir = qtdemo demos_mediaplayer.subdir = qmediaplayer demos_declarative.subdir = declarative -#mobile demos -demos_guitartuner = mobile/guitartuner -demos_qcamera = mobile/qcamera -demos_qtbubblelevel = mobile/qtbubblelevel -demos_quickhit = mobile/quickhit +#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 |