summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJuha Vuolle <juha.vuolle@insta.fi>2021-01-07 09:45:21 +0200
committerJuha Vuolle <juha.vuolle@insta.fi>2021-01-21 16:45:14 +0200
commit682271c9e62e58d48b7e4d17761aade3465ca4d8 (patch)
tree7e35071847fddaac547faba32e1550cd82ae3599 /tools
parentb789cfdd4fb7a833e426072393a4cb23328a1641 (diff)
Fix a set of compilation errors against Qt6
Fixes include -qmllistproperty uses qsizetype instead of int -implicit constructor calls that Qt6 marks as explicit -QEnableIf removed => std::enable_if -Replace the removed QCoreApplicationPrivate::cloneEvent() -Conflicting forward declaration for QStringList (comes via qglobal.h) N.B. after this task the generated (by generator.cpp) code won’t still compile, and it likely requires more in-depth study how to fix it => looks like they relate to the Qt6 property system changes. By temporarily disabling the violating generated code all unit tests pass though => needs a followup task to analyze and fix. Task-number: QTBUG-89832 Change-Id: I9f7d1cd5898b549f243a7df464ca124d29074c46 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
Diffstat (limited to 'tools')
-rw-r--r--tools/qscxmlc/generator.cpp2
-rw-r--r--tools/qscxmlc/qscxmlc.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/tools/qscxmlc/generator.cpp b/tools/qscxmlc/generator.cpp
index a767872..dfedb3b 100644
--- a/tools/qscxmlc/generator.cpp
+++ b/tools/qscxmlc/generator.cpp
@@ -463,7 +463,7 @@ void Generator::generateCode()
// Build extra array
//
QList<QByteArray> extraList;
- QMultiHash<QByteArray, QByteArray> knownExtraMetaObject = knownGadgets;
+ QMultiHash<QByteArray, QByteArray> knownExtraMetaObject(knownGadgets);
knownExtraMetaObject.unite(knownQObjectClasses);
for (int i = 0; i < cdef->propertyList.count(); ++i) {
diff --git a/tools/qscxmlc/qscxmlc.h b/tools/qscxmlc/qscxmlc.h
index 81c2427..a909bfe 100644
--- a/tools/qscxmlc/qscxmlc.h
+++ b/tools/qscxmlc/qscxmlc.h
@@ -43,7 +43,6 @@
#include <QtCore/qglobal.h>
QT_BEGIN_NAMESPACE
-class QStringList;
int run(const QStringList &arguments);