diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-02-11 14:10:00 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2014-10-27 10:00:36 +0100 |
| commit | 08ffa4bc83b0d43ee15023713438e16b4e984b61 (patch) | |
| tree | b83282f043f487064e07ec346120ad7310f43f97 /qmake | |
| parent | 8c828dcba954b3168a7bef7ce6af17b5bdac5500 (diff) | |
| download | qt4-tools-08ffa4bc83b0d43ee15023713438e16b4e984b61.tar.gz | |
fix warning when generating VS 2013 project
/FS forces the compiler to synchronize pdb file writes.
This option is not needed when building with Visual Studio itself.
Still, qmake needs to know it when parsing the compiler flags.
Task-number: QTBUG-36535
Change-Id: Id5b68c4028844e0b95904e08b5121310a4ff13d6
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
(cherry picked from commit qtbase/9b59e51c5064c67c423389c2c884d009903910c7)
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
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 55ee605257..9d3bcee5ea 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -503,6 +503,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; |