feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Use Q_DECL_OVERRIDE instead of QTC_OVERRIDE

Browse Source 
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>
This commit is contained in:
Thomas Hartmann
2014-09-24 12:49:32 +02:00
parent 652c53bf06
commit 48f19e925b
100 changed files with 985 additions and 1100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/ios/iosdeploystep.h
View File

@@ -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;