diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:24:17 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:24:17 +0200 |
| commit | 6b29f99bb1f88b0a8e8c04552a25fcf81928a7e2 (patch) | |
| tree | a35bc609a1ff391f38c1ca450bfe4d95ac284f81 /tests | |
| parent | 465e6f559fccf04203997cdf5182693567a9e697 (diff) | |
| parent | 7b9ff873fc6b55a26e43753c738ebd941c796e29 (diff) | |
| download | qtwayland-6b29f99bb1f88b0a8e8c04552a25fcf81928a7e2.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I31f4c29c985301d28d5c8d0501761c7d4fb7fda6
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/compositor/testinputdevice.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/compositor/testinputdevice.h b/tests/auto/compositor/testinputdevice.h index 710fc82d..e6134aa1 100644 --- a/tests/auto/compositor/testinputdevice.h +++ b/tests/auto/compositor/testinputdevice.h @@ -29,8 +29,10 @@ #include <QWaylandInputDevice> #include <QList> +QT_BEGIN_NAMESPACE class QInputEvent; class QMouseEvent; +QT_END_NAMESPACE class TestInputDevice : public QWaylandInputDevice { |