diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-21 01:00:08 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-21 01:00:09 +0200 |
commit | 7a252ac46780b6145084d8d5ca0549b2de3639cc (patch) | |
tree | e8a938a26fb610e0eaba62dcf185b2e361f01951 /mkspecs | |
parent | 10b8ed816d0dff4321d5a8b0723a8090b2058678 (diff) | |
parent | 2708c6c11d685ab25c12d558961d924c9a4533d2 (diff) |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: Iaf28977e7ecf566b28b9406dcb005d48621169c2
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/features/static_runtime.prf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/static_runtime.prf b/mkspecs/features/static_runtime.prf index 3275e6e2e2..1af3236189 100644 --- a/mkspecs/features/static_runtime.prf +++ b/mkspecs/features/static_runtime.prf @@ -1,7 +1,7 @@ msvc { # -MD becomes -MT, -MDd becomes -MTd - QMAKE_CFLAGS ~= s,^-MD(d?)$, -MT\1,g - QMAKE_CXXFLAGS ~= s,^-MD(d?)$, -MT\1,g + QMAKE_CFLAGS ~= s,^-MD(d?)$,-MT\1,g + QMAKE_CXXFLAGS ~= s,^-MD(d?)$,-MT\1,g } else: mingw { QMAKE_LFLAGS += -static } |