diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-09-19 15:04:00 +0200 |
---|---|---|
committer | Oliver Wolff <oliver.wolff@qt.io> | 2018-09-26 05:41:08 +0000 |
commit | f4169a633b97b7b6e7365172cf3d38d2f16a8914 (patch) | |
tree | d094ef46fe0bd24e14de5bf5a53f7287c5254d27 /qmake/generators | |
parent | 7b00eab5933cb46061dd15334edd3a083fe446cc (diff) |
Revert "qmake: Work around MSVC compiler bug."
The fix was for MSVC2010 which is now no longer supported
and causes a warning:
msvc_vcproj.cpp(217,12): warning: unknown pragma ignored [-Wunknown-pragmas]
#pragma optimize( "g", off )
by clang-cl.
This reverts commit 9f54846d951838361f4188b423e7aa7c7b9a9540.
Task-number: QTBUG-63512
Change-Id: I395b964d09ac04a7dc852e43d7d95669948eea52
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Miguel Costa <miguel.costa@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'qmake/generators')
-rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index b453873344..73f0f35d1b 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -208,16 +208,6 @@ struct VcsolutionDepend { QStringList dependencies; }; -/* Disable optimization in getProjectUUID() due to a compiler - * bug in MSVC 2010 that causes ASSERT: "&other != this" in the QString - * copy constructor for non-empty file names at: - * filename.isEmpty()?project->first("QMAKE_MAKEFILE"):filename */ - -#ifdef Q_CC_MSVC -# pragma optimize( "g", off ) -# pragma warning ( disable : 4748 ) -#endif - QUuid VcprojGenerator::getProjectUUID(const QString &filename) { bool validUUID = true; @@ -249,10 +239,6 @@ QUuid VcprojGenerator::getProjectUUID(const QString &filename) return uuid; } -#ifdef Q_CC_MSVC -# pragma optimize( "g", on ) -#endif - QUuid VcprojGenerator::increaseUUID(const QUuid &id) { QUuid result(id); |