Merge remote-tracking branch 'origin/4.8'

Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: Iaec96f929230754b87b32c2588db5cac5acd8453
This commit is contained in:
Eike Ziller
2019-01-21 08:54:49 +01:00
5 changed files with 22 additions and 17 deletions

View File

@@ -1403,9 +1403,9 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments,
m_perspective.useSubPerspectiveSwitcher(EngineManager::engineChooser());
m_perspective.addToolBarAction(&m_startAction);
m_perspective.addWindow(m_breakpointManagerWindow, Perspective::SplitVertical, nullptr);
m_perspective.addWindow(m_globalLogWindow, Perspective::SplitHorizontal, m_breakpointManagerWindow, false);
m_perspective.addWindow(m_engineManagerWindow, Perspective::AddToTab, m_globalLogWindow);
m_perspective.addWindow(m_engineManagerWindow, Perspective::SplitVertical, nullptr);
m_perspective.addWindow(m_breakpointManagerWindow, Perspective::SplitHorizontal, m_engineManagerWindow);
m_perspective.addWindow(m_globalLogWindow, Perspective::AddToTab, m_breakpointManagerWindow, false);
setInitialState();