diff options
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/demos.pro | 21 | ||||
| -rw-r--r-- | demos/spectrum/spectrum.pri | 6 |
2 files changed, 12 insertions, 15 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 diff --git a/demos/spectrum/spectrum.pri b/demos/spectrum/spectrum.pri index 5773900..75c0113 100644 --- a/demos/spectrum/spectrum.pri +++ b/demos/spectrum/spectrum.pri @@ -41,9 +41,9 @@ win32 { # ..$${spectrum_build_dir} # without the result having a trailing slash where spectrum_build_dir # is undefined. - spectrum_build_dir = /release - if (!debug_and_release|build_pass): CONFIG(debug, debug|release) { - spectrum_build_dir = /debug + build_pass { + CONFIG(release, release|debug): spectrum_build_dir = /release + CONFIG(debug, release|debug): spectrum_build_dir = /debug } } |