diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-17 11:39:16 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-17 11:39:16 +0100 |
commit | dbafabb019eac6ab21b43279b3a348e4afbd065e (patch) | |
tree | 24245148e3f0b948df06823d879f9158d1b81d2f /qmake | |
parent | 00b96399e6d3bcd7a1081721cafeb15da3ab9781 (diff) | |
parent | 9de2853a942529f88815ed29375ff4efc44d168c (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/corelib/global/qglobal.h
Change-Id: I03d8b6e07135056baaa1d97c3c63fbe8b25583d9
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index 1a92b79a09..633682baf4 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -510,6 +510,11 @@ bool VCCLCompilerTool::parseOption(const char* option) BrowseInformation = brAllInfo; BrowseInformationFile = option+3; break; + case 'S': + if (config->CompilerVersion < NET2013) + found = false; + // Ignore this flag. Visual Studio 2013 takes care of this setting. + break; case 'r': BrowseInformation = brNoLocalSymbols; BrowseInformationFile = option+3; |