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/libs/qmljs/qmljsdescribevalue.cpp | |
| parent | 652c53bf06826bc347d5384b3da01c8a083b2118 (diff) | |
| download | qt-creator-48f19e925b9af6fb0b22c8bd6c34a4778fe280a8.tar.gz | |
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/libs/qmljs/qmljsdescribevalue.cpp')
| -rw-r--r-- | src/libs/qmljs/qmljsdescribevalue.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libs/qmljs/qmljsdescribevalue.cpp b/src/libs/qmljs/qmljsdescribevalue.cpp index 9213646a84..572c056a8a 100644 --- a/src/libs/qmljs/qmljsdescribevalue.cpp +++ b/src/libs/qmljs/qmljsdescribevalue.cpp @@ -187,7 +187,7 @@ public: return true; } - bool processProperty(const QString &name, const Value *value, const PropertyInfo &pInfo) QTC_OVERRIDE + bool processProperty(const QString &name, const Value *value, const PropertyInfo &pInfo) Q_DECL_OVERRIDE { d.dumpNewline(); d.dump(name); @@ -200,19 +200,19 @@ public: d.closeContext(""); return true; } - bool processEnumerator(const QString &name, const Value *value) QTC_OVERRIDE + bool processEnumerator(const QString &name, const Value *value) Q_DECL_OVERRIDE { return dump(name, value); } - bool processSignal(const QString &name, const Value *value) QTC_OVERRIDE + bool processSignal(const QString &name, const Value *value) Q_DECL_OVERRIDE { return dump(name, value); } - bool processSlot(const QString &name, const Value *value) QTC_OVERRIDE + bool processSlot(const QString &name, const Value *value) Q_DECL_OVERRIDE { return dump(name, value); } - bool processGeneratedSlot(const QString &name, const Value *value) QTC_OVERRIDE + bool processGeneratedSlot(const QString &name, const Value *value) Q_DECL_OVERRIDE { return dump(name, value); } |