SdkTool: Fix build with Qt5

Amends c246caf7a9.

Change-Id: I5835751f7312acbe8f171c3e61d4836111849421
Reviewed-by: hjk <hjk@qt.io>

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);
 

src/tools/sdktool/addcmakeoperation.cpp

@@ -38,6 +38,7 @@
 #endif
 
 #include <QLoggingCategory>
+#include <QRegularExpression>
 
 Q_LOGGING_CATEGORY(addCMakeOperationLog, "qtc.sdktool.operations.addcmake", QtWarningMsg)
 

src/tools/sdktool/adddebuggeroperation.cpp

@@ -38,6 +38,7 @@
 #endif
 
 #include <QLoggingCategory>
+#include <QRegularExpression>
 
 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());

src/tools/sdktool/addkeysoperation.cpp

@@ -28,6 +28,7 @@
 #include <iostream>
 
 #include <QLoggingCategory>
+#include <QRegularExpression>
 
 #ifdef WITH_TESTS
 #include <QTest>

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);

src/tools/sdktool/addqtoperation.cpp

@@ -40,6 +40,7 @@
 #endif
 
 #include <QLoggingCategory>
+#include <QRegularExpression>
 
 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);

src/tools/sdktool/addtoolchainoperation.cpp

@@ -40,6 +40,7 @@
 #endif
 
 #include <QLoggingCategory>
+#include <QRegularExpression>
 
 Q_LOGGING_CATEGORY(addtoolchainlog, "qtc.sdktool.operations.addtoolchain", QtWarningMsg)
 

src/tools/sdktool/addvalueoperation.cpp

@@ -38,6 +38,7 @@
 #endif
 
 #include <QLoggingCategory>
+#include <QRegularExpression>
 
 Q_LOGGING_CATEGORY(addvaluelog, "qtc.sdktool.operations.addvalue", QtWarningMsg)
 

src/tools/sdktool/rmdebuggeroperation.cpp

@@ -41,6 +41,7 @@
 #endif
 
 #include <QLoggingCategory>
+#include <QRegularExpression>
 
 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"));

src/tools/sdktool/rmkeysoperation.cpp

@@ -32,6 +32,7 @@
 #endif
 
 #include <QLoggingCategory>
+#include <QRegularExpression>
 
 Q_LOGGING_CATEGORY(rmkeyslog, "qtc.sdktool.operations.rmkeys", QtWarningMsg)