diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-05-04 10:03:50 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-05-04 10:03:50 +0200 |
| commit | 105b69836cda6a6788103cb8ed022d9762970630 (patch) | |
| tree | ddf94e072587ddebc418064f6d4065833f897949 /src/plugins/coreplugin/navigationwidget.h | |
| parent | ba5d12e80f3e978af5666260439f87496015106c (diff) | |
| parent | 3b901b25a86f49ebef9be03ec762ed76422fd91c (diff) | |
| download | qt-creator-105b69836cda6a6788103cb8ed022d9762970630.tar.gz | |
Merge remote-tracking branch 'origin/4.3'
Conflicts:
tests/auto/debugger/tst_dumpers.cpp
Change-Id: Id8b53b000f94a1b5ab923db79f67bad3276d09dc
Diffstat (limited to 'src/plugins/coreplugin/navigationwidget.h')
| -rw-r--r-- | src/plugins/coreplugin/navigationwidget.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/coreplugin/navigationwidget.h b/src/plugins/coreplugin/navigationwidget.h index 3cc68c5896..e2b49ee95c 100644 --- a/src/plugins/coreplugin/navigationwidget.h +++ b/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; |