summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2014-09-10 12:18:41 +0200
committerKai Koehne <kai.koehne@digia.com>2014-10-09 14:33:53 +0200
commit9a7e8562fce16aa90c59dd48a7b8d8e4bf137bfb (patch)
tree746baceb5a30e126458232e0aa7a366dc582705b
parent9d4950068c3eb98f736b725d29395484b9aee6c6 (diff)
Fix build with Qt 5.4 and MSVC2013 (release)
Qt 5.4 adds '-Zc:strictStrings' to the win32-2013 mkspec (commit 9f0e5d00ab51c). 7zip sources however aren't compatible with this setting. Task-number: QTIFW-542 Change-Id: Ibb92afba1f890ca07c3805ce1dedf55c0eac3c57 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
-rw-r--r--src/libs/7zip/7zip.pri1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libs/7zip/7zip.pri b/src/libs/7zip/7zip.pri
index ded5793f4..c128d0397 100644
--- a/src/libs/7zip/7zip.pri
+++ b/src/libs/7zip/7zip.pri
@@ -2,6 +2,7 @@ win32 {
7ZIP_BASE=$$PWD/win
INCLUDEPATH += $$7ZIP_BASE/C $$7ZIP_BASE/CPP
DEFINES += WIN_LONG_PATH _UNICODE _NO_CRYPTO
+ QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings
}
unix {