1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_uic: Update version regexp

Browse Source 
The pattern did not match double-digit version numbers like 5.10.0.
Adapt it to better match the version number and use QRegularExpression.

Change-Id: I2e25b247213cee6853bfeb27871c839135e3970f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Friedemann Kleint 2017-02-03 08:43:03 +01:00
parent 7190f2fd02
commit 59ad4465b1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/auto/tools/uic/tst_uic.cpp
View File

@ -34,6 +34,7 @@
#include <QtCore/QByteArray> #include <QtCore/QByteArray>
#include <QtCore/QLibraryInfo> #include <QtCore/QLibraryInfo>
#include <QtCore/QTemporaryDir> #include <QtCore/QTemporaryDir>
#include <QtCore/QRegularExpression>
#include <QtCore/QStandardPaths> #include <QtCore/QStandardPaths>
class tst_uic : public QObject class tst_uic : public QObject
@ -63,12 +64,12 @@ private:
const QString m_command; const QString m_command;
QString m_baseline; QString m_baseline;
QTemporaryDir m_generated; QTemporaryDir m_generated;
QRegExp m_versionRegexp; QRegularExpression m_versionRegexp;
}; };
tst_uic::tst_uic() tst_uic::tst_uic()
: m_command(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/uic")) : m_command(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/uic"))
, m_versionRegexp(QLatin1String("Created by: Qt User Interface Compiler version [.\\d]{5,5}")) , m_versionRegexp(QLatin1String("\\*\\* Created by: Qt User Interface Compiler version \\d{1,2}\\.\\d{1,2}\\.\\d{1,2}"))
{ {
} }