From d39dfef98f170b6165aeef71213b441adc752475 Mon Sep 17 00:00:00 2001 From: Christian Prochaska Date: Wed, 14 Aug 2013 15:24:01 +0200 Subject: [PATCH] Qt: fix examples With this patch, the 'textedit' example can run on base-linux again and 'qt_lauchpad' contains only runnable launch entries. Fixes #837. --- libports/run/qt5.run | 5 +- libports/run/qt5_textedit.run | 63 +++++++++++-------- libports/src/app/qt5/qt_launchpad/main.cpp | 5 +- qt4/run/qt4.run | 4 +- qt4/run/textedit.run | 72 ++++++++++++++-------- qt4/src/app/qt_launchpad/main.cpp | 5 +- 6 files changed, 93 insertions(+), 61 deletions(-) diff --git a/libports/run/qt5.run b/libports/run/qt5.run index 30aaff2d8..a8908afdc 100644 --- a/libports/run/qt5.run +++ b/libports/run/qt5.run @@ -12,7 +12,7 @@ build { server/nitpicker server/liquid_framebuffer app/qt5/qt_launchpad - app/qt5/examples/textedit + app/qt5/examples/calculatorform app/qt5/examples/tetrix } @@ -117,7 +117,7 @@ set boot_modules { qt5_ui_tools.lib.so zlib.lib.so stdcxx.lib.so - textedit + calculatorform tetrix } @@ -133,4 +133,3 @@ build_boot_image $boot_modules append qemu_args " -m 512" run_genode_until forever - diff --git a/libports/run/qt5_textedit.run b/libports/run/qt5_textedit.run index 61e152242..d30bda588 100644 --- a/libports/run/qt5_textedit.run +++ b/libports/run/qt5_textedit.run @@ -5,10 +5,8 @@ set build_components { core init - drivers/atapi drivers/framebuffer drivers/timer - server/ffat_fs server/nitpicker server/liquid_framebuffer app/qt5/examples/textedit @@ -17,11 +15,14 @@ set build_components { set use_sd_card_driver [expr [have_spec omap4] || [have_spec exynos5]] set use_usb_driver [expr [have_spec omap4] || [have_spec exynos5]] -lappend_if $use_sd_card_driver build_components drivers/sd_card -lappend_if $use_usb_driver build_components drivers/usb -lappend_if [have_spec pci] build_components drivers/pci -lappend_if [have_spec acpi] build_components drivers/acpi -lappend_if [have_spec ps2] build_components drivers/input/ps2 +lappend_if $use_sd_card_driver build_components drivers/sd_card +lappend_if $use_usb_driver build_components drivers/usb +lappend_if [have_spec pci] build_components drivers/pci +lappend_if [have_spec pci] build_components drivers/atapi +lappend_if [have_spec acpi] build_components drivers/acpi +lappend_if [have_spec ps2] build_components drivers/input/ps2 +lappend_if [have_spec linux] build_components server/ram_fs +lappend_if [expr ![have_spec linux]] build_components server/ffat_fs build $build_components create_boot_directory @@ -69,7 +70,7 @@ append_if [have_spec pci] config { } -append_if [expr [have_spec pl180] || [have_spec omap4]] config { +append_if $use_sd_card_driver config { @@ -94,6 +95,27 @@ append_if [have_spec ps2] config { } +append_if [have_spec linux] config { + + + + + + + + + } + +append_if [expr ![have_spec linux]] config { + + + + + + + + } + append config { @@ -103,14 +125,6 @@ append config { - - - - - - - - @@ -136,7 +150,6 @@ set boot_modules { timer nitpicker liquid_fb - ffat_fs textedit freetype.lib.so icu.lib.so @@ -159,13 +172,15 @@ set boot_modules { } # platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec pci] boot_modules atapi_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec framebuffer] boot_modules fb_drv -lappend_if $use_sd_card_driver boot_modules sd_card_drv -lappend_if $use_usb_driver boot_modules usb_drv +lappend_if [have_spec linux] boot_modules fb_sdl +lappend_if [have_spec linux] boot_modules ram_fs +lappend_if [expr ![have_spec linux]] boot_modules ffat_fs +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec pci] boot_modules atapi_drv +lappend_if [have_spec ps2] boot_modules ps2_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if $use_sd_card_driver boot_modules sd_card_drv +lappend_if $use_usb_driver boot_modules usb_drv build_boot_image $boot_modules diff --git a/libports/src/app/qt5/qt_launchpad/main.cpp b/libports/src/app/qt5/qt_launchpad/main.cpp index 3c2043732..9ad60e267 100644 --- a/libports/src/app/qt5/qt_launchpad/main.cpp +++ b/libports/src/app/qt5/qt_launchpad/main.cpp @@ -29,9 +29,8 @@ int main(int argc, char *argv[]) Qt_launchpad *launchpad = new Qt_launchpad(Genode::env()->ram_session()->quota()); - launchpad->add_launcher("previewer", 25*1024*1024); - launchpad->add_launcher("textedit", 25*1024*1024); - launchpad->add_launcher("tetrix", 40*1024*1024); + launchpad->add_launcher("calculatorform", 30*1024*1024); + launchpad->add_launcher("tetrix", 40*1024*1024); launchpad->move(300,100); launchpad->show(); diff --git a/qt4/run/qt4.run b/qt4/run/qt4.run index 735ce117b..eb8aefcae 100644 --- a/qt4/run/qt4.run +++ b/qt4/run/qt4.run @@ -10,7 +10,7 @@ build { drivers/framebuffer drivers/timer server/nitpicker - app/examples/textedit + app/examples/calculatorform app/examples/tetrix app/qt_launchpad } @@ -95,7 +95,7 @@ set boot_modules { timer nitpicker qt_launchpad - textedit + calculatorform tetrix dejavusans.lib.so freetype.lib.so diff --git a/qt4/run/textedit.run b/qt4/run/textedit.run index 751c04153..05a8cc922 100644 --- a/qt4/run/textedit.run +++ b/qt4/run/textedit.run @@ -2,21 +2,28 @@ # Build # -build { +set build_components { core init - drivers/input/ps2 - drivers/pci - drivers/atapi - drivers/sd_card drivers/framebuffer drivers/timer - drivers/usb - server/ffat_fs server/nitpicker app/examples/textedit } +set use_sd_card_driver [expr [have_spec omap4] || [have_spec exynos5]] +set use_usb_driver [expr [have_spec omap4] || [have_spec exynos5]] + +lappend_if $use_sd_card_driver build_components drivers/sd_card +lappend_if $use_usb_driver build_components drivers/usb +lappend_if [have_spec pci] build_components drivers/pci +lappend_if [have_spec pci] build_components drivers/atapi +lappend_if [have_spec acpi] build_components drivers/acpi +lappend_if [have_spec ps2] build_components drivers/input/ps2 +lappend_if [have_spec linux] build_components server/ram_fs +lappend_if [expr ![have_spec linux]] build_components server/ffat_fs + +build $build_components create_boot_directory # @@ -62,7 +69,7 @@ append_if [have_spec pci] config { } -append_if [expr [have_spec pl180] || [have_spec omap4]] config { +append_if $use_sd_card_driver config { @@ -78,7 +85,7 @@ append_if [expr ![have_spec ps2] && [have_spec usb]] config { - + } append_if [have_spec ps2] config { @@ -87,6 +94,27 @@ append_if [have_spec ps2] config { } +append_if [have_spec linux] config { + + + + + + + + + } + +append_if [expr ![have_spec linux]] config { + + + + + + + + } + append config { @@ -96,14 +124,6 @@ append config { - - - - - - - - @@ -128,7 +148,6 @@ set boot_modules { init timer nitpicker - ffat_fs textedit dejavusans.lib.so freetype.lib.so @@ -142,18 +161,19 @@ set boot_modules { qt_core.lib.so qt_gui.lib.so zlib.lib.so - usb_drv stdcxx.lib.so } # platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec pci] boot_modules atapi_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec framebuffer] boot_modules fb_drv -lappend_if [have_spec omap4] boot_modules sd_card_drv -lappend_if [have_spec omap4] boot_modules usb_drv +lappend_if [have_spec linux] boot_modules fb_sdl +lappend_if [have_spec linux] boot_modules ram_fs +lappend_if [expr ![have_spec linux]] boot_modules ffat_fs +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec pci] boot_modules atapi_drv +lappend_if [have_spec ps2] boot_modules ps2_drv +lappend_if [have_spec framebuffer] boot_modules fb_drv +lappend_if $use_sd_card_driver boot_modules sd_card_drv +lappend_if $use_usb_driver boot_modules usb_drv build_boot_image $boot_modules diff --git a/qt4/src/app/qt_launchpad/main.cpp b/qt4/src/app/qt_launchpad/main.cpp index b9a125ff4..f08510043 100644 --- a/qt4/src/app/qt_launchpad/main.cpp +++ b/qt4/src/app/qt_launchpad/main.cpp @@ -29,9 +29,8 @@ int main(int argc, char *argv[]) Qt_launchpad *launchpad = new Qt_launchpad(Genode::env()->ram_session()->quota()); - launchpad->add_launcher("previewer", 23*1024*1024); - launchpad->add_launcher("textedit", 18*1024*1024); - launchpad->add_launcher("tetrix", 18*1024*1024); + launchpad->add_launcher("calculatorform", 18*1024*1024); + launchpad->add_launcher("tetrix", 18*1024*1024); launchpad->move(300,100); launchpad->show();