ui/cocoa: Update path to docs in build tree

[PATCH] ui/cocoa: Update path to docs in build tree

Roman Bolshakov posted 1 patch 3 years, 4 months ago

Download mbox

Failed in applying to current master (apply log)

ui/cocoa.m | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Expand all Fold all

[PATCH] ui/cocoa: Update path to docs in build tree

Posted by Roman Bolshakov 3 years, 4 months ago

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

Re: [PATCH] ui/cocoa: Update path to docs in build tree

Posted by Peter Maydell 3 years, 4 months ago

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