diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-29 22:49:55 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-29 22:50:23 +0100 |
| commit | 75b42f18d886b59dbf3380dd12f39f40005ef08b (patch) | |
| tree | cd1cb5699064fa897f11d9f9f4923c0c0f05d95a /src/plugins/debugger/debuggeractions.h | |
| parent | 43203140461174071f7a3e68bf388a6522556810 (diff) | |
| parent | a6ca348636dd92ab1445cff2286b3293163f5cea (diff) | |
| download | qt-creator-75b42f18d886b59dbf3380dd12f39f40005ef08b.tar.gz | |
Merge remote branch 'origin/1.3'
Trailing whitespace removal re-applied manually.
Diffstat (limited to 'src/plugins/debugger/debuggeractions.h')
| -rw-r--r-- | src/plugins/debugger/debuggeractions.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/debugger/debuggeractions.h b/src/plugins/debugger/debuggeractions.h index b8519994b7..36a3271caf 100644 --- a/src/plugins/debugger/debuggeractions.h +++ b/src/plugins/debugger/debuggeractions.h @@ -60,7 +60,7 @@ public slots: void writeSettings(QSettings *settings) const; private: - QHash<int, Utils::SavedAction *> m_items; + QHash<int, Utils::SavedAction *> m_items; }; @@ -88,7 +88,7 @@ enum DebuggerActionCode DebugDebuggingHelpers, UseCodeModel, - + UseToolTipsInMainEditor, UseToolTipsInLocalsView, UseToolTipsInBreakpointsView, |