Merge remote-tracking branch 'origin/5.8.0' into 5.8

Conflicts:
	doc/global/qt-cpp-defines.qdocconf
	src/plugins/platforms/android/qandroidplatformopenglcontext.h
	src/plugins/platforms/android/qandroidplatformtheme.h

Change-Id: I13d51cc66f708138ff4d667ceea7d515992e58a4

1 files changed, 7 insertions, 2 deletions

diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 018c70089d..8a77bbe672 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -204,7 +204,8 @@ const char _slnExtSections[]    = "\n\tGlobalSection(ExtensibilityGlobals) = pos
 VcprojGenerator::VcprojGenerator()
     : Win32MakefileGenerator(),
       is64Bit(false),
-      projectWriter(0)
+      projectWriter(0),
+      customBuildToolFilterFileSuffix(QStringLiteral(".cbt"))
 {
 }
 
@@ -892,10 +893,14 @@ void VcprojGenerator::init()
                         if (!hasBuiltinCompiler(file)) {
                             extraCompilerSources[file] += quc.toQString();
                         } else {
+                            // Use a fake file name foo.moc.cbt for the project view.
+                            // This prevents VS from complaining about a circular
+                            // dependency from foo.moc -> foo.moc.
                             QString out = Option::fixPathToTargetOS(replaceExtraCompilerVariables(
                                             compiler_out, file, QString(), NoShell), false);
+                            out += customBuildToolFilterFileSuffix;
                             extraCompilerSources[out] += quc.toQString();
-                            extraCompilerOutputs[out] = QStringList(file); // Can only have one
+                            extraCompilerOutputs[out] = file;
                         }
                     }
                 }