diff options
| author | Maximilian Goldstein <max.goldstein@qt.io> | 2022-06-09 16:11:26 +0200 |
|---|---|---|
| committer | Maximilian Goldstein <max.goldstein@qt.io> | 2022-06-15 09:43:01 +0200 |
| commit | e3b0ac28b0038d76402b13d225921437925cf0e5 (patch) | |
| tree | 2a7af0401bf3e701fe00e973a4889ae41a5d35d9 /src | |
| parent | 36aabaa2ec9ceb9ceb76878e54081e8f28c08a9c (diff) | |
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 <qt_ci_bot@qt-project.org>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/jsruntime/qv4sequenceobject_p.h | 11 | ||||
| -rw-r--r-- | src/qmlmodels/qqmlmodelindexvaluetype_p.h | 27 |
2 files changed, 27 insertions, 11 deletions
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 <QtCore/qabstractitemmodel.h> -#include <QtCore/qitemselectionmodel.h> -#endif - QT_BEGIN_NAMESPACE namespace QV4 { @@ -137,12 +132,6 @@ QT_DECLARE_SEQUENTIAL_CONTAINER(QBoolStdVectorForeign, std::vector<bool>, bool); QT_DECLARE_SEQUENTIAL_CONTAINER(QStringStdVectorForeign, std::vector<QString>, QString); QT_DECLARE_SEQUENTIAL_CONTAINER(QUrlStdVectorForeign, std::vector<QUrl>, QUrl); -#if QT_CONFIG(qml_itemmodel) -QT_DECLARE_SEQUENTIAL_CONTAINER(QModelIndexListForeign, QModelIndexList, QModelIndex); -QT_DECLARE_SEQUENTIAL_CONTAINER(QModelIndexStdVectorForeign, std::vector<QModelIndex>, QModelIndex); -QT_DECLARE_SEQUENTIAL_CONTAINER(QItemSelectionForeign, QItemSelection, QItemSelectionRange); -#endif - #undef QT_DECLARE_SEQUENTIAL_CONTAINER QT_END_NAMESPACE diff --git a/src/qmlmodels/qqmlmodelindexvaluetype_p.h b/src/qmlmodels/qqmlmodelindexvaluetype_p.h index b73c92e3de..9d5099a8f1 100644 --- a/src/qmlmodels/qqmlmodelindexvaluetype_p.h +++ b/src/qmlmodels/qqmlmodelindexvaluetype_p.h @@ -131,6 +131,33 @@ public: inline bool isEmpty() const { return v.isEmpty(); } }; +struct QModelIndexListForeign +{ + Q_GADGET + QML_ANONYMOUS + QML_SEQUENTIAL_CONTAINER(QModelIndex) + QML_FOREIGN(QModelIndexList) + QML_ADDED_IN_VERSION(2, 0) +}; + +struct QModelIndexStdVectorForeign +{ + Q_GADGET + QML_ANONYMOUS + QML_SEQUENTIAL_CONTAINER(QModelIndex) + QML_FOREIGN(std::vector<QModelIndex>) + QML_ADDED_IN_VERSION(2, 0) +}; + +struct QItemSelectionForeign +{ + Q_GADGET + QML_ANONYMOUS + QML_SEQUENTIAL_CONTAINER(QItemSelectionRange) + QML_FOREIGN(QItemSelection) + QML_ADDED_IN_VERSION(2, 0) +}; + #undef QLISTVALUETYPE_INVOKABLE_API QT_END_NAMESPACE |