From 35bba2cac5fb13ab07d2bfd3fee1d9284e8620b5 Mon Sep 17 00:00:00 2001
From: Edward Welbourne <edward.welbourne@qt.io>
Date: Thu, 18 Oct 2018 10:22:32 +0200
Subject: [PATCH] More const; don't take mutable char *argv[] where const is
 all we need
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

QTest::qtest_qParseArgs() takes a needlessly mutable parameter.
This needs transient legacy version until qtdeclarative is converted
to use the const-qualified variant.

Change-Id: I19fad25423f6f1ea7d5fac537815f4f633ac4405
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
---
 src/testlib/qtestcase.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index be93ee4ea0b..f21c2c9fdef 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -496,7 +496,7 @@ static void qPrintDataTags(FILE *stream)
     }
 }
 
-static int qToInt(char *str)
+static int qToInt(const char *str)
 {
     char *pEnd;
     int l = (int)strtol(str, &pEnd, 10);
@@ -507,7 +507,7 @@ static int qToInt(char *str)
     return l;
 }
 
-Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, char *argv[], bool qml)
+Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, const char *const argv[], bool qml)
 {
     QTestLog::LogMode logFormat = QTestLog::Plain;
     const char *logFilename = 0;
@@ -845,6 +845,11 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, char *argv[], bool qml)
         QTestLog::addLogger(logFormat, logFilename);
 }
 
+// Temporary, backwards compatibility, until qtdeclarative's use of it is converted
+Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, char *argv[], bool qml) {
+    qtest_qParseArgs(argc, const_cast<const char *const *>(argv), qml);
+}
+
 QBenchmarkResult qMedian(const QVector<QBenchmarkResult> &container)
 {
     const int count = container.count();