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/iosdeploystep.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/iosdeploystep.h')
| -rw-r--r-- | src/plugins/ios/iosdeploystep.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/plugins/ios/iosdeploystep.h b/src/plugins/ios/iosdeploystep.h index a5e55bd5e0..b65885772e 100644 --- a/src/plugins/ios/iosdeploystep.h +++ b/src/plugins/ios/iosdeploystep.h @@ -36,7 +36,6 @@ #include <projectexplorer/buildstep.h> #include <projectexplorer/devicesupport/idevice.h> #include <qtsupport/baseqtversion.h> -#include <utils/qtcoverride.h> #include <QFutureInterface> #include <QProcess> @@ -68,10 +67,10 @@ public: ~IosDeployStep(); - bool fromMap(const QVariantMap &map) QTC_OVERRIDE; - QVariantMap toMap() const QTC_OVERRIDE; + bool fromMap(const QVariantMap &map) Q_DECL_OVERRIDE; + QVariantMap toMap() const Q_DECL_OVERRIDE; - void run(QFutureInterface<bool> &fi) QTC_OVERRIDE; + void run(QFutureInterface<bool> &fi) Q_DECL_OVERRIDE; void cleanup(); void cancel(); signals: @@ -90,10 +89,10 @@ private slots: private: IosDeployStep(ProjectExplorer::BuildStepList *bc, IosDeployStep *other); - bool init() QTC_OVERRIDE; - ProjectExplorer::BuildStepConfigWidget *createConfigWidget() QTC_OVERRIDE; - bool immutable() const QTC_OVERRIDE { return true; } - bool runInGuiThread() const QTC_OVERRIDE { return true; } + bool init() Q_DECL_OVERRIDE; + ProjectExplorer::BuildStepConfigWidget *createConfigWidget() Q_DECL_OVERRIDE; + bool immutable() const Q_DECL_OVERRIDE { return true; } + bool runInGuiThread() const Q_DECL_OVERRIDE { return true; } ProjectExplorer::IDevice::ConstPtr device() const; IosDevice::ConstPtr iosdevice() const; IosSimulator::ConstPtr iossimulator() const; |