From 48f19e925b9af6fb0b22c8bd6c34a4778fe280a8 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 24 Sep 2014 12:49:32 +0200 Subject: 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 Reviewed-by: Fawzi Mohamed --- src/plugins/ios/iosdeploystepfactory.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'src/plugins/ios/iosdeploystepfactory.h') diff --git a/src/plugins/ios/iosdeploystepfactory.h b/src/plugins/ios/iosdeploystepfactory.h index e6288e981f..9b23d4b89e 100644 --- a/src/plugins/ios/iosdeploystepfactory.h +++ b/src/plugins/ios/iosdeploystepfactory.h @@ -30,7 +30,6 @@ #define IOSDEPLOYSTEPFACTORY_H #include -#include namespace Ios { namespace Internal { @@ -41,20 +40,20 @@ class IosDeployStepFactory : public ProjectExplorer::IBuildStepFactory public: explicit IosDeployStepFactory(QObject *parent = 0); - QList availableCreationIds(ProjectExplorer::BuildStepList *parent) const QTC_OVERRIDE; - QString displayNameForId(Core::Id id) const QTC_OVERRIDE; + QList availableCreationIds(ProjectExplorer::BuildStepList *parent) const Q_DECL_OVERRIDE; + QString displayNameForId(Core::Id id) const Q_DECL_OVERRIDE; bool canCreate(ProjectExplorer::BuildStepList *parent, - Core::Id id) const QTC_OVERRIDE; - ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) QTC_OVERRIDE; + Core::Id id) const Q_DECL_OVERRIDE; + ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) Q_DECL_OVERRIDE; - bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const QTC_OVERRIDE; - ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) QTC_OVERRIDE; + bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const Q_DECL_OVERRIDE; + ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) Q_DECL_OVERRIDE; bool canClone(ProjectExplorer::BuildStepList *parent, - ProjectExplorer::BuildStep *product) const QTC_OVERRIDE; + ProjectExplorer::BuildStep *product) const Q_DECL_OVERRIDE; ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, - ProjectExplorer::BuildStep *product) QTC_OVERRIDE; + ProjectExplorer::BuildStep *product) Q_DECL_OVERRIDE; }; } // namespace Internal -- cgit v1.2.1