diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-28 10:09:27 +0200 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@gmail.com> | 2016-08-28 10:12:09 +0200 |
commit | b0c416dede8b6ca596eb2a13361d98613e8c9533 (patch) | |
tree | adddaa3622e0013858355ad6994c8e6e892ce254 /tests/auto/compositor/compositor/testcompositor.h | |
parent | 9610eccdf237c5ffc21630cee9c364d0fe871901 (diff) | |
parent | ae9bfd29b42156fb8f04dfa60b9e48ce10ebacb8 (diff) |
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
Diffstat (limited to 'tests/auto/compositor/compositor/testcompositor.h')
-rw-r--r-- | tests/auto/compositor/compositor/testcompositor.h | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/tests/auto/compositor/compositor/testcompositor.h b/tests/auto/compositor/compositor/testcompositor.h new file mode 100644 index 000000000..8eeb7ade6 --- /dev/null +++ b/tests/auto/compositor/compositor/testcompositor.h @@ -0,0 +1,54 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** 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 "qwaylandcompositor.h" +#include "qwaylandsurface.h" +#include "qwaylandwlshell.h" + +class TestCompositor : public QWaylandCompositor +{ + Q_OBJECT +public: + TestCompositor(bool createInputDev = false); + void create(); + void flushClients(); + +public slots: + void onSurfaceCreated(QWaylandSurface *surface); + void onSurfaceAboutToBeDestroyed(QWaylandSurface *surface); + +protected: + QWaylandSeat *createSeat() Q_DECL_OVERRIDE; + QWaylandKeyboard *createKeyboardDevice(QWaylandSeat *seat) Q_DECL_OVERRIDE; + +public: + QList<QWaylandSurface *> surfaces; + QWaylandWlShell* shell; + bool m_createSeat; +}; + |