diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-06-16 08:40:29 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-06-16 08:40:29 (GMT) |
| commit | 18fcfc3576b7bcbcf3326697461f21fab990512b (patch) | |
| tree | 86ef2720641caeb2147a8608939cfa03f5d1e117 | |
| parent | 0cbf7654e90d5dbd00b89bb90a37df8c55b329cd (diff) | |
| parent | 9fbf1387b04ec1dab0772956457fdbf1c0e508f2 (diff) | |
| download | Qt-18fcfc3576b7bcbcf3326697461f21fab990512b.zip Qt-18fcfc3576b7bcbcf3326697461f21fab990512b.tar.gz Qt-18fcfc3576b7bcbcf3326697461f21fab990512b.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
| -rw-r--r-- | examples/widgets/softkeys/softkeys.cpp | 12 | ||||
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 4 |
2 files changed, 11 insertions, 5 deletions
diff --git a/examples/widgets/softkeys/softkeys.cpp b/examples/widgets/softkeys/softkeys.cpp index 9672aee..e717510 100644 --- a/examples/widgets/softkeys/softkeys.cpp +++ b/examples/widgets/softkeys/softkeys.cpp @@ -127,7 +127,9 @@ void MainWindow::addSoftKeys() QList<QAction*> softkeys; softkeys.append(ok); softkeys.append(cancel); - pushButton->setSoftKeys(softkeys); + QWidget* focusWidget = QApplication::focusWidget(); + if (focusWidget) + focusWidget->setSoftKeys(softkeys); } void MainWindow::exitApplication() @@ -138,13 +140,17 @@ void MainWindow::exitApplication() void MainWindow::okPressed() { infoLabel->setText(tr("OK pressed")); - pushButton->setSoftKey(0); + QWidget* focusWidget = QApplication::focusWidget(); + if (focusWidget) + focusWidget->setSoftKey(0); } void MainWindow::cancelPressed() { infoLabel->setText(tr("Cancel pressed")); - pushButton->setSoftKey(0); + QWidget* focusWidget = QApplication::focusWidget(); + if (focusWidget) + focusWidget->setSoftKey(0); } diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 7b78033..663a1df 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -62,8 +62,8 @@ QMAKE_LFLAGS_DLL = -shared QMAKE_LINK_OBJECT_MAX = 10 QMAKE_LINK_OBJECT_SCRIPT= object_script -QMAKE_DESKTOPSERVICES_LIBS = -lsendas2 -lsendui -lplatformenv -lcommonui -letext -lapmime -QMAKE_STATUSPANE_LIBS = -lavkon -leikcoctl +QMAKE_DESKTOPSERVICES_LIBS = -lsendas2 -lplatformenv -lcommonui -letext -lapmime +QMAKE_STATUSPANE_LIBS = -lavkon -leikcoctl QMAKE_LIBS = -llibc -llibm -leuser -llibdl QMAKE_LIBS_CORE = $$QMAKE_LIBS -llibpthread -lefsrv |