diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-04-10 08:16:20 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-04-10 08:16:20 +0200 |
| commit | a20da2353cc308aab15e3efa05ab7d899e9c6ca7 (patch) | |
| tree | 63881eb44f19384ebfb0e0443291b8f9ab82f149 /mkspecs/win32-clang-msvc | |
| parent | 95f787bfdc890c259e8b347bdad9123d534efe0f (diff) | |
| parent | eaf20420f8a4d72c804a9d3725c3e294b34c78c8 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
mkspecs/win32-clang-msvc/qmake.conf
src/gui/image/qpnghandler.cpp
Change-Id: Ied79d02912ffb3a307a99483df7db08c7f9d0cd8
Diffstat (limited to 'mkspecs/win32-clang-msvc')
| -rw-r--r-- | mkspecs/win32-clang-msvc/qmake.conf | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mkspecs/win32-clang-msvc/qmake.conf b/mkspecs/win32-clang-msvc/qmake.conf index 1cf1f31712..5da7e2d1b2 100644 --- a/mkspecs/win32-clang-msvc/qmake.conf +++ b/mkspecs/win32-clang-msvc/qmake.conf @@ -51,7 +51,4 @@ QMAKE_CFLAGS_OPTIMIZE_FULL = /clang:-O3 QMAKE_LFLAGS_RELEASE += /OPT:REF,ICF,LBR -# Precompiled headers are not supported yet by clang -CONFIG -= precompile_header - load(qt_config) |