Don't change the current page of mainwindow container

Task-number: QTBUG-12097

Change-Id: I5a4c7c5803b1f82d5ebdc1d61dc00d3dcd43a53f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

diff --git a/src/designer/src/components/objectinspector/objectinspector.cpp b/src/designer/src/components/objectinspector/objectinspector.cpp
index 45aad7c..9535559 100644 (file)
--- a/src/designer/src/components/objectinspector/objectinspector.cpp
+++ b/src/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)) {