summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlessandro Portale <aportale@trolltech.com>2009-05-27 19:43:02 (GMT)
committerAlessandro Portale <aportale@trolltech.com>2009-05-27 19:43:02 (GMT)
commit51d580aef7fce99a7c531fa35e50637ec8704a5d (patch)
tree98cfdae78e6ccf5aa49ed2485340b8d689fce0d7 /src
parentb0259b33de9813023a4228d28afd1fa56b99e9b0 (diff)
downloadQt-51d580aef7fce99a7c531fa35e50637ec8704a5d.zip
Qt-51d580aef7fce99a7c531fa35e50637ec8704a5d.tar.gz
Qt-51d580aef7fce99a7c531fa35e50637ec8704a5d.tar.bz2
QSoftKeyStack::softKeyStackOfWidget only returns a stack if has one.
No implicit creation happens.
Diffstat (limited to 'src')
-rw-r--r--src/gui/widgets/qsoftkeystack.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qsoftkeystack.cpp b/src/gui/widgets/qsoftkeystack.cpp
index ac58d2a..50d7939 100644
--- a/src/gui/widgets/qsoftkeystack.cpp
+++ b/src/gui/widgets/qsoftkeystack.cpp
@@ -220,7 +220,7 @@ QMainWindow *QSoftKeyStack::mainWindowOfWidget(QWidget *widget)
QSoftKeyStack *QSoftKeyStack::softKeyStackOfWidget(QWidget *widget)
{
QMainWindow *mainWindow = mainWindowOfWidget(widget);
- return mainWindow ? mainWindow->softKeyStack() : 0;
+ return (mainWindow && mainWindow->hasSoftKeyStack()) ? mainWindow->softKeyStack() : 0;
}
#if !defined(Q_WS_S60)