From 5a8814ff8f1764a79df64410a5a5eb6b52d9f035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Wed, 17 Apr 2013 13:24:10 +0200 Subject: Fixed broken wayland_scanner config.test. We need to replicate the extra compiler rule to invoke the wayland-scanner without trying to invoke the qtwaylandscanner. Change-Id: I312b24103f63570080c32103fb352f1948308f15 Reviewed-by: Andy Nichols --- config.tests/wayland_scanner/wayland_scanner.pro | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'config.tests/wayland_scanner') 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 -- cgit v1.2.1