diff options
| author | Jarek Kobus <jaroslaw.kobus@nokia.com> | 2012-07-05 13:13:50 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-06 06:14:42 (GMT) |
| commit | 1e06b0087f72a1ec08c7ec02390dd7103dd04743 (patch) | |
| tree | b5c654381df7b6be1f8ea7785235918d947166b5 /tools/designer/src/components | |
| parent | 696018e016ae49c9ee6df2023fee37c0bd57ec8c (diff) | |
| download | Qt-1e06b0087f72a1ec08c7ec02390dd7103dd04743.zip Qt-1e06b0087f72a1ec08c7ec02390dd7103dd04743.tar.gz Qt-1e06b0087f72a1ec08c7ec02390dd7103dd04743.tar.bz2 | |
Don't change the current page of mainwindow container
Task-number: QTBUG-12097
Change-Id: I3d9fa918ac8ea9ee419a3384f0d9e33366315a6c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'tools/designer/src/components')
| -rw-r--r-- | tools/designer/src/components/objectinspector/objectinspector.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/designer/src/components/objectinspector/objectinspector.cpp b/tools/designer/src/components/objectinspector/objectinspector.cpp index 57f9192..4dbceb1 100644 --- a/tools/designer/src/components/objectinspector/objectinspector.cpp +++ b/tools/designer/src/components/objectinspector/objectinspector.cpp @@ -305,7 +305,7 @@ void ObjectInspector::ObjectInspectorPrivate::showContainersCurrentPage(QWidget bool macroStarted = false; // Find a multipage container (tab widgets, etc.) in the hierarchy and set the right page. while (w != 0) { - if (fw->isManaged(w)) { // Rule out unmanaged internal scroll areas, for example, on QToolBoxes. + if (fw->isManaged(w) && !qobject_cast<QMainWindow *>(w)) { // Rule out unmanaged internal scroll areas, for example, on QToolBoxes. if (QDesignerContainerExtension *c = qt_extension<QDesignerContainerExtension*>(m_core->extensionManager(), w)) { const int count = c->count(); if (count > 1 && !c->widget(c->currentIndex())->isAncestorOf(widget)) { |