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

6
src/tools/iostool/iosdevicemanager.cpp
View File

@@ -266,8 +266,8 @@ public:
bool startService(const QString &service, ServiceSocket &fd);
void stopService(ServiceSocket fd);
void startDeviceLookup(int timeout);
bool connectToPort(quint16 port, ServiceSocket *fd) QTC_OVERRIDE;
int qmljsDebugPort() const QTC_OVERRIDE;
bool connectToPort(quint16 port, ServiceSocket *fd) Q_DECL_OVERRIDE;
int qmljsDebugPort() const Q_DECL_OVERRIDE;
void addError(const QString &msg);
bool writeAll(ServiceSocket fd, const char *cmd, qptrdiff len = -1);
bool sendGdbCommand(ServiceSocket fd, const char *cmd, qptrdiff len = -1);
@@ -339,7 +339,7 @@ public:
void deviceCallbackReturned();
bool installApp();
bool runApp();
int qmljsDebugPort() const QTC_OVERRIDE;
int qmljsDebugPort() const Q_DECL_OVERRIDE;
am_res_t appTransferCallback(CFDictionaryRef dict);
am_res_t appInstallCallback(CFDictionaryRef dict);
void reportProgress2(int progress, const QString &status);