diff options
| author | Andy Nichols <andy.nichols@digia.com> | 2013-06-03 17:46:41 +0200 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@digia.com> | 2013-06-03 17:46:41 +0200 |
| commit | d20ef80bb54685466dd9d7beae5ddccc46a437fd (patch) | |
| tree | b77c709cbb28810055301fa088062af7de6fc165 /config.tests | |
| parent | 894adf8a447865119be7c6c4d01577d8032f4177 (diff) | |
| parent | 63482addec06d2bbab0330271cb7d21869156760 (diff) | |
| download | qtwayland-d20ef80bb54685466dd9d7beae5ddccc46a437fd.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
qtwayland.pro
src/plugins/platforms/wayland_common/qwaylandshellsurface.cpp
src/plugins/platforms/wayland_common/qwaylandwindow.cpp
src/plugins/platforms/wayland_common/qwaylandwindow.h
Change-Id: I6f9e8fb0536212b7b072aec3c8152390fb9f2922
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/egl/egl.pro | 2 | ||||
| -rw-r--r-- | config.tests/wayland_egl/wayland_egl.pro | 2 | ||||
| -rw-r--r-- | config.tests/wayland_scanner/wayland_scanner.pro | 12 |
3 files changed, 14 insertions, 2 deletions
diff --git a/config.tests/egl/egl.pro b/config.tests/egl/egl.pro index f95e3c76..e96672e5 100644 --- a/config.tests/egl/egl.pro +++ b/config.tests/egl/egl.pro @@ -1,6 +1,8 @@ TARGET = egl QT = core +!contains(QT_CONFIG, opengles2):error("wayland_egl support currently requires Qt configured with OpenGL ES2") + !contains(QT_CONFIG, no-pkg-config) { CONFIG += link_pkgconfig PKGCONFIG += egl diff --git a/config.tests/wayland_egl/wayland_egl.pro b/config.tests/wayland_egl/wayland_egl.pro index 76d92b18..0db9b04f 100644 --- a/config.tests/wayland_egl/wayland_egl.pro +++ b/config.tests/wayland_egl/wayland_egl.pro @@ -1,6 +1,8 @@ TARGET = wayland_egl QT = core +!contains(QT_CONFIG, opengles2):error("wayland_egl support currently requires Qt configured with OpenGL ES2") + !contains(QT_CONFIG, no-pkg-config) { CONFIG += link_pkgconfig PKGCONFIG += wayland-egl diff --git a/config.tests/wayland_scanner/wayland_scanner.pro b/config.tests/wayland_scanner/wayland_scanner.pro index 57edd5b2..300e439e 100644 --- a/config.tests/wayland_scanner/wayland_scanner.pro +++ b/config.tests/wayland_scanner/wayland_scanner.pro @@ -1,5 +1,6 @@ TARGET = wayland_scanner -QT = core + +isEmpty(QMAKE_WAYLAND_SCANNER):error("QMAKE_WAYLAND_SCANNER not defined for this mkspec") !contains(QT_CONFIG, no-pkg-config) { CONFIG += link_pkgconfig @@ -11,5 +12,12 @@ QT = core # Input SOURCES += main.cpp -WAYLANDSOURCES += scanner-test.xml +wayland-check-header.name = wayland ${QMAKE_FILE_BASE} +wayland-check-header.input = WAYLANDCHECKSOURCES +wayland-check-header.variable_out = HEADERS +wayland-check-header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)} +wayland-check-header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} +silent:wayland-client-header.commands = @echo Wayland scanner check header ${QMAKE_FILE_IN} && $$wayland-check-header.commands +QMAKE_EXTRA_COMPILERS += wayland-check-header +WAYLANDCHECKSOURCES = scanner-test.xml |