diff options
| author | Thomas Hartmann <thomas.hartmann@qt.io> | 2017-10-05 15:14:29 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-10-11 06:49:09 +0000 |
| commit | 2aa7ed7a06fe79dc8729e29a7ea4850dd9eceb1f (patch) | |
| tree | 338c5cfad8038ab43f442d485e23672b4fe162e8 | |
| parent | 6afdb8bdf957909d086684ada10cf86f132c3efe (diff) | |
| download | qt-creator-2aa7ed7a06fe79dc8729e29a7ea4850dd9eceb1f.tar.gz | |
QmlDesigner: Fix compile with Qt 5.10
The QtQuick include at this point for some reasons tries to
include not existing Vulcan headers.
Change-Id: Ie2dc667b3438a2bbf7e8f251520502a836b109db
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h | 2 | ||||
| -rw-r--r-- | src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h index a61937d9c3..40b9e55b73 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h @@ -28,7 +28,7 @@ #include <QMap> #include <QIcon> #include <QAbstractListModel> -#include <QtQuick> +#include <QtQml/qqml.h> QT_FORWARD_DECLARE_CLASS(QMimeData) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp index 8e3ef4418a..4364983608 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp @@ -41,6 +41,7 @@ #include <metainfo.h> #include "rewritingexception.h" +#include <QDrag> #include <QFileInfo> #include <QFileSystemModel> #include <QStackedWidget> @@ -54,6 +55,7 @@ #include <QApplication> #include <QTimer> #include <QShortcut> +#include <QQmlContext> #include <QQuickItem> namespace QmlDesigner { |