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

9
src/plugins/ios/iosqtversionfactory.h
View File

@@ -30,7 +30,6 @@
#define IOSQTVERSIONFACTORY_H
#include <qtsupport/qtversionfactory.h>
#include <utils/qtcoverride.h>
namespace Ios {
namespace Internal {
@@ -40,13 +39,13 @@ class IosQtVersionFactory : public QtSupport::QtVersionFactory
public:
explicit IosQtVersionFactory(QObject *parent = 0);
bool canRestore(const QString &type) QTC_OVERRIDE;
QtSupport::BaseQtVersion *restore(const QString &type, const QVariantMap &data) QTC_OVERRIDE;
bool canRestore(const QString &type) Q_DECL_OVERRIDE;
QtSupport::BaseQtVersion *restore(const QString &type, const QVariantMap &data) Q_DECL_OVERRIDE;
int priority() const QTC_OVERRIDE;
int priority() const Q_DECL_OVERRIDE;
QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator,
bool isAutoDetected = false,
const QString &autoDetectionSource = QString()) QTC_OVERRIDE;
const QString &autoDetectionSource = QString()) Q_DECL_OVERRIDE;
};
} // namespace Internal