From 4fe029963d375675d3d4ddaea7e1767486228a73 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 4 Feb 2013 11:31:00 +0100 Subject: qmake/MSVC: do not disable buffer security check per default The default must be "unset" to let the user's MSVC settings decide what the default value is. Task-number: QTBUG-29329 Change-Id: I6015202c123dbb7304941b0d24557a26a1e3236c Reviewed-by: Oswald Buddenhagen --- qmake/generators/win32/msvc_objectmodel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qmake/generators/win32/msvc_objectmodel.cpp') diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index f7b0b29def..f347377cf2 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -311,7 +311,7 @@ VCCLCompilerTool::VCCLCompilerTool() : AssemblerOutput(asmListingNone), BasicRuntimeChecks(runtimeBasicCheckNone), BrowseInformation(brInfoNone), - BufferSecurityCheck(_False), + BufferSecurityCheck(unset), CallingConvention(callConventionDefault), CompileAs(compileAsDefault), CompileAsManaged(managedDefault), -- cgit v1.2.3 From 9c1628aae3d3a7a5f935caa10f838ca24832c5f5 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 4 Feb 2013 12:02:13 +0100 Subject: do not parse MSVC option /Gs as /GS /Gs[size] will be added as additional option as there is no XML element for this option. Task-number: QTBUG-29329 Change-Id: I1f09bfdac90f9c5f2333dc03e6e4e6a206b4f6d0 Reviewed-by: Oswald Buddenhagen Reviewed-by: Joerg Bornemann --- qmake/generators/win32/msvc_objectmodel.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'qmake/generators/win32/msvc_objectmodel.cpp') diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index f347377cf2..475f265295 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -603,9 +603,7 @@ bool VCCLCompilerTool::parseOption(const char* option) CallingConvention = callConventionFastCall; break; case 's': - // Warning: following [num] is not used, - // were should we put it? - BufferSecurityCheck = _True; + AdditionalOptions += option; break; case 'y': EnableFunctionLevelLinking = _True; -- cgit v1.2.3 From be8c47b1404257e33d6b7866101167726a3d1c30 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 4 Feb 2013 12:26:28 +0100 Subject: qmake/MSVC: fix parsing of the /openmp option Task-number: QTBUG-29143 Change-Id: I6b1ce0babf51701fa404b821b22060a87c4f46b2 Reviewed-by: Oswald Buddenhagen --- qmake/generators/win32/msvc_objectmodel.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'qmake/generators/win32/msvc_objectmodel.cpp') diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index 475f265295..2a9e657304 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -1078,11 +1078,20 @@ bool VCCLCompilerTool::parseOption(const char* option) } found = false; break; case 'o': - if (second == 'p' && third == 'e' && fourth == 'n') { - OpenMP = _True; - break; + { + const char *str = option + 2; + const size_t len = strlen(str); + if (len >= 5 && len <= 6 && strncmp(str, "penmp", 5) == 0) { + if (len == 5) { + OpenMP = _True; + break; + } else if (str[5] == '-') { + OpenMP = _False; + break; + } } found = false; break; + } case 's': if(second == 'h' && third == 'o' && fourth == 'w') { ShowIncludes = _True; -- cgit v1.2.3