в windows версии FileConverter2 заменен на x2t32.exe

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@63907 954022d7-b5bf-4e40-9824-e11837661b57

в windows версии FileConverter2 заменен на x2t32.exe
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@63907 954022d7-b5bf-4e40-9824-e11837661b57
3777a018 · Sergey.Konovalov · Alexander Trofimov · 9ef9b9b9 · 3777a018 · 3777a018
Commit 3777a018 authored Aug 06, 2015 by Sergey.Konovalov Committed by Alexander Trofimov May 21, 2016
11 changed files
--- a/ASCHTMLRenderer/Linux/ASCHTMLRendererLib.pro
+++ b/ASCHTMLRenderer/Linux/ASCHTMLRendererLib.pro
@@ -10,7 +10,7 @@ TARGET = ASCHTMLRendererLib
 TEMPLATE = lib
 CONFIG += staticlib
 win32 {
-    QMAKE_CXXFLAGS += -std=c++11
+    QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings
 } else {
    QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
 }

--- a/ASCOfficeDocFile/DocFormatLib/Linux/DocFormatLib.pro
+++ b/ASCOfficeDocFile/DocFormatLib/Linux/DocFormatLib.pro
@@ -10,7 +10,7 @@ TARGET = DocFormatLib
 TEMPLATE = lib
 CONFIG += staticlib
 win32 {
-    QMAKE_CXXFLAGS += -std=c++11
+    QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings
 } else {
    QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
 }

--- a/ASCOfficeDocxFile2/Linux/ASCOfficeDocxFile2Lib.pro
+++ b/ASCOfficeDocxFile2/Linux/ASCOfficeDocxFile2Lib.pro
@@ -10,7 +10,7 @@ TARGET = ASCOfficeDocxFile2Lib
 TEMPLATE = lib
 CONFIG += staticlib
 win32 {
-    QMAKE_CXXFLAGS += -std=c++11
+    QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings
 } else {
    QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
 }

--- a/ASCOfficeOdfFile/linux/OdfFileReaderLib.pro
+++ b/ASCOfficeOdfFile/linux/OdfFileReaderLib.pro
@@ -11,7 +11,7 @@ TEMPLATE = lib
 CONFIG += staticlib

 win32 {
-    QMAKE_CXXFLAGS += -std=c++11
+    QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings
 } else {
    QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
 }

--- a/ASCOfficeOdfFileW/linux/OdfFileWriterLib.pro
+++ b/ASCOfficeOdfFileW/linux/OdfFileWriterLib.pro
@@ -11,7 +11,7 @@ TEMPLATE = lib
 CONFIG += staticlib

 win32 {
-    QMAKE_CXXFLAGS += -std=c++11
+    QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings
 } else {
    QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
 }

--- a/ASCOfficePPTFile/PPTFormatLib/Linux/PPTFormatLib.pro
+++ b/ASCOfficePPTFile/PPTFormatLib/Linux/PPTFormatLib.pro
@@ -10,7 +10,7 @@ TARGET = PptFormatLib
 TEMPLATE = lib
 CONFIG += staticlib
 win32 {
-    QMAKE_CXXFLAGS += -std=c++11
+    QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings
 } else {
    QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
 }

--- a/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro
+++ b/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro
--- a/ASCOfficeRtfFile/RtfFormatLib/Linux/RtfFormatLib.pro
+++ b/ASCOfficeRtfFile/RtfFormatLib/Linux/RtfFormatLib.pro
@@ -10,7 +10,7 @@ TARGET = RtfFormatLib
 TEMPLATE = lib
 CONFIG += staticlib
 win32 {
-    QMAKE_CXXFLAGS += -std=c++11
+    QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings
 } else {
    QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
 }

--- a/ASCOfficeTxtFile/TxtXmlFormatLib/Linux/TxtXmlFormatLib.pro
+++ b/ASCOfficeTxtFile/TxtXmlFormatLib/Linux/TxtXmlFormatLib.pro
@@ -10,7 +10,7 @@ TARGET = TxtXmlFormatLib
 TEMPLATE = lib
 CONFIG += staticlib
 win32 {
-    QMAKE_CXXFLAGS += -std=c++11
+    QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings
 } else {
    QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
 }

--- a/ASCOfficeUtils/ASCOfficeUtilsLib/Linux/ASCOfficeUtilsLib.pro
+++ b/ASCOfficeUtils/ASCOfficeUtilsLib/Linux/ASCOfficeUtilsLib.pro
@@ -10,7 +10,7 @@ TARGET = ASCOfficeUtilsLib
 TEMPLATE = lib
 CONFIG += staticlib
 win32 {
-    QMAKE_CXXFLAGS += -std=c++11
+    QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings
 } else {
    QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
 }

--- a/Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro
+++ b/Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro
@@ -10,7 +10,7 @@ TARGET = DocxFormatLib
 TEMPLATE = lib
 CONFIG += staticlib
 win32 {
-    QMAKE_CXXFLAGS += -std=c++11
+    QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings
 } else {
    QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
 }