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/embedded | |
| 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/embedded')
| -rw-r--r-- | demos/embedded/weatherinfo/weatherinfo.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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: |