From c67f7c0f0fc34887a4922a269815c460cbe3ccf8 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 25 Jul 2014 13:19:03 +0200 Subject: Windows/Direct2D platform plugins: Add Q_DECL_OVERRIDE. Replace old virtual declarations by Q_DECL_OVERRIDE where applicable. Errors discovered: QWindowsScreen::primaryOrientation() did not overwrite any method, changed to orientation(). Task-number: QTBUG-38858 Task-number: QTBUG-38993 Change-Id: Ie85d5235f3cd35c7a24cac3c1c7693c6508b1009 Reviewed-by: Oliver Wolff --- src/plugins/platforms/windows/qwindowsdrag.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/plugins/platforms/windows/qwindowsdrag.h') diff --git a/src/plugins/platforms/windows/qwindowsdrag.h b/src/plugins/platforms/windows/qwindowsdrag.h index 4f758fbf3f..b4d303a10f 100644 --- a/src/plugins/platforms/windows/qwindowsdrag.h +++ b/src/plugins/platforms/windows/qwindowsdrag.h @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE class QWindowsDropMimeData : public QWindowsInternalMimeData { public: QWindowsDropMimeData() {} - virtual IDataObject *retrieveDataObject() const; + IDataObject *retrieveDataObject() const Q_DECL_OVERRIDE; }; class QWindowsOleDropTarget : public IDropTarget @@ -90,9 +90,9 @@ public: QWindowsDrag(); virtual ~QWindowsDrag(); - virtual QMimeData *platformDropData() { return &m_dropData; } + QMimeData *platformDropData() Q_DECL_OVERRIDE { return &m_dropData; } - virtual Qt::DropAction drag(QDrag *drag); + Qt::DropAction drag(QDrag *drag) Q_DECL_OVERRIDE; static QWindowsDrag *instance(); -- cgit v1.2.3