feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Limit the usage of qMakePair

Browse Source 
Change-Id: Ic079174e75d3a538d5d97fc3931ddd035623f4a6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2022-09-30 11:49:41 +02:00
parent c09c7ccba0
commit b885281ce7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androidmanifesteditorwidget.cpp
View File

@@ -689,7 +689,7 @@ void AndroidManifestEditorWidget::updateInfoBar()
void AndroidManifestEditorWidget::updateSdkVersions() void AndroidManifestEditorWidget::updateSdkVersions()
{ {
static const QPair<int, int> sdkPair = qMakePair(16, 31); static const QPair<int, int> sdkPair{16, 31};
int minSdk = sdkPair.first; int minSdk = sdkPair.first;
const int targetSdk = sdkPair.second; const int targetSdk = sdkPair.second;
const Target *target = androidTarget(m_textEditorWidget->textDocument()->filePath()); const Target *target = androidTarget(m_textEditorWidget->textDocument()->filePath());

2
src/plugins/android/androidsdkmanager.cpp
View File

@@ -706,7 +706,7 @@ QPair<SystemImage *, int> SdkManagerOutputParser::parseSystemImage(const QString
image->setDisplayText(packageData.description); image->setDisplayText(packageData.description);
image->setDescriptionText(packageData.description); image->setDescriptionText(packageData.description);
image->setApiLevel(apiLevel); image->setApiLevel(apiLevel);
result = qMakePair(image, apiLevel); result = {image, apiLevel};
} else { } else {
qCDebug(sdkManagerLog) << "System-image: Minimum required data unavailable: "<< data; qCDebug(sdkManagerLog) << "System-image: Minimum required data unavailable: "<< data;
} }