diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2014-09-30 11:04:08 +0300 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2014-09-30 10:50:13 +0200 |
| commit | f81b407ca0a1812af5c2bffa6cee485afa563cd8 (patch) | |
| tree | b17bd364fc732dca02787534d997bb6564fbacb4 | |
| parent | 9af13b1f8760179bac53a2d5614b59baac5b260b (diff) | |
| download | qt-creator-f81b407ca0a1812af5c2bffa6cee485afa563cd8.tar.gz | |
Core: Revert function signature change
Breaks BC with MSVC2010.
This partially reverts commit fe8ed7f5a666629ae43f8fc0888484a8bfa3b210.
Change-Id: I36f995f992f3d12f16900c6dbe1dc94123c188bd
Reviewed-by: hjk <hjk121@nokiamail.com>
| -rw-r--r-- | src/plugins/coreplugin/modemanager.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/coreplugin/modemanager.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/coreplugin/modemanager.cpp b/src/plugins/coreplugin/modemanager.cpp index 349d93ef76..9e387d4f44 100644 --- a/src/plugins/coreplugin/modemanager.cpp +++ b/src/plugins/coreplugin/modemanager.cpp @@ -320,7 +320,7 @@ bool ModeManager::isModeSelectorVisible() return d->m_modeSelectorVisible; } -ModeManager *ModeManager::instance() +QObject *ModeManager::instance() { return m_instance; } diff --git a/src/plugins/coreplugin/modemanager.h b/src/plugins/coreplugin/modemanager.h index 9e708e0e02..a6689368be 100644 --- a/src/plugins/coreplugin/modemanager.h +++ b/src/plugins/coreplugin/modemanager.h @@ -52,7 +52,7 @@ class CORE_EXPORT ModeManager : public QObject Q_OBJECT public: - static ModeManager *instance(); + static QObject *instance(); static IMode *currentMode(); static IMode *mode(Id id); |