diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-02-04 12:02:13 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-04 16:23:53 +0100 |
commit | 9c1628aae3d3a7a5f935caa10f838ca24832c5f5 (patch) | |
tree | f78a50bfcc6111ddc9fa4396f7d9e6e01f71422f /qmake/generators | |
parent | 4fe029963d375675d3d4ddaea7e1767486228a73 (diff) |
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 <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qmake/generators')
-rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
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; |