diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-08-27 13:08:38 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-08-27 13:08:38 +0200 |
| commit | afac8dac580b5e6524f03c252c27b7f2353bace9 (patch) | |
| tree | 49b729086ff7f337cd1a5f9ee1f8be3aef736214 /qmake/generators/projectgenerator.cpp | |
| parent | f2f1a93c58b6cb88f3cd0655e95ccd5ad99286d0 (diff) | |
| parent | b3dc0c13e88f3bd859c96144a9d4280c675665bc (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/gui/painting/qdrawhelper.cpp
src/gui/painting/qdrawhelper_p.h
src/gui/painting/qdrawhelper_sse2.cpp
src/gui/painting/qdrawhelper_x86_p.h
Change-Id: I83256bb38ab3a705776e353bc0629315b6c59a0f
Diffstat (limited to 'qmake/generators/projectgenerator.cpp')
| -rw-r--r-- | qmake/generators/projectgenerator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/projectgenerator.cpp b/qmake/generators/projectgenerator.cpp index ef34955eb1..19acc09e85 100644 --- a/qmake/generators/projectgenerator.cpp +++ b/qmake/generators/projectgenerator.cpp @@ -36,7 +36,7 @@ QT_BEGIN_NAMESPACE -QString project_builtin_regx() //calculate the builtin regular expression.. +static QString project_builtin_regx() //calculate the builtin regular expression.. { QString ret; QStringList builtin_exts; |