From 08d84a688a2cd2bac6076cef09af04c3f9d29b90 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 20 Oct 2020 09:03:35 +0200 Subject: Fix compilation of sdktool against old Qt versions Amends 6c5eaed92ca838e68745c71ee27adb754a496b8e Change-Id: Ia664ea16767e9787252ec529061c7d5f5d89a7de Reviewed-by: Christian Stenger --- src/libs/utils/stringutils.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/libs/utils/stringutils.cpp b/src/libs/utils/stringutils.cpp index d8483df552..9d179a9abd 100644 --- a/src/libs/utils/stringutils.cpp +++ b/src/libs/utils/stringutils.cpp @@ -399,6 +399,9 @@ QString formatElapsedTime(qint64 elapsed) */ QString wildcardToRegularExpression(const QString &original) { +#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) + using qsizetype = int; +#endif const qsizetype wclen = original.size(); QString rx; rx.reserve(wclen + wclen / 16); @@ -455,6 +458,10 @@ QString wildcardToRegularExpression(const QString &original) } } +#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) return QRegularExpression::anchoredPattern(rx); +#else + return "\\A" + rx + "\\z"; +#endif } } // namespace Utils -- cgit v1.2.3