aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2013-12-06 15:59:25 +0100
committerEike Ziller <eike.ziller@digia.com>2013-12-09 08:31:59 +0100
commit9be80434d3754635a1abbe887b1f94bf085c8292 (patch)
tree1011bfb90d74f783258b5372c32fe26dd33fb961
parent8cfa1fdd7bc20e9ea07ba438224904b887bebb7d (diff)
Fix compilation of ios plugin with Windows 64 bit
Q_PID is a pointer under windows, and the compiler won't allow us to convert a 64 bit pointer to int. Task-number: QTCREATORBUG-11026 Change-Id: I34e45bf2ef1e565c5967fac6b482c14117a04578 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
-rw-r--r--src/plugins/ios/iosdebugsupport.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/ios/iosdebugsupport.cpp b/src/plugins/ios/iosdebugsupport.cpp
index 32d69447af..44edcb276b 100644
--- a/src/plugins/ios/iosdebugsupport.cpp
+++ b/src/plugins/ios/iosdebugsupport.cpp
@@ -162,7 +162,9 @@ void IosDebugSupport::handleGotInferiorPid(Q_PID pid)
{
if (pid > 0) {
//m_runControl->engine()->notifyInferiorPid(pid);
+#ifndef Q_OS_WIN // Q_PID might be 64 bit pointer...
m_runControl->engine()->notifyEngineRemoteSetupDone(int(pid), m_qmlPort);
+#endif
} else {
m_runControl->engine()->notifyEngineRemoteSetupFailed(
tr("Got an invalid process id."));