diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-08-23 00:33:52 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-08-23 00:33:52 (GMT) |
| commit | 6a3945d3ca3185c00597dcaefb93617620973ff5 (patch) | |
| tree | 0534630f29a2d513621adf33c6fb25085fcab220 /src/gui/kernel/qwidget_s60.cpp | |
| parent | 1690ad91cc9e686e688aa7832a16cbf2c9336948 (diff) | |
| parent | 67e90b8a5701ef5b0653f012e74debc91e1b3b49 (diff) | |
| download | Qt-6a3945d3ca3185c00597dcaefb93617620973ff5.zip Qt-6a3945d3ca3185c00597dcaefb93617620973ff5.tar.gz Qt-6a3945d3ca3185c00597dcaefb93617620973ff5.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/gui/kernel/qwidget_s60.cpp')
| -rw-r--r-- | src/gui/kernel/qwidget_s60.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp index 7ab9fbc..7494f92 100644 --- a/src/gui/kernel/qwidget_s60.cpp +++ b/src/gui/kernel/qwidget_s60.cpp @@ -486,7 +486,7 @@ void QWidgetPrivate::show_sys() #ifdef Q_WS_S60 // Lazily initialize the S60 screen furniture when the first window is shown. - if (!QApplication::testAttribute(Qt::AA_S60DontConstructApplicationPanes) + if (q->isWindow() && !QApplication::testAttribute(Qt::AA_S60DontConstructApplicationPanes) && !S60->buttonGroupContainer() && !S60->statusPane()) { if (!q->testAttribute(Qt::WA_DontShowOnScreen)) { |