* [PATCH] ui/cocoa: Update path to docs in build tree
@ 2021-01-08 21:38 Roman Bolshakov
2021-01-09 6:19 ` Roman Bolshakov
2021-01-12 10:50 ` Peter Maydell
0 siblings, 2 replies; 3+ messages in thread
From: Roman Bolshakov @ 2021-01-08 21:38 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, Roman Bolshakov, Gerd Hoffmann
QEMU documentation can't be opened if QEMU is run from build tree
because executables are placed in the top of build tree after conversion
to meson.
Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
---
ui/cocoa.m | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ui/cocoa.m b/ui/cocoa.m
index ea3b845b53..13fba8103e 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -1176,7 +1176,7 @@ QemuCocoaView *cocoaView;
- (void) openDocumentation: (NSString *) filename
{
/* Where to look for local files */
- NSString *path_array[] = {@"../share/doc/qemu/", @"../doc/qemu/", @"../docs/"};
+ NSString *path_array[] = {@"../share/doc/qemu/", @"../doc/qemu/", @"docs/"};
NSString *full_file_path;
NSURL *full_file_url;
--
2.29.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ui/cocoa: Update path to docs in build tree
2021-01-08 21:38 [PATCH] ui/cocoa: Update path to docs in build tree Roman Bolshakov
@ 2021-01-09 6:19 ` Roman Bolshakov
2021-01-12 10:50 ` Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Roman Bolshakov @ 2021-01-09 6:19 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, Gerd Hoffmann
On Sat, Jan 09, 2021 at 12:38:15AM +0300, Roman Bolshakov wrote:
> QEMU documentation can't be opened if QEMU is run from build tree
> because executables are placed in the top of build tree after conversion
> to meson.
>
> Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
> ---
> ui/cocoa.m | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/ui/cocoa.m b/ui/cocoa.m
> index ea3b845b53..13fba8103e 100644
> --- a/ui/cocoa.m
> +++ b/ui/cocoa.m
> @@ -1176,7 +1176,7 @@ QemuCocoaView *cocoaView;
> - (void) openDocumentation: (NSString *) filename
> {
> /* Where to look for local files */
> - NSString *path_array[] = {@"../share/doc/qemu/", @"../doc/qemu/", @"../docs/"};
> + NSString *path_array[] = {@"../share/doc/qemu/", @"../doc/qemu/", @"docs/"};
> NSString *full_file_path;
> NSURL *full_file_url;
>
> --
> 2.29.2
>
Forgot to add:
Reported-by: Peter Maydell <peter.maydell@linaro.org>
-Roman
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ui/cocoa: Update path to docs in build tree
2021-01-08 21:38 [PATCH] ui/cocoa: Update path to docs in build tree Roman Bolshakov
2021-01-09 6:19 ` Roman Bolshakov
@ 2021-01-12 10:50 ` Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Peter Maydell @ 2021-01-12 10:50 UTC (permalink / raw)
To: Roman Bolshakov; +Cc: QEMU Developers, Gerd Hoffmann
On Fri, 8 Jan 2021 at 21:38, Roman Bolshakov <r.bolshakov@yadro.com> wrote:
>
> QEMU documentation can't be opened if QEMU is run from build tree
> because executables are placed in the top of build tree after conversion
> to meson.
>
> Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
> ---
> ui/cocoa.m | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to target-arm.next, thanks.
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-01-12 11:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-08 21:38 [PATCH] ui/cocoa: Update path to docs in build tree Roman Bolshakov
2021-01-09 6:19 ` Roman Bolshakov
2021-01-12 10:50 ` Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.