diff options
| author | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2014-09-24 12:49:32 +0200 |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2014-09-25 12:16:47 +0200 |
| commit | 48f19e925b9af6fb0b22c8bd6c34a4778fe280a8 (patch) | |
| tree | b929e23cd0487100fa7f21234400b616231e4143 /src/plugins/qmljstools/qmljsmodelmanager.h | |
| parent | 652c53bf06826bc347d5384b3da01c8a083b2118 (diff) | |
Use Q_DECL_OVERRIDE instead of QTC_OVERRIDE
This patch removes src/libs/utils/qtcoverride.h
and uses Q_DECL_OVERRIDE from Qt 5 instead.
Change-Id: I61ffa539648ffe996dc061eec7708c04580c0f09
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Diffstat (limited to 'src/plugins/qmljstools/qmljsmodelmanager.h')
| -rw-r--r-- | src/plugins/qmljstools/qmljsmodelmanager.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/plugins/qmljstools/qmljsmodelmanager.h b/src/plugins/qmljstools/qmljsmodelmanager.h index 64a41ee042..7caa988a64 100644 --- a/src/plugins/qmljstools/qmljsmodelmanager.h +++ b/src/plugins/qmljstools/qmljsmodelmanager.h @@ -37,7 +37,6 @@ #include <qmljs/qmljsconstants.h> #include <cplusplus/CppDocument.h> -#include <utils/qtcoverride.h> #include <QFuture> #include <QFutureSynchronizer> @@ -61,11 +60,11 @@ public: void delayedInitialization(); protected: - QHash<QString, QmlJS::Dialect> languageForSuffix() const QTC_OVERRIDE; - void writeMessageInternal(const QString &msg) const QTC_OVERRIDE; - WorkingCopy workingCopyInternal() const QTC_OVERRIDE; - void addTaskInternal(QFuture<void> result, const QString &msg, const char *taskId) const QTC_OVERRIDE; - ProjectInfo defaultProjectInfoForProject(ProjectExplorer::Project *project) const QTC_OVERRIDE; + QHash<QString, QmlJS::Dialect> languageForSuffix() const Q_DECL_OVERRIDE; + void writeMessageInternal(const QString &msg) const Q_DECL_OVERRIDE; + WorkingCopy workingCopyInternal() const Q_DECL_OVERRIDE; + void addTaskInternal(QFuture<void> result, const QString &msg, const char *taskId) const Q_DECL_OVERRIDE; + ProjectInfo defaultProjectInfoForProject(ProjectExplorer::Project *project) const Q_DECL_OVERRIDE; private slots: void updateDefaultProjectInfo(); private: |