Merge remote-tracking branch 'origin/4.11' into 4.12

Change-Id: I3edd6457620e6c2686e13d1030805294d7d3958f
2020-04-03 15:56:36 +02:00
parent 8f8b1b3d9d e986bdc7a7
commit f8ec649c99
7 changed files with 47878 additions and 82 deletions
--- a/src/plugins/debugger/debuggermainwindow.cpp
+++ b/src/plugins/debugger/debuggermainwindow.cpp
@@ -302,6 +302,11 @@ DebuggerMainWindow::DebuggerMainWindow()
    cmd->setAttribute(Command::CA_Hide);
    viewsMenu->addAction(cmd, Core::Constants::G_DEFAULT_THREE);

+    // HACK: See QTCREATORBUG-23755. This ensures the showCentralWidget()
+    // call in restorePersistentSettings() below has something to operate on,
+    // and a plain QWidget is what we'll use anyway as central widget.
+    setCentralWidget(new QWidget);
+
    restorePersistentSettings();
 }