Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

src/plugins/debugger/debuggermanager.cpp

@@ -430,6 +430,14 @@ void DebuggerManager::init()
 
     m_threadsDock = createDockForWidget(m_threadsWindow);
 
+    QSplitter *localsAndWatchers = new QSplitter(Qt::Vertical, 0);
+    localsAndWatchers->setWindowTitle(m_localsWindow->windowTitle());
+    localsAndWatchers->addWidget(m_localsWindow);
+    localsAndWatchers->addWidget(m_watchersWindow);
+    localsAndWatchers->setStretchFactor(0, 3);
+    localsAndWatchers->setStretchFactor(1, 1);
+    m_watchDock = createDockForWidget(localsAndWatchers);
+
     setStatus(DebuggerProcessNotReady);
 }
 
@@ -457,17 +465,6 @@ IDebuggerManagerAccessForEngines *DebuggerManager::engineInterface()
     return dynamic_cast<IDebuggerManagerAccessForEngines *>(this);
 }
 
-void DebuggerManager::createDockWidgets()
-{
-    QSplitter *localsAndWatchers = new QSplitter(Qt::Vertical, 0);
-    localsAndWatchers->setWindowTitle(m_localsWindow->windowTitle());
-    localsAndWatchers->addWidget(m_localsWindow);
-    localsAndWatchers->addWidget(m_watchersWindow);
-    localsAndWatchers->setStretchFactor(0, 3);
-    localsAndWatchers->setStretchFactor(1, 1);
-    m_watchDock = createDockForWidget(localsAndWatchers);
-}
-
 void DebuggerManager::createNewDock(QWidget *widget)
 {
     QDockWidget *dockWidget = new QDockWidget(widget->windowTitle(), m_mainWindow);

src/plugins/debugger/debuggermanager.h

@@ -316,7 +316,6 @@ private:
     //
     QWidget *threadsWindow() const { return m_threadsWindow; }
     QList<QDockWidget*> dockWidgets() const { return m_dockWidgets; }
-    void createDockWidgets();
 
     virtual bool qtDumperLibraryEnabled() const;
     virtual QString qtDumperLibraryName() const;

src/plugins/debugger/debuggerplugin.cpp

@@ -173,10 +173,6 @@ class DebugMode : public Core::BaseMode
 public:
     DebugMode(QObject *parent = 0);
     ~DebugMode();
-
-    // IMode
-    void activated() {}
-    void shutdown() {}
 };
 
 DebugMode::DebugMode(QObject *parent)
@@ -409,8 +405,6 @@ DebuggerPlugin::~DebuggerPlugin()
 
 void DebuggerPlugin::shutdown()
 {
-    if (m_debugMode)
-        m_debugMode->shutdown(); // saves state including manager information
     QTC_ASSERT(m_manager, /**/);
     if (m_manager)
         m_manager->shutdown();
@@ -758,7 +752,6 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess
     toolBarAddingLayout->addWidget(rightPaneSplitter);
     toolBarAddingLayout->addWidget(debugToolBar);
 
-    m_manager->createDockWidgets();
     m_manager->setSimpleDockWidgetArrangement();
     readSettings();