From b885281ce7a8aec5cca6beeb829208d1f4f672e6 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Fri, 30 Sep 2022 11:49:41 +0200 Subject: [PATCH] Android: Limit the usage of qMakePair Change-Id: Ic079174e75d3a538d5d97fc3931ddd035623f4a6 Reviewed-by: Alessandro Portale Reviewed-by: --- src/plugins/android/androidmanifesteditorwidget.cpp | 2 +- src/plugins/android/androidsdkmanager.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/android/androidmanifesteditorwidget.cpp b/src/plugins/android/androidmanifesteditorwidget.cpp index 74b40b2b02b..04bd7446b52 100644 --- a/src/plugins/android/androidmanifesteditorwidget.cpp +++ b/src/plugins/android/androidmanifesteditorwidget.cpp @@ -689,7 +689,7 @@ void AndroidManifestEditorWidget::updateInfoBar() void AndroidManifestEditorWidget::updateSdkVersions() { - static const QPair sdkPair = qMakePair(16, 31); + static const QPair sdkPair{16, 31}; int minSdk = sdkPair.first; const int targetSdk = sdkPair.second; const Target *target = androidTarget(m_textEditorWidget->textDocument()->filePath()); diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp index b318c2b1f03..0fed77d2312 100644 --- a/src/plugins/android/androidsdkmanager.cpp +++ b/src/plugins/android/androidsdkmanager.cpp @@ -706,7 +706,7 @@ QPair SdkManagerOutputParser::parseSystemImage(const QString image->setDisplayText(packageData.description); image->setDescriptionText(packageData.description); image->setApiLevel(apiLevel); - result = qMakePair(image, apiLevel); + result = {image, apiLevel}; } else { qCDebug(sdkManagerLog) << "System-image: Minimum required data unavailable: "<< data; }