summaryrefslogtreecommitdiffstats
path: root/qtwayland.pro
diff options
context:
space:
mode:
authorAndy Nichols <andy.nichols@digia.com>2014-01-09 15:10:43 +0100
committerAndy Nichols <andy.nichols@digia.com>2014-01-09 16:10:23 +0100
commit1c70431808ca2d0797fda05bb9ee3640bff800bb (patch)
tree6bbf1333b7da5afea2e163263820d5c40dbc1ea3 /qtwayland.pro
parent3e02c41cc43a20c8af41730934ae7bbac02ab861 (diff)
parentc9734e76ce03ebba63e34b60b16a9cca3efa3569 (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 'qtwayland.pro')
-rw-r--r--qtwayland.pro1
1 files changed, 1 insertions, 0 deletions
diff --git a/qtwayland.pro b/qtwayland.pro
index a995ab3c..d6971baa 100644
--- a/qtwayland.pro
+++ b/qtwayland.pro
@@ -8,6 +8,7 @@ qtCompileTest(egl)
qtCompileTest(brcm_egl)
qtCompileTest(glx)
qtCompileTest(xcomposite)
+qtCompileTest(drm_egl_server)
load(qt_parts)