summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2014-04-01 12:38:06 +0200
committerJoerg Bornemann <joerg.bornemann@digia.com>2014-04-01 15:54:53 +0200
commit7e4502d67633da3a3850b9f973d682843a625123 (patch)
tree028449299fda82804980f34bed160d6c8fd70008
parenta5132d38c0c5dfd0125e22a6096d53a2dbd8d64b (diff)
downloadqt-creator-7e4502d67633da3a3850b9f973d682843a625123.tar.gz
change QtVersionManager::instance() return type to QtVersionManager*
Enough time has passed to make developers acquainted to the static methods of QtVersionManager. Returning the correct type in the instance method has the following advantages: - signal/slot autocompletion is working again - Qt5's type-safe connect syntax becomes usable without casting to QtVersionManager* Change-Id: Ib20c0ba5a8b0152c403330a4463f50e64578f44a Reviewed-by: hjk <hjk121@nokiamail.com>
-rw-r--r--src/plugins/qtsupport/qtversionmanager.cpp2
-rw-r--r--src/plugins/qtsupport/qtversionmanager.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp
index 37e2cd3699..670db0fefa 100644
--- a/src/plugins/qtsupport/qtversionmanager.cpp
+++ b/src/plugins/qtsupport/qtversionmanager.cpp
@@ -202,7 +202,7 @@ QtVersionManager::~QtVersionManager()
m_versions.clear();
}
-QObject *QtVersionManager::instance()
+QtVersionManager *QtVersionManager::instance()
{
return m_instance;
}
diff --git a/src/plugins/qtsupport/qtversionmanager.h b/src/plugins/qtsupport/qtversionmanager.h
index c4b2fda07c..da6a1cf72f 100644
--- a/src/plugins/qtsupport/qtversionmanager.h
+++ b/src/plugins/qtsupport/qtversionmanager.h
@@ -42,7 +42,7 @@ class QTSUPPORT_EXPORT QtVersionManager : public QObject
friend class BaseQtVersion;
friend class Internal::QtOptionsPageWidget;
public:
- static QObject *instance();
+ static QtVersionManager *instance();
QtVersionManager();
~QtVersionManager();
static void extensionsInitialized();