diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-07-17 07:04:11 +0200 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-07-17 09:00:23 +0200 |
commit | 9eac5c89d793cd444d9348b0d4a72828cf87df7c (patch) | |
tree | 51e840ae14208968dca9658aa0a3aa90b28c16f5 /src | |
parent | 94ddb700c8871a4cc00c7050cf1eeaf53fcfb42e (diff) |
Deal with variable renaming in QDropEvent
qtbase ea2ae140e99bbd21515a99c5480e53129ef843c3 gave QEvent variable
names a consistent naming convention, but QQuickDropEventEx inherits
QDropEvent and directly accessses them, so it needs updating.
Change-Id: Id0a593145a292828504b22d557acae980f8357ec
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/quick/items/qquickdrag_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickdrag_p.h b/src/quick/items/qquickdrag_p.h index 36b0a2bfd1..1c49c0a79a 100644 --- a/src/quick/items/qquickdrag_p.h +++ b/src/quick/items/qquickdrag_p.h @@ -117,14 +117,14 @@ private: class QQuickDropEventEx : public QDropEvent { public: - void setProposedAction(Qt::DropAction action) { default_action = action; drop_action = action; } + void setProposedAction(Qt::DropAction action) { m_defaultAction = action; m_dropAction = action; } static void setProposedAction(QDropEvent *event, Qt::DropAction action) { static_cast<QQuickDropEventEx *>(event)->setProposedAction(action); } void copyActions(const QDropEvent &from) { - default_action = from.proposedAction(); drop_action = from.dropAction(); } + m_defaultAction = from.proposedAction(); m_dropAction = from.dropAction(); } static void copyActions(QDropEvent *to, const QDropEvent &from) { static_cast<QQuickDropEventEx *>(to)->copyActions(from); |