summaryrefslogtreecommitdiffstats
path: root/src/imports
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 /src/imports
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 'src/imports')
-rw-r--r--src/imports/statemachine/childrenprivate.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/statemachine/childrenprivate.h b/src/imports/statemachine/childrenprivate.h
index 2dcecd6..8eab308 100644
--- a/src/imports/statemachine/childrenprivate.h
+++ b/src/imports/statemachine/childrenprivate.h
@@ -141,12 +141,12 @@ public:
emit parentObject<T>(prop)->childrenChanged();
}
- static int count(QQmlListProperty<QObject> *prop)
+ static qsizetype count(QQmlListProperty<QObject> *prop)
{
return static_cast<Self *>(prop->data)->children.count();
}
- static QObject *at(QQmlListProperty<QObject> *prop, int index)
+ static QObject *at(QQmlListProperty<QObject> *prop, qsizetype index)
{
return static_cast<Self *>(prop->data)->children.at(index);
}
@@ -161,7 +161,7 @@ public:
emit parentObject<T>(prop)->childrenChanged();
}
- static void replace(QQmlListProperty<QObject> *prop, int index, QObject *item)
+ static void replace(QQmlListProperty<QObject> *prop, qsizetype index, QObject *item)
{
auto &children = static_cast<Self *>(prop->data)->children;