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/ios/iosdevicefactory.h | |
| 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/plugins/ios/iosdevicefactory.h')
| -rw-r--r-- | src/plugins/ios/iosdevicefactory.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/plugins/ios/iosdevicefactory.h b/src/plugins/ios/iosdevicefactory.h index 2575897ed0..d7bc0a5480 100644 --- a/src/plugins/ios/iosdevicefactory.h +++ b/src/plugins/ios/iosdevicefactory.h @@ -30,7 +30,6 @@ #define IOSDEVICEFACTORY_H #include <projectexplorer/devicesupport/idevicefactory.h> -#include <utils/qtcoverride.h> #include <QTimer> #include <QMap> @@ -45,13 +44,13 @@ class IosDeviceFactory : public ProjectExplorer::IDeviceFactory public: IosDeviceFactory(); - QString displayNameForId(Core::Id type) const QTC_OVERRIDE; - QList<Core::Id> availableCreationIds() const QTC_OVERRIDE; + QString displayNameForId(Core::Id type) const Q_DECL_OVERRIDE; + QList<Core::Id> availableCreationIds() const Q_DECL_OVERRIDE; - bool canCreate() const QTC_OVERRIDE; - ProjectExplorer::IDevice::Ptr create(Core::Id id) const QTC_OVERRIDE; - bool canRestore(const QVariantMap &map) const QTC_OVERRIDE; - ProjectExplorer::IDevice::Ptr restore(const QVariantMap &map) const QTC_OVERRIDE; + bool canCreate() const Q_DECL_OVERRIDE; + ProjectExplorer::IDevice::Ptr create(Core::Id id) const Q_DECL_OVERRIDE; + bool canRestore(const QVariantMap &map) const Q_DECL_OVERRIDE; + ProjectExplorer::IDevice::Ptr restore(const QVariantMap &map) const Q_DECL_OVERRIDE; }; } // namespace Internal |