Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikkel Krautz <mikkel@krautz.dk>2014-12-24 14:39:56 +0300
committerMikkel Krautz <mikkel@krautz.dk>2014-12-24 14:49:09 +0300
commitd2dbfedf191f6df7e6514274e93639d842c02552 (patch)
tree93d1ac4b413bfbcdbdd5d72e0c810e2be014f8d1
parent124b1ceb032dddaa85091c5fa74ba63723c98303 (diff)
Remove -Zc:strictStrings flag that Qt 5.4 adds when using MSVS 2013.
-rw-r--r--compiler.pri9
1 files changed, 9 insertions, 0 deletions
diff --git a/compiler.pri b/compiler.pri
index eff150345..789562b29 100644
--- a/compiler.pri
+++ b/compiler.pri
@@ -95,6 +95,15 @@ win32 {
QMAKE_CXXFLAGS_RELEASE *= -arch:SSE
}
+ # Qt 5.4 uses -Zc:strictStrings by default on MSVS 2013.
+ # TextToSpeech_win.cpp uses sapi.h, which isn't compatible
+ # with the strictStrings option due to bad conversions
+ # in some of its functions's default parameters.
+ QMAKE_CFLAGS_RELEASE -= -Zc:strictStrings
+ QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings
+ QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO -= -Zc:strictStrings
+ QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO -= -Zc:strictStrings
+
QMAKE_LFLAGS_CONSOLE -= /SUBSYSTEM:CONSOLE
QMAKE_LFLAGS_CONSOLE += /SUBSYSTEM:CONSOLE,5.01