summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2010-03-23 09:21:38 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2010-03-23 09:21:38 (GMT)
commit0409cdb406021d8609eb2a88a896f9fbc085805f (patch)
tree197e54d3adc628d899f22873ad7266e06f72c1db
parent262e98f9a29385f99cd6f768632264e0b621dc01 (diff)
downloadQt-0409cdb406021d8609eb2a88a896f9fbc085805f.zip
Qt-0409cdb406021d8609eb2a88a896f9fbc085805f.tar.gz
Qt-0409cdb406021d8609eb2a88a896f9fbc085805f.tar.bz2
Hotfix to const usage in 262e98f9a29385f99cd6f768632264e0b621dc01
Reviewed-By: TrustMe
-rw-r--r--src/gui/kernel/qsoftkeymanager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp
index d324c76..923144a 100644
--- a/src/gui/kernel/qsoftkeymanager.cpp
+++ b/src/gui/kernel/qsoftkeymanager.cpp
@@ -197,8 +197,8 @@ QWidget *QSoftKeyManager::softkeySource(QWidget *previousSource, bool& recursive
QWidget *source = NULL;
if (!previousSource) {
// Initial source is primarily focuswidget and secondarily activeWindow
- const QWidget *focus = QApplication::focusWidget();
- const QWidget *popup = QApplication::activePopupWidget();
+ QWidget *focus = QApplication::focusWidget();
+ QWidget *popup = QApplication::activePopupWidget();
if (popup) {
if (isChildOf(focus, popup))
source = focus;
@@ -206,7 +206,7 @@ QWidget *QSoftKeyManager::softkeySource(QWidget *previousSource, bool& recursive
source = popup;
}
if (!source) {
- const QWidget *modal = QApplication::activeModalWidget();
+ QWidget *modal = QApplication::activeModalWidget();
if (modal) {
if (isChildOf(focus, modal))
source = focus;