diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2019-04-05 09:53:22 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2019-04-09 07:00:18 +0000 |
| commit | 8cd0a39dd79a48697c181c3754cada4ffd832214 (patch) | |
| tree | 482b3aabac6e47b287eefae2ae617935a7a71f69 /qmake/generators/win32/msvc_nmake.cpp | |
| parent | ffc71a977f4bef2872c5c93ddd4db7ebaee8e356 (diff) | |
qmake: Remove special-handling of cl.exe's -Gm option
The comment hints that it's fixing an issue in Visual Studio 2013, which
we don't support anymore.
In all supported Visual Studio Versions -Gm is actually deprecated
anyhow, and not set anymore by default. So I guess it's safe
to remove the special handling here.
Change-Id: I2e8ff85350ba651d9a763aabba7b6494ba88d82e
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'qmake/generators/win32/msvc_nmake.cpp')
| -rw-r--r-- | qmake/generators/win32/msvc_nmake.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index f295705e2e..af6d3c5aff 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -171,15 +171,7 @@ QString NmakeMakefileGenerator::var(const ProKey &value) const .arg(precompH_f, precompH_f, escapeFilePath(isRunC ? precompPchC : precompPch)); QString p = MakefileGenerator::var(value); p.replace(QLatin1String("-c"), precompRule); - // Cannot use -Gm with -FI & -Yu, as this gives an - // internal compiler error, on the newer compilers - // ### work-around for a VS 2003 bug. Move to some prf file or remove completely. - p.remove("-Gm"); return p; - } else if (value == "QMAKE_CXXFLAGS") { - // Remove internal compiler error option - // ### work-around for a VS 2003 bug. Move to some prf file or remove completely. - return MakefileGenerator::var(value).remove("-Gm"); } } |