diff options
Diffstat (limited to 'src/plugins/qnx/qnxversionnumber.cpp')
-rw-r--r-- | src/plugins/qnx/qnxversionnumber.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/qnx/qnxversionnumber.cpp b/src/plugins/qnx/qnxversionnumber.cpp index ee29628189..0a1061c4f5 100644 --- a/src/plugins/qnx/qnxversionnumber.cpp +++ b/src/plugins/qnx/qnxversionnumber.cpp @@ -26,7 +26,7 @@ #include "qnxversionnumber.h" #include <QDir> -#include <QRegExp> +#include <QRegularExpression> namespace Qnx { namespace Internal { @@ -89,14 +89,15 @@ QString QnxVersionNumber::segment(int index) const QnxVersionNumber QnxVersionNumber::fromTargetName(const QString &targetName) { - return fromFileName(targetName, QRegExp(QLatin1String("^target_(.*)$"))); + return fromFileName(targetName, QRegularExpression("^target_(.*)$")); } -QnxVersionNumber QnxVersionNumber::fromFileName(const QString &fileName, const QRegExp ®Exp) +QnxVersionNumber QnxVersionNumber::fromFileName(const QString &fileName, const QRegularExpression ®Exp) { QStringList segments; - if (regExp.exactMatch(fileName) && regExp.captureCount() == 1) - segments << regExp.cap(1).split(QLatin1Char('_')); + const QRegularExpressionMatch match = regExp.match(fileName); + if (match.hasMatch() && regExp.captureCount() == 1) + segments << match.captured(1).split(QLatin1Char('_')); return QnxVersionNumber(segments); } |