diff options
author | Liang Qi <liang.qi@qt.io> | 2017-03-13 07:10:51 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-03-13 07:29:03 +0100 |
commit | 435774ced1f062645a2d48972ac4698c4741c1a7 (patch) | |
tree | f54c53e361d724068aca48823778bd6425c0016b /src/quick | |
parent | 77e0dc0485953427320ed0b442ba24eef4f9d73b (diff) | |
parent | fb0490dd653e4856a3595bd7e49c3127215170d1 (diff) |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/qml/qml/qqmlimport.cpp
Change-Id: I26f8d18fe8af664ee8573116f182fe12b71e089a
Diffstat (limited to 'src/quick')
-rw-r--r-- | src/quick/configure.json | 1 | ||||
-rw-r--r-- | src/quick/items/context2d/qquickcanvasitem.cpp | 1 | ||||
-rw-r--r-- | src/quick/items/qquickpainteditem_p.h | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/src/quick/configure.json b/src/quick/configure.json index 4ed11e8318..e06cae8641 100644 --- a/src/quick/configure.json +++ b/src/quick/configure.json @@ -51,6 +51,7 @@ "quick-canvas": { "label": "Canvas item", "purpose": "Provides the Qt Quick Canvas Item", + "condition": "features.quick-path", "output": [ "privateFeature" ] diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp index a81ab619ac..da9379e7af 100644 --- a/src/quick/items/context2d/qquickcanvasitem.cpp +++ b/src/quick/items/context2d/qquickcanvasitem.cpp @@ -47,6 +47,7 @@ #include <qsgtextureprovider.h> #include <QtQuick/private/qquickpixmapcache_p.h> #include <QtGui/QGuiApplication> +#include <qsgtextureprovider.h> #include <qqmlinfo.h> #include <private/qqmlengine_p.h> diff --git a/src/quick/items/qquickpainteditem_p.h b/src/quick/items/qquickpainteditem_p.h index 229fbf1007..3e160ed55a 100644 --- a/src/quick/items/qquickpainteditem_p.h +++ b/src/quick/items/qquickpainteditem_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include "qquickpainteditem.h" #include "qquickitem_p.h" #include "qquickpainteditem.h" #include <QtGui/qcolor.h> |