Merge remote-tracking branch 'qt/5.7' into 5.8v5.8.0-alpha1

Conflicts:
	src/compositor/compositor_api/qwaylandseat.cpp
	src/compositor/compositor_api/qwaylandview.cpp
	tests/auto/compositor/compositor.pro
	tests/auto/compositor/compositor/testinputdevice.cpp
	tests/auto/compositor/compositor/testinputdevice.h
	tests/auto/compositor/testinputdevice.cpp
	tests/auto/compositor/testinputdevice.h
	tests/auto/compositor/testseat.cpp
	tests/auto/compositor/testseat.h

Change-Id: I98e045908dd964e5d4120bd35e71b8839c0d923a

1 files changed, 0 insertions, 54 deletions

diff --git a/tests/auto/compositor/testseat.h b/tests/auto/compositor/testseat.h
deleted file mode 100644
index 54641c07d..000000000
--- a/tests/auto/compositor/testseat.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 LG Electronics, Inc., author: <mikko.levonmaa@lge.com>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QWaylandSeat>
-#include <QList>
-
-QT_BEGIN_NAMESPACE
-class QInputEvent;
-class QMouseEvent;
-QT_END_NAMESPACE
-
-class TestSeat : public QWaylandSeat
-{
-
-public:
-
-    TestSeat(QWaylandCompositor *compositor, QWaylandSeat::CapabilityFlags caps);
-    ~TestSeat();
-
-    bool isOwner(QInputEvent *inputEvent) const Q_DECL_OVERRIDE;
-
-    QList<QMouseEvent *> createMouseEvents(int count);
-
-    int queryCount() { return m_queryCount; }
-
-private:
-    mutable int m_queryCount;
-    QList<QMouseEvent *> m_events;
-};