3 files changed, 4 insertions, 10 deletions
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index e49e429f775..d2647f3d7b9 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -44,6 +44,7 @@
 #include <coreplugin/navigationwidget.h>
 #include <coreplugin/outputpane.h>
 #include <coreplugin/rightpane.h>
+#include <coreplugin/session.h>
 
 #include <extensionsystem/iplugin.h>
 #include <extensionsystem/pluginmanager.h>
@@ -787,9 +788,10 @@ DebuggerPluginPrivate::DebuggerPluginPrivate(const QStringList &arguments)
     ICore::addAdditionalContext(debuggerNotRunning);
 
     m_arguments = arguments;
-    if (!m_arguments.isEmpty())
-        connect(ProjectExplorerPlugin::instance(), &ProjectExplorerPlugin::finishedInitialization,
+    if (!m_arguments.isEmpty()) {
+        connect(SessionManager::instance(), &SessionManager::startupSessionRestored,
                 this, &DebuggerPluginPrivate::parseCommandLineArguments);
+    }
 
     // Menus
     m_menu = ActionManager::createMenu(M_DEBUG_ANALYZER);
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index e8aa205abdc..4a9d1ef8aae 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -1897,10 +1897,6 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
             &ProjectWelcomePage::requestProject,
             m_instance,
             &ProjectExplorerPlugin::openProjectWelcomePage);
-    connect(SessionManager::instance(),
-            &SessionManager::startupSessionRestored,
-            m_instance,
-            &ProjectExplorerPlugin::finishedInitialization);
     dd->updateWelcomePage();
 
     MacroExpander *expander = Utils::globalMacroExpander();
diff --git a/src/plugins/projectexplorer/projectexplorer.h b/src/plugins/projectexplorer/projectexplorer.h
index eb33841dd9a..ffb5d1bcd3c 100644
--- a/src/plugins/projectexplorer/projectexplorer.h
+++ b/src/plugins/projectexplorer/projectexplorer.h
@@ -24,8 +24,6 @@ namespace Core {
 class OutputWindow;
 } // Core
 
-namespace Utils { class CommandLine; }
-
 namespace ProjectExplorer {
 class CustomParserSettings;
 class FolderNode;
@@ -170,8 +168,6 @@ public:
     static Core::OutputWindow *buildSystemOutput();
 
 signals:
-    void finishedInitialization();
-
     // Is emitted when a project has been added/removed,
     // or the file list of a specific project has changed.
     void fileListChanged();