some steps towards Qt 5.12 compatibility; see #40

ggobi · Mar 1, 2019 · 16afbaf · 16afbaf
1 parent 64a52bf
commit 16afbaf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/kdebindings/generator/generators/smoke/generator_smoke.cpp b/src/kdebindings/generator/generators/smoke/generator_smoke.cpp
@@ -232,6 +232,8 @@ int generate()
         Util::typeMap["size_t"] = "ulong";
     }
 
+    Util::typeMap["qsizetype"] = Util::typeMap["size_t"];
+
     qDebug() << "Generating SMOKE sources...";
 
     SmokeDataFile smokeData;

diff --git a/src/kdebindings/generator/generatorvisitor.cpp b/src/kdebindings/generator/generatorvisitor.cpp
@@ -419,7 +419,7 @@ void GeneratorVisitor::visitDeclarator(DeclaratorAST* node)
         Typedef tdef = Typedef(currentTypeRef, declName, nspace.join("::"), parent);
         tdef.setFileName(m_header);
         QString name = tdef.toString();
-        if (!typedefs.contains(name)) {
+        if (!typedefs.contains(name) && !name.endsWith("iterator")) {
             QHash<QString, Typedef>::iterator it = typedefs.insert(name, tdef);
             if (parent)
                 parent->appendChild(&it.value());

diff --git a/src/kdebindings/smoke/qt/smokeconfig.xml b/src/kdebindings/smoke/qt/smokeconfig.xml
@@ -142,6 +142,11 @@
 	<signature>.*QXmlStreamNotationDeclaration</signature>
 	<signature>.*QDateTime</signature>
 	<signature>.*QOAuth1Signature</signature>
+	<signature>.*QJsonArray</signature>
+	<signature>.*QJsonDocument</signature>
+	<signature>.*QJsonObject</signature>
+	<signature>.*QJsonValue</signature>
+	<signature>.*QSqlError</signature>
 
 	<!-- QByteArray would need to be Qt:: qualified, just ignore -->
 	<signature>.*QMetaType::type\(const QByteArray&amp;\).*</signature>
@@ -396,7 +401,6 @@
 	<class>QOperatingSystemVersion</class>
 	<class>QStringView</class>
 	<class>QRandomGenerator</class>
-	<class>QSemaphoreReleaser</class>
 
         <!-- QtGui -->
         <class>QInputMethodEvent::Attribute</class>