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.pro | |
| 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.pro')
| -rw-r--r-- | tests/auto/compositor/compositor.pro | 39 |
1 files changed, 2 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 |