diff options
| author | Eike Ziller <[email protected]> | 2018-07-10 07:44:53 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2018-07-10 07:44:53 +0200 |
| commit | d09b71d260c791816c7d6a73d6b7ab801f22865d (patch) | |
| tree | 673eda244852e3f8d88f1abff5d6955050cad398 /src/plugins/debugger/debuggerplugin.cpp | |
| parent | d20464d56f81d0524cb71b263c76e748832af0f8 (diff) | |
| parent | 3300182d405bffe062a0f2be900f35822a9e20b0 (diff) | |
Merge remote-tracking branch 'origin/4.7'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/plugins/android/androiddebugsupport.cpp
Change-Id: I01c4880850ad25432a65bb32849365d2aeb0756f
Diffstat (limited to 'src/plugins/debugger/debuggerplugin.cpp')
| -rw-r--r-- | src/plugins/debugger/debuggerplugin.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index efc17e824cc..06041d474e6 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -2795,7 +2795,6 @@ void DebuggerPluginPrivate::aboutToShutdown() disconnect(SessionManager::instance(), &SessionManager::startupProjectChanged, this, nullptr); - m_mainWindow->saveCurrentPerspective(); m_shutdownTimer.setInterval(0); m_shutdownTimer.setSingleShot(true); connect(&m_shutdownTimer, &QTimer::timeout, this, &DebuggerPluginPrivate::doShutdown); |