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

4
src/tools/iostool/main.cpp
View File

@@ -125,7 +125,7 @@ class SingleRelayServer: public RelayServer
public:
SingleRelayServer(IosTool *parent, int serverFileDescriptor);
protected:
void newRelayConnection() QTC_OVERRIDE;
void newRelayConnection() Q_DECL_OVERRIDE;
private:
int m_serverFileDescriptor;
};
@@ -136,7 +136,7 @@ public:
GenericRelayServer(IosTool *parent, int remotePort,
Ios::DeviceSession *deviceSession);
protected:
void newRelayConnection() QTC_OVERRIDE;
void newRelayConnection() Q_DECL_OVERRIDE;
private:
int m_remotePort;
Ios::DeviceSession *m_deviceSession;