diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2020-06-16 07:48:09 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2020-06-16 06:19:01 +0000 |
| commit | 4b1adeca7f98868c0c5f9b5e85829ccc78256103 (patch) | |
| tree | adf72b32303b58d15397bac1c98615fbc2e060c1 /src/plugins/android/androidqtversion.cpp | |
| parent | 555970eeb0a31e41ed867e8f64fb1fd1b18a77d4 (diff) | |
| download | qt-creator-4b1adeca7f98868c0c5f9b5e85829ccc78256103.tar.gz | |
Android: Use QRegularExpression instead of QRegExp
Task-number: QTCREATORBUG-24098
Change-Id: Ic19bd73dd2bac39b393bf87c4567193631b57c80
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/android/androidqtversion.cpp')
| -rw-r--r-- | src/plugins/android/androidqtversion.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/android/androidqtversion.cpp b/src/plugins/android/androidqtversion.cpp index b3b602830a..ef1f8328cf 100644 --- a/src/plugins/android/androidqtversion.cpp +++ b/src/plugins/android/androidqtversion.cpp @@ -42,6 +42,8 @@ #include <proparser/profileevaluator.h> +#include <QRegularExpression> + using namespace ProjectExplorer; namespace Android { @@ -168,10 +170,11 @@ void AndroidQtVersion::parseMkSpec(ProFileEvaluator *evaluator) const m_androidAbis = QStringList{evaluator->value("ANDROID_TARGET_ARCH")}; const QString androidPlatform = evaluator->value("ANDROID_PLATFORM"); if (!androidPlatform.isEmpty()) { - const QRegExp regex("android-(\\d+)"); - if (regex.exactMatch(androidPlatform)) { + const QRegularExpression regex("android-(\\d+)"); + const QRegularExpressionMatch match = regex.match(androidPlatform); + if (match.hasMatch()) { bool ok = false; - int tmp = regex.cap(1).toInt(&ok); + int tmp = match.captured(1).toInt(&ok); if (ok) m_minNdk = tmp; } |