From 1e06b0087f72a1ec08c7ec02390dd7103dd04743 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Thu, 5 Jul 2012 15:13:50 +0200 Subject: Don't change the current page of mainwindow container Task-number: QTBUG-12097 Change-Id: I3d9fa918ac8ea9ee419a3384f0d9e33366315a6c Reviewed-by: Friedemann Kleint --- tools/designer/src/components/objectinspector/objectinspector.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(w)) { // Rule out unmanaged internal scroll areas, for example, on QToolBoxes. if (QDesignerContainerExtension *c = qt_extension(m_core->extensionManager(), w)) { const int count = c->count(); if (count > 1 && !c->widget(c->currentIndex())->isAncestorOf(widget)) { -- cgit v0.12