From f4169a633b97b7b6e7365172cf3d38d2f16a8914 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 19 Sep 2018 15:04:00 +0200 Subject: 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 Reviewed-by: Miguel Costa Reviewed-by: Allan Sandfeld Jensen --- qmake/generators/win32/msvc_vcproj.cpp | 14 -------------- 1 file changed, 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); -- cgit v1.2.3