Merge remote-tracking branch 'origin/4.3'

Conflicts:
	tests/auto/debugger/tst_dumpers.cpp

Change-Id: Id8b53b000f94a1b5ab923db79f67bad3276d09dc

src/plugins/coreplugin/navigationwidget.h

@@ -58,10 +58,11 @@ public:
     virtual ~NavigationWidgetPlaceHolder();
     static NavigationWidgetPlaceHolder *current(Side side);
     static void setCurrent(Side side, NavigationWidgetPlaceHolder *navWidget);
-    void applyStoredSize(int width);
+    void applyStoredSize();
 
 private:
     void currentModeAboutToChange(Id mode);
+    int storedWidth() const;
 
     Id m_mode;
     Side m_side;