diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-05-02 15:13:49 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-05-02 15:14:36 +0200 |
| commit | 44ca7e31ee9365a72cd17ecd335ec4d0161420a9 (patch) | |
| tree | c03b4f8263b41986b6f5d4ac9c6e35e371e98a33 /src/imports/qtquick2/plugin.cpp | |
| parent | 580fa7dc88aae23053e44ffa335a15f6af112a20 (diff) | |
| parent | 325e6305b418ffe1dfb9a36c2516c6a8a3de5733 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: Ie2b9472ba925df6e6a74727d44d8179557072105
Diffstat (limited to 'src/imports/qtquick2/plugin.cpp')
| -rw-r--r-- | src/imports/qtquick2/plugin.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/imports/qtquick2/plugin.cpp b/src/imports/qtquick2/plugin.cpp index 4dc6fee916..a5a2c73ced 100644 --- a/src/imports/qtquick2/plugin.cpp +++ b/src/imports/qtquick2/plugin.cpp @@ -38,8 +38,11 @@ ****************************************************************************/ #include <QtQml/qqmlextensionplugin.h> + +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #include <QtQml/private/qqmlengine_p.h> -#include <QtQml/private/qqmlmodelsmodule_p.h> +#include <QtQmlModels/private/qqmlmodelsmodule_p.h> +#endif // QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #include <private/qtquick2_p.h> |