diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-17 01:01:42 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-04-17 07:58:19 +0200 |
commit | 761d23806633cb32613f2ddf11711b3a71650eb1 (patch) | |
tree | 900fd3ff412cbb74c9213f7369deafc64aabb5c5 /src/quick/items | |
parent | 8bc3329e2cec4638fa9af274a40dda176bbb7352 (diff) | |
parent | 259c958e21c63f227a1bb678867210e0f6af0991 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
tests/auto/qml/qv4assembler/tst_qv4assembler.cpp
Change-Id: I9d31c982881a617099354bf8acceb76332f11496
Diffstat (limited to 'src/quick/items')
-rw-r--r-- | src/quick/items/qquickwindow.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick/items/qquickwindow.h b/src/quick/items/qquickwindow.h index 79e8a11aa8..53fe0a4c4b 100644 --- a/src/quick/items/qquickwindow.h +++ b/src/quick/items/qquickwindow.h @@ -241,6 +241,7 @@ private: friend class QQuickWidget; friend class QQuickRenderControl; friend class QQuickAnimatorController; + friend class QQuickWidgetPrivate; Q_DISABLE_COPY(QQuickWindow) }; |