diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-13 11:58:07 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-14 14:24:57 +0100 |
commit | e65cd6f3794e12e6bc5c2ee985eae8e70ff5f333 (patch) | |
tree | 8965835c375422d63b2ccfa927b31a56e64bda1d /qmake/generators/win32/msvc_objectmodel.cpp | |
parent | d1ee7189553e13337b198fe4ba66d79fb7a7f41d (diff) | |
parent | e95a758236cf2c68e33da4ddb62bff4fe8d9dd8b (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/concurrent/doc/qtconcurrent.qdocconf
src/corelib/doc/qtcore.qdocconf
src/corelib/global/qglobal.h
src/dbus/doc/qtdbus.qdocconf
src/dbus/qdbusmessage.h
src/gui/doc/qtgui.qdocconf
src/gui/image/qimagereader.cpp
src/network/doc/qtnetwork.qdocconf
src/opengl/doc/qtopengl.qdocconf
src/opengl/qgl.h
src/plugins/platforms/windows/qwindowswindow.cpp
src/printsupport/doc/qtprintsupport.qdocconf
src/sql/doc/qtsql.qdocconf
src/testlib/doc/qttestlib.qdocconf
src/tools/qdoc/doc/config/qt-cpp-ignore.qdocconf
src/widgets/doc/qtwidgets.qdocconf
src/xml/doc/qtxml.qdocconf
Change-Id: Ie9a1fa2cc44bec22a0b942e817a1095ca3414629
Diffstat (limited to 'qmake/generators/win32/msvc_objectmodel.cpp')
-rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index f7b0b29def..2a9e657304 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), @@ -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; @@ -1080,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; |