From e3b0ac28b0038d76402b13d225921437925cf0e5 Mon Sep 17 00:00:00 2001 From: Maximilian Goldstein Date: Thu, 9 Jun 2022 16:11:26 +0200 Subject: Move itemmodel sequential types from QtQml to QtQml.Models Otherwise we'd have to create a cyclic dependency between QtQml and QtQml.Models Fixes: QTBUG-104124 Change-Id: Ie62d81ab403166842c39eb1e10748a9835b0705c Reviewed-by: Qt CI Bot Reviewed-by: Ulf Hermann --- src/qml/jsruntime/qv4sequenceobject_p.h | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'src/qml/jsruntime/qv4sequenceobject_p.h') diff --git a/src/qml/jsruntime/qv4sequenceobject_p.h b/src/qml/jsruntime/qv4sequenceobject_p.h index 9265bda59e..51cdc2fc2c 100644 --- a/src/qml/jsruntime/qv4sequenceobject_p.h +++ b/src/qml/jsruntime/qv4sequenceobject_p.h @@ -24,11 +24,6 @@ #include "qv4context_p.h" #include "qv4string_p.h" -#if QT_CONFIG(qml_itemmodel) -#include -#include -#endif - QT_BEGIN_NAMESPACE namespace QV4 { @@ -137,12 +132,6 @@ QT_DECLARE_SEQUENTIAL_CONTAINER(QBoolStdVectorForeign, std::vector, bool); QT_DECLARE_SEQUENTIAL_CONTAINER(QStringStdVectorForeign, std::vector, QString); QT_DECLARE_SEQUENTIAL_CONTAINER(QUrlStdVectorForeign, std::vector, QUrl); -#if QT_CONFIG(qml_itemmodel) -QT_DECLARE_SEQUENTIAL_CONTAINER(QModelIndexListForeign, QModelIndexList, QModelIndex); -QT_DECLARE_SEQUENTIAL_CONTAINER(QModelIndexStdVectorForeign, std::vector, QModelIndex); -QT_DECLARE_SEQUENTIAL_CONTAINER(QItemSelectionForeign, QItemSelection, QItemSelectionRange); -#endif - #undef QT_DECLARE_SEQUENTIAL_CONTAINER QT_END_NAMESPACE -- cgit v1.2.1