diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-02-04 11:02:13 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-07 12:24:03 (GMT) |
| commit | c4eaf24d9d783aef56ff1503c7b22f86316cfcb8 (patch) | |
| tree | bd87c78597ad550e2c68c3ca077dc6da7dcaa321 /qmake | |
| parent | c9e094da68b2710d6b51885c6a3897a78237bd42 (diff) | |
| download | Qt-c4eaf24d9d783aef56ff1503c7b22f86316cfcb8.zip Qt-c4eaf24d9d783aef56ff1503c7b22f86316cfcb8.tar.gz Qt-c4eaf24d9d783aef56ff1503c7b22f86316cfcb8.tar.bz2 | |
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>
(cherry picked from commit 9c1628aae3d3a7a5f935caa10f838ca24832c5f5)
Diffstat (limited to 'qmake')
| -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 f1aebad..6f47be7 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; |