diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-10-20 09:03:35 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-10-20 08:28:04 +0000 |
| commit | 08d84a688a2cd2bac6076cef09af04c3f9d29b90 (patch) | |
| tree | 6cd5f784a9068638ddddc2544df4ad835f1b9c93 | |
| parent | 83da45adde46df9c7762dc0004c7b02154876548 (diff) | |
Fix compilation of sdktool against old Qt versions
Amends 6c5eaed92ca838e68745c71ee27adb754a496b8e
Change-Id: Ia664ea16767e9787252ec529061c7d5f5d89a7de
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| -rw-r--r-- | src/libs/utils/stringutils.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
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 |