From 93c0ba247d5a2574416231a91bc59473ed3a11ec Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 18 Oct 2016 08:16:58 +0200 Subject: [PATCH 1/2] Revert "iOS: Replaced deprecated signal QProcess::error. Fixes compilation issues with GCC" This reverts commit a9f00a2da3d71fd365e93141527cfb755b8de75b as this commit uses functions that are available from Qt5.6 onwards but we still have Qt5.5 as minimum requirement. Change-Id: Ice16d4faeb3417dc80431299b308b37ab2b56c1f Reviewed-by: Eike Ziller --- src/plugins/ios/iostoolhandler.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/ios/iostoolhandler.cpp b/src/plugins/ios/iostoolhandler.cpp index 8615713357d..c5da66c3598 100644 --- a/src/plugins/ios/iostoolhandler.cpp +++ b/src/plugins/ios/iostoolhandler.cpp @@ -589,7 +589,8 @@ IosDeviceToolHandlerPrivate::IosDeviceToolHandlerPrivate(const IosDeviceType &de QObject::connect(process, static_cast(&QProcess::finished), std::bind(&IosDeviceToolHandlerPrivate::subprocessFinished,this, _1,_2)); - QObject::connect(process, &QProcess::errorOccurred, std::bind(&IosDeviceToolHandlerPrivate::subprocessError, this, _1)); + QObject::connect(process, static_cast(&QProcess::error), + std::bind(&IosDeviceToolHandlerPrivate::subprocessError, this, _1)); QObject::connect(&killTimer, &QTimer::timeout, std::bind(&IosDeviceToolHandlerPrivate::killProcess, this)); } @@ -749,7 +750,8 @@ void IosSimulatorToolHandlerPrivate::requestRunApp(const QString &bundlePath, std::bind(&IosSimulatorToolHandlerPrivate::simAppProcessHasErrorOutput,this)); QObject::connect(process, static_cast(&QProcess::finished), std::bind(&IosSimulatorToolHandlerPrivate::simAppProcessFinished,this, _1,_2)); - QObject::connect(process, &QProcess::errorOccurred, std::bind(&IosSimulatorToolHandlerPrivate::simAppProcessError, this, _1)); + QObject::connect(process, static_cast(&QProcess::error), + std::bind(&IosSimulatorToolHandlerPrivate::simAppProcessError, this, _1)); appPId = pId; gotInferiorPid(bundlePath,deviceId,pId); From c1a46127cfe46204da9eb35ffffb7631615c5f2e Mon Sep 17 00:00:00 2001 From: Vikas Pachdha Date: Wed, 19 Oct 2016 10:40:45 +0200 Subject: [PATCH 2/2] Remove deployment of iossim tool iossim tool no longer exists and it is replaced by Xcode's simctl tool Change-Id: I4f4dbdc8b8e91663109c289b75a21dd92d966018 Reviewed-by: Christian Stenger --- scripts/deployqtHelper_mac.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh index d5b156823ae..6a5be027b61 100755 --- a/scripts/deployqtHelper_mac.sh +++ b/scripts/deployqtHelper_mac.sh @@ -129,8 +129,6 @@ if [ ! -d "$1/Contents/Frameworks/QtCore.framework" ]; then "-executable=$1/Contents/Resources/qtpromaker" \ "-executable=$1/Contents/Resources/sdktool" \ "-executable=$1/Contents/Resources/ios/iostool" \ - "-executable=$1/Contents/Resources/ios/iossim" \ - "-executable=$1/Contents/Resources/ios/iossim_1_8_2" \ "-executable=$1/Contents/Resources/buildoutputparser" \ "-executable=$1/Contents/Resources/cpaster" \ "-executable=$qbsapp" \