diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-19 16:32:03 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-19 16:32:09 +0200 |
commit | 4f0988c3907406087dbfdc193abfbf767678d814 (patch) | |
tree | aafd9c98bb248d9920443778bf122ea23b1e4c75 /src/qmltest/quicktestevent_p.h | |
parent | 32a980a86257021247a742b2b8c0b4aafe6e9035 (diff) | |
parent | 01a9c006b0cb3f9ec7c140d25e6bfa3ca6250a4c (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I7bd70996e3372d154c6b0e47336baa22146667b0
Diffstat (limited to 'src/qmltest/quicktestevent_p.h')
-rw-r--r-- | src/qmltest/quicktestevent_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qmltest/quicktestevent_p.h b/src/qmltest/quicktestevent_p.h index 02b8b2c46b..1adf8f3317 100644 --- a/src/qmltest/quicktestevent_p.h +++ b/src/qmltest/quicktestevent_p.h @@ -59,9 +59,11 @@ QT_BEGIN_NAMESPACE class Q_QUICK_TEST_EXPORT QuickTestEvent : public QObject { Q_OBJECT + Q_PROPERTY(int defaultMouseDelay READ defaultMouseDelay FINAL) public: QuickTestEvent(QObject *parent = 0); ~QuickTestEvent(); + int defaultMouseDelay() const; public Q_SLOTS: bool keyPress(int key, int modifiers, int delay); |