diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-09-04 07:03:54 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-04 07:03:54 +0200 |
| commit | 6a36fe904c7183aba8e7f1977ff86303d84ff62b (patch) | |
| tree | 6034e7bfdf0d14b72512b36f63d35a936b32e0dc /qmake/generators/projectgenerator.cpp | |
| parent | 18088d4706bdd2fefafe7dbb44dc467126f2c795 (diff) | |
| parent | db57af5a0d7aa0687a19fef1cd385bee0f26f7b6 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/corelib/codecs/qicucodec.cpp
src/dbus/qdbusserver.cpp
src/gui/painting/qbezier.cpp
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
src/plugins/printsupport/cups/qppdprintdevice.cpp
Change-Id: I2703128bb64baf5580fbc2c2061b55b0f0611d2a
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 c43f6b4e4a..613c97fb85 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; |