2 files changed, 41 insertions, 2 deletions
diff --git a/tests/auto/tools/qmakelib/evaltest.cpp b/tests/auto/tools/qmakelib/evaltest.cpp
index 4e215b8570..10a5d7c0c3 100644
--- a/tests/auto/tools/qmakelib/evaltest.cpp
+++ b/tests/auto/tools/qmakelib/evaltest.cpp
@@ -2191,6 +2191,44 @@ void tst_qmakelib::addTestFunctions(const QString &qindir)
             << ""
             << true;
 
+    QTest::newRow("versionAtLeast(): true")
+            << "VAR = 1.2.3\nversionAtLeast(VAR, 1.2.3): OK = 1"
+            << "OK = 1"
+            << ""
+            << true;
+
+    QTest::newRow("versionAtLeast(): false")
+            << "VAR = 1.2.2\nversionAtLeast(VAR, 1.2.3): OK = 1"
+            << "OK = UNDEF"
+            << ""
+            << true;
+
+    QTest::newRow("versionAtLeast(): bad number of arguments")
+            << "versionAtLeast(1): OK = 1\nversionAtLeast(1, 2, 3): OK = 1"
+            << "OK = UNDEF"
+            << "##:1: versionAtLeast(variable, versionNumber) requires two arguments.\n"
+               "##:2: versionAtLeast(variable, versionNumber) requires two arguments."
+            << true;
+
+    QTest::newRow("versionAtMost(): true")
+            << "VAR = 1.2.3\nversionAtMost(VAR, 1.2.3): OK = 1"
+            << "OK = 1"
+            << ""
+            << true;
+
+    QTest::newRow("versionAtMost(): false")
+            << "VAR = 1.2.3\nversionAtMost(VAR, 1.2.2): OK = 1"
+            << "OK = UNDEF"
+            << ""
+            << true;
+
+    QTest::newRow("versionAtMost(): bad number of arguments")
+            << "versionAtMost(1): OK = 1\nversionAtMost(1, 2, 3): OK = 1"
+            << "OK = UNDEF"
+            << "##:1: versionAtMost(variable, versionNumber) requires two arguments.\n"
+               "##:2: versionAtMost(variable, versionNumber) requires two arguments."
+            << true;
+
     QTest::newRow("clear(): top-level")
             << "VAR = there\nclear(VAR): OK = 1"
             << "OK = 1\nVAR ="
diff --git a/tests/auto/tools/uic/tst_uic.cpp b/tests/auto/tools/uic/tst_uic.cpp
index cf43cb02d3..85668c96d4 100644
--- a/tests/auto/tools/uic/tst_uic.cpp
+++ b/tests/auto/tools/uic/tst_uic.cpp
@@ -34,6 +34,7 @@
 #include <QtCore/QByteArray>
 #include <QtCore/QLibraryInfo>
 #include <QtCore/QTemporaryDir>
+#include <QtCore/QRegularExpression>
 #include <QtCore/QStandardPaths>
 
 class tst_uic : public QObject
@@ -63,12 +64,12 @@ private:
     const QString m_command;
     QString m_baseline;
     QTemporaryDir m_generated;
-    QRegExp m_versionRegexp;
+    QRegularExpression m_versionRegexp;
 };
 
 tst_uic::tst_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}"))
 {
 }