diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-12 01:00:07 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-12-12 10:06:06 +0100 |
| commit | 1196b1ef6c5d2cb05ceba5d6f178dc7e2432ed61 (patch) | |
| tree | 2a99ee28d15d8ee51fc28096e5559bfc2d453e3f /src/quick/items/qquickpainteditem.cpp | |
| parent | fb54af6638dcbeae8ad21249fe234ef4d82c005b (diff) | |
| parent | ca206bceaff3667469986402e6143bf4c666b228 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/qml/types/qqmlbind.cpp
Change-Id: Ib992d1a7ac6c1a96d39819be6f23955dc31b44b2
Diffstat (limited to 'src/quick/items/qquickpainteditem.cpp')
| -rw-r--r-- | src/quick/items/qquickpainteditem.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/quick/items/qquickpainteditem.cpp b/src/quick/items/qquickpainteditem.cpp index cee73ac2e8..df5ec0c3f2 100644 --- a/src/quick/items/qquickpainteditem.cpp +++ b/src/quick/items/qquickpainteditem.cpp @@ -133,7 +133,6 @@ QQuickPaintedItemPrivate::QQuickPaintedItemPrivate() , contentsScale(1.0) , fillColor(Qt::transparent) , renderTarget(QQuickPaintedItem::Image) - , performanceHints(nullptr) , opaquePainting(false) , antialiasing(false) , mipmap(false) |