From 72e19f09193b7c85eebc064137a3dee0a25e1a91 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 14 Dec 2022 12:47:31 +0100 Subject: [PATCH] Android: Don't call mutable expressions inside QTC_ASSERT In order to conform to the theory: "Removing all QTC_ASSERTs and QTC_CHECKs should not change anything". Change-Id: Ie8ef58533dfbeec00eaf45d42bcb731d8e2a3136 Reviewed-by: hjk --- src/plugins/android/androidrunnerworker.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp index 8ea3742ac77..1927b1d8318 100644 --- a/src/plugins/android/androidrunnerworker.cpp +++ b/src/plugins/android/androidrunnerworker.cpp @@ -235,7 +235,8 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner, const QString &packa if (m_qmlDebugServices != QmlDebug::NoQmlDebugServices) { qCDebug(androidRunWorkerLog) << "QML debugging enabled"; QTcpServer server; - QTC_ASSERT(server.listen(QHostAddress::LocalHost), + const bool isListening = server.listen(QHostAddress::LocalHost); + QTC_ASSERT(isListening, qDebug() << Tr::tr("No free ports available on host for QML debugging.")); m_qmlServer.setScheme(Utils::urlTcpScheme()); m_qmlServer.setHost(server.serverAddress().toString()); @@ -350,8 +351,9 @@ bool AndroidRunnerWorker::uploadDebugServer(const QString &debugServerFileName) qCDebug(androidRunWorkerLog) << "Debug server copy from temp directory failed"; return false; } - QTC_ASSERT(runAdb({"shell", "run-as", m_packageName, "chmod", "777", debugServerFileName}), - qCDebug(androidRunWorkerLog) << "Debug server chmod 777 failed."); + + const bool ok = runAdb({"shell", "run-as", m_packageName, "chmod", "777", debugServerFileName}); + QTC_ASSERT(ok, qCDebug(androidRunWorkerLog) << "Debug server chmod 777 failed."); return true; }