summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/iostool/iosdevicemanager.cpp3
-rw-r--r--src/tools/iostool/iosdevicemanager.h9
-rw-r--r--src/tools/iostool/main.cpp1
3 files changed, 9 insertions, 4 deletions
diff --git a/src/tools/iostool/iosdevicemanager.cpp b/src/tools/iostool/iosdevicemanager.cpp
index 48f7b4000c..e8225c8670 100644
--- a/src/tools/iostool/iosdevicemanager.cpp
+++ b/src/tools/iostool/iosdevicemanager.cpp
@@ -62,9 +62,6 @@
#include "MobileDevice.h"
#endif
-// avoid utils dependency
-#define QTC_OVERRIDE override
-
static const bool debugGdbServer = false;
static const bool debugAll = false;
static const bool verbose = true;
diff --git a/src/tools/iostool/iosdevicemanager.h b/src/tools/iostool/iosdevicemanager.h
index fddcdb2f33..cd41a03a94 100644
--- a/src/tools/iostool/iosdevicemanager.h
+++ b/src/tools/iostool/iosdevicemanager.h
@@ -39,6 +39,15 @@
#include <unistd.h>
#include <string.h>
+// avoid utils dependency
+#include <qglobal.h>
+
+#ifdef Q_DECL_OVERRIDE
+#define QTC_OVERRIDE Q_DECL_OVERRIDE
+#else
+#define QTC_OVERRIDE
+#endif
+
namespace Ios {
namespace Internal {
class DevInfoSession;
diff --git a/src/tools/iostool/main.cpp b/src/tools/iostool/main.cpp
index 1ef48f8bc5..73f48f0265 100644
--- a/src/tools/iostool/main.cpp
+++ b/src/tools/iostool/main.cpp
@@ -60,7 +60,6 @@
#endif
// avoid utils dependency
-#define QTC_OVERRIDE override
#define QTC_CHECK(cond) if (cond) {} else { qWarning() << "assert failed " << #cond << " " \
<< __FILE__ << ":" << __LINE__; } do {} while (0)