Merge remote-tracking branch 'gerrit/master' into containers

Conflicts:
	src/corelib/tools/qstring.cpp

Change-Id: I23d214bf33c2badfae1876da3cc7d6d8f6e635fb

1 files changed, 16 insertions, 2 deletions

diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 55d3fa8455..109b50fd94 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -1,8 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: http://www.qt-project.org/
 **
 ** This file is part of the qmake application of the Qt Toolkit.
 **
@@ -35,6 +34,7 @@
 **
 **
 **
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -305,6 +305,16 @@ 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;
@@ -335,6 +345,10 @@ 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);