summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Schulz <david.schulz@digia.com>2013-10-29 14:49:47 +0100
committerhjk <hjk121@nokiamail.com>2013-10-29 15:08:31 +0100
commitc8aeb78955f673fddf42b1c6057f38ff1d9d5d4a (patch)
tree85942510723fcadca328519b154918082e76e4f3
parentce9c2efd1f2f5626de7523faacc5f1329edf176d (diff)
downloadqt-creator-c8aeb78955f673fddf42b1c6057f38ff1d9d5d4a.tar.gz
Fix compilation of IOS Simulator debugging on windows.
Change-Id: I57dc9297c89b193dbcb7dd9c96ff6d6118ce2191 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
-rw-r--r--src/plugins/ios/iosdebugsupport.cpp6
-rw-r--r--src/plugins/ios/iostoolhandler.cpp4
2 files changed, 9 insertions, 1 deletions
diff --git a/src/plugins/ios/iosdebugsupport.cpp b/src/plugins/ios/iosdebugsupport.cpp
index 72c8d18943..44f01a6875 100644
--- a/src/plugins/ios/iosdebugsupport.cpp
+++ b/src/plugins/ios/iosdebugsupport.cpp
@@ -49,8 +49,12 @@
#include <QTcpServer>
#include <stdio.h>
-#include <unistd.h>
#include <fcntl.h>
+#ifdef Q_OS_UNIX
+#include <unistd.h>
+#else
+#include <io.h>
+#endif
using namespace Debugger;
using namespace ProjectExplorer;
diff --git a/src/plugins/ios/iostoolhandler.cpp b/src/plugins/ios/iostoolhandler.cpp
index 17edb913e3..c5d15c62e1 100644
--- a/src/plugins/ios/iostoolhandler.cpp
+++ b/src/plugins/ios/iostoolhandler.cpp
@@ -258,6 +258,10 @@ MyProcess::MyProcess(QObject *parent) : QProcess(parent)
{
}
+MyProcess::~MyProcess()
+{
+}
+
int MyProcess::processOutputSocket()
{
return 0;