diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-04-03 15:22:22 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-05-02 09:26:04 +0000 |
| commit | 325e6305b418ffe1dfb9a36c2516c6a8a3de5733 (patch) | |
| tree | c03b4f8263b41986b6f5d4ac9c6e35e371e98a33 /src/quick | |
| parent | 0d409333d8679c75beeeda2711a9f01b5e708743 (diff) | |
Move model types into their own library
The model types are not part of the core QML runtime and should only be
loaded if you explicitly import them. We cannot enforce that in Qt5 as
some of them are available from the QtQml import, but we can change it
in Qt6.
Change-Id: I1e49e84d748e352537ec2d4af901c034c91d038f
Reviewed-by: Erik Verbruggen <erik.verbruggen@me.com>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/configure.json | 3 | ||||
| -rw-r--r-- | src/quick/items/qquickitemview_p_p.h | 6 | ||||
| -rw-r--r-- | src/quick/items/qquickrepeater.cpp | 1 | ||||
| -rw-r--r-- | src/quick/items/qquicktableview.cpp | 6 | ||||
| -rw-r--r-- | src/quick/items/qquicktableview_p_p.h | 4 | ||||
| -rw-r--r-- | src/quick/quick.pro | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/src/quick/configure.json b/src/quick/configure.json index 9ec3531ef4..70fe6d2129 100644 --- a/src/quick/configure.json +++ b/src/quick/configure.json @@ -2,7 +2,8 @@ "module": "quick", "depends": [ "qml-private", - "gui-private" + "gui-private", + "qmlmodels-private" ], "testDir": "../../config.tests", diff --git a/src/quick/items/qquickitemview_p_p.h b/src/quick/items/qquickitemview_p_p.h index ea5b5df9c6..0f1594f904 100644 --- a/src/quick/items/qquickitemview_p_p.h +++ b/src/quick/items/qquickitemview_p_p.h @@ -59,9 +59,9 @@ QT_REQUIRE_CONFIG(quick_itemview); #include "qquickitemviewfxitem_p_p.h" #include "qquickitemviewtransition_p.h" #include "qquickflickable_p_p.h" -#include <QtQml/private/qqmlobjectmodel_p.h> -#include <QtQml/private/qqmldelegatemodel_p.h> -#include <QtQml/private/qqmlchangeset_p.h> +#include <QtQmlModels/private/qqmlobjectmodel_p.h> +#include <QtQmlModels/private/qqmldelegatemodel_p.h> +#include <QtQmlModels/private/qqmlchangeset_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick/items/qquickrepeater.cpp b/src/quick/items/qquickrepeater.cpp index 805b6fe190..c8a03aff33 100644 --- a/src/quick/items/qquickrepeater.cpp +++ b/src/quick/items/qquickrepeater.cpp @@ -41,7 +41,6 @@ #include "qquickrepeater_p_p.h" #include <private/qqmlglobal_p.h> -#include <private/qqmllistaccessor_p.h> #include <private/qqmlchangeset_p.h> #include <private/qqmldelegatemodel_p.h> diff --git a/src/quick/items/qquicktableview.cpp b/src/quick/items/qquicktableview.cpp index 5e7e0db154..8f5130fc17 100644 --- a/src/quick/items/qquicktableview.cpp +++ b/src/quick/items/qquicktableview.cpp @@ -42,10 +42,10 @@ #include <QtCore/qtimer.h> #include <QtCore/qdir.h> -#include <QtQml/private/qqmldelegatemodel_p.h> -#include <QtQml/private/qqmldelegatemodel_p_p.h> +#include <QtQmlModels/private/qqmldelegatemodel_p.h> +#include <QtQmlModels/private/qqmldelegatemodel_p_p.h> #include <QtQml/private/qqmlincubator_p.h> -#include <QtQml/private/qqmlchangeset_p.h> +#include <QtQmlModels/private/qqmlchangeset_p.h> #include <QtQml/qqmlinfo.h> #include <QtQuick/private/qquickflickable_p_p.h> diff --git a/src/quick/items/qquicktableview_p_p.h b/src/quick/items/qquicktableview_p_p.h index cbf6824278..7f2aee9105 100644 --- a/src/quick/items/qquicktableview_p_p.h +++ b/src/quick/items/qquicktableview_p_p.h @@ -54,9 +54,9 @@ #include "qquicktableview_p.h" #include <QtCore/qtimer.h> -#include <QtQml/private/qqmltableinstancemodel_p.h> +#include <QtQmlModels/private/qqmltableinstancemodel_p.h> #include <QtQml/private/qqmlincubator_p.h> -#include <QtQml/private/qqmlchangeset_p.h> +#include <QtQmlModels/private/qqmlchangeset_p.h> #include <QtQml/qqmlinfo.h> #include <QtQuick/private/qquickflickable_p_p.h> diff --git a/src/quick/quick.pro b/src/quick/quick.pro index 37d2ad1172..700f794af4 100644 --- a/src/quick/quick.pro +++ b/src/quick/quick.pro @@ -1,6 +1,6 @@ TARGET = QtQuick -QT = core-private gui-private qml-private +QT = core-private gui-private qml-private qmlmodels-private qtConfig(qml-network): \ QT_PRIVATE += network |