diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2016-10-18 08:16:58 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-10-18 06:38:22 +0000 |
| commit | 93c0ba247d5a2574416231a91bc59473ed3a11ec (patch) | |
| tree | 8c7da70ac56b401aa3d1b41bce1c1c6a3e6d2ddf /src | |
| parent | bc7b8bf20ce79ab454b3ef78264996d05a9d9469 (diff) | |
| download | qt-creator-93c0ba247d5a2574416231a91bc59473ed3a11ec.tar.gz | |
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 <eike.ziller@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/ios/iostoolhandler.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/ios/iostoolhandler.cpp b/src/plugins/ios/iostoolhandler.cpp index 8615713357..c5da66c359 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<void (QProcess::*)(int, QProcess::ExitStatus)>(&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<void (QProcess::*)(QProcess::ProcessError)>(&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<void (QProcess::*)(int, QProcess::ExitStatus)>(&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<void (QProcess::*)(QProcess::ProcessError)>(&QProcess::error), + std::bind(&IosSimulatorToolHandlerPrivate::simAppProcessError, this, _1)); appPId = pId; gotInferiorPid(bundlePath,deviceId,pId); |