diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-04-03 17:11:36 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-05-05 18:41:27 +0200 |
| commit | a1947aeffe158a0ea7de3ced1bf8d6a4719a27ef (patch) | |
| tree | c1b249b7d8bd9b3079df3ad5fe468f7ff4df861b /qmake/generators/projectgenerator.cpp | |
| parent | 412dd857b81471277e1014b6329f46a389a42cb3 (diff) | |
Port qmake over to user QRegularExpression
Use the DotMatchesEverythingOption for all places
where we interpret .pro files, to increase compatibility
with QRegExp.
Change-Id: I347d6b17858069f3c9cedcedd04df58358d83f27
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'qmake/generators/projectgenerator.cpp')
| -rw-r--r-- | qmake/generators/projectgenerator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/projectgenerator.cpp b/qmake/generators/projectgenerator.cpp index 613c97fb85..ac6793cbf3 100644 --- a/qmake/generators/projectgenerator.cpp +++ b/qmake/generators/projectgenerator.cpp @@ -32,7 +32,7 @@ #include <qdir.h> #include <qfile.h> #include <qfileinfo.h> -#include <qregexp.h> +#include <qregularexpression.h> QT_BEGIN_NAMESPACE @@ -245,7 +245,7 @@ ProjectGenerator::init() v["INCLUDEPATH"] += inc.real(); } } - if(no_qt_files && file_no_path.indexOf(QRegExp("^q[a-z_0-9].h$")) != -1) + if (no_qt_files && file_no_path.contains(QRegularExpression("^q[a-z_0-9].h$"))) no_qt_files = false; QString h_ext; for(int hit = 0; hit < Option::h_ext.size(); ++hit) { |