From 51d580aef7fce99a7c531fa35e50637ec8704a5d Mon Sep 17 00:00:00 2001
From: Alessandro Portale <aportale@trolltech.com>
Date: Wed, 27 May 2009 21:43:02 +0200
Subject: QSoftKeyStack::softKeyStackOfWidget only returns a stack if has one.
 No implicit creation happens.

---
 src/gui/widgets/qsoftkeystack.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)
-- 
cgit v0.12