diff options
| author | Martin Smith <msmith@trolltech.com> | 2009-12-18 09:07:46 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2009-12-18 09:07:46 (GMT) |
| commit | 0d212670c06ed54ac785e0bb945c792947d388f5 (patch) | |
| tree | c4f6c6762ad42df463f30e05e090fa2cfa9de77a /demos | |
| parent | 371420d5f31a04b91c01807139d49e97db040bee (diff) | |
| parent | 7c1283fca1ef2e742b5794600e00edf0c3e3020f (diff) | |
| download | Qt-0d212670c06ed54ac785e0bb945c792947d388f5.zip Qt-0d212670c06ed54ac785e0bb945c792947d388f5.tar.gz Qt-0d212670c06ed54ac785e0bb945c792947d388f5.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/demos.pro | 21 | ||||
| -rw-r--r-- | demos/embedded/weatherinfo/weatherinfo.cpp | 3 |
2 files changed, 20 insertions, 4 deletions
diff --git a/demos/demos.pro b/demos/demos.pro index a943bfd..5a9b6db 100644 --- a/demos/demos.pro +++ b/demos/demos.pro @@ -20,7 +20,24 @@ symbian: SUBDIRS = \ demos_shared \ demos_deform \ demos_pathstroke - + +wince*: SUBDIRS = \ + demos_shared \ + demos_deform \ + demos_gradients \ + demos_pathstroke \ + demos_affine \ + demos_composition \ + demos_books \ + demos_interview \ + demos_mainwindow \ + demos_spreadsheet \ + demos_textedit \ + # demos_chip \ + demos_embeddeddialogs \ + demos_undo \ + demos_sub-attaq + contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles1):!contains(QT_CONFIG, opengles1cl):!contains(QT_CONFIG, opengles2):{ SUBDIRS += demos_boxes } @@ -33,7 +50,7 @@ wince*|symbian|embedded|x11: SUBDIRS += embedded !cross_compile:{ contains(QT_BUILD_PARTS, tools):{ !wince*:SUBDIRS += demos_sqlbrowser demos_qtdemo -wince*: SUBDIRS += demos_sqlbrowser +wince*:SUBDIRS += demos_sqlbrowser } } contains(QT_CONFIG, phonon):!static:SUBDIRS += demos_mediaplayer diff --git a/demos/embedded/weatherinfo/weatherinfo.cpp b/demos/embedded/weatherinfo/weatherinfo.cpp index 842f05b..3b78a5f 100644 --- a/demos/embedded/weatherinfo/weatherinfo.cpp +++ b/demos/embedded/weatherinfo/weatherinfo.cpp @@ -105,9 +105,8 @@ private slots: void delayedInit() { #if defined(Q_OS_SYMBIAN) qt_SetDefaultIap(); -#else - request("Oslo"); #endif + request("Oslo"); } private slots: |