diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-10-17 20:52:55 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-10-17 20:52:55 +0100 |
| commit | 782d7b30dd8e27ba24346e7c411b476db88b59e7 (patch) | |
| tree | c0210a939d942717719a7249639b8149f9d9c248 /ui/meson.build | |
| parent | e12ce85b2c79d83a340953291912875c30b3af06 (diff) | |
| parent | c47110d90fa5401bcc42c17f8ae0724a1c96599a (diff) | |
| download | qemu-782d7b30dd8e27ba24346e7c411b476db88b59e7.zip qemu-782d7b30dd8e27ba24346e7c411b476db88b59e7.tar.gz qemu-782d7b30dd8e27ba24346e7c411b476db88b59e7.tar.bz2 | |
Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging
* Drop ninjatool and just require ninja (Paolo)
* Fix docs build under msys2 (Yonggang)
* HAX snafu fix (Claudio)
* Disable signal handlers during fuzzing (Alex)
* Miscellaneous fixes (Bruce, Greg)
# gpg: Signature made Sat 17 Oct 2020 15:45:56 BST
# gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg: issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini-gitlab/tags/for-upstream: (22 commits)
ci: include configure and meson logs in all jobs if configure fails
hax: unbreak accelerator cpu code after cpus.c split
fuzz: Disable QEMU's SIG{INT,HUP,TERM} handlers
cirrus: Enable doc build on msys2/mingw
meson: Move the detection logic for sphinx to meson
meson: move SPHINX_ARGS references within "if build_docs"
docs: Fix Sphinx configuration for msys2/mingw
meson: Only install icons and qemu.desktop if have_system
configure: fix handling of --docdir parameter
meson: cleanup curses/iconv test
meson.build: don't condition iconv detection on library detection
build: add --enable/--disable-libudev
build: replace ninjatool with ninja
build: cleanups to Makefile
add ninja to dockerfiles, CI configurations and test VMs
dockerfiles: enable Centos 8 PowerTools
configure: move QEMU_INCLUDES to meson
tests: add missing generated sources to testqapi
make: run shell with pipefail
tests/Makefile.include: unbreak non-tcg builds
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/meson.build')
| -rw-r--r-- | ui/meson.build | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ui/meson.build b/ui/meson.build index 6ce8148..ab4de98 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -113,8 +113,11 @@ if have_system or xkbcommon.found() endif subdir('shader') -subdir('icons') -install_data('qemu.desktop', install_dir: config_host['qemu_desktopdir']) +if have_system + subdir('icons') + + install_data('qemu.desktop', install_dir: config_host['qemu_desktopdir']) +endif modules += {'ui': ui_modules} |