tools: port away from QPair

Pick-to: 6.7
Task-number: QTBUG-115841
Change-Id: If122a1c17b1b4092b115521cec814ce3b508cd80
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>

2 files changed, 3 insertions, 2 deletions

diff --git a/src/tools/androiddeployqt/CMakeLists.txt b/src/tools/androiddeployqt/CMakeLists.txt
index 2a0f1ae9af..041d883877 100644
--- a/src/tools/androiddeployqt/CMakeLists.txt
+++ b/src/tools/androiddeployqt/CMakeLists.txt
@@ -17,6 +17,7 @@ qt_internal_add_tool(${target_name}
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
         QT_NO_FOREACH
+        QT_NO_QPAIR
     LIBRARIES
         Qt::Core
     INCLUDE_DIRECTORIES
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp
index 423978fcce..45d06f731b 100644
--- a/src/tools/androiddeployqt/main.cpp
+++ b/src/tools/androiddeployqt/main.cpp
@@ -224,7 +224,7 @@ struct Options
         qtPluginsDirectory = directories["qtPluginsDirectory"_L1];
         qtQmlDirectory = directories["qtQmlDirectory"_L1];
     }
-    typedef QPair<QString, QString> BundledFile;
+    using BundledFile = std::pair<QString, QString>;
     QHash<QString, QList<BundledFile>> bundledFiles;
     QHash<QString, QList<QtDependency>> qtDependencies;
     QHash<QString, QStringList> localLibs;
@@ -2582,7 +2582,7 @@ bool copyQtFiles(Options *options)
                                     *options)) {
             return false;
         }
-        options->bundledFiles[options->currentArchitecture] += qMakePair(destinationFileName, qtDependency.relativePath);
+        options->bundledFiles[options->currentArchitecture] += std::make_pair(destinationFileName, qtDependency.relativePath);
     }
 
     return true;