diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-29 08:09:46 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-29 08:10:45 +0100 |
| commit | 2609429d7afc263ab8e44864b0f42f1c8356eda8 (patch) | |
| tree | 78798b4006a7c6664bf41b44011a57110ee94acd /src/quick/items/qquickevents_p_p.h | |
| parent | 475c74a9926efcd968572563e678988e53804603 (diff) | |
| parent | 4a886753a75c7c4d66f1fa9cab5a6c5a03240df3 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/imports/settings/qqmlsettings.cpp
src/quick/items/qquickwindow.cpp
tools/qmlplugindump/main.cpp
Change-Id: I96fedbc773a110374baed79a0b7de92d65df0ed6
Diffstat (limited to 'src/quick/items/qquickevents_p_p.h')
| -rw-r--r-- | src/quick/items/qquickevents_p_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/items/qquickevents_p_p.h b/src/quick/items/qquickevents_p_p.h index f3ce04d11e..d1a8bbd901 100644 --- a/src/quick/items/qquickevents_p_p.h +++ b/src/quick/items/qquickevents_p_p.h @@ -450,6 +450,8 @@ protected: Qt::MouseButton m_button = Qt::NoButton; Qt::MouseButtons m_pressedButtons; + friend class QQuickWindowPrivate; + Q_DISABLE_COPY(QQuickPointerEvent) }; |