diff options
| author | Andy Nichols <andy.nichols@digia.com> | 2014-01-09 15:10:43 +0100 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@digia.com> | 2014-01-09 16:10:23 +0100 |
| commit | 1c70431808ca2d0797fda05bb9ee3640bff800bb (patch) | |
| tree | 6bbf1333b7da5afea2e163263820d5c40dbc1ea3 /tests | |
| parent | 3e02c41cc43a20c8af41730934ae7bbac02ab861 (diff) | |
| parent | c9734e76ce03ebba63e34b60b16a9cca3efa3569 (diff) | |
Merge remote-tracking branch stable into dev
Conflicts:
.qmake.conf
src/compositor/hardware_integration/qwaylandclientbufferintegrationplugin.h
src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp
src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp
src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp
src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp
src/plugins/platforms/qwayland-brcm-egl/main.cpp
src/plugins/platforms/qwayland-egl/main.cpp
src/plugins/platforms/qwayland-generic/main.cpp
src/plugins/platforms/qwayland-xcomposite-egl/main.cpp
src/plugins/platforms/qwayland-xcomposite-glx/main.cpp
Change-Id: I957c9bee893a9e19fc8c93f0e51292007fb3a4a8
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/client/client.pro | 1 | ||||
| -rw-r--r-- | tests/auto/compositor/mockclient.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/client/client.pro b/tests/auto/client/client.pro index 448f7d516..eaf6c6e95 100644 --- a/tests/auto/client/client.pro +++ b/tests/auto/client/client.pro @@ -10,6 +10,7 @@ QT += core-private gui-private LIBS += -lwayland-client -lwayland-server } +CONFIG += wayland-scanner WAYLANDSERVERSOURCES += \ ../../../src/3rdparty/protocol/wayland.xml diff --git a/tests/auto/compositor/mockclient.h b/tests/auto/compositor/mockclient.h index fa7c28a81..db748df4e 100644 --- a/tests/auto/compositor/mockclient.h +++ b/tests/auto/compositor/mockclient.h @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "wayland-client.h" +#include <wayland-client.h> #include <QObject> #include <QImage> |