Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: Ibfc5e4ce50bd3392567b6d3f3d00c1062a2d9149

1 files changed, 14 insertions, 1 deletions

diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp
index 4601aef..eb6f70a 100644
--- a/tools/dumpcpp/main.cpp
+++ b/tools/dumpcpp/main.cpp
@@ -935,6 +935,19 @@ static QByteArrayList vTableOnlyStubsFromTypeLib(ITypeLib *typelib, const QStrin
     return result;
 }
 
+static void writeForwardDeclaration(QTextStream &declOut, const QByteArray &className)
+{
+    if (className.startsWith("enum ")) {
+        declOut << "#ifndef Q_CC_MINGW\n"
+                << "    " << className << ';' << endl // Only MSVC accepts this
+                << "#else\n"
+                << "    " << className << " {};" << endl
+                << "#endif\n";
+    } else {
+        declOut << "    " << className << ';' << endl;
+    }
+}
+
 bool generateTypeLibrary(QString typeLibFile, QString outname,
                          const QString &nameSpace, ObjectCategories category)
 {
@@ -1116,7 +1129,7 @@ bool generateTypeLibrary(QString typeLibFile, QString outname,
                     for (int c = 0; c < classList.count(); ++c) {
                         QByteArray className = classList.at(c);
                         if (className.contains(' ')) {
-                            declOut << "    " << className << ';' << endl;
+                            writeForwardDeclaration(declOut, className);
                             namespaceForType.insert(className.mid(className.indexOf(' ') + 1), nspace);
                         } else {
                             declOut << "    class " << className << ';' << endl;