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

Qnx: Replace QRegExp by QRegularExpression

Browse Source 
Task-number: QTCREATORBUG-24098
Change-Id: Ic32313d8879b6497209196b0e3e4846c00c9846a
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2020-06-19 13:46:26 +02:00
parent 788926d624
commit f82b96107f
5 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/qnx/qnxdevice.cpp
View File

@@ -42,7 +42,7 @@
#include <utils/stringutils.h>
#include <QApplication>
#include <QRegExp>
#include <QRegularExpression>
#include <QStringList>
#include <QThread>
@@ -120,11 +120,12 @@ void QnxDevice::updateVersionNumber() const
QByteArray output = versionNumberProcess.readAllStandardOutput();
QString versionMessage = QString::fromLatin1(output);
QRegExp versionNumberRegExp = QRegExp(QLatin1String("(\\d+)\\.(\\d+)\\.(\\d+)"));
if (versionNumberRegExp.indexIn(versionMessage) > -1 && versionNumberRegExp.captureCount() == 3) {
int major = versionNumberRegExp.cap(1).toInt();
int minor = versionNumberRegExp.cap(2).toInt();
int patch = versionNumberRegExp.cap(3).toInt();
const QRegularExpression versionNumberRegExp("(\\d+)\\.(\\d+)\\.(\\d+)");
const QRegularExpressionMatch match = versionNumberRegExp.match(versionMessage);
if (match.hasMatch()) {
int major = match.captured(1).toInt();
int minor = match.captured(2).toInt();
int patch = match.captured(3).toInt();
m_versionNumber = (major << 16)|(minor<<8)|(patch);
}