diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-17 21:12:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-17 21:12:14 (GMT) |
| commit | bf819a04b0c60c64912f72b613c1546d8be7dc50 (patch) | |
| tree | 5e8dd0f5b3abacaeabed892f72789f1c8cb6d808 /demos | |
| parent | b8a4b365b1105a742369bbaa5dc00e43914089e0 (diff) | |
| parent | 05d1efb5322651cbe227c9fd6ac200cfff423a91 (diff) | |
| download | Qt-bf819a04b0c60c64912f72b613c1546d8be7dc50.zip Qt-bf819a04b0c60c64912f72b613c1546d8be7dc50.tar.gz Qt-bf819a04b0c60c64912f72b613c1546d8be7dc50.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
WeatherInfo now shows Oslo info upon launch instead of blank screen
Fixed QCoeFepInputContext::widgetDestroyed
Diffstat (limited to 'demos')
| -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: |