summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2014-02-11 14:10:00 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-12 17:55:51 +0100
commit9b59e51c5064c67c423389c2c884d009903910c7 (patch)
treec1e93b0220dc061f2565a38828c622733394e695
parent8e22d71b225576ae7ccd6ed349c05219bae7689e (diff)
downloadqtbase-9b59e51c5064c67c423389c2c884d009903910c7.tar.gz
qtbase-9b59e51c5064c67c423389c2c884d009903910c7.tar.bz2
qtbase-9b59e51c5064c67c423389c2c884d009903910c7.zip
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>
-rw-r--r--qmake/generators/win32/msvc_objectmodel.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index 8159cf58e2..a2a441c6bf 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;