diff options
| author | Samuel Rødal <samuel.rodal@digia.com> | 2013-04-17 13:24:10 +0200 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@digia.com> | 2013-04-17 13:53:37 +0200 |
| commit | 5a8814ff8f1764a79df64410a5a5eb6b52d9f035 (patch) | |
| tree | efac1c5373201ed3fe6f8209e895cf673ebc36e6 /config.tests | |
| parent | 82d52cdae8bb5c328db68123cb16d9d1fe4efb81 (diff) | |
| download | qtwayland-5a8814ff8f1764a79df64410a5a5eb6b52d9f035.tar.gz | |
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 <andy.nichols@digia.com>
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/wayland_scanner/wayland_scanner.pro | 12 |
1 files changed, 10 insertions, 2 deletions
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 |