From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Fri, 23 Nov 2012 09:04:00 +0000 (+0100)
Subject: Detect QMainWindow-separator as passive interactor in Qt Designer.
X-Git-Tag: accepted/tizen/20131212.181521~155
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5e4bc7e3556cb5afcd82731277bdef60ae2cbe33;p=platform%2Fupstream%2Fqttools.git

Detect QMainWindow-separator as passive interactor in Qt Designer.

Ensure that dock widgets in Qt Creator can be resized.

Task-number: QTCREATORBUG-8284
Change-Id: If6aa55b2dde8fce53e1527db678f518b3912907b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
---

diff --git a/src/designer/src/lib/shared/widgetfactory.cpp b/src/designer/src/lib/shared/widgetfactory.cpp
index d8bf16a..dd03e2a 100644
--- a/src/designer/src/lib/shared/widgetfactory.cpp
+++ b/src/designer/src/lib/shared/widgetfactory.cpp
@@ -802,6 +802,7 @@ static bool isTabBarInteractor(const QTabBar *tabBar)
 bool WidgetFactory::isPassiveInteractor(QWidget *widget)
 {
     static const QString qtPassive = QStringLiteral("__qt__passive_");
+    static const QString qtMainWindowSplitter = QStringLiteral("qt_qmainwindow_extended_splitter");
     if (m_lastPassiveInteractor != 0 && (QWidget*)(*m_lastPassiveInteractor) == widget)
         return m_lastWasAPassiveInteractor;
 
@@ -842,8 +843,11 @@ bool WidgetFactory::isPassiveInteractor(QWidget *widget)
         return (m_lastWasAPassiveInteractor = true);
     else if (qstrcmp(widget->metaObject()->className(), "QWorkspaceTitleBar") == 0)
         return (m_lastWasAPassiveInteractor = true);
-    else if (widget->objectName().startsWith(qtPassive))
-        return (m_lastWasAPassiveInteractor = true);
+    const QString name = widget->objectName();
+    if (name.startsWith(qtPassive) || name == qtMainWindowSplitter) {
+        m_lastWasAPassiveInteractor = true;
+        return m_lastWasAPassiveInteractor;
+    }
     return m_lastWasAPassiveInteractor;
 }