diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2020-07-14 14:27:53 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2020-07-15 12:08:09 +0000 |
| commit | 6a811936d88fd999760699d7661508ffac1408c4 (patch) | |
| tree | 6e081861e2532cddcd0333b67cf66e6a2251d848 /src/tools/sdktool/addkitoperation.cpp | |
| parent | 1f5c89b111d17d5340aa5ab671a65b7ec92c2fad (diff) | |
Tools: Replace QRegExp by QRegularExpression
Task-number: QTCREATORBUG-24098
Change-Id: I16d8928689d208c13776b76cabd663c006a0eb51
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/tools/sdktool/addkitoperation.cpp')
| -rw-r--r-- | src/tools/sdktool/addkitoperation.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/sdktool/addkitoperation.cpp b/src/tools/sdktool/addkitoperation.cpp index f0213f17a3..df5b297c97 100644 --- a/src/tools/sdktool/addkitoperation.cpp +++ b/src/tools/sdktool/addkitoperation.cpp @@ -38,7 +38,7 @@ #include "settings.h" #include <QDir> -#include <QRegExp> +#include <QRegularExpression> #include <iostream> @@ -582,8 +582,8 @@ QVariantMap AddKitOperation::addKit(const QVariantMap &map, const QVariantMap &t for (auto i = tcs.constBegin(); i != tcs.constEnd(); ++i) { if (!i.value().isEmpty() && !AddToolChainOperation::exists(tcMap, i.value())) { - QRegExp abiRegExp = QRegExp("[a-z0-9_]+-[a-z0-9_]+-[a-z0-9_]+-[a-z0-9_]+-(8|16|32|64|128)bit"); - if (!abiRegExp.exactMatch(i.value())) { + const QRegularExpression abiRegExp("^[a-z0-9_]+-[a-z0-9_]+-[a-z0-9_]+-[a-z0-9_]+-(8|16|32|64|128)bit$"); + if (!abiRegExp.match(i.value()).hasMatch()) { std::cerr << "Error: Toolchain " << qPrintable(i.value()) << " for language " << qPrintable(i.key()) << " does not exist." << std::endl; return QVariantMap(); |