From 8c7c6553560f42cdbca458121a12c67d13648942 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 5 Apr 2022 08:16:06 +0200 Subject: [PATCH] SdkTool: Fix build with Qt5 Amends c246caf7a96b1d. Change-Id: I5835751f7312acbe8f171c3e61d4836111849421 Reviewed-by: hjk --- src/tools/sdktool/addabiflavor.cpp | 2 +- src/tools/sdktool/addcmakeoperation.cpp | 1 + src/tools/sdktool/adddebuggeroperation.cpp | 5 +++-- src/tools/sdktool/addkeysoperation.cpp | 1 + src/tools/sdktool/addkitoperation.cpp | 2 +- src/tools/sdktool/addqtoperation.cpp | 7 ++++--- src/tools/sdktool/addtoolchainoperation.cpp | 1 + src/tools/sdktool/addvalueoperation.cpp | 1 + src/tools/sdktool/rmdebuggeroperation.cpp | 5 +++-- src/tools/sdktool/rmkeysoperation.cpp | 1 + 10 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/tools/sdktool/addabiflavor.cpp b/src/tools/sdktool/addabiflavor.cpp index a6f4607ea6a..6a7fedfa81f 100644 --- a/src/tools/sdktool/addabiflavor.cpp +++ b/src/tools/sdktool/addabiflavor.cpp @@ -121,7 +121,7 @@ void AddAbiFlavor::unittest() QVERIFY(map.contains(QLatin1String(VERSION))); AddAbiFlavorData d; - d.m_oses = {"linux", "windows"}; + d.m_oses = QStringList{"linux", "windows"}; d.m_flavor = "foo"; map = d.addAbiFlavor(map); diff --git a/src/tools/sdktool/addcmakeoperation.cpp b/src/tools/sdktool/addcmakeoperation.cpp index 687a43edec8..7a7304bc282 100644 --- a/src/tools/sdktool/addcmakeoperation.cpp +++ b/src/tools/sdktool/addcmakeoperation.cpp @@ -38,6 +38,7 @@ #endif #include +#include Q_LOGGING_CATEGORY(addCMakeOperationLog, "qtc.sdktool.operations.addcmake", QtWarningMsg) diff --git a/src/tools/sdktool/adddebuggeroperation.cpp b/src/tools/sdktool/adddebuggeroperation.cpp index 6c228cdb8b3..9adfc6d89d2 100644 --- a/src/tools/sdktool/adddebuggeroperation.cpp +++ b/src/tools/sdktool/adddebuggeroperation.cpp @@ -38,6 +38,7 @@ #endif #include +#include Q_LOGGING_CATEGORY(addDebuggerOperationLog, "qtc.sdktool.operations.adddebugger", QtWarningMsg) @@ -172,7 +173,7 @@ void AddDebuggerOperation::unittest() d.m_id = "testId"; d.m_displayName = "name"; d.m_binary = "/tmp/bin/gdb"; - d.m_abis = {"aarch64", "x86_64"}; + d.m_abis = QStringList{"aarch64", "x86_64"}; d.m_extra = {{"ExtraKey", QVariant("ExtraValue")}}; map = d.addDebugger(map); @@ -197,7 +198,7 @@ void AddDebuggerOperation::unittest() d2.m_id = "testId"; d2.m_displayName = "name2"; d2.m_binary = "/tmp/bin/gdb"; - d2.m_abis = {}; + d2.m_abis = QStringList{}; d2.m_extra = {{"ExtraKey", QVariant("ExtraValue2")}}; QVariantMap unchanged = d2.addDebugger(map); QVERIFY(unchanged.isEmpty()); diff --git a/src/tools/sdktool/addkeysoperation.cpp b/src/tools/sdktool/addkeysoperation.cpp index 95c567e0e04..5f471dfc3ed 100644 --- a/src/tools/sdktool/addkeysoperation.cpp +++ b/src/tools/sdktool/addkeysoperation.cpp @@ -28,6 +28,7 @@ #include #include +#include #ifdef WITH_TESTS #include diff --git a/src/tools/sdktool/addkitoperation.cpp b/src/tools/sdktool/addkitoperation.cpp index f7d7864bcd2..3fbed7a74a3 100644 --- a/src/tools/sdktool/addkitoperation.cpp +++ b/src/tools/sdktool/addkitoperation.cpp @@ -353,7 +353,7 @@ void AddKitOperation::unittest() aqtd.m_displayName = "Qt"; aqtd.m_type = "desktop-qt"; aqtd.m_qmake = "/usr/bin/qmake"; - aqtd.m_abis = {}; + aqtd.m_abis = QStringList{}; aqtd.m_extra = {}; qtMap = aqtd.addQt(qtMap); diff --git a/src/tools/sdktool/addqtoperation.cpp b/src/tools/sdktool/addqtoperation.cpp index 59f8850a936..1c4ff7d7808 100644 --- a/src/tools/sdktool/addqtoperation.cpp +++ b/src/tools/sdktool/addqtoperation.cpp @@ -40,6 +40,7 @@ #endif #include +#include Q_LOGGING_CATEGORY(log, "qtc.sdktool.operations.addqt", QtWarningMsg) @@ -197,7 +198,7 @@ void AddQtOperation::unittest() qtData.m_displayName = "Test Qt Version"; qtData.m_type = "testType"; qtData.m_qmake = "/tmp//../tmp/test/qmake"; - qtData.m_abis = {}; + qtData.m_abis = QStringList{}; qtData.m_extra = {{QLatin1String("extraData"), QVariant(QLatin1String("extraValue"))}}; map = qtData.addQt(map); @@ -231,7 +232,7 @@ void AddQtOperation::unittest() qtData.m_displayName = "Test Qt Version2"; qtData.m_type = "testType2"; qtData.m_qmake = "/tmp/test/qmake2"; - qtData.m_abis = {}; + qtData.m_abis = QStringList{}; qtData.m_extra = {{QLatin1String("extraData"), QVariant(QLatin1String("extraValue"))}}; QTest::ignoreMessage(QtCriticalMsg, @@ -245,7 +246,7 @@ void AddQtOperation::unittest() qtData.m_displayName = "Test Qt Version"; qtData.m_type = "testType3"; qtData.m_qmake = "/tmp/test/qmake2"; - qtData.m_abis = {}; + qtData.m_abis = QStringList{}; qtData.m_extra = {{QLatin1String("extraData"), QVariant(QLatin1String("extraValue"))}}; map = qtData.addQt(map); diff --git a/src/tools/sdktool/addtoolchainoperation.cpp b/src/tools/sdktool/addtoolchainoperation.cpp index d305b3e7d4c..50991259f55 100644 --- a/src/tools/sdktool/addtoolchainoperation.cpp +++ b/src/tools/sdktool/addtoolchainoperation.cpp @@ -40,6 +40,7 @@ #endif #include +#include Q_LOGGING_CATEGORY(addtoolchainlog, "qtc.sdktool.operations.addtoolchain", QtWarningMsg) diff --git a/src/tools/sdktool/addvalueoperation.cpp b/src/tools/sdktool/addvalueoperation.cpp index 08f9473a42a..65bc5adc15d 100644 --- a/src/tools/sdktool/addvalueoperation.cpp +++ b/src/tools/sdktool/addvalueoperation.cpp @@ -38,6 +38,7 @@ #endif #include +#include Q_LOGGING_CATEGORY(addvaluelog, "qtc.sdktool.operations.addvalue", QtWarningMsg) diff --git a/src/tools/sdktool/rmdebuggeroperation.cpp b/src/tools/sdktool/rmdebuggeroperation.cpp index bdefbecb26e..f7b44d57b2e 100644 --- a/src/tools/sdktool/rmdebuggeroperation.cpp +++ b/src/tools/sdktool/rmdebuggeroperation.cpp @@ -41,6 +41,7 @@ #endif #include +#include Q_LOGGING_CATEGORY(rmdebuggerlog, "qtc.sdktool.operations.rmdebugger", QtWarningMsg) @@ -108,13 +109,13 @@ void RmDebuggerOperation::unittest() d.m_displayName = "Name1"; d.m_engine = 2; d.m_binary = "/tmp/debugger1"; - d.m_abis = {"test11", "test12"}; + d.m_abis = QStringList{"test11", "test12"}; QVariantMap map = d.addDebugger(AddDebuggerOperation::initializeDebuggers()); d.m_id = "id2"; d.m_displayName = "Name2"; d.m_binary = "/tmp/debugger2"; - d.m_abis = {"test21", "test22"}; + d.m_abis = QStringList{"test21", "test22"}; map = d.addDebugger(map); QVariantMap result = rmDebugger(map, QLatin1String("id2")); diff --git a/src/tools/sdktool/rmkeysoperation.cpp b/src/tools/sdktool/rmkeysoperation.cpp index 9d05bfeee01..9c7f282790e 100644 --- a/src/tools/sdktool/rmkeysoperation.cpp +++ b/src/tools/sdktool/rmkeysoperation.cpp @@ -32,6 +32,7 @@ #endif #include +#include Q_LOGGING_CATEGORY(rmkeyslog, "qtc.sdktool.operations.rmkeys", QtWarningMsg)