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 /src/angle/src/config.pri | |
| 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 'src/angle/src/config.pri')
| -rw-r--r-- | src/angle/src/config.pri | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/angle/src/config.pri b/src/angle/src/config.pri index 5c521281a6..cafae0e742 100644 --- a/src/angle/src/config.pri +++ b/src/angle/src/config.pri @@ -79,10 +79,9 @@ msvc { # /Oy: Omits frame pointer (x86 only). # /Gy: Enables function-level linking. # /GS: Buffers security check. - # /Gm-: Disable minimal rebuild. # /RTC1: Run time error checking - QMAKE_CFLAGS_RELEASE += -Oy- -Gy -GS -Gm- - QMAKE_CFLAGS_DEBUG += -Oy- -Gy -GS -Gm- -RTC1 + QMAKE_CFLAGS_RELEASE += -Oy- -Gy -GS + QMAKE_CFLAGS_DEBUG += -Oy- -Gy -GS -RTC1 QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO = -Zi $$QMAKE_CFLAGS_RELEASE QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON |