feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.12'

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

Change-Id: I34c3d1fd5be90537e37d15e00b1a0d455d1bf81d
This commit is contained in:
Eike Ziller
2020-04-14 09:47:38 +02:00
parent e86a2bfdd2 af061c81b7
commit deb0eaf795
78 changed files with 5304 additions and 2534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/qmldesigner/designmodewidget.cpp
View File

@@ -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