diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-01-26 11:46:56 +0100 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-01-26 11:46:56 +0100 |
commit | 9225ac7348c9023093b6ef8d4519087c7dddeaa2 (patch) | |
tree | 4660e25bd5cfd4a2a40b0ad97ea689c4acb22a8c /src/quick/items/qquickview.h | |
parent | 9d8fe2ac121162c15be6728495be2235b728325a (diff) | |
parent | 0076c44d3993f377ad6417d3bb08109b608dfbd2 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/pointerhandler
Change-Id: I7962fd2282792c43af69784c8e98fb050fd928a7
Diffstat (limited to 'src/quick/items/qquickview.h')
-rw-r--r-- | src/quick/items/qquickview.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/quick/items/qquickview.h b/src/quick/items/qquickview.h index 1fcc34e3a1..6d3b30e4c4 100644 --- a/src/quick/items/qquickview.h +++ b/src/quick/items/qquickview.h @@ -97,14 +97,14 @@ private Q_SLOTS: void continueExecute(); protected: - void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent*) Q_DECL_OVERRIDE; - - void keyPressEvent(QKeyEvent *) Q_DECL_OVERRIDE; - void keyReleaseEvent(QKeyEvent *) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *) Q_DECL_OVERRIDE; + void resizeEvent(QResizeEvent *) override; + void timerEvent(QTimerEvent*) override; + + void keyPressEvent(QKeyEvent *) override; + void keyReleaseEvent(QKeyEvent *) override; + void mousePressEvent(QMouseEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; private: Q_DISABLE_COPY(QQuickView) Q_DECLARE_PRIVATE(QQuickView) |