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

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

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
 }

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
 }

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
 }

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
 }

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
 }

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
 }

ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro

@@ -10,7 +10,9 @@ TARGET = PPTXFormatLib
 TEMPLATE = lib
 CONFIG += staticlib
 win32 {
-    QMAKE_CXXFLAGS += -std=c++11
+    #todo accentbordercallout90type, вернуть inline оптимизацию Ob2
+    QMAKE_CXXFLAGS_RELEASE += -Ob0
+    QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings
 } else {
     QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
 }

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
 }

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
 }

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
 }

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
 }