feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Revert "iOS: Replaced deprecated signal QProcess::error. Fixes compilation issues with GCC"

Browse Source 
This reverts commit a9f00a2da3 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 <eike.ziller@qt.io>
This commit is contained in:
Christian Stenger
2016-10-18 08:16:58 +02:00
committed by Eike Ziller
parent bc7b8bf20c
commit 93c0ba247d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/ios/iostoolhandler.cpp
View File

@@ -589,7 +589,8 @@ IosDeviceToolHandlerPrivate::IosDeviceToolHandlerPrivate(const IosDeviceType &de
QObject::connect(process, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), QObject::connect(process, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
std::bind(&IosDeviceToolHandlerPrivate::subprocessFinished,this, _1,_2)); std::bind(&IosDeviceToolHandlerPrivate::subprocessFinished,this, _1,_2));
QObject::connect(process, &QProcess::errorOccurred, std::bind(&IosDeviceToolHandlerPrivate::subprocessError, this, _1)); QObject::connect(process, static_cast<void (QProcess::*)(QProcess::ProcessError)>(&QProcess::error),
std::bind(&IosDeviceToolHandlerPrivate::subprocessError, this, _1));
QObject::connect(&killTimer, &QTimer::timeout, std::bind(&IosDeviceToolHandlerPrivate::killProcess, this)); 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)); std::bind(&IosSimulatorToolHandlerPrivate::simAppProcessHasErrorOutput,this));
QObject::connect(process, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), QObject::connect(process, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
std::bind(&IosSimulatorToolHandlerPrivate::simAppProcessFinished,this, _1,_2)); std::bind(&IosSimulatorToolHandlerPrivate::simAppProcessFinished,this, _1,_2));
QObject::connect(process, &QProcess::errorOccurred, std::bind(&IosSimulatorToolHandlerPrivate::simAppProcessError, this, _1)); QObject::connect(process, static_cast<void (QProcess::*)(QProcess::ProcessError)>(&QProcess::error),
std::bind(&IosSimulatorToolHandlerPrivate::simAppProcessError, this, _1));
appPId = pId; appPId = pId;
gotInferiorPid(bundlePath,deviceId,pId); gotInferiorPid(bundlePath,deviceId,pId);