From f50ffd614c25f66a5e237f19ea6f0982f665bc27 Mon Sep 17 00:00:00 2001
From: hjk <hjk121@nokiamail.com>
Date: Fri, 11 Oct 2013 13:55:45 +0200
Subject: [PATCH] Ios: Make it the plugin compilable (but not functional)
outside Mac
Change-Id: I1149ce410f2875c6ad8bd0d62c23bb6181f4c1ac
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
---
src/plugins/ios/ios.pro | 2 +-
src/plugins/ios/iosdevice.cpp | 15 ++++++++++-----
src/plugins/plugins.pro | 7 ++-----
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/plugins/ios/ios.pro b/src/plugins/ios/ios.pro
index fcfe58b6e2e..a9f3201e801 100644
--- a/src/plugins/ios/ios.pro
+++ b/src/plugins/ios/ios.pro
@@ -5,7 +5,7 @@ include(../../qtcreatorplugin.pri)
QT += xml network
-LIBS += -framework CoreFoundation -framework IOKit
+macx: LIBS += -framework CoreFoundation -framework IOKit
HEADERS += \
iosconstants.h \
diff --git a/src/plugins/ios/iosdevice.cpp b/src/plugins/ios/iosdevice.cpp
index 616158636ed..378cf43031e 100644
--- a/src/plugins/ios/iosdevice.cpp
+++ b/src/plugins/ios/iosdevice.cpp
@@ -39,15 +39,18 @@
#include <QVariantMap>
#include <QMessageBox>
+#ifdef Q_OS_MAC
#include <IOKit/IOKitLib.h>
#include <IOKit/usb/IOUSBLib.h>
#include <CoreFoundation/CoreFoundation.h>
+#endif
+
using namespace ProjectExplorer;
static bool debugDeviceDetection = false;
-namespace {
-QString CFStringRef2QString(CFStringRef s)
+#ifdef Q_OS_MAC
+static QString CFStringRef2QString(CFStringRef s)
{
unsigned char buf[250];
CFIndex len = CFStringGetLength(s);
@@ -67,8 +70,7 @@ QString CFStringRef2QString(CFStringRef s)
delete[] bigBuf;
return res;
}
-
-}
+#endif
namespace Ios {
namespace Internal {
@@ -349,6 +351,7 @@ void IosDeviceManager::infoGathererFinished(IosToolHandler *gatherer)
gatherer->deleteLater();
}
+#ifdef Q_OS_MAC
namespace {
io_iterator_t gAddedIter;
io_iterator_t gRemovedIter;
@@ -418,9 +421,11 @@ void deviceDisconnectedCallback(void *refCon, io_iterator_t iterator)
} // extern C
} // anonymous namespace
+#endif
void IosDeviceManager::monitorAvailableDevices()
{
+#ifdef Q_OS_MAC
CFMutableDictionaryRef matchingDictionary =
IOServiceMatching("IOUSBDevice" );
{
@@ -469,7 +474,7 @@ void IosDeviceManager::monitorAvailableDevices()
// Iterate once to get already-present devices and arm the notification
deviceConnectedCallback(NULL, gAddedIter);
deviceDisconnectedCallback(NULL, gRemovedIter);
-
+#endif
}
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index b20e24425fe..39311cdc0f8 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -48,11 +48,8 @@ SUBDIRS = \
todo \
qnx \
clearcase \
- baremetal
-
-macx {
- SUBDIRS += ios
-}
+ baremetal \
+ ios
isEmpty(QBS_INSTALL_DIR): QBS_INSTALL_DIR = $$(QBS_INSTALL_DIR)
exists(../shared/qbs/qbs.pro)|!isEmpty(QBS_INSTALL_DIR): \
--
GitLab