diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-11-27 13:00:01 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-11-27 17:43:53 +0000 |
| commit | 69817f6ad13e94ed51b15488b18bafe9b7f44c26 (patch) | |
| tree | b2ac7843ac557dc071560518fc9c705901c3fbb4 /src/plugins/platforms/windows/qwindowsdrag.h | |
| parent | d6ecdb434410ffda64058cdb51483786f5af9932 (diff) | |
| parent | ea5f40a7880946dd5e3346235d1a8e1a1a8fd42e (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsdrag.h')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsdrag.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/plugins/platforms/windows/qwindowsdrag.h b/src/plugins/platforms/windows/qwindowsdrag.h index b031faa884..ebe949a6af 100644 --- a/src/plugins/platforms/windows/qwindowsdrag.h +++ b/src/plugins/platforms/windows/qwindowsdrag.h @@ -42,6 +42,9 @@ struct IDropTargetHelper; QT_BEGIN_NAMESPACE + +class QPlatformScreen; + class QWindowsDropMimeData : public QWindowsInternalMimeData { public: QWindowsDropMimeData() {} @@ -97,8 +100,6 @@ public: IDropTargetHelper* dropHelper(); - QPixmap defaultCursor(Qt::DropAction action) const; - private: static bool m_canceled; @@ -106,11 +107,6 @@ private: IDataObject *m_dropDataObject; IDropTargetHelper* m_cachedDropTargetHelper; - - mutable QPixmap m_copyDragCursor; - mutable QPixmap m_moveDragCursor; - mutable QPixmap m_linkDragCursor; - mutable QPixmap m_ignoreDragCursor; }; QT_END_NAMESPACE |