Merge remote-tracking branch 'origin/4.12'

 Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp

Change-Id: I34c3d1fd5be90537e37d15e00b1a0d455d1bf81d

1 files changed, 2 insertions, 17 deletions

diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp
index ea88dfcc04..5a1aa97fa6 100644
--- a/src/plugins/qmldesigner/designmodewidget.cpp
+++ b/src/plugins/qmldesigner/designmodewidget.cpp
@@ -210,22 +210,6 @@ void DesignModeWidget::disableWidgets()
     m_isDisabled = true;
 }
 
-bool DesignModeWidget::eventFilter(QObject *obj, QEvent *event) // TODO
-{
-    if (event->type() == QEvent::Hide) {
-        qDebug() << ">>> HIDE";
-        m_outputPaneDockWidget->toggleView(false);
-        return true;
-    } else if (event->type() == QEvent::Show) {
-        qDebug() << ">>> SHOW";
-        m_outputPaneDockWidget->toggleView(true);
-        return true;
-    } else {
-        // standard event processing
-        return QObject::eventFilter(obj, event);
-    }
-}
-
 void DesignModeWidget::setup()
 {
     auto &actionManager = viewManager().designerActionManager();
@@ -354,7 +338,8 @@ void DesignModeWidget::setup()
         command->setAttribute(Core::Command::CA_Hide);
         mviews->addAction(command);
 
-        //outputPanePlaceholder->installEventFilter(this);
+        connect(outputPanePlaceholder, &Core::OutputPanePlaceHolder::visibilityChangeRequested,
+                m_outputPaneDockWidget, &ADS::DockWidget::toggleView);
     }
 
     // Create toolbars