diff options
author | Liang Qi <liang.qi@qt.io> | 2019-06-25 11:17:32 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-06-25 13:04:27 +0200 |
commit | ef37ab9970ffb9347bc95a3e6006de956c0155c9 (patch) | |
tree | 4c6afb6d232c6ed8aab732763ef895e8bd85ec55 /mkspecs/features/ltcg.prf | |
parent | 79bdc7cf1daec75df59de9236599a9f24077511a (diff) | |
parent | 5b5e8f78fecbe2bd9279bfa9ef10015cef8b1bc7 (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
src/gui/painting/qdrawhelper.cpp
src/gui/text/qdistancefield.cpp
src/gui/text/qdistancefield_p.h
src/network/ssl/qsslsocket_openssl.cpp
src/plugins/platforms/android/qandroidinputcontext.cpp
src/widgets/styles/qstylesheetstyle.cpp
Done-With: Timur Pocheptsov <timur.pocheptsov@qt.io>
Change-Id: Ia7daad21f077ea889898f17734ec46303e71fe6b
Diffstat (limited to 'mkspecs/features/ltcg.prf')
-rw-r--r-- | mkspecs/features/ltcg.prf | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf index d113caf35c..43ba482954 100644 --- a/mkspecs/features/ltcg.prf +++ b/mkspecs/features/ltcg.prf @@ -28,7 +28,10 @@ CONFIG(release, debug|release) { } load(link_ltcg) - QMAKE_CFLAGS *= $$QMAKE_CFLAGS_LTCG - QMAKE_CXXFLAGS *= $$QMAKE_CXXFLAGS_LTCG - QMAKE_LFLAGS *= $$QMAKE_LFLAGS_LTCG + QMAKE_CFLAGS -= $$QMAKE_CFLAGS_LTCG + QMAKE_CFLAGS += $$QMAKE_CFLAGS_LTCG + QMAKE_CXXFLAGS -= $$QMAKE_CXXFLAGS_LTCG + QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_LTCG + QMAKE_LFLAGS -= $$QMAKE_LFLAGS_LTCG + QMAKE_LFLAGS += $$QMAKE_LFLAGS_LTCG } |