RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 22:57:44 +00:00
Code Issues Activity Actions

Ladybird: Ensure that installed ladybird can launch WebContent process

Browse source 
Always call platform_init after there's a QApplication, because in the
installed configuration that's how we find the resources.

Try QCoreApplication::applicationDirPath() after looking in ./WebContent
for the WebContent process. In an installed configuration, ladybird and
WebContent will both be in $PREFIX/bin.

Add install rules for WebContent and its linked libraries, for if they
ever differ from ladybird's.
This commit is contained in:
Andrew Kaster 2022-10-07 17:08:29 -06:00
parent bbb08c1912
commit 6fff03713c
6 changed files with 32 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Ladybird/main.cpp
View file

@ -17,18 +17,18 @@ Browser::Settings* s_settings;
ErrorOr<int> serenity_main(Main::Arguments arguments)
{
platform_init();
// NOTE: We only instantiate this to ensure that Gfx::FontDatabase has its default queries initialized.
Gfx::FontDatabase::set_default_font_query("Katica 10 400 0");
Gfx::FontDatabase::set_fixed_width_font_query("Csilla 10 400 0");
// NOTE: This is only used for the Core::Socket inside the IPC connections.
// FIXME: Refactor things so we can get rid of this somehow.
Core::EventLoop event_loop;
QApplication app(arguments.argc, arguments.argv);
platform_init();
// NOTE: We only instantiate this to ensure that Gfx::FontDatabase has its default queries initialized.
Gfx::FontDatabase::set_default_font_query("Katica 10 400 0");
Gfx::FontDatabase::set_fixed_width_font_query("Csilla 10 400 0");
String url;
Core::ArgsParser args_parser;
args_parser.set_general_help("The Ladybird web browser :^)");