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

Android: Don't call mutable expressions inside QTC_ASSERT

Browse Source 
In order to conform to the theory: "Removing all
QTC_ASSERTs and QTC_CHECKs should not change anything".

Change-Id: Ie8ef58533dfbeec00eaf45d42bcb731d8e2a3136
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2022-12-14 12:47:31 +01:00
parent bd170f3748
commit 72e19f0919
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/android/androidrunnerworker.cpp
View File

@@ -235,7 +235,8 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner, const QString &packa
if (m_qmlDebugServices != QmlDebug::NoQmlDebugServices) { if (m_qmlDebugServices != QmlDebug::NoQmlDebugServices) {
qCDebug(androidRunWorkerLog) << "QML debugging enabled"; qCDebug(androidRunWorkerLog) << "QML debugging enabled";
QTcpServer server; 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.")); qDebug() << Tr::tr("No free ports available on host for QML debugging."));
m_qmlServer.setScheme(Utils::urlTcpScheme()); m_qmlServer.setScheme(Utils::urlTcpScheme());
m_qmlServer.setHost(server.serverAddress().toString()); 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"; qCDebug(androidRunWorkerLog) << "Debug server copy from temp directory failed";
return false; 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; return true;
} }