diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-23 08:01:14 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2016-08-23 12:28:25 +0200 |
| commit | 6b7a94b56aa4c3ce21ecf093baba03f0cd7582ed (patch) | |
| tree | 455596965d022c63d2c21ca615babf92c9ec74cf /tests/auto/compositor/compositor/compositor.pro | |
| parent | 625f257e4857dd21653fccf0e7dd4010a60bc45d (diff) | |
| parent | 2cc758045e322873ad58f675a70c8d8366b5c318 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
tests/auto/compositor/compositor.pro
tests/auto/compositor/compositor/compositor.pro
Change-Id: Id9f3cf97ca3b600bdafba846908643ff0f8964b9
Diffstat (limited to 'tests/auto/compositor/compositor/compositor.pro')
| -rw-r--r-- | tests/auto/compositor/compositor/compositor.pro | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/tests/auto/compositor/compositor/compositor.pro b/tests/auto/compositor/compositor/compositor.pro new file mode 100644 index 000000000..d85c30483 --- /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 \ + testinputdevice.cpp + +HEADERS += \ + testcompositor.h \ + testkeyboardgrabber.h \ + mockclient.h \ + mockseat.h \ + testinputdevice.h |