diff options
| author | Olivier Blin <olivier.blin@softathome.com> | 2014-06-20 11:05:42 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@digia.com> | 2014-06-23 10:40:21 +0200 |
| commit | 242fbc33a33cbf1d67e88fc4316c3d8f2de1e813 (patch) | |
| tree | d06016e6a64d3fb6afa3f735176dbe791f4f8bfb /mkspecs | |
| parent | fb3f7b3ede45ca56643082787f091f15d1ab08db (diff) | |
Fix installation of private headers generated by wayland-scanner
Private qtwayland headers were not installed at first build, since
qmake was ignoring unexisting files from the install target. It
required another run of qmake to have a proper Makefile generated.
The rules for generated headers need CONFIG = no_check_exist, so that
files get listed in the Makefile even if they do not exist yet (thanks
to Loïc Yhuel for the pointer).
Change-Id: I1a0278d629295a55a3ddcf5f8fb068a04ba5be47
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/wayland-scanner.prf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf index 3a9d8cafbd..5a97d98373 100644 --- a/mkspecs/features/wayland-scanner.prf +++ b/mkspecs/features/wayland-scanner.prf @@ -32,6 +32,7 @@ qt_install_headers { !isEmpty(header_files_client) { wayland_generated_client_headers.files = $$header_files_client wayland_generated_client_headers.path = $$private_headers.path + wayland_generated_client_headers.CONFIG = no_check_exist INSTALLS += wayland_generated_client_headers WAYLAND_CLIENT_HEADER_DEST = $$header_dest/ WAYLAND_CLIENT_INCLUDE_DIR = $$MODULE_INCNAME/private @@ -41,6 +42,7 @@ qt_install_headers { !isEmpty(header_files_server) { wayland_generated_server_headers.files = $$header_files_server wayland_generated_server_headers.path = $$private_headers.path + wayland_generated_server_headers.CONFIG = no_check_exist INSTALLS += wayland_generated_server_headers WAYLAND_SERVER_HEADER_DEST = $$header_dest/ WAYLAND_SERVER_INCLUDE_DIR = $$MODULE_INCNAME/private |