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 | |
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')
-rw-r--r-- | tests/auto/compositor/compositor.pro | 39 | ||||
-rw-r--r-- | tests/auto/compositor/compositor/BLACKLIST (renamed from tests/auto/compositor/BLACKLIST) | 0 | ||||
-rw-r--r-- | tests/auto/compositor/compositor/compositor.pro | 40 | ||||
-rw-r--r-- | tests/auto/compositor/compositor/mockclient.cpp (renamed from tests/auto/compositor/mockclient.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/compositor/compositor/mockclient.h (renamed from tests/auto/compositor/mockclient.h) | 0 | ||||
-rw-r--r-- | tests/auto/compositor/compositor/mockseat.cpp (renamed from tests/auto/compositor/mockseat.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/compositor/compositor/mockseat.h (renamed from tests/auto/compositor/mockseat.h) | 0 | ||||
-rw-r--r-- | tests/auto/compositor/compositor/testcompositor.cpp (renamed from tests/auto/compositor/testcompositor.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/compositor/compositor/testcompositor.h (renamed from tests/auto/compositor/testcompositor.h) | 0 | ||||
-rw-r--r-- | tests/auto/compositor/compositor/testkeyboardgrabber.cpp (renamed from tests/auto/compositor/testkeyboardgrabber.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/compositor/compositor/testkeyboardgrabber.h (renamed from tests/auto/compositor/testkeyboardgrabber.h) | 0 | ||||
-rw-r--r-- | tests/auto/compositor/compositor/testseat.cpp (renamed from tests/auto/compositor/testseat.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/compositor/compositor/testseat.h (renamed from tests/auto/compositor/testseat.h) | 0 | ||||
-rw-r--r-- | tests/auto/compositor/compositor/tst_compositor.cpp (renamed from tests/auto/compositor/tst_compositor.cpp) | 0 |
14 files changed, 42 insertions, 37 deletions
diff --git a/tests/auto/compositor/compositor.pro b/tests/auto/compositor/compositor.pro index 50378c6d4..6bf2aef6c 100644 --- a/tests/auto/compositor/compositor.pro +++ b/tests/auto/compositor/compositor.pro @@ -1,38 +1,3 @@ -CONFIG += testcase link_pkgconfig -CONFIG += wayland-scanner -TARGET = tst_compositor +TEMPLATE=subdirs -QT += testlib -QT += core-private gui-private waylandcompositor waylandcompositor-private - -!contains(QT_CONFIG, no-pkg-config) { - PKGCONFIG += wayland-client wayland-server -} else { - LIBS += -lwayland-client -lwayland-server -} - -config_xkbcommon { - !contains(QT_CONFIG, no-pkg-config) { - PKGCONFIG_PRIVATE += xkbcommon - } else { - LIBS_PRIVATE += -lxkbcommon - } -} else { - DEFINES += QT_NO_WAYLAND_XKB -} - -WAYLANDCLIENTSOURCES += \ - ../../../src/3rdparty/protocol/xdg-shell.xml \ - -SOURCES += tst_compositor.cpp \ - testcompositor.cpp \ - testkeyboardgrabber.cpp \ - mockclient.cpp \ - mockseat.cpp \ - testseat.cpp - -HEADERS += testcompositor.h \ - testkeyboardgrabber.h \ - mockclient.h \ - mockseat.h \ - testseat.h +SUBDIRS += compositor diff --git a/tests/auto/compositor/BLACKLIST b/tests/auto/compositor/compositor/BLACKLIST index df4672be3..df4672be3 100644 --- a/tests/auto/compositor/BLACKLIST +++ b/tests/auto/compositor/compositor/BLACKLIST diff --git a/tests/auto/compositor/compositor/compositor.pro b/tests/auto/compositor/compositor/compositor.pro new file mode 100644 index 000000000..a3748697d --- /dev/null +++ b/tests/auto/compositor/compositor/compositor.pro @@ -0,0 +1,40 @@ +CONFIG += testcase link_pkgconfig +CONFIG += wayland-scanner +TARGET = tst_compositor + +QT += testlib +QT += core-private gui-private waylandcompositor waylandcompositor-private + +!contains(QT_CONFIG, no-pkg-config) { + PKGCONFIG += wayland-client wayland-server +} else { + LIBS += -lwayland-client -lwayland-server +} + +config_xkbcommon { + !contains(QT_CONFIG, no-pkg-config) { + PKGCONFIG_PRIVATE += xkbcommon + } else { + LIBS_PRIVATE += -lxkbcommon + } +} else { + DEFINES += QT_NO_WAYLAND_XKB +} + +WAYLANDCLIENTSOURCES += \ + ../../../../src/3rdparty/protocol/xdg-shell.xml \ + +SOURCES += \ + tst_compositor.cpp \ + testcompositor.cpp \ + testkeyboardgrabber.cpp \ + mockclient.cpp \ + mockseat.cpp \ + testseat.cpp + +HEADERS += \ + testcompositor.h \ + testkeyboardgrabber.h \ + mockclient.h \ + mockseat.h \ + testseat.h diff --git a/tests/auto/compositor/mockclient.cpp b/tests/auto/compositor/compositor/mockclient.cpp index 9b6d327a9..9b6d327a9 100644 --- a/tests/auto/compositor/mockclient.cpp +++ b/tests/auto/compositor/compositor/mockclient.cpp diff --git a/tests/auto/compositor/mockclient.h b/tests/auto/compositor/compositor/mockclient.h index 33ada638a..33ada638a 100644 --- a/tests/auto/compositor/mockclient.h +++ b/tests/auto/compositor/compositor/mockclient.h diff --git a/tests/auto/compositor/mockseat.cpp b/tests/auto/compositor/compositor/mockseat.cpp index 29c4a4e13..29c4a4e13 100644 --- a/tests/auto/compositor/mockseat.cpp +++ b/tests/auto/compositor/compositor/mockseat.cpp diff --git a/tests/auto/compositor/mockseat.h b/tests/auto/compositor/compositor/mockseat.h index 1c6d324c2..1c6d324c2 100644 --- a/tests/auto/compositor/mockseat.h +++ b/tests/auto/compositor/compositor/mockseat.h diff --git a/tests/auto/compositor/testcompositor.cpp b/tests/auto/compositor/compositor/testcompositor.cpp index 733bea5b3..733bea5b3 100644 --- a/tests/auto/compositor/testcompositor.cpp +++ b/tests/auto/compositor/compositor/testcompositor.cpp diff --git a/tests/auto/compositor/testcompositor.h b/tests/auto/compositor/compositor/testcompositor.h index 8eeb7ade6..8eeb7ade6 100644 --- a/tests/auto/compositor/testcompositor.h +++ b/tests/auto/compositor/compositor/testcompositor.h diff --git a/tests/auto/compositor/testkeyboardgrabber.cpp b/tests/auto/compositor/compositor/testkeyboardgrabber.cpp index a3aa42ac2..a3aa42ac2 100644 --- a/tests/auto/compositor/testkeyboardgrabber.cpp +++ b/tests/auto/compositor/compositor/testkeyboardgrabber.cpp diff --git a/tests/auto/compositor/testkeyboardgrabber.h b/tests/auto/compositor/compositor/testkeyboardgrabber.h index 0ef595987..0ef595987 100644 --- a/tests/auto/compositor/testkeyboardgrabber.h +++ b/tests/auto/compositor/compositor/testkeyboardgrabber.h diff --git a/tests/auto/compositor/testseat.cpp b/tests/auto/compositor/compositor/testseat.cpp index 38227872b..38227872b 100644 --- a/tests/auto/compositor/testseat.cpp +++ b/tests/auto/compositor/compositor/testseat.cpp diff --git a/tests/auto/compositor/testseat.h b/tests/auto/compositor/compositor/testseat.h index 54641c07d..54641c07d 100644 --- a/tests/auto/compositor/testseat.h +++ b/tests/auto/compositor/compositor/testseat.h diff --git a/tests/auto/compositor/tst_compositor.cpp b/tests/auto/compositor/compositor/tst_compositor.cpp index 05e876dd0..05e876dd0 100644 --- a/tests/auto/compositor/tst_compositor.cpp +++ b/tests/auto/compositor/compositor/tst_compositor.cpp |