From 5af4552511c2190787fe5dd96ea58c9111932082 Mon Sep 17 00:00:00 2001 From: Christian Prochaska Date: Sun, 28 Jun 2020 14:21:09 +0200 Subject: [PATCH] qt5: build Qt libraries and applications with qmake Fixes #3795 --- .../gems/recipes/src/mixer_gui_qt/content.mk | 9 - repos/gems/recipes/src/mixer_gui_qt/used_apis | 8 +- .../gems/recipes/src/test-tiled_wm/content.mk | 9 - .../gems/recipes/src/test-tiled_wm/used_apis | 8 +- repos/gems/run/mixer_gui_qt_test.run | 18 +- repos/gems/run/tiled_wm.run | 18 +- repos/gems/src/app/mixer_gui_qt/main.cpp | 14 +- repos/gems/src/app/mixer_gui_qt/target.mk | 15 +- repos/gems/src/test/tiled_wm/app/target.mk | 5 +- .../gems/src/test/tiled_wm/overlay/target.mk | 5 +- repos/gems/src/test/tiled_wm/panel/target.mk | 9 +- repos/gems/src/test/tiled_wm/target.inc | 14 +- repos/gems/src/test/tiled_wm/util.h | 8 +- .../qgenodeviewwidget/qgenodeviewwidget.h | 32 +- .../{qt5 => }/qpluginwidget/qpluginwidget.h | 35 +- .../qt5/qpa_genode/qgenodeplatformwindow.h | 214 -- .../libports/include/qt5_component/qpa_init.h | 59 + repos/libports/lib/import/import-qt5.inc | 94 - repos/libports/lib/import/import-qt5_angle.mk | 3 - repos/libports/lib/import/import-qt5_core.mk | 15 - repos/libports/lib/import/import-qt5_gui.mk | 24 - .../libports/lib/import/import-qt5_jscore.mk | 3 - .../libports/lib/import/import-qt5_network.mk | 15 - .../libports/lib/import/import-qt5_opengl.mk | 15 - repos/libports/lib/import/import-qt5_pcre2.mk | 3 - .../lib/import/import-qt5_printsupport.mk | 17 - .../import/import-qt5_qgenodeviewwidget.mk | 1 - repos/libports/lib/import/import-qt5_qjpeg.mk | 3 - repos/libports/lib/import/import-qt5_qmake.mk | 212 ++ repos/libports/lib/import/import-qt5_qml.mk | 15 - .../lib/import/import-qt5_qpa_genode.mk | 11 - .../lib/import/import-qt5_qpluginwidget.mk | 4 - .../lib/import/import-qt5_qtquick2plugin.mk | 3 - repos/libports/lib/import/import-qt5_quick.mk | 15 - .../lib/import/import-qt5_quickcontrols2.mk | 15 - .../lib/import/import-qt5_quicktemplates2.mk | 15 - .../lib/import/import-qt5_scriptclassic.mk | 14 - repos/libports/lib/import/import-qt5_sql.mk | 15 - repos/libports/lib/import/import-qt5_svg.mk | 15 - repos/libports/lib/import/import-qt5_test.mk | 15 - .../lib/import/import-qt5_ui_tools.mk | 27 - .../lib/import/import-qt5_virtualkeyboard.mk | 15 - .../libports/lib/import/import-qt5_webcore.mk | 3 - .../libports/lib/import/import-qt5_webkit.mk | 15 - .../lib/import/import-qt5_webkitwidgets.mk | 15 - .../libports/lib/import/import-qt5_widgets.mk | 15 - repos/libports/lib/import/import-qt5_wtf.mk | 3 - repos/libports/lib/import/import-qt5_xml.mk | 15 - repos/libports/lib/mk/libQt5Core.mk | 6 + repos/libports/lib/mk/libQt5Gui.mk | 6 + repos/libports/lib/mk/libQt5Network.mk | 6 + repos/libports/lib/mk/libQt5PrintSupport.mk | 6 + repos/libports/lib/mk/libQt5Qml.mk | 6 + repos/libports/lib/mk/libQt5Quick.mk | 6 + repos/libports/lib/mk/libQt5QuickWidgets.mk | 6 + repos/libports/lib/mk/libQt5Sql.mk | 6 + repos/libports/lib/mk/libQt5Svg.mk | 6 + repos/libports/lib/mk/libQt5Test.mk | 6 + .../libports/lib/mk/libQt5VirtualKeyboard.mk | 6 + repos/libports/lib/mk/libQt5Widgets.mk | 6 + repos/libports/lib/mk/libqgenode.mk | 6 + repos/libports/lib/mk/libqgenodeviewwidget.mk | 18 + repos/libports/lib/mk/libqpluginwidget.mk | 22 + repos/libports/lib/mk/qt5.inc | 22 - repos/libports/lib/mk/qt5_angle.inc | 15 - repos/libports/lib/mk/qt5_angle_generated.inc | 97 - repos/libports/lib/mk/qt5_base.mk | 106 + repos/libports/lib/mk/qt5_component.mk | 2 +- repos/libports/lib/mk/qt5_core.mk | 27 - repos/libports/lib/mk/qt5_core_generated.inc | 363 ---- repos/libports/lib/mk/qt5_declarative.mk | 96 + repos/libports/lib/mk/qt5_gui.mk | 34 - repos/libports/lib/mk/qt5_gui_generated.inc | 402 ---- repos/libports/lib/mk/qt5_jscore.inc | 22 - .../libports/lib/mk/qt5_jscore_generated.inc | 365 ---- repos/libports/lib/mk/qt5_network.mk | 29 - .../libports/lib/mk/qt5_network_generated.inc | 211 -- repos/libports/lib/mk/qt5_opengl.mk | 11 - .../libports/lib/mk/qt5_opengl_generated.inc | 64 - repos/libports/lib/mk/qt5_pcre2.mk | 7 - repos/libports/lib/mk/qt5_pcre2_generated.inc | 49 - repos/libports/lib/mk/qt5_printsupport.mk | 25 - .../lib/mk/qt5_printsupport_generated.inc | 71 - .../libports/lib/mk/qt5_qgenodeviewwidget.mk | 13 - repos/libports/lib/mk/qt5_qjpeg.mk | 17 - repos/libports/lib/mk/qt5_qml.mk | 24 - repos/libports/lib/mk/qt5_qml_generated.inc | 323 --- .../lib/mk/qt5_qmlfolderlistmodelplugin.mk | 45 - ...qt5_qmlfolderlistmodelplugin_generated.inc | 40 - repos/libports/lib/mk/qt5_qpa_genode.mk | 55 - repos/libports/lib/mk/qt5_qpluginwidget.mk | 13 - .../lib/mk/qt5_qquicklayoutsplugin.mk | 45 - .../mk/qt5_qquicklayoutsplugin_generated.inc | 50 - repos/libports/lib/mk/qt5_qtquick2plugin.mk | 45 - .../lib/mk/qt5_qtquick2plugin_generated.inc | 42 - .../lib/mk/qt5_qtquickcontrols2plugin.mk | 45 - .../qt5_qtquickcontrols2plugin_generated.inc | 63 - .../lib/mk/qt5_qtquicktemplates2plugin.mk | 45 - .../qt5_qtquicktemplates2plugin_generated.inc | 46 - .../mk/qt5_qtquickvirtualkeyboardplugin.mk | 45 - ...qtquickvirtualkeyboardplugin_generated.inc | 43 - ...t5_qtquickvirtualkeyboardsettingsplugin.mk | 45 - ...irtualkeyboardsettingsplugin_generated.inc | 43 - .../qt5_qtquickvirtualkeyboardstylesplugin.mk | 45 - ...kvirtualkeyboardstylesplugin_generated.inc | 48 - .../lib/mk/qt5_qtvirtualkeyboardplugin.mk | 49 - .../qt5_qtvirtualkeyboardplugin_generated.inc | 44 - repos/libports/lib/mk/qt5_quick.mk | 18 - repos/libports/lib/mk/qt5_quick_generated.inc | 407 ---- repos/libports/lib/mk/qt5_quickcontrols2.mk | 83 +- .../lib/mk/qt5_quickcontrols2_generated.inc | 91 - repos/libports/lib/mk/qt5_quicktemplates2.mk | 11 - .../lib/mk/qt5_quicktemplates2_generated.inc | 226 --- repos/libports/lib/mk/qt5_scriptclassic.mk | 18 - .../lib/mk/qt5_scriptclassic_generated.inc | 60 - repos/libports/lib/mk/qt5_sql.mk | 19 - repos/libports/lib/mk/qt5_sql_generated.inc | 57 - repos/libports/lib/mk/qt5_svg.mk | 74 +- repos/libports/lib/mk/qt5_svg_generated.inc | 54 - repos/libports/lib/mk/qt5_test.mk | 11 - repos/libports/lib/mk/qt5_test_generated.inc | 62 - repos/libports/lib/mk/qt5_ui_tools.mk | 19 - .../lib/mk/qt5_ui_tools_generated.inc | 48 - repos/libports/lib/mk/qt5_virtualkeyboard.mk | 96 +- .../lib/mk/qt5_virtualkeyboard_generated.inc | 119 -- repos/libports/lib/mk/qt5_webcore.inc | 38 - .../libports/lib/mk/qt5_webcore_generated.inc | 1747 ----------------- repos/libports/lib/mk/qt5_webkit.inc | 27 - .../libports/lib/mk/qt5_webkit_generated.inc | 209 -- repos/libports/lib/mk/qt5_webkitwidgets.inc | 24 - .../lib/mk/qt5_webkitwidgets_generated.inc | 199 -- repos/libports/lib/mk/qt5_widgets.mk | 14 - .../libports/lib/mk/qt5_widgets_generated.inc | 386 ---- repos/libports/lib/mk/qt5_windowplugin.mk | 45 - .../lib/mk/qt5_windowplugin_generated.inc | 42 - repos/libports/lib/mk/qt5_wtf.inc | 19 - repos/libports/lib/mk/qt5_wtf_generated.inc | 101 - repos/libports/lib/mk/qt5_xml.mk | 11 - repos/libports/lib/mk/qt5_xml_generated.inc | 36 - repos/libports/lib/mk/spec/32bit/qt5_angle.mk | 1 - .../libports/lib/mk/spec/32bit/qt5_jscore.mk | 1 - .../libports/lib/mk/spec/32bit/qt5_webcore.mk | 1 - .../libports/lib/mk/spec/32bit/qt5_webkit.mk | 1 - .../lib/mk/spec/32bit/qt5_webkitwidgets.mk | 1 - repos/libports/lib/mk/spec/32bit/qt5_wtf.mk | 1 - .../libports/lib/mk/spec/x86_64/qt5_angle.mk | 1 - .../libports/lib/mk/spec/x86_64/qt5_jscore.mk | 1 - .../lib/mk/spec/x86_64/qt5_webcore.mk | 1 - .../libports/lib/mk/spec/x86_64/qt5_webkit.mk | 1 - .../lib/mk/spec/x86_64/qt5_webkitwidgets.mk | 1 - repos/libports/lib/mk/spec/x86_64/qt5_wtf.mk | 1 - ...qgenodeviewwidget => libqgenodeviewwidget} | 32 + repos/libports/lib/symbols/libqpluginwidget | 128 ++ repos/libports/lib/symbols/qt5_component | 4 - repos/libports/lib/symbols/qt5_qpa_genode | 283 --- repos/libports/lib/symbols/qt5_qpluginwidget | 35 - repos/libports/ports/qt5-host.hash | 2 +- repos/libports/ports/qt5-host.port | 6 +- repos/libports/ports/qt5.hash | 2 +- repos/libports/ports/qt5.port | 625 +----- .../api/libqgenodeviewwidget/content.mk | 10 + .../recipes/api/libqgenodeviewwidget/hash | 1 + .../recipes/api/libqpluginwidget/content.mk | 10 + .../recipes/api/libqpluginwidget/hash | 1 + repos/libports/recipes/api/qt5/content.mk | 20 + repos/libports/recipes/api/qt5/hash | 1 + .../recipes/api/qt5_component/content.mk | 3 +- .../libports/recipes/api/qt5_core/content.mk | 27 - repos/libports/recipes/api/qt5_core/hash | 1 - repos/libports/recipes/api/qt5_gui/content.mk | 23 - repos/libports/recipes/api/qt5_gui/hash | 1 - .../recipes/api/qt5_network/content.mk | 23 - repos/libports/recipes/api/qt5_network/hash | 1 - .../recipes/api/qt5_opengl/content.mk | 23 - repos/libports/recipes/api/qt5_opengl/hash | 1 - .../recipes/api/qt5_printsupport/content.mk | 23 - .../recipes/api/qt5_printsupport/hash | 1 - .../api/qt5_qgenodeviewwidget/content.mk | 11 - .../recipes/api/qt5_qgenodeviewwidget/hash | 1 - .../libports/recipes/api/qt5_qjpeg/content.mk | 22 - repos/libports/recipes/api/qt5_qjpeg/hash | 1 - repos/libports/recipes/api/qt5_qml/content.mk | 23 - repos/libports/recipes/api/qt5_qml/hash | 1 - .../recipes/api/qt5_qpa_genode/content.mk | 27 - .../libports/recipes/api/qt5_qpa_genode/hash | 1 - .../recipes/api/qt5_qpluginwidget/content.mk | 11 - .../recipes/api/qt5_qpluginwidget/hash | 1 - .../libports/recipes/api/qt5_quick/content.mk | 23 - repos/libports/recipes/api/qt5_quick/hash | 1 - .../recipes/api/qt5_quickcontrols2/content.mk | 23 - .../recipes/api/qt5_quickcontrols2/hash | 1 - .../api/qt5_quicktemplates2/content.mk | 23 - .../recipes/api/qt5_quicktemplates2/hash | 1 - .../recipes/api/qt5_scriptclassic/content.mk | 23 - .../recipes/api/qt5_scriptclassic/hash | 1 - repos/libports/recipes/api/qt5_sql/content.mk | 23 - repos/libports/recipes/api/qt5_sql/hash | 1 - repos/libports/recipes/api/qt5_svg/content.mk | 23 - repos/libports/recipes/api/qt5_svg/hash | 1 - .../libports/recipes/api/qt5_test/content.mk | 23 - repos/libports/recipes/api/qt5_test/hash | 1 - .../recipes/api/qt5_ui_tools/content.mk | 25 - repos/libports/recipes/api/qt5_ui_tools/hash | 1 - .../api/qt5_virtualkeyboard/content.mk | 23 - .../recipes/api/qt5_virtualkeyboard/hash | 1 - .../recipes/api/qt5_webkit/content.mk | 34 - repos/libports/recipes/api/qt5_webkit/hash | 1 - .../recipes/api/qt5_widgets/content.mk | 24 - repos/libports/recipes/api/qt5_widgets/hash | 1 - repos/libports/recipes/api/qt5_xml/content.mk | 23 - repos/libports/recipes/api/qt5_xml/hash | 1 - .../recipes/pkg/qt5_textedit/archives | 7 +- .../libports/recipes/pkg/qt5_textedit/runtime | 12 +- .../recipes/raw/qt5_dejavusans/content.mk | 2 +- .../qt5_qt_labs_folderlistmodel/content.mk | 16 - .../raw/qt5_qt_labs_folderlistmodel/hash | 1 - .../recipes/raw/qt5_qtquick2/content.mk | 16 - repos/libports/recipes/raw/qt5_qtquick2/hash | 1 - .../raw/qt5_qtquick_controls2/content.mk | 16 - .../recipes/raw/qt5_qtquick_controls2/hash | 1 - .../raw/qt5_qtquick_layouts/content.mk | 16 - .../recipes/raw/qt5_qtquick_layouts/hash | 1 - .../raw/qt5_qtquick_templates2/content.mk | 16 - .../recipes/raw/qt5_qtquick_templates2/hash | 1 - .../qt5_qtquick_virtualkeyboard/content.mk | 30 - .../raw/qt5_qtquick_virtualkeyboard/hash | 1 - .../recipes/raw/qt5_qtquick_window/content.mk | 16 - .../recipes/raw/qt5_qtquick_window/hash | 1 - .../recipes/raw/qt5_samegame/content.mk | 4 +- .../recipes/raw/qt5_textedit/textedit.config | 1 + .../recipes/src/libqgenodeviewwidget/api | 1 + .../src/libqgenodeviewwidget/content.mk | 14 + .../recipes/src/libqgenodeviewwidget/hash | 1 + .../used_apis | 7 +- .../libports/recipes/src/libqpluginwidget/api | 1 + .../recipes/src/libqpluginwidget/content.mk | 14 + .../recipes/src/libqpluginwidget/hash | 1 + .../used_apis | 10 +- repos/libports/recipes/src/qt5_base/api | 1 + .../libports/recipes/src/qt5_base/content.mk | 33 + repos/libports/recipes/src/qt5_base/hash | 1 + .../{qt5_qpa_genode => qt5_base}/used_apis | 9 +- .../recipes/src/qt5_calculatorform/content.mk | 8 +- .../recipes/src/qt5_calculatorform/used_apis | 7 +- .../recipes/src/qt5_component/content.mk | 2 +- repos/libports/recipes/src/qt5_core/api | 1 - .../libports/recipes/src/qt5_core/content.mk | 41 - repos/libports/recipes/src/qt5_core/hash | 1 - .../libports/recipes/src/qt5_declarative/api | 1 + .../recipes/src/qt5_declarative/content.mk | 25 + .../libports/recipes/src/qt5_declarative/hash | 1 + .../{qt5_core => qt5_declarative}/used_apis | 4 +- repos/libports/recipes/src/qt5_gui/api | 1 - repos/libports/recipes/src/qt5_gui/content.mk | 28 - repos/libports/recipes/src/qt5_gui/hash | 1 - repos/libports/recipes/src/qt5_gui/used_apis | 7 - .../recipes/src/qt5_launchpad/content.mk | 4 +- .../recipes/src/qt5_launchpad/used_apis | 7 +- repos/libports/recipes/src/qt5_network/api | 1 - .../recipes/src/qt5_network/content.mk | 27 - repos/libports/recipes/src/qt5_network/hash | 1 - .../recipes/src/qt5_network/used_apis | 6 - repos/libports/recipes/src/qt5_opengl/api | 1 - .../recipes/src/qt5_opengl/content.mk | 27 - repos/libports/recipes/src/qt5_opengl/hash | 1 - .../libports/recipes/src/qt5_opengl/used_apis | 7 - .../recipes/src/qt5_openglwindow/content.mk | 8 +- .../recipes/src/qt5_openglwindow/used_apis | 6 +- .../libports/recipes/src/qt5_printsupport/api | 1 - .../recipes/src/qt5_printsupport/content.mk | 27 - .../recipes/src/qt5_printsupport/hash | 1 - .../recipes/src/qt5_printsupport/used_apis | 7 - .../recipes/src/qt5_qgenodeviewwidget/api | 1 - .../src/qt5_qgenodeviewwidget/content.mk | 14 - .../recipes/src/qt5_qgenodeviewwidget/hash | 1 - repos/libports/recipes/src/qt5_qjpeg/api | 1 - .../libports/recipes/src/qt5_qjpeg/content.mk | 26 - repos/libports/recipes/src/qt5_qjpeg/hash | 1 - .../libports/recipes/src/qt5_qjpeg/used_apis | 6 - repos/libports/recipes/src/qt5_qml/api | 1 - repos/libports/recipes/src/qt5_qml/content.mk | 29 - repos/libports/recipes/src/qt5_qml/hash | 1 - repos/libports/recipes/src/qt5_qml/used_apis | 5 - repos/libports/recipes/src/qt5_qpa_genode/api | 1 - .../recipes/src/qt5_qpa_genode/content.mk | 41 - .../libports/recipes/src/qt5_qpa_genode/hash | 1 - .../recipes/src/qt5_qpluginwidget/api | 1 - .../recipes/src/qt5_qpluginwidget/content.mk | 14 - .../recipes/src/qt5_qpluginwidget/hash | 1 - .../qt5_qt_labs_folderlistmodel/content.mk | 27 - .../src/qt5_qt_labs_folderlistmodel/hash | 1 - .../src/qt5_qt_labs_folderlistmodel/used_apis | 9 - .../recipes/src/qt5_qtquick2/content.mk | 27 - repos/libports/recipes/src/qt5_qtquick2/hash | 1 - .../recipes/src/qt5_qtquick2/used_apis | 8 - .../src/qt5_qtquick_controls2/content.mk | 27 - .../recipes/src/qt5_qtquick_controls2/hash | 1 - .../src/qt5_qtquick_controls2/used_apis | 11 - .../src/qt5_qtquick_layouts/content.mk | 27 - .../recipes/src/qt5_qtquick_layouts/hash | 1 - .../recipes/src/qt5_qtquick_layouts/used_apis | 9 - .../src/qt5_qtquick_templates2/content.mk | 27 - .../recipes/src/qt5_qtquick_templates2/hash | 1 - .../src/qt5_qtquick_templates2/used_apis | 10 - .../qt5_qtquick_virtualkeyboard/content.mk | 51 - .../src/qt5_qtquick_virtualkeyboard/hash | 1 - .../src/qt5_qtquick_virtualkeyboard/used_apis | 11 - .../recipes/src/qt5_qtquick_window/content.mk | 27 - .../recipes/src/qt5_qtquick_window/hash | 1 - .../recipes/src/qt5_qtquick_window/used_apis | 9 - repos/libports/recipes/src/qt5_quick/api | 1 - .../libports/recipes/src/qt5_quick/content.mk | 27 - repos/libports/recipes/src/qt5_quick/hash | 1 - .../libports/recipes/src/qt5_quick/used_apis | 8 - .../recipes/src/qt5_quickcontrols2/api | 2 +- .../recipes/src/qt5_quickcontrols2/content.mk | 8 +- .../recipes/src/qt5_quickcontrols2/used_apis | 7 - .../recipes/src/qt5_quicktemplates2/api | 1 - .../src/qt5_quicktemplates2/content.mk | 27 - .../recipes/src/qt5_quicktemplates2/hash | 1 - .../recipes/src/qt5_quicktemplates2/used_apis | 10 - .../recipes/src/qt5_samegame/content.mk | 4 +- .../recipes/src/qt5_samegame/used_apis | 9 +- .../recipes/src/qt5_scriptclassic/api | 1 - .../recipes/src/qt5_scriptclassic/content.mk | 27 - .../recipes/src/qt5_scriptclassic/hash | 1 - .../recipes/src/qt5_scriptclassic/used_apis | 6 - repos/libports/recipes/src/qt5_sql/api | 1 - repos/libports/recipes/src/qt5_sql/content.mk | 27 - repos/libports/recipes/src/qt5_sql/hash | 1 - repos/libports/recipes/src/qt5_sql/used_apis | 4 - repos/libports/recipes/src/qt5_svg/api | 2 +- repos/libports/recipes/src/qt5_svg/content.mk | 8 +- repos/libports/recipes/src/qt5_svg/used_apis | 4 - repos/libports/recipes/src/qt5_test/api | 1 - .../libports/recipes/src/qt5_test/content.mk | 27 - repos/libports/recipes/src/qt5_test/hash | 1 - repos/libports/recipes/src/qt5_test/used_apis | 4 - .../recipes/src/qt5_testqstring/content.mk | 8 +- .../recipes/src/qt5_testqstring/used_apis | 8 +- .../recipes/src/qt5_tetrix/content.mk | 6 +- .../libports/recipes/src/qt5_tetrix/used_apis | 9 +- .../recipes/src/qt5_textedit/content.mk | 8 +- .../recipes/src/qt5_textedit/used_apis | 8 +- repos/libports/recipes/src/qt5_ui_tools/api | 1 - .../recipes/src/qt5_ui_tools/content.mk | 28 - repos/libports/recipes/src/qt5_ui_tools/hash | 1 - .../recipes/src/qt5_ui_tools/used_apis | 7 - .../recipes/src/qt5_virtualkeyboard/api | 2 +- .../src/qt5_virtualkeyboard/content.mk | 8 +- .../recipes/src/qt5_virtualkeyboard/used_apis | 8 +- .../qt5_virtualkeyboard_example/content.mk | 8 +- .../src/qt5_virtualkeyboard_example/used_apis | 10 +- repos/libports/recipes/src/qt5_webkit/api | 1 - .../recipes/src/qt5_webkit/content.mk | 83 - repos/libports/recipes/src/qt5_webkit/hash | 1 - .../libports/recipes/src/qt5_webkit/used_apis | 17 - repos/libports/recipes/src/qt5_widgets/api | 1 - .../recipes/src/qt5_widgets/content.mk | 27 - repos/libports/recipes/src/qt5_widgets/hash | 1 - .../recipes/src/qt5_widgets/used_apis | 6 - repos/libports/recipes/src/qt5_xml/api | 1 - repos/libports/recipes/src/qt5_xml/content.mk | 27 - repos/libports/recipes/src/qt5_xml/hash | 1 - repos/libports/recipes/src/qt5_xml/used_apis | 4 - .../recipes/src/test-qpluginwidget/content.mk | 4 +- .../recipes/src/test-qpluginwidget/used_apis | 12 +- .../recipes/src/test-qt_core/content.mk | 4 +- .../recipes/src/test-qt_core/used_apis | 4 +- .../recipes/src/test-qt_quick/content.mk | 4 +- .../recipes/src/test-qt_quick/used_apis | 9 +- repos/libports/run/qt5.run | 22 +- repos/libports/run/qt5_calculatorform.run | 21 +- repos/libports/run/qt5_common.inc | 242 ++- repos/libports/run/qt5_core.run | 2 +- repos/libports/run/qt5_drivers.inc | 405 ---- repos/libports/run/qt5_openglwindow.run | 15 +- repos/libports/run/qt5_qpluginwidget.run | 29 +- repos/libports/run/qt5_quicktest.run | 29 +- repos/libports/run/qt5_samegame.run | 32 +- repos/libports/run/qt5_testqstring.run | 20 +- repos/libports/run/qt5_tetrix.run | 20 +- repos/libports/run/qt5_textedit.run | 23 +- repos/libports/run/qt5_virtualkeyboard.run | 62 +- .../app/qt5/examples/calculatorform/target.mk | 16 +- .../app/qt5/examples/openglwindow/target.mk | 16 +- .../src/app/qt5/examples/samegame/target.mk | 11 +- .../app/qt5/examples/testqstring/target.mk | 19 +- .../src/app/qt5/examples/tetrix/target.mk | 18 +- .../src/app/qt5/examples/textedit/target.mk | 16 +- .../qt5/examples/virtualkeyboard/target.mk | 20 +- .../src/app/qt5/qt_launchpad/child_entry.cpp | 7 + .../app/qt5/qt_launchpad/kbyte_loadbar.cpp | 7 + .../src/app/qt5/qt_launchpad/launch_entry.cpp | 7 + .../src/app/qt5/qt_launchpad/main.cpp | 24 +- .../src/app/qt5/qt_launchpad/qt_launchpad.cpp | 11 +- .../src/app/qt5/qt_launchpad/target.mk | 15 +- .../src/app/qt5/tmpl/target.mk.example | 7 - .../src/app/qt5/tmpl/target_defaults.inc | 30 - .../src/app/qt5/tmpl/target_final.inc | 96 - .../qgenodeviewwidget/qgenodeviewwidget.cpp | 11 +- .../qgenodeviewwidget/qgenodeviewwidget.json | 3 + .../qgenodeviewwidget/qgenodeviewwidget.pro | 6 + .../{qt5 => }/qpluginwidget/qpluginwidget.cpp | 10 +- .../src/lib/qpluginwidget/qpluginwidget.json | 3 + .../src/lib/qpluginwidget/qpluginwidget.pro | 6 + repos/libports/src/lib/qt5/libc_dummies.cc | 15 - .../qt5/patches/example_virtualkeyboard.patch | 44 - .../lib/qt5/patches/header_generation.patch | 109 - .../src/lib/qt5/patches/host_tools.patch | 26 - .../qt5/patches/qtbase_configuration.patch | 172 -- .../src/lib/qt5/patches/qtbase_fixes.patch | 30 - .../lib/qt5/patches/qtbase_generated.patch | 788 -------- .../src/lib/qt5/patches/qtbase_genode.patch | 580 ------ .../qtbase_genode_openglwindow_example.patch | 21 - .../qtbase_genode_qtscriptclassic.patch | 40 - .../qtbase_genode_textedit_example.patch | 64 - .../qt5/patches/qtbase_qwindow_title.patch | 14 - .../patches/qtdeclarative_configuration.patch | 16 - .../qt5/patches/qtdeclarative_generated.patch | 183 -- .../qt5/patches/qtdeclarative_genode.patch | 44 - .../patches/qtquickcontrols2_generated.patch | 67 - .../lib/qt5/patches/qtscriptclassic_qt5.patch | 456 ----- .../qt5/patches/qtscriptclassic_qt5_7.patch | 37 - .../src/lib/qt5/patches/qtsvg_generated.patch | 14 - .../qt5/patches/qttools_configuration.patch | 43 - .../lib/qt5/patches/qttools_generated.patch | 14 - .../qtvirtualkeyboard_configuration.patch | 34 - .../patches/qtvirtualkeyboard_generated.patch | 22 - .../qt5/patches/qtwebkit_configuration.patch | 128 -- .../src/lib/qt5/patches/qtwebkit_fixes.patch | 71 - .../lib/qt5/patches/qtwebkit_generated.patch | 28 - .../src/lib/qt5/patches/qtwebkit_genode.patch | 426 ---- repos/libports/src/lib/qt5/patches/series | 24 - .../lib/qt5/patches/series.qtscriptclassic | 2 - .../imageformats/jpeg/import_plugin.cc | 16 - .../src/plugins/platforms/genode/genode.json | 3 - .../src/plugins/platforms/genode/main.cpp | 51 - .../platforms/genode/qgenodeclipboard.cpp | 142 -- .../platforms/genode/qgenodeclipboard.h | 71 - .../platforms/genode/qgenodecursor.cpp | 79 - .../plugins/platforms/genode/qgenodecursor.h | 45 - .../platforms/genode/qgenodeglcontext.cpp | 143 -- .../platforms/genode/qgenodeglcontext.h | 54 - .../platforms/genode/qgenodeintegration.cpp | 111 -- .../platforms/genode/qgenodeintegration.h | 60 - .../genode/qgenodeintegrationplugin.h | 43 - .../genode/qgenodeplatformwindow.cpp | 904 --------- .../plugins/platforms/genode/qgenodescreen.h | 63 - .../platforms/genode/qgenodewindowsurface.cpp | 131 -- .../platforms/genode/qgenodewindowsurface.h | 51 - .../src/imports/folderlistmodel/target.mk | 6 - .../src/imports/layouts/target.mk | 6 - .../src/imports/qtquick2/target.mk | 6 - .../qtvirtualkeyboard/import/target.mk | 6 - .../qtvirtualkeyboard/settings/target.mk | 6 - .../qtvirtualkeyboard/styles/target.mk | 6 - .../src/imports/qtvirtualkeyboard/target.mk | 6 - .../lib/qt5/qtwebkit/Source/WebCore/idl_files | 558 ------ .../qt5/tools/lib_mk_file_generator/README | 16 - .../create_generated_inc | 129 -- .../create_generated_incs | 66 - .../genode_qt5_configure | 66 - .../{qt5 => qt5_component}/qt_component.cc | 16 +- .../src/test/qt5/qpluginwidget/main.cpp | 41 +- .../test/qt5/qpluginwidget/qpluginwidget.pro | 8 +- .../src/test/qt5/qpluginwidget/target.mk | 16 +- repos/libports/src/test/qt5/qt_core/target.mk | 10 +- .../src/test/qt5/qt_quick/qt_quick.pro | 2 +- .../libports/src/test/qt5/qt_quick/target.mk | 11 +- repos/ports/ports/arora.hash | 1 - repos/ports/ports/arora.port | 12 - repos/ports/recipes/pkg/arora/README | 1 - repos/ports/recipes/pkg/arora/archives | 32 - repos/ports/recipes/pkg/arora/hash | 1 - repos/ports/recipes/pkg/arora/runtime | 65 - repos/ports/recipes/raw/arora/content.mk | 4 - repos/ports/recipes/raw/arora/hash | 1 - repos/ports/recipes/raw/arora/init.config | 49 - repos/ports/recipes/src/arora/content.mk | 22 - repos/ports/recipes/src/arora/hash | 1 - repos/ports/recipes/src/arora/used_apis | 21 - repos/ports/run/arora.run | 170 -- repos/ports/src/app/arora/arora.pro | 3 - repos/ports/src/app/arora/arora_component.cc | 52 - repos/ports/src/app/arora/demo/bg.png | Bin 521 -> 0 bytes repos/ports/src/app/arora/demo/bg_content.png | Bin 676 -> 0 bytes repos/ports/src/app/arora/demo/bg_top.png | Bin 3022 -> 0 bytes repos/ports/src/app/arora/demo/busybox.html | 70 - repos/ports/src/app/arora/demo/demo.html | 7 - repos/ports/src/app/arora/demo/http_block.png | Bin 76084 -> 0 bytes repos/ports/src/app/arora/demo/intro.html | 81 - repos/ports/src/app/arora/demo/nitpicker.html | 142 -- .../src/app/arora/demo/nitpicker_plugin.png | Bin 96674 -> 0 bytes .../arora/demo/nitpicker_plugin/config.plugin | 46 - repos/ports/src/app/arora/demo/tetrix.html | 15 - repos/ports/src/app/arora/demo/tinycore.html | 120 -- repos/ports/src/app/arora/demo/title_bg.png | Bin 785 -> 0 bytes repos/ports/src/app/arora/demo_html.qrc | 14 - .../app/arora/patches/arora_bookmarks.patch | 28 - .../arora/patches/arora_disable_adblock.patch | 53 - .../patches/arora_disable_qprocess.patch | 53 - .../arora_disable_ssl_messageboxes.patch | 47 - .../src/app/arora/patches/arora_genode.patch | 445 ----- .../app/arora/patches/arora_move_window.patch | 24 - .../patches/arora_nitpicker_plugin.patch | 40 - .../src/app/arora/patches/arora_qt5_cpp.patch | 894 --------- .../app/arora/patches/arora_startpage.patch | 36 - repos/ports/src/app/arora/patches/series | 9 - .../arora/qwebplugins/nitpicker/nitpicker.pri | 13 - .../qwebplugins/nitpicker/nitpickerplugin.cpp | 76 - .../qwebplugins/nitpicker/nitpickerplugin.h | 27 - .../nitpicker/nitpickerpluginwidget.cpp | 80 - .../nitpicker/nitpickerpluginwidget.h | 39 - repos/ports/src/app/arora/target.mk | 85 - tool/tool_chain_qt5 | 91 +- 516 files changed, 1824 insertions(+), 20989 deletions(-) rename repos/libports/include/{qt5 => }/qgenodeviewwidget/qgenodeviewwidget.h (70%) rename repos/libports/include/{qt5 => }/qpluginwidget/qpluginwidget.h (76%) delete mode 100644 repos/libports/include/qt5/qpa_genode/qgenodeplatformwindow.h create mode 100644 repos/libports/include/qt5_component/qpa_init.h delete mode 100644 repos/libports/lib/import/import-qt5.inc delete mode 100644 repos/libports/lib/import/import-qt5_angle.mk delete mode 100644 repos/libports/lib/import/import-qt5_core.mk delete mode 100644 repos/libports/lib/import/import-qt5_gui.mk delete mode 100644 repos/libports/lib/import/import-qt5_jscore.mk delete mode 100644 repos/libports/lib/import/import-qt5_network.mk delete mode 100644 repos/libports/lib/import/import-qt5_opengl.mk delete mode 100644 repos/libports/lib/import/import-qt5_pcre2.mk delete mode 100644 repos/libports/lib/import/import-qt5_printsupport.mk delete mode 100644 repos/libports/lib/import/import-qt5_qgenodeviewwidget.mk delete mode 100644 repos/libports/lib/import/import-qt5_qjpeg.mk create mode 100644 repos/libports/lib/import/import-qt5_qmake.mk delete mode 100644 repos/libports/lib/import/import-qt5_qml.mk delete mode 100644 repos/libports/lib/import/import-qt5_qpa_genode.mk delete mode 100644 repos/libports/lib/import/import-qt5_qpluginwidget.mk delete mode 100644 repos/libports/lib/import/import-qt5_qtquick2plugin.mk delete mode 100644 repos/libports/lib/import/import-qt5_quick.mk delete mode 100644 repos/libports/lib/import/import-qt5_quickcontrols2.mk delete mode 100644 repos/libports/lib/import/import-qt5_quicktemplates2.mk delete mode 100644 repos/libports/lib/import/import-qt5_scriptclassic.mk delete mode 100644 repos/libports/lib/import/import-qt5_sql.mk delete mode 100644 repos/libports/lib/import/import-qt5_svg.mk delete mode 100644 repos/libports/lib/import/import-qt5_test.mk delete mode 100644 repos/libports/lib/import/import-qt5_ui_tools.mk delete mode 100644 repos/libports/lib/import/import-qt5_virtualkeyboard.mk delete mode 100644 repos/libports/lib/import/import-qt5_webcore.mk delete mode 100644 repos/libports/lib/import/import-qt5_webkit.mk delete mode 100644 repos/libports/lib/import/import-qt5_webkitwidgets.mk delete mode 100644 repos/libports/lib/import/import-qt5_widgets.mk delete mode 100644 repos/libports/lib/import/import-qt5_wtf.mk delete mode 100644 repos/libports/lib/import/import-qt5_xml.mk create mode 100644 repos/libports/lib/mk/libQt5Core.mk create mode 100644 repos/libports/lib/mk/libQt5Gui.mk create mode 100644 repos/libports/lib/mk/libQt5Network.mk create mode 100644 repos/libports/lib/mk/libQt5PrintSupport.mk create mode 100644 repos/libports/lib/mk/libQt5Qml.mk create mode 100644 repos/libports/lib/mk/libQt5Quick.mk create mode 100644 repos/libports/lib/mk/libQt5QuickWidgets.mk create mode 100644 repos/libports/lib/mk/libQt5Sql.mk create mode 100644 repos/libports/lib/mk/libQt5Svg.mk create mode 100644 repos/libports/lib/mk/libQt5Test.mk create mode 100644 repos/libports/lib/mk/libQt5VirtualKeyboard.mk create mode 100644 repos/libports/lib/mk/libQt5Widgets.mk create mode 100644 repos/libports/lib/mk/libqgenode.mk create mode 100644 repos/libports/lib/mk/libqgenodeviewwidget.mk create mode 100644 repos/libports/lib/mk/libqpluginwidget.mk delete mode 100644 repos/libports/lib/mk/qt5.inc delete mode 100644 repos/libports/lib/mk/qt5_angle.inc delete mode 100644 repos/libports/lib/mk/qt5_angle_generated.inc create mode 100644 repos/libports/lib/mk/qt5_base.mk delete mode 100644 repos/libports/lib/mk/qt5_core.mk delete mode 100644 repos/libports/lib/mk/qt5_core_generated.inc create mode 100644 repos/libports/lib/mk/qt5_declarative.mk delete mode 100644 repos/libports/lib/mk/qt5_gui.mk delete mode 100644 repos/libports/lib/mk/qt5_gui_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_jscore.inc delete mode 100644 repos/libports/lib/mk/qt5_jscore_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_network.mk delete mode 100644 repos/libports/lib/mk/qt5_network_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_opengl.mk delete mode 100644 repos/libports/lib/mk/qt5_opengl_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_pcre2.mk delete mode 100644 repos/libports/lib/mk/qt5_pcre2_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_printsupport.mk delete mode 100644 repos/libports/lib/mk/qt5_printsupport_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_qgenodeviewwidget.mk delete mode 100644 repos/libports/lib/mk/qt5_qjpeg.mk delete mode 100644 repos/libports/lib/mk/qt5_qml.mk delete mode 100644 repos/libports/lib/mk/qt5_qml_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_qmlfolderlistmodelplugin.mk delete mode 100644 repos/libports/lib/mk/qt5_qmlfolderlistmodelplugin_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_qpa_genode.mk delete mode 100644 repos/libports/lib/mk/qt5_qpluginwidget.mk delete mode 100644 repos/libports/lib/mk/qt5_qquicklayoutsplugin.mk delete mode 100644 repos/libports/lib/mk/qt5_qquicklayoutsplugin_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_qtquick2plugin.mk delete mode 100644 repos/libports/lib/mk/qt5_qtquick2plugin_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_qtquickcontrols2plugin.mk delete mode 100644 repos/libports/lib/mk/qt5_qtquickcontrols2plugin_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_qtquicktemplates2plugin.mk delete mode 100644 repos/libports/lib/mk/qt5_qtquicktemplates2plugin_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_qtquickvirtualkeyboardplugin.mk delete mode 100644 repos/libports/lib/mk/qt5_qtquickvirtualkeyboardplugin_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_qtquickvirtualkeyboardsettingsplugin.mk delete mode 100644 repos/libports/lib/mk/qt5_qtquickvirtualkeyboardsettingsplugin_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_qtquickvirtualkeyboardstylesplugin.mk delete mode 100644 repos/libports/lib/mk/qt5_qtquickvirtualkeyboardstylesplugin_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_qtvirtualkeyboardplugin.mk delete mode 100644 repos/libports/lib/mk/qt5_qtvirtualkeyboardplugin_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_quick.mk delete mode 100644 repos/libports/lib/mk/qt5_quick_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_quickcontrols2_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_quicktemplates2.mk delete mode 100644 repos/libports/lib/mk/qt5_quicktemplates2_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_scriptclassic.mk delete mode 100644 repos/libports/lib/mk/qt5_scriptclassic_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_sql.mk delete mode 100644 repos/libports/lib/mk/qt5_sql_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_svg_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_test.mk delete mode 100644 repos/libports/lib/mk/qt5_test_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_ui_tools.mk delete mode 100644 repos/libports/lib/mk/qt5_ui_tools_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_virtualkeyboard_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_webcore.inc delete mode 100644 repos/libports/lib/mk/qt5_webcore_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_webkit.inc delete mode 100644 repos/libports/lib/mk/qt5_webkit_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_webkitwidgets.inc delete mode 100644 repos/libports/lib/mk/qt5_webkitwidgets_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_widgets.mk delete mode 100644 repos/libports/lib/mk/qt5_widgets_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_windowplugin.mk delete mode 100644 repos/libports/lib/mk/qt5_windowplugin_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_wtf.inc delete mode 100644 repos/libports/lib/mk/qt5_wtf_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_xml.mk delete mode 100644 repos/libports/lib/mk/qt5_xml_generated.inc delete mode 100644 repos/libports/lib/mk/spec/32bit/qt5_angle.mk delete mode 100644 repos/libports/lib/mk/spec/32bit/qt5_jscore.mk delete mode 100644 repos/libports/lib/mk/spec/32bit/qt5_webcore.mk delete mode 100644 repos/libports/lib/mk/spec/32bit/qt5_webkit.mk delete mode 100644 repos/libports/lib/mk/spec/32bit/qt5_webkitwidgets.mk delete mode 100644 repos/libports/lib/mk/spec/32bit/qt5_wtf.mk delete mode 100644 repos/libports/lib/mk/spec/x86_64/qt5_angle.mk delete mode 100644 repos/libports/lib/mk/spec/x86_64/qt5_jscore.mk delete mode 100644 repos/libports/lib/mk/spec/x86_64/qt5_webcore.mk delete mode 100644 repos/libports/lib/mk/spec/x86_64/qt5_webkit.mk delete mode 100644 repos/libports/lib/mk/spec/x86_64/qt5_webkitwidgets.mk delete mode 100644 repos/libports/lib/mk/spec/x86_64/qt5_wtf.mk rename repos/libports/lib/symbols/{qt5_qgenodeviewwidget => libqgenodeviewwidget} (50%) create mode 100644 repos/libports/lib/symbols/libqpluginwidget delete mode 100644 repos/libports/lib/symbols/qt5_qpa_genode delete mode 100644 repos/libports/lib/symbols/qt5_qpluginwidget create mode 100644 repos/libports/recipes/api/libqgenodeviewwidget/content.mk create mode 100644 repos/libports/recipes/api/libqgenodeviewwidget/hash create mode 100644 repos/libports/recipes/api/libqpluginwidget/content.mk create mode 100644 repos/libports/recipes/api/libqpluginwidget/hash create mode 100644 repos/libports/recipes/api/qt5/content.mk create mode 100644 repos/libports/recipes/api/qt5/hash delete mode 100644 repos/libports/recipes/api/qt5_core/content.mk delete mode 100644 repos/libports/recipes/api/qt5_core/hash delete mode 100644 repos/libports/recipes/api/qt5_gui/content.mk delete mode 100644 repos/libports/recipes/api/qt5_gui/hash delete mode 100644 repos/libports/recipes/api/qt5_network/content.mk delete mode 100644 repos/libports/recipes/api/qt5_network/hash delete mode 100644 repos/libports/recipes/api/qt5_opengl/content.mk delete mode 100644 repos/libports/recipes/api/qt5_opengl/hash delete mode 100644 repos/libports/recipes/api/qt5_printsupport/content.mk delete mode 100644 repos/libports/recipes/api/qt5_printsupport/hash delete mode 100644 repos/libports/recipes/api/qt5_qgenodeviewwidget/content.mk delete mode 100644 repos/libports/recipes/api/qt5_qgenodeviewwidget/hash delete mode 100644 repos/libports/recipes/api/qt5_qjpeg/content.mk delete mode 100644 repos/libports/recipes/api/qt5_qjpeg/hash delete mode 100644 repos/libports/recipes/api/qt5_qml/content.mk delete mode 100644 repos/libports/recipes/api/qt5_qml/hash delete mode 100644 repos/libports/recipes/api/qt5_qpa_genode/content.mk delete mode 100644 repos/libports/recipes/api/qt5_qpa_genode/hash delete mode 100644 repos/libports/recipes/api/qt5_qpluginwidget/content.mk delete mode 100644 repos/libports/recipes/api/qt5_qpluginwidget/hash delete mode 100644 repos/libports/recipes/api/qt5_quick/content.mk delete mode 100644 repos/libports/recipes/api/qt5_quick/hash delete mode 100644 repos/libports/recipes/api/qt5_quickcontrols2/content.mk delete mode 100644 repos/libports/recipes/api/qt5_quickcontrols2/hash delete mode 100644 repos/libports/recipes/api/qt5_quicktemplates2/content.mk delete mode 100644 repos/libports/recipes/api/qt5_quicktemplates2/hash delete mode 100644 repos/libports/recipes/api/qt5_scriptclassic/content.mk delete mode 100644 repos/libports/recipes/api/qt5_scriptclassic/hash delete mode 100644 repos/libports/recipes/api/qt5_sql/content.mk delete mode 100644 repos/libports/recipes/api/qt5_sql/hash delete mode 100644 repos/libports/recipes/api/qt5_svg/content.mk delete mode 100644 repos/libports/recipes/api/qt5_svg/hash delete mode 100644 repos/libports/recipes/api/qt5_test/content.mk delete mode 100644 repos/libports/recipes/api/qt5_test/hash delete mode 100644 repos/libports/recipes/api/qt5_ui_tools/content.mk delete mode 100644 repos/libports/recipes/api/qt5_ui_tools/hash delete mode 100644 repos/libports/recipes/api/qt5_virtualkeyboard/content.mk delete mode 100644 repos/libports/recipes/api/qt5_virtualkeyboard/hash delete mode 100644 repos/libports/recipes/api/qt5_webkit/content.mk delete mode 100644 repos/libports/recipes/api/qt5_webkit/hash delete mode 100644 repos/libports/recipes/api/qt5_widgets/content.mk delete mode 100644 repos/libports/recipes/api/qt5_widgets/hash delete mode 100644 repos/libports/recipes/api/qt5_xml/content.mk delete mode 100644 repos/libports/recipes/api/qt5_xml/hash delete mode 100644 repos/libports/recipes/raw/qt5_qt_labs_folderlistmodel/content.mk delete mode 100644 repos/libports/recipes/raw/qt5_qt_labs_folderlistmodel/hash delete mode 100644 repos/libports/recipes/raw/qt5_qtquick2/content.mk delete mode 100644 repos/libports/recipes/raw/qt5_qtquick2/hash delete mode 100644 repos/libports/recipes/raw/qt5_qtquick_controls2/content.mk delete mode 100644 repos/libports/recipes/raw/qt5_qtquick_controls2/hash delete mode 100644 repos/libports/recipes/raw/qt5_qtquick_layouts/content.mk delete mode 100644 repos/libports/recipes/raw/qt5_qtquick_layouts/hash delete mode 100644 repos/libports/recipes/raw/qt5_qtquick_templates2/content.mk delete mode 100644 repos/libports/recipes/raw/qt5_qtquick_templates2/hash delete mode 100644 repos/libports/recipes/raw/qt5_qtquick_virtualkeyboard/content.mk delete mode 100644 repos/libports/recipes/raw/qt5_qtquick_virtualkeyboard/hash delete mode 100644 repos/libports/recipes/raw/qt5_qtquick_window/content.mk delete mode 100644 repos/libports/recipes/raw/qt5_qtquick_window/hash create mode 100644 repos/libports/recipes/src/libqgenodeviewwidget/api create mode 100644 repos/libports/recipes/src/libqgenodeviewwidget/content.mk create mode 100644 repos/libports/recipes/src/libqgenodeviewwidget/hash rename repos/libports/recipes/src/{qt5_qgenodeviewwidget => libqgenodeviewwidget}/used_apis (63%) create mode 100644 repos/libports/recipes/src/libqpluginwidget/api create mode 100644 repos/libports/recipes/src/libqpluginwidget/content.mk create mode 100644 repos/libports/recipes/src/libqpluginwidget/hash rename repos/libports/recipes/src/{qt5_qpluginwidget => libqpluginwidget}/used_apis (56%) create mode 100644 repos/libports/recipes/src/qt5_base/api create mode 100644 repos/libports/recipes/src/qt5_base/content.mk create mode 100644 repos/libports/recipes/src/qt5_base/hash rename repos/libports/recipes/src/{qt5_qpa_genode => qt5_base}/used_apis (72%) delete mode 100644 repos/libports/recipes/src/qt5_core/api delete mode 100644 repos/libports/recipes/src/qt5_core/content.mk delete mode 100644 repos/libports/recipes/src/qt5_core/hash create mode 100644 repos/libports/recipes/src/qt5_declarative/api create mode 100644 repos/libports/recipes/src/qt5_declarative/content.mk create mode 100644 repos/libports/recipes/src/qt5_declarative/hash rename repos/libports/recipes/src/{qt5_core => qt5_declarative}/used_apis (53%) delete mode 100644 repos/libports/recipes/src/qt5_gui/api delete mode 100644 repos/libports/recipes/src/qt5_gui/content.mk delete mode 100644 repos/libports/recipes/src/qt5_gui/hash delete mode 100644 repos/libports/recipes/src/qt5_gui/used_apis delete mode 100644 repos/libports/recipes/src/qt5_network/api delete mode 100644 repos/libports/recipes/src/qt5_network/content.mk delete mode 100644 repos/libports/recipes/src/qt5_network/hash delete mode 100644 repos/libports/recipes/src/qt5_network/used_apis delete mode 100644 repos/libports/recipes/src/qt5_opengl/api delete mode 100644 repos/libports/recipes/src/qt5_opengl/content.mk delete mode 100644 repos/libports/recipes/src/qt5_opengl/hash delete mode 100644 repos/libports/recipes/src/qt5_opengl/used_apis delete mode 100644 repos/libports/recipes/src/qt5_printsupport/api delete mode 100644 repos/libports/recipes/src/qt5_printsupport/content.mk delete mode 100644 repos/libports/recipes/src/qt5_printsupport/hash delete mode 100644 repos/libports/recipes/src/qt5_printsupport/used_apis delete mode 100644 repos/libports/recipes/src/qt5_qgenodeviewwidget/api delete mode 100644 repos/libports/recipes/src/qt5_qgenodeviewwidget/content.mk delete mode 100644 repos/libports/recipes/src/qt5_qgenodeviewwidget/hash delete mode 100644 repos/libports/recipes/src/qt5_qjpeg/api delete mode 100644 repos/libports/recipes/src/qt5_qjpeg/content.mk delete mode 100644 repos/libports/recipes/src/qt5_qjpeg/hash delete mode 100644 repos/libports/recipes/src/qt5_qjpeg/used_apis delete mode 100644 repos/libports/recipes/src/qt5_qml/api delete mode 100644 repos/libports/recipes/src/qt5_qml/content.mk delete mode 100644 repos/libports/recipes/src/qt5_qml/hash delete mode 100644 repos/libports/recipes/src/qt5_qml/used_apis delete mode 100644 repos/libports/recipes/src/qt5_qpa_genode/api delete mode 100644 repos/libports/recipes/src/qt5_qpa_genode/content.mk delete mode 100644 repos/libports/recipes/src/qt5_qpa_genode/hash delete mode 100644 repos/libports/recipes/src/qt5_qpluginwidget/api delete mode 100644 repos/libports/recipes/src/qt5_qpluginwidget/content.mk delete mode 100644 repos/libports/recipes/src/qt5_qpluginwidget/hash delete mode 100644 repos/libports/recipes/src/qt5_qt_labs_folderlistmodel/content.mk delete mode 100644 repos/libports/recipes/src/qt5_qt_labs_folderlistmodel/hash delete mode 100644 repos/libports/recipes/src/qt5_qt_labs_folderlistmodel/used_apis delete mode 100644 repos/libports/recipes/src/qt5_qtquick2/content.mk delete mode 100644 repos/libports/recipes/src/qt5_qtquick2/hash delete mode 100644 repos/libports/recipes/src/qt5_qtquick2/used_apis delete mode 100644 repos/libports/recipes/src/qt5_qtquick_controls2/content.mk delete mode 100644 repos/libports/recipes/src/qt5_qtquick_controls2/hash delete mode 100644 repos/libports/recipes/src/qt5_qtquick_controls2/used_apis delete mode 100644 repos/libports/recipes/src/qt5_qtquick_layouts/content.mk delete mode 100644 repos/libports/recipes/src/qt5_qtquick_layouts/hash delete mode 100644 repos/libports/recipes/src/qt5_qtquick_layouts/used_apis delete mode 100644 repos/libports/recipes/src/qt5_qtquick_templates2/content.mk delete mode 100644 repos/libports/recipes/src/qt5_qtquick_templates2/hash delete mode 100644 repos/libports/recipes/src/qt5_qtquick_templates2/used_apis delete mode 100644 repos/libports/recipes/src/qt5_qtquick_virtualkeyboard/content.mk delete mode 100644 repos/libports/recipes/src/qt5_qtquick_virtualkeyboard/hash delete mode 100644 repos/libports/recipes/src/qt5_qtquick_virtualkeyboard/used_apis delete mode 100644 repos/libports/recipes/src/qt5_qtquick_window/content.mk delete mode 100644 repos/libports/recipes/src/qt5_qtquick_window/hash delete mode 100644 repos/libports/recipes/src/qt5_qtquick_window/used_apis delete mode 100644 repos/libports/recipes/src/qt5_quick/api delete mode 100644 repos/libports/recipes/src/qt5_quick/content.mk delete mode 100644 repos/libports/recipes/src/qt5_quick/hash delete mode 100644 repos/libports/recipes/src/qt5_quick/used_apis delete mode 100644 repos/libports/recipes/src/qt5_quicktemplates2/api delete mode 100644 repos/libports/recipes/src/qt5_quicktemplates2/content.mk delete mode 100644 repos/libports/recipes/src/qt5_quicktemplates2/hash delete mode 100644 repos/libports/recipes/src/qt5_quicktemplates2/used_apis delete mode 100644 repos/libports/recipes/src/qt5_scriptclassic/api delete mode 100644 repos/libports/recipes/src/qt5_scriptclassic/content.mk delete mode 100644 repos/libports/recipes/src/qt5_scriptclassic/hash delete mode 100644 repos/libports/recipes/src/qt5_scriptclassic/used_apis delete mode 100644 repos/libports/recipes/src/qt5_sql/api delete mode 100644 repos/libports/recipes/src/qt5_sql/content.mk delete mode 100644 repos/libports/recipes/src/qt5_sql/hash delete mode 100644 repos/libports/recipes/src/qt5_sql/used_apis delete mode 100644 repos/libports/recipes/src/qt5_test/api delete mode 100644 repos/libports/recipes/src/qt5_test/content.mk delete mode 100644 repos/libports/recipes/src/qt5_test/hash delete mode 100644 repos/libports/recipes/src/qt5_test/used_apis delete mode 100644 repos/libports/recipes/src/qt5_ui_tools/api delete mode 100644 repos/libports/recipes/src/qt5_ui_tools/content.mk delete mode 100644 repos/libports/recipes/src/qt5_ui_tools/hash delete mode 100644 repos/libports/recipes/src/qt5_ui_tools/used_apis delete mode 100644 repos/libports/recipes/src/qt5_webkit/api delete mode 100644 repos/libports/recipes/src/qt5_webkit/content.mk delete mode 100644 repos/libports/recipes/src/qt5_webkit/hash delete mode 100644 repos/libports/recipes/src/qt5_webkit/used_apis delete mode 100644 repos/libports/recipes/src/qt5_widgets/api delete mode 100644 repos/libports/recipes/src/qt5_widgets/content.mk delete mode 100644 repos/libports/recipes/src/qt5_widgets/hash delete mode 100644 repos/libports/recipes/src/qt5_widgets/used_apis delete mode 100644 repos/libports/recipes/src/qt5_xml/api delete mode 100644 repos/libports/recipes/src/qt5_xml/content.mk delete mode 100644 repos/libports/recipes/src/qt5_xml/hash delete mode 100644 repos/libports/recipes/src/qt5_xml/used_apis delete mode 100644 repos/libports/run/qt5_drivers.inc delete mode 100644 repos/libports/src/app/qt5/tmpl/target.mk.example delete mode 100644 repos/libports/src/app/qt5/tmpl/target_defaults.inc delete mode 100644 repos/libports/src/app/qt5/tmpl/target_final.inc rename repos/libports/src/lib/{qt5 => }/qgenodeviewwidget/qgenodeviewwidget.cpp (95%) create mode 100644 repos/libports/src/lib/qgenodeviewwidget/qgenodeviewwidget.json create mode 100644 repos/libports/src/lib/qgenodeviewwidget/qgenodeviewwidget.pro rename repos/libports/src/lib/{qt5 => }/qpluginwidget/qpluginwidget.cpp (98%) create mode 100644 repos/libports/src/lib/qpluginwidget/qpluginwidget.json create mode 100644 repos/libports/src/lib/qpluginwidget/qpluginwidget.pro delete mode 100644 repos/libports/src/lib/qt5/libc_dummies.cc delete mode 100644 repos/libports/src/lib/qt5/patches/example_virtualkeyboard.patch delete mode 100644 repos/libports/src/lib/qt5/patches/header_generation.patch delete mode 100644 repos/libports/src/lib/qt5/patches/host_tools.patch delete mode 100644 repos/libports/src/lib/qt5/patches/qtbase_configuration.patch delete mode 100644 repos/libports/src/lib/qt5/patches/qtbase_fixes.patch delete mode 100644 repos/libports/src/lib/qt5/patches/qtbase_generated.patch delete mode 100644 repos/libports/src/lib/qt5/patches/qtbase_genode.patch delete mode 100644 repos/libports/src/lib/qt5/patches/qtbase_genode_openglwindow_example.patch delete mode 100644 repos/libports/src/lib/qt5/patches/qtbase_genode_qtscriptclassic.patch delete mode 100644 repos/libports/src/lib/qt5/patches/qtbase_genode_textedit_example.patch delete mode 100644 repos/libports/src/lib/qt5/patches/qtbase_qwindow_title.patch delete mode 100644 repos/libports/src/lib/qt5/patches/qtdeclarative_configuration.patch delete mode 100644 repos/libports/src/lib/qt5/patches/qtdeclarative_generated.patch delete mode 100644 repos/libports/src/lib/qt5/patches/qtdeclarative_genode.patch delete mode 100644 repos/libports/src/lib/qt5/patches/qtquickcontrols2_generated.patch delete mode 100644 repos/libports/src/lib/qt5/patches/qtscriptclassic_qt5.patch delete mode 100644 repos/libports/src/lib/qt5/patches/qtscriptclassic_qt5_7.patch delete mode 100644 repos/libports/src/lib/qt5/patches/qtsvg_generated.patch delete mode 100644 repos/libports/src/lib/qt5/patches/qttools_configuration.patch delete mode 100644 repos/libports/src/lib/qt5/patches/qttools_generated.patch delete mode 100644 repos/libports/src/lib/qt5/patches/qtvirtualkeyboard_configuration.patch delete mode 100644 repos/libports/src/lib/qt5/patches/qtvirtualkeyboard_generated.patch delete mode 100644 repos/libports/src/lib/qt5/patches/qtwebkit_configuration.patch delete mode 100644 repos/libports/src/lib/qt5/patches/qtwebkit_fixes.patch delete mode 100644 repos/libports/src/lib/qt5/patches/qtwebkit_generated.patch delete mode 100644 repos/libports/src/lib/qt5/patches/qtwebkit_genode.patch delete mode 100644 repos/libports/src/lib/qt5/patches/series delete mode 100644 repos/libports/src/lib/qt5/patches/series.qtscriptclassic delete mode 100644 repos/libports/src/lib/qt5/qtbase/src/plugins/imageformats/jpeg/import_plugin.cc delete mode 100644 repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/genode.json delete mode 100644 repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/main.cpp delete mode 100644 repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeclipboard.cpp delete mode 100644 repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeclipboard.h delete mode 100644 repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodecursor.cpp delete mode 100644 repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodecursor.h delete mode 100644 repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeglcontext.cpp delete mode 100644 repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeglcontext.h delete mode 100644 repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeintegration.cpp delete mode 100644 repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeintegration.h delete mode 100644 repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeintegrationplugin.h delete mode 100644 repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeplatformwindow.cpp delete mode 100644 repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodescreen.h delete mode 100644 repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodewindowsurface.cpp delete mode 100644 repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodewindowsurface.h delete mode 100644 repos/libports/src/lib/qt5/qtdeclarative/src/imports/folderlistmodel/target.mk delete mode 100644 repos/libports/src/lib/qt5/qtdeclarative/src/imports/layouts/target.mk delete mode 100644 repos/libports/src/lib/qt5/qtdeclarative/src/imports/qtquick2/target.mk delete mode 100644 repos/libports/src/lib/qt5/qtvirtualkeyboard/src/imports/qtvirtualkeyboard/import/target.mk delete mode 100644 repos/libports/src/lib/qt5/qtvirtualkeyboard/src/imports/qtvirtualkeyboard/settings/target.mk delete mode 100644 repos/libports/src/lib/qt5/qtvirtualkeyboard/src/imports/qtvirtualkeyboard/styles/target.mk delete mode 100644 repos/libports/src/lib/qt5/qtvirtualkeyboard/src/imports/qtvirtualkeyboard/target.mk delete mode 100644 repos/libports/src/lib/qt5/qtwebkit/Source/WebCore/idl_files delete mode 100644 repos/libports/src/lib/qt5/tools/lib_mk_file_generator/README delete mode 100755 repos/libports/src/lib/qt5/tools/lib_mk_file_generator/create_generated_inc delete mode 100755 repos/libports/src/lib/qt5/tools/lib_mk_file_generator/create_generated_incs delete mode 100755 repos/libports/src/lib/qt5/tools/lib_mk_file_generator/genode_qt5_configure rename repos/libports/src/lib/{qt5 => qt5_component}/qt_component.cc (71%) delete mode 100644 repos/ports/ports/arora.hash delete mode 100644 repos/ports/ports/arora.port delete mode 100644 repos/ports/recipes/pkg/arora/README delete mode 100644 repos/ports/recipes/pkg/arora/archives delete mode 100644 repos/ports/recipes/pkg/arora/hash delete mode 100644 repos/ports/recipes/pkg/arora/runtime delete mode 100644 repos/ports/recipes/raw/arora/content.mk delete mode 100644 repos/ports/recipes/raw/arora/hash delete mode 100644 repos/ports/recipes/raw/arora/init.config delete mode 100644 repos/ports/recipes/src/arora/content.mk delete mode 100644 repos/ports/recipes/src/arora/hash delete mode 100644 repos/ports/recipes/src/arora/used_apis delete mode 100644 repos/ports/run/arora.run delete mode 100644 repos/ports/src/app/arora/arora.pro delete mode 100644 repos/ports/src/app/arora/arora_component.cc delete mode 100644 repos/ports/src/app/arora/demo/bg.png delete mode 100644 repos/ports/src/app/arora/demo/bg_content.png delete mode 100644 repos/ports/src/app/arora/demo/bg_top.png delete mode 100644 repos/ports/src/app/arora/demo/busybox.html delete mode 100644 repos/ports/src/app/arora/demo/demo.html delete mode 100644 repos/ports/src/app/arora/demo/http_block.png delete mode 100644 repos/ports/src/app/arora/demo/intro.html delete mode 100644 repos/ports/src/app/arora/demo/nitpicker.html delete mode 100644 repos/ports/src/app/arora/demo/nitpicker_plugin.png delete mode 100644 repos/ports/src/app/arora/demo/nitpicker_plugin/config.plugin delete mode 100644 repos/ports/src/app/arora/demo/tetrix.html delete mode 100644 repos/ports/src/app/arora/demo/tinycore.html delete mode 100644 repos/ports/src/app/arora/demo/title_bg.png delete mode 100644 repos/ports/src/app/arora/demo_html.qrc delete mode 100644 repos/ports/src/app/arora/patches/arora_bookmarks.patch delete mode 100644 repos/ports/src/app/arora/patches/arora_disable_adblock.patch delete mode 100644 repos/ports/src/app/arora/patches/arora_disable_qprocess.patch delete mode 100644 repos/ports/src/app/arora/patches/arora_disable_ssl_messageboxes.patch delete mode 100644 repos/ports/src/app/arora/patches/arora_genode.patch delete mode 100644 repos/ports/src/app/arora/patches/arora_move_window.patch delete mode 100644 repos/ports/src/app/arora/patches/arora_nitpicker_plugin.patch delete mode 100644 repos/ports/src/app/arora/patches/arora_qt5_cpp.patch delete mode 100644 repos/ports/src/app/arora/patches/arora_startpage.patch delete mode 100644 repos/ports/src/app/arora/patches/series delete mode 100644 repos/ports/src/app/arora/qwebplugins/nitpicker/nitpicker.pri delete mode 100644 repos/ports/src/app/arora/qwebplugins/nitpicker/nitpickerplugin.cpp delete mode 100644 repos/ports/src/app/arora/qwebplugins/nitpicker/nitpickerplugin.h delete mode 100644 repos/ports/src/app/arora/qwebplugins/nitpicker/nitpickerpluginwidget.cpp delete mode 100644 repos/ports/src/app/arora/qwebplugins/nitpicker/nitpickerpluginwidget.h delete mode 100644 repos/ports/src/app/arora/target.mk diff --git a/repos/gems/recipes/src/mixer_gui_qt/content.mk b/repos/gems/recipes/src/mixer_gui_qt/content.mk index b71e014cd0..9dee6e325e 100644 --- a/repos/gems/recipes/src/mixer_gui_qt/content.mk +++ b/repos/gems/recipes/src/mixer_gui_qt/content.mk @@ -5,15 +5,6 @@ content: $(MIRROR_FROM_REP_DIR) LICENSE $(MIRROR_FROM_REP_DIR): $(mirror_from_rep_dir) -MIRROR_FROM_LIBPORTS := src/app/qt5/tmpl/target_defaults.inc \ - src/app/qt5/tmpl/target_final.inc - -content: $(MIRROR_FROM_LIBPORTS) - -$(MIRROR_FROM_LIBPORTS): - mkdir -p $(dir $@) - cp -r $(GENODE_DIR)/repos/libports/$@ $(dir $@) - MIRROR_FROM_OS := include/mixer content: $(MIRROR_FROM_OS) diff --git a/repos/gems/recipes/src/mixer_gui_qt/used_apis b/repos/gems/recipes/src/mixer_gui_qt/used_apis index bb8ce485eb..837dbe51bf 100644 --- a/repos/gems/recipes/src/mixer_gui_qt/used_apis +++ b/repos/gems/recipes/src/mixer_gui_qt/used_apis @@ -1,12 +1,10 @@ base libc +mesa os qoost -qt5_core -qt5_gui -qt5_qjpeg -qt5_qpa_genode -qt5_widgets +qt5 +qt5_component report_session stdcxx vfs diff --git a/repos/gems/recipes/src/test-tiled_wm/content.mk b/repos/gems/recipes/src/test-tiled_wm/content.mk index 3bf4ad64d8..3e593bfa9f 100644 --- a/repos/gems/recipes/src/test-tiled_wm/content.mk +++ b/repos/gems/recipes/src/test-tiled_wm/content.mk @@ -5,14 +5,5 @@ content: $(MIRROR_FROM_REP_DIR) LICENSE $(MIRROR_FROM_REP_DIR): $(mirror_from_rep_dir) -MIRROR_FROM_LIBPORTS := src/app/qt5/tmpl/target_defaults.inc \ - src/app/qt5/tmpl/target_final.inc - -content: $(MIRROR_FROM_LIBPORTS) - -$(MIRROR_FROM_LIBPORTS): - mkdir -p $(dir $@) - cp -r $(GENODE_DIR)/repos/libports/$@ $(dir $@) - LICENSE: cp $(GENODE_DIR)/LICENSE $@ diff --git a/repos/gems/recipes/src/test-tiled_wm/used_apis b/repos/gems/recipes/src/test-tiled_wm/used_apis index 97a6f87570..fa79b3c030 100644 --- a/repos/gems/recipes/src/test-tiled_wm/used_apis +++ b/repos/gems/recipes/src/test-tiled_wm/used_apis @@ -1,12 +1,10 @@ base libc +mesa os qoost -qt5_core -qt5_gui -qt5_qjpeg -qt5_qpa_genode -qt5_widgets +qt5 +qt5_component report_session stdcxx timer_session diff --git a/repos/gems/run/mixer_gui_qt_test.run b/repos/gems/run/mixer_gui_qt_test.run index 019a7d452e..44b0219717 100644 --- a/repos/gems/run/mixer_gui_qt_test.run +++ b/repos/gems/run/mixer_gui_qt_test.run @@ -1,16 +1,7 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc import_from_depot [depot_user]/src/dynamic_rom \ - [depot_user]/src/mixer_gui_qt \ - [depot_user]/src/qt5_widgets - -# -# Build -# - -append build_components [qt5_build_components feature] - -build $build_components + [depot_user]/src/mixer_gui_qt # # Generate config @@ -19,7 +10,7 @@ build $build_components append config { } -append config [qt5_parent_provides feature] +append config [qt5_parent_provides] append config { @@ -27,7 +18,7 @@ append config { } -append config [qt5_start_nodes feature] +append config [qt5_start_nodes] append config { @@ -75,6 +66,7 @@ append config { 2018-01-01 00:01 + @@ -94,7 +86,7 @@ install_config $config # Boot modules # -append boot_modules [qt5_boot_modules feature] +append boot_modules [qt5_boot_modules] build_boot_image $boot_modules diff --git a/repos/gems/run/tiled_wm.run b/repos/gems/run/tiled_wm.run index bc641343c0..95b94c7031 100644 --- a/repos/gems/run/tiled_wm.run +++ b/repos/gems/run/tiled_wm.run @@ -1,9 +1,7 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc import_from_depot [depot_user]/src/qt5_component \ - [depot_user]/src/qt5_printsupport \ [depot_user]/src/qt5_textedit \ - [depot_user]/src/qt5_widgets \ [depot_user]/src/dynamic_rom \ [depot_user]/src/test-tiled_wm @@ -43,12 +41,12 @@ proc qt5_decorator_config { } { append config { - } [qt5_parent_provides feature] { + } [qt5_parent_provides] { - } [qt5_start_nodes feature] { + } [qt5_start_nodes] { @@ -120,6 +118,7 @@ append config { + @@ -145,6 +144,7 @@ append config { + @@ -167,6 +167,7 @@ append config { + @@ -189,6 +190,7 @@ append config { + @@ -210,6 +212,7 @@ append config { + @@ -224,14 +227,11 @@ append config { install_config $config -append build_components [qt5_build_components feature] - # for debugging only #append build_components { app/window_layouter app/themed_decorator } +#build $build_components -build $build_components - -append boot_modules [qt5_boot_modules feature] +append boot_modules [qt5_boot_modules] # for debugging only #append boot_modules { window_layouter themed_decorator } diff --git a/repos/gems/src/app/mixer_gui_qt/main.cpp b/repos/gems/src/app/mixer_gui_qt/main.cpp index 19abd97967..f36b8c7e9d 100644 --- a/repos/gems/src/app/mixer_gui_qt/main.cpp +++ b/repos/gems/src/app/mixer_gui_qt/main.cpp @@ -4,6 +4,13 @@ * \date 2015-10-15 */ +/* + * Copyright (C) 2015-2020 Genode Labs GmbH + * + * This file is part of the Genode OS framework, which is distributed + * under the terms of the GNU Affero General Public License version 3. + */ + /* Genode includes */ #include #include @@ -15,6 +22,9 @@ #include #include +/* qt5_component includes */ +#include + /* application includes */ #include "main_window.h" @@ -89,13 +99,11 @@ static inline void load_stylesheet() } -extern void initialize_qt_gui(Genode::Env &); - void Libc::Component::construct(Libc::Env &env) { Libc::with_libc([&] { - initialize_qt_gui(env); + qpa_init(env); int argc = 1; char const *argv[] = { "mixer_gui_qt", 0 }; diff --git a/repos/gems/src/app/mixer_gui_qt/target.mk b/repos/gems/src/app/mixer_gui_qt/target.mk index 3cc8c754f1..f70cdff88d 100644 --- a/repos/gems/src/app/mixer_gui_qt/target.mk +++ b/repos/gems/src/app/mixer_gui_qt/target.mk @@ -1,9 +1,14 @@ -include $(call select_from_repositories,src/app/qt5/tmpl/target_defaults.inc) +QMAKE_PROJECT_FILE = $(PRG_DIR)/mixer_gui_qt.pro -include $(call select_from_repositories,src/app/qt5/tmpl/target_final.inc) +QMAKE_TARGET_BINARIES = mixer_gui_qt -main_window.o: main_window.moc +QT5_PORT_LIBS = libQt5Core libQt5Gui libQt5Widgets -LIBS += qoost qt5_gui qt5_widgets qt5_core libc base +LIBS = base libc libm mesa stdcxx qoost $(QT5_PORT_LIBS) -CC_CXX_WARN_STRICT = +include $(call select_from_repositories,lib/import/import-qt5_qmake.mk) + +QT5_GENODE_LIBS_APP += ld.lib.so +QT5_GENODE_LIBS_APP := $(filter-out qt5_component.lib.so,$(QT5_GENODE_LIBS_APP)) + +qmake_prepared.tag: qmake_root/lib/ld.lib.so diff --git a/repos/gems/src/test/tiled_wm/app/target.mk b/repos/gems/src/test/tiled_wm/app/target.mk index 37cbb47f32..dc1efc32de 100644 --- a/repos/gems/src/test/tiled_wm/app/target.mk +++ b/repos/gems/src/test/tiled_wm/app/target.mk @@ -1,3 +1,4 @@ -include $(PRG_DIR)/../target.inc +QMAKE_PROJECT_FILE = $(PRG_DIR)/app.pro +QMAKE_TARGET_BINARIES = test-tiled_wm-app -LIBS += base +include $(PRG_DIR)/../target.inc diff --git a/repos/gems/src/test/tiled_wm/overlay/target.mk b/repos/gems/src/test/tiled_wm/overlay/target.mk index 37cbb47f32..a967ebe17b 100644 --- a/repos/gems/src/test/tiled_wm/overlay/target.mk +++ b/repos/gems/src/test/tiled_wm/overlay/target.mk @@ -1,3 +1,4 @@ -include $(PRG_DIR)/../target.inc +QMAKE_PROJECT_FILE = $(PRG_DIR)/overlay.pro +QMAKE_TARGET_BINARIES = test-tiled_wm-overlay -LIBS += base +include $(PRG_DIR)/../target.inc diff --git a/repos/gems/src/test/tiled_wm/panel/target.mk b/repos/gems/src/test/tiled_wm/panel/target.mk index 68db2769a0..65c17170aa 100644 --- a/repos/gems/src/test/tiled_wm/panel/target.mk +++ b/repos/gems/src/test/tiled_wm/panel/target.mk @@ -1,5 +1,6 @@ +QMAKE_PROJECT_FILE = $(PRG_DIR)/panel.pro +QMAKE_TARGET_BINARIES = test-tiled_wm-panel + +qmake_prepared.tag: icon.h + include $(PRG_DIR)/../target.inc - -LIBS += base - -panel.o main.o: icon.h diff --git a/repos/gems/src/test/tiled_wm/target.inc b/repos/gems/src/test/tiled_wm/target.inc index 723db9f456..9f0fe2aebf 100644 --- a/repos/gems/src/test/tiled_wm/target.inc +++ b/repos/gems/src/test/tiled_wm/target.inc @@ -1,13 +1,16 @@ -include $(call select_from_repositories,src/app/qt5/tmpl/target_defaults.inc) +QT5_PORT_LIBS = libQt5Core libQt5Gui libQt5Widgets -include $(call select_from_repositories,src/app/qt5/tmpl/target_final.inc) +LIBS = base libc libm mesa stdcxx qoost $(QT5_PORT_LIBS) -CC_CXX_WARN_STRICT = +include $(call select_from_repositories,lib/import/import-qt5_qmake.mk) + +QT5_GENODE_LIBS_APP += ld.lib.so +QT5_GENODE_LIBS_APP := $(filter-out qt5_component.lib.so,$(QT5_GENODE_LIBS_APP)) + +qmake_prepared.tag: qmake_root/lib/ld.lib.so INC_DIR += $(PRG_DIR)/.. -LIBS += qoost - # # We need Qt headers in a local directory for MOC to work correctly # @@ -22,4 +25,3 @@ endif icon.h: $(ICON_H) $(VERBOSE)cp $(ICON_H) . - diff --git a/repos/gems/src/test/tiled_wm/util.h b/repos/gems/src/test/tiled_wm/util.h index 000b9dbf05..cc4e57e911 100644 --- a/repos/gems/src/test/tiled_wm/util.h +++ b/repos/gems/src/test/tiled_wm/util.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2018 Genode Labs GmbH + * Copyright (C) 2018-2020 Genode Labs GmbH * * This file is part of the Genode OS framework, which is distributed * under the terms of the GNU Affero General Public License version 3. @@ -33,6 +33,8 @@ /* Libc includes */ #include +/* qt5_component includes */ +#include typedef Genode::String<32> Name; @@ -75,11 +77,9 @@ class Genode_signal_proxy : public QObject, * Qt initialization */ -extern void initialize_qt_gui(Genode::Env &); - static inline QApplication & qt5_initialization(Libc::Env &env) { - initialize_qt_gui(env); + qpa_init(env); char const *argv[] = { "qt5_app", 0 }; int argc = sizeof(argv)/sizeof(*argv); diff --git a/repos/libports/include/qt5/qgenodeviewwidget/qgenodeviewwidget.h b/repos/libports/include/qgenodeviewwidget/qgenodeviewwidget.h similarity index 70% rename from repos/libports/include/qt5/qgenodeviewwidget/qgenodeviewwidget.h rename to repos/libports/include/qgenodeviewwidget/qgenodeviewwidget.h index d2a6b3704c..15f743c9ba 100644 --- a/repos/libports/include/qt5/qgenodeviewwidget/qgenodeviewwidget.h +++ b/repos/libports/include/qgenodeviewwidget/qgenodeviewwidget.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010-2017 Genode Labs GmbH + * Copyright (C) 2010-2020 Genode Labs GmbH * * This file is part of the Genode OS framework, which is distributed * under the terms of the GNU Affero General Public License version 3. @@ -15,9 +15,6 @@ #define QGENODEVIEWWIDGET_H #include -#if 0 -#include -#endif #include @@ -86,4 +83,31 @@ public: int buf_x, int buf_y, int w, int h); }; +class QGenodeViewWidgetInterface +{ + public: + virtual QWidget *createWidget(QWidget *parent = 0) = 0; +}; + + +Q_DECLARE_INTERFACE(QGenodeViewWidgetInterface, "org.genode.QGenodeViewWidgetInterface") + + +class QGenodeViewWidgetPlugin : public QObject, public QGenodeViewWidgetInterface +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.genode.QGenodeViewWidgetInterface" FILE "qgenodeviewwidget.json") + Q_INTERFACES(QGenodeViewWidgetInterface) + + public: + + explicit QGenodeViewWidgetPlugin(QObject *parent = 0) : QObject(parent) { } + + QWidget *createWidget(QWidget *parent = 0) + { + return new QGenodeViewWidget(parent); + } + +}; + #endif // QGENODEVIEWWIDGET_H diff --git a/repos/libports/include/qt5/qpluginwidget/qpluginwidget.h b/repos/libports/include/qpluginwidget/qpluginwidget.h similarity index 76% rename from repos/libports/include/qt5/qpluginwidget/qpluginwidget.h rename to repos/libports/include/qpluginwidget/qpluginwidget.h index 455540b0a0..01186ff026 100644 --- a/repos/libports/include/qt5/qpluginwidget/qpluginwidget.h +++ b/repos/libports/include/qpluginwidget/qpluginwidget.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010-2017 Genode Labs GmbH + * Copyright (C) 2010-2020 Genode Labs GmbH * * This file is part of the Genode OS framework, which is distributed * under the terms of the GNU Affero General Public License version 3. @@ -133,4 +133,37 @@ class QPluginWidget : public QEmbeddedViewWidget static void env(Libc::Env &env) { _env = &env; } }; + +class QPluginWidgetInterface +{ + public: + virtual void env(Libc::Env &env) = 0; + virtual QWidget *createWidget(QWidget *parent, QUrl plugin_url, QString &args, + int max_width = -1, int max_height = -1) = 0; +}; + + +Q_DECLARE_INTERFACE(QPluginWidgetInterface, "org.genode.QPluginWidgetInterface") + + +class QPluginWidgetPlugin : public QObject, public QPluginWidgetInterface +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.genode.QPluginWidgetInterface" FILE "qpluginwidget.json") + Q_INTERFACES(QPluginWidgetInterface) + + public: + + explicit QPluginWidgetPlugin(QObject *parent = 0) : QObject(parent) { } + + void env(Libc::Env &env) { QPluginWidget::env(env); } + + QWidget *createWidget(QWidget *parent, QUrl plugin_url, QString &args, + int max_width = -1, int max_height = -1) + { + return new QPluginWidget(parent, plugin_url, args, max_width, max_height); + } + +}; + #endif // QPLUGINWIDGET_H diff --git a/repos/libports/include/qt5/qpa_genode/qgenodeplatformwindow.h b/repos/libports/include/qt5/qpa_genode/qgenodeplatformwindow.h deleted file mode 100644 index 7a8047caf8..0000000000 --- a/repos/libports/include/qt5/qpa_genode/qgenodeplatformwindow.h +++ /dev/null @@ -1,214 +0,0 @@ -/* - * \brief QGenodePlatformWindow - * \author Christian Prochaska - * \author Christian Helmuth - * \date 2013-05-08 - */ - -/* - * Copyright (C) 2013-2019 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU Affero General Public License version 3. - */ - - -#ifndef _QGENODEPLATFORMWINDOW_H_ -#define _QGENODEPLATFORMWINDOW_H_ - -/* Genode includes */ -#include -#include - -/* EGL includes */ -#include - -/* Qt includes */ -#include -#include -#include - -/* Qoost includes */ -#include - -QT_BEGIN_NAMESPACE - -class QGenodePlatformWindow : public QObject, public QPlatformWindow -{ - Q_OBJECT - - private: - - Genode::Env &_env; - QString _gui_session_label; - static QStringList _gui_session_label_list; - Gui::Connection _gui_session; - Framebuffer::Session_client _framebuffer_session; - unsigned char *_framebuffer; - bool _framebuffer_changed; - bool _geometry_changed; - Framebuffer::Mode _current_mode; - Gui::Session::View_handle _view_handle; - Input::Session_client _input_session; - Genode::Attached_dataspace _ev_buf; - QPoint _mouse_position; - Qt::KeyboardModifiers _keyboard_modifiers; - Qt::MouseButtons _mouse_button_state; - QByteArray _title; - bool _resize_handle; - bool _decoration; - EGLSurface _egl_surface; - - QPoint _local_position() const - { - return QPoint(_mouse_position.x() - geometry().x(), - _mouse_position.y() - geometry().y()); - } - - - typedef Genode::Codepoint Codepoint; - - struct Mapped_key - { - enum Event { PRESSED, RELEASED, REPEAT }; - - Qt::Key key { Qt::Key_unknown }; - Codepoint codepoint { Codepoint::INVALID }; - }; - - QHash _pressed; - - Mapped_key _map_key(Input::Keycode, Codepoint, Mapped_key::Event); - void _key_event(Input::Keycode, Codepoint, Mapped_key::Event); - void _mouse_button_event(Input::Keycode, bool press); - - Genode::Io_signal_handler _input_signal_handler; - Genode::Io_signal_handler _mode_changed_signal_handler; - - QVector _touch_points { 16 }; - QTouchDevice *_touch_device; - QTouchDevice * _init_touch_device(); - - void _process_touch_events(QList const &events); - - Gui::Session::View_handle _create_view(); - void _adjust_and_set_geometry(const QRect &rect); - - QString _sanitize_label(QString label); - - /* - * Genode signals are handled as Qt signals to avoid blocking in the - * Genode signal handler, which could cause nested signal handler - * execution. - */ - - private Q_SLOTS: - - void _handle_input(); - void _handle_mode_changed(); - - Q_SIGNALS: - - void _input(); - void _mode_changed(); - - public: - - QGenodePlatformWindow(Genode::Env &env, QWindow *window, - int screen_width, int screen_height); - - ~QGenodePlatformWindow(); - - QSurfaceFormat format() const override; - - void setGeometry(const QRect &rect) override; - - QRect geometry() const override; - - QMargins frameMargins() const override; - - void setVisible(bool visible) override; - - void setWindowFlags(Qt::WindowFlags flags) override; - - void setWindowState(Qt::WindowStates state) override; - - WId winId() const override; - - void setParent(const QPlatformWindow *window) override; - - void setWindowTitle(const QString &title) override; - - void setWindowFilePath(const QString &title) override; - - void setWindowIcon(const QIcon &icon) override; - - void raise() override; - - void lower() override; - - bool isExposed() const override; - - bool isActive() const override; - - bool isEmbedded() const override; - - QPoint mapToGlobal(const QPoint &pos) const override; - - QPoint mapFromGlobal(const QPoint &pos) const override; - - void propagateSizeHints() override; - - void setOpacity(qreal level) override; - - void setMask(const QRegion ®ion) override; - - void requestActivateWindow() override; - - void handleContentOrientationChange(Qt::ScreenOrientation orientation) override; - - qreal devicePixelRatio() const override; - - bool setKeyboardGrabEnabled(bool grab) override; - - bool setMouseGrabEnabled(bool grab) override; - - bool setWindowModified(bool modified) override; - - bool windowEvent(QEvent *event) override; - - bool startSystemResize(const QPoint &pos, Qt::Corner corner) override; - - void setFrameStrutEventsEnabled(bool enabled) override; - - bool frameStrutEventsEnabled() const override; - - - /* for QGenodeWindowSurface */ - - unsigned char *framebuffer(); - - void refresh(int x, int y, int w, int h); - - - /* for QGenodeGLContext */ - - EGLSurface egl_surface() const; - - void egl_surface(EGLSurface egl_surface); - - - /* for QGenodeViewWidget */ - - Gui::Session_client &gui_session(); - Gui::View_capability view_cap() const; - - signals: - - void framebuffer_changed(); - -}; - -QT_END_NAMESPACE - -#endif /* _QGENODEPLATFORMWINDOW_H_ */ diff --git a/repos/libports/include/qt5_component/qpa_init.h b/repos/libports/include/qt5_component/qpa_init.h new file mode 100644 index 0000000000..0a41ca9fee --- /dev/null +++ b/repos/libports/include/qt5_component/qpa_init.h @@ -0,0 +1,59 @@ +/* + * \brief QPA plugin initialization + * \author Christian Prochaska + * \date 2020-06-28 + */ + +/* + * Copyright (C) 2020 Genode Labs GmbH + * + * This file is part of the Genode OS framework, which is distributed + * under the terms of the GNU Affero General Public License version 3. + */ + +#ifndef _INCLUDE__QPA_INIT_H_ +#define _INCLUDE__QPA_INIT_H_ + +/* Genode includes */ +#include + +/* libc includes */ +#include /* 'dlopen' */ +#include /* 'fprintf' */ +#include /* 'access' */ + +/** + * Initialize the QPA plugin + * + * When Qt loads the plugin again, it will get the same handle. + */ +static inline void qpa_init(Genode::Env &env) +{ + char const *qpa_plugin = "/qt/plugins/platforms/libqgenode.lib.so"; + + void *qpa_plugin_handle = nullptr; + + /* check existence with 'access()' first to avoid ld error messages */ + if (access(qpa_plugin, F_OK) == 0) + qpa_plugin_handle = dlopen(qpa_plugin, RTLD_LAZY); + + if (qpa_plugin_handle) { + + typedef void (*initialize_qpa_plugin_t)(Genode::Env &); + + initialize_qpa_plugin_t initialize_qpa_plugin = + (initialize_qpa_plugin_t) dlsym(qpa_plugin_handle, + "initialize_qpa_plugin"); + + if (!initialize_qpa_plugin) { + fprintf(stderr, "Could not find 'initialize_qpa_plugin' \ + function in QPA plugin\n"); + dlclose(qpa_plugin_handle); + exit(1); + } + + initialize_qpa_plugin(env); + } +} + +#endif /* _INCLUDE__QPA_INIT_H_ */ diff --git a/repos/libports/lib/import/import-qt5.inc b/repos/libports/lib/import/import-qt5.inc deleted file mode 100644 index 7fdcea4ad9..0000000000 --- a/repos/libports/lib/import/import-qt5.inc +++ /dev/null @@ -1,94 +0,0 @@ -# prevent import file to be included twice, for example via import-qt5_gui.mk -# and import-qt5_core.mk - -ifeq ($(QT5_IMPORTED),) -QT5_IMPORTED = true - -# hook for selectively skipping qt5 builds by the buildbot -ifneq ($(INHIBIT_QT5),) -REQUIRES += removal_of_INHIBIT_QT5_env_var -endif - -QT_VERSION := 5.13.0 - -# identify the qt5 repository by searching for a file that is unique for qt5 -QT5_REP_DIR := $(call select_from_repositories,lib/import/import-qt5.inc) -QT5_REP_DIR := $(realpath $(dir $(QT5_REP_DIR))../..) - -QT5_PORT_DIR := $(call select_from_ports,qt5) -QT5_CONTRIB_DIR := $(QT5_PORT_DIR)/src/lib/qt5/qt5 - -ifeq ($(CONTRIB_DIR),) -QT5_INC_DIR += $(call select_from_repositories,src/lib/qt5/qt5/qtbase/mkspecs/genode-g++) -else -QT5_INC_DIR += $(QT5_PORT_DIR)/include \ - $(QT5_CONTRIB_DIR)/qtbase/mkspecs/genode-g++ \ - $(QT5_REP_DIR)/include/qt5 -endif - -INC_DIR += $(QT5_INC_DIR) - -# extracted from qt.prf -QT_DEFINES += -DQT_STATICPLUGIN - -QT_DEFINES += -D__GENODE__ - -CC_OPT += $(QT_DEFINES) - -# handle moc-headers, resources and ui descriptions - -# -# Locations of moc, rcc, and uic binaries -# -QT5_HOST_TOOL_INSTALL_LOCATION ?= /usr/local/genode/qt5/19.08 -MOC = $(QT5_HOST_TOOL_INSTALL_LOCATION)/bin/moc -RCC = $(QT5_HOST_TOOL_INSTALL_LOCATION)/bin/rcc -UIC = $(QT5_HOST_TOOL_INSTALL_LOCATION)/bin/uic - -$(MOC) $(RCC) $(UIC): - $(error Error: could not find '$@'. The Qt5 host tools can be installed with the '/tool/tool_chain_qt5' script) - -# moc rules -moc_%.cpp: %.h $(MOC) - $(MSG_CONVERT)$@ - $(VERBOSE) $(MOC) $(QT_DEFINES) $(addprefix -I,$(QT5_INC_DIR)) $< -o $@ - -%.moc: %.cpp $(MOC) - $(MSG_CONVERT)$@ - $(VERBOSE) $(MOC) $(QT_DEFINES) $(addprefix -I,$(QT5_INC_DIR)) $< -o $@ - -# rcc rule -qrc_%.cpp: %.qrc $(RCC) - $(MSG_CONVERT)$@ - $(VERBOSE) $(RCC) -name $(basename $(notdir $<)) $< -o $@ - -# uic rule -ui_%.h: %.ui $(UIC) - $(MSG_CONVERT)$@ - $(VERBOSE) $(UIC) $< -o $@ - -# add include dirs for QT5-specific genode addons -INC_DIR += $(QT5_REP_DIR)/include/qt5/genode - -# -# add C++ include dirs and libs -# -# We cannot just extend the 'LIBS' variable here because 'import-*.mk' are -# included (in 'base/mk/lib.mk') by iterating through the elements of the -# 'LIBS' variable. Hence, we also need to manually import the stdcxx snippet. -# -LIBS += stdcxx -include $(call select_from_repositories,lib/import/import-stdcxx.mk) - -# set QT_ARCH definition according to the SPECS variable -ifneq ($(filter x86_32,$(SPECS)),) - QT_DEFINES += -DQT_ARCH_I386 -endif -ifneq ($(filter x86_64,$(SPECS)),) - QT_DEFINES += -DQT_ARCH_X86_64 -endif -ifneq ($(filter arm,$(SPECS)),) - QT_DEFINES += -DQT_ARCH_ARMV6 -endif - -endif diff --git a/repos/libports/lib/import/import-qt5_angle.mk b/repos/libports/lib/import/import-qt5_angle.mk deleted file mode 100644 index 5602c0bec7..0000000000 --- a/repos/libports/lib/import/import-qt5_angle.mk +++ /dev/null @@ -1,3 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) diff --git a/repos/libports/lib/import/import-qt5_core.mk b/repos/libports/lib/import/import-qt5_core.mk deleted file mode 100644 index 980e1bd06a..0000000000 --- a/repos/libports/lib/import/import-qt5_core.mk +++ /dev/null @@ -1,15 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) - -ifeq ($(CONTRIB_DIR),) -QT5_CORE_INC_DIR := $(realpath $(call select_from_repositories,include/QtCore)/..) -else -QT5_CORE_INC_DIR := $(QT5_PORT_DIR)/include -endif - -QT5_INC_DIR += $(QT5_CORE_INC_DIR) -QT5_INC_DIR += $(QT5_CORE_INC_DIR)/QtCore -QT5_INC_DIR += $(QT5_CORE_INC_DIR)/QtCore/$(QT_VERSION) -QT5_INC_DIR += $(QT5_CORE_INC_DIR)/QtCore/$(QT_VERSION)/QtCore -QT5_INC_DIR += $(QT5_CORE_INC_DIR)/QtCore/$(QT_VERSION)/QtCore/private diff --git a/repos/libports/lib/import/import-qt5_gui.mk b/repos/libports/lib/import/import-qt5_gui.mk deleted file mode 100644 index 29bc32cf34..0000000000 --- a/repos/libports/lib/import/import-qt5_gui.mk +++ /dev/null @@ -1,24 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) - -# -# Public QtGui headers include OpenGL headers -# -# We cannot just extend the 'LIBS' variable here because 'import-*.mk' are -# included (in 'base/mk/lib.mk') by iterating through the elements of the -# 'LIBS' variable. Hence, we need to manually import the mesa snippet. -# -include $(call select_from_repositories,lib/import/import-mesa_api.mk) - -ifeq ($(CONTRIB_DIR),) -QT5_GUI_INC_DIR := $(realpath $(call select_from_repositories,include/QtGui)/..) -else -QT5_GUI_INC_DIR := $(QT5_PORT_DIR)/include -endif - -QT5_INC_DIR += $(QT5_GUI_INC_DIR) -QT5_INC_DIR += $(QT5_GUI_INC_DIR)/QtGui -QT5_INC_DIR += $(QT5_GUI_INC_DIR)/QtGui/$(QT_VERSION) -QT5_INC_DIR += $(QT5_GUI_INC_DIR)/QtGui/$(QT_VERSION)/QtGui -QT5_INC_DIR += $(QT5_GUI_INC_DIR)/QtGui/$(QT_VERSION)/QtGui/private diff --git a/repos/libports/lib/import/import-qt5_jscore.mk b/repos/libports/lib/import/import-qt5_jscore.mk deleted file mode 100644 index 5602c0bec7..0000000000 --- a/repos/libports/lib/import/import-qt5_jscore.mk +++ /dev/null @@ -1,3 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) diff --git a/repos/libports/lib/import/import-qt5_network.mk b/repos/libports/lib/import/import-qt5_network.mk deleted file mode 100644 index 35be22bacb..0000000000 --- a/repos/libports/lib/import/import-qt5_network.mk +++ /dev/null @@ -1,15 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) - -ifeq ($(CONTRIB_DIR),) -QT5_NETWORK_INC_DIR := $(realpath $(call select_from_repositories,include/QtNetwork)/..) -else -QT5_NETWORK_INC_DIR := $(QT5_PORT_DIR)/include -endif - -QT5_INC_DIR += $(QT5_NETWORK_INC_DIR) -QT5_INC_DIR += $(QT5_NETWORK_INC_DIR)/QtNetwork -QT5_INC_DIR += $(QT5_NETWORK_INC_DIR)/QtNetwork/$(QT_VERSION) -QT5_INC_DIR += $(QT5_NETWORK_INC_DIR)/QtNetwork/$(QT_VERSION)/QtNetwork -QT5_INC_DIR += $(QT5_NETWORK_INC_DIR)/QtNetwork/$(QT_VERSION)/QtNetwork/private diff --git a/repos/libports/lib/import/import-qt5_opengl.mk b/repos/libports/lib/import/import-qt5_opengl.mk deleted file mode 100644 index 750f0547e5..0000000000 --- a/repos/libports/lib/import/import-qt5_opengl.mk +++ /dev/null @@ -1,15 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) - -ifeq ($(CONTRIB_DIR),) -QT5_OPENGL_INC_DIR := $(realpath $(call select_from_repositories,include/QtOpenGL)/..) -else -QT5_OPENGL_INC_DIR := $(QT5_PORT_DIR)/include -endif - -QT5_INC_DIR += $(QT5_OPENGL_INC_DIR) -QT5_INC_DIR += $(QT5_OPENGL_INC_DIR)/QtOpenGL -QT5_INC_DIR += $(QT5_OPENGL_INC_DIR)/QtOpenGL/$(QT_VERSION) -QT5_INC_DIR += $(QT5_OPENGL_INC_DIR)/QtOpenGL/$(QT_VERSION)/QtOpenGL -QT5_INC_DIR += $(QT5_OPENGL_INC_DIR)/QtOpenGL/$(QT_VERSION)/QtOpenGL/private diff --git a/repos/libports/lib/import/import-qt5_pcre2.mk b/repos/libports/lib/import/import-qt5_pcre2.mk deleted file mode 100644 index 5602c0bec7..0000000000 --- a/repos/libports/lib/import/import-qt5_pcre2.mk +++ /dev/null @@ -1,3 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) diff --git a/repos/libports/lib/import/import-qt5_printsupport.mk b/repos/libports/lib/import/import-qt5_printsupport.mk deleted file mode 100644 index 8635514a21..0000000000 --- a/repos/libports/lib/import/import-qt5_printsupport.mk +++ /dev/null @@ -1,17 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) - -ifeq ($(CONTRIB_DIR),) -QT5_PRINTSUPPORT_INC_DIR := $(realpath $(call select_from_repositories,include/QtPrintSupport)/..) -else -QT5_PRINTSUPPORT_INC_DIR := $(QT5_PORT_DIR)/include -endif - -QT5_INC_DIR += $(QT5_PRINTSUPPORT_INC_DIR) -QT5_INC_DIR += $(QT5_PRINTSUPPORT_INC_DIR)/QtPrintSupport -QT5_INC_DIR += $(QT5_PRINTSUPPORT_INC_DIR)/QtPrintSupport/$(QT_VERSION) -QT5_INC_DIR += $(QT5_PRINTSUPPORT_INC_DIR)/QtPrintSupport/$(QT_VERSION)/QtPrintSupport -QT5_INC_DIR += $(QT5_PRINTSUPPORT_INC_DIR)/QtPrintSupport/$(QT_VERSION)/QtPrintSupport/private - -CC_CXX_OPT += -DQT_PRINTSUPPORT_LIB diff --git a/repos/libports/lib/import/import-qt5_qgenodeviewwidget.mk b/repos/libports/lib/import/import-qt5_qgenodeviewwidget.mk deleted file mode 100644 index 098c6682db..0000000000 --- a/repos/libports/lib/import/import-qt5_qgenodeviewwidget.mk +++ /dev/null @@ -1 +0,0 @@ -QT5_INC_DIR += $(realpath $(call select_from_repositories,include/qt5/qgenodeviewwidget)/..) diff --git a/repos/libports/lib/import/import-qt5_qjpeg.mk b/repos/libports/lib/import/import-qt5_qjpeg.mk deleted file mode 100644 index 5602c0bec7..0000000000 --- a/repos/libports/lib/import/import-qt5_qjpeg.mk +++ /dev/null @@ -1,3 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) diff --git a/repos/libports/lib/import/import-qt5_qmake.mk b/repos/libports/lib/import/import-qt5_qmake.mk new file mode 100644 index 0000000000..349d5ced96 --- /dev/null +++ b/repos/libports/lib/import/import-qt5_qmake.mk @@ -0,0 +1,212 @@ +# +# The following externally defined variables are evaluated: +# +# QMAKE_PROJECT_FILE: path to the qmake project file (for applications with target.mk) +# QMAKE_TARGET_BINARIES binaries to be stripped and linked into 'bin' and 'debug' directories +# QT5_PORT_LIBS: Qt5 libraries used from port (for example libQt5Core) +# + +QT_TOOLS_DIR = /usr/local/genode/qt5/20.08 +QMAKE = $(QT_TOOLS_DIR)/bin/qmake + +ifeq ($(filter-out $(SPECS),arm),) +QMAKE_PLATFORM = genode-arm-g++ +else ifeq ($(filter-out $(SPECS),arm_64),) +QMAKE_PLATFORM = genode-aarch64-g++ +else ifeq ($(filter-out $(SPECS),x86_32),) +QMAKE_PLATFORM = genode-x86_32-g++ +else ifeq ($(filter-out $(SPECS),x86_64),) +QMAKE_PLATFORM = genode-x86_64-g++ +else +$(error Error: unsupported platform) +endif + +ifeq ($(CONTRIB_DIR),) +QT_DIR = $(call select_from_repositories,src/lib/qt5) +QT_API_DIR = $(call select_from_repositories,mkspecs)/.. +else +QT_PORT_DIR = $(call select_from_ports,qt5) +QT_DIR = $(QT_PORT_DIR)/src/lib/qt5 +QT_API_DIR = $(QT_DIR)/genode/api +endif + +ifneq ($(VERBOSE),) +QT5_OUTPUT_FILTER = > /dev/null +endif + +# +# Genode libraries to be linked to Qt applications and libraries +# + +QT5_GENODE_LIBS_APP = libc.lib.so libm.lib.so stdcxx.lib.so qt5_component.lib.so +QT5_GENODE_LIBS_SHLIB = libc.lib.so libm.lib.so stdcxx.lib.so + +# +# flags to be passed to qmake via env.sh and mkspecs/common/genode.conf +# + +GENODE_QMAKE_CFLAGS = \ + -D__FreeBSD__=12 \ + -D__GENODE__ \ + -ffunction-sections \ + -fno-strict-aliasing \ + $(CC_OPT_NOSTDINC) \ + $(CC_MARCH) \ + $(CC_OPT_PIC) \ + $(filter-out -I.,$(INCLUDES)) \ + -I$(CURDIR)/qmake_root/include/QtCore/spec/$(QMAKE_PLATFORM) + +GENODE_QMAKE_LFLAGS_APP = \ + $(addprefix $(LD_OPT_PREFIX),$(LD_MARCH)) \ + $(addprefix $(LD_OPT_PREFIX),$(LD_OPT_GC_SECTIONS)) \ + $(addprefix $(LD_OPT_PREFIX),$(LD_OPT_ALIGN_SANE)) \ + $(addprefix $(LD_OPT_PREFIX),--dynamic-list=$(BASE_DIR)/src/ld/genode_dyn.dl) \ + $(LD_OPT_NOSTDLIB) \ + -Wl,-Ttext=0x01000000 \ + $(CC_MARCH) \ + -Wl,--dynamic-linker=$(DYNAMIC_LINKER).lib.so \ + -Wl,--eh-frame-hdr \ + -Wl,-rpath-link=. \ + -Wl,-T -Wl,$(LD_SCRIPT_DYN) \ + -L$(CURDIR)/qmake_root/lib \ + -Wl,--whole-archive \ + -Wl,--start-group \ + $(addprefix -l:,$(QT5_GENODE_LIBS_APP)) \ + -Wl,--end-group \ + -Wl,--no-whole-archive + +GENODE_QMAKE_LFLAGS_SHLIB = \ + $(LD_OPT_NOSTDLIB) \ + -Wl,-shared \ + -Wl,--eh-frame-hdr \ + $(addprefix $(LD_OPT_PREFIX),$(LD_MARCH)) \ + $(addprefix $(LD_OPT_PREFIX),$(LD_OPT_GC_SECTIONS)) \ + $(addprefix $(LD_OPT_PREFIX),$(LD_OPT_ALIGN_SANE)) \ + -Wl,-T -Wl,$(LD_SCRIPT_SO) \ + $(addprefix $(LD_OPT_PREFIX),--entry=0x0) \ + -L$(CURDIR)/qmake_root/lib \ + -Wl,--whole-archive \ + -Wl,--start-group \ + $(addprefix -l:,$(QT5_GENODE_LIBS_SHLIB)) \ + -l:ldso_so_support.lib.a \ + -Wl,--end-group \ + -Wl,--no-whole-archive + +# +# libgcc must appear on the command line after all other libs +# (including those added by qmake) and using the QMAKE_LIBS +# variable achieves this, fortunately +# +GENODE_QMAKE_LIBS = \ + $(shell $(CC) $(CC_MARCH) -print-libgcc-file-name) + +ifeq ($(CONTRIB_DIR),) +GENODE_QMAKE_INCDIR_OPENGL = $(call select_from_repositories,include/GL)/.. +GENODE_QMAKE_INCDIR_EGL = $(call select_from_repositories,include/EGL)/.. +else +GENODE_QMAKE_INCDIR_OPENGL = $(call select_from_ports,mesa)/include +GENODE_QMAKE_INCDIR_EGL = $(call select_from_ports,mesa)/include +endif + +GENODE_QMAKE_LIBS_OPENGL = $(CURDIR)/qmake_root/lib/mesa.lib.so +GENODE_QMAKE_LIBS_EGL = $(CURDIR)/qmake_root/lib/egl.lib.so + +# +# export variables for qmake.conf +# + +env.sh: + $(VERBOSE)rm -f $@ + $(VERBOSE)echo "export GENODE_QMAKE_CC='$(CC)'" >> $@ + $(VERBOSE)echo "export GENODE_QMAKE_CXX='$(CXX)'" >> $@ + $(VERBOSE)echo "export GENODE_QMAKE_LINK='$(CXX)'" >> $@ + $(VERBOSE)echo "export GENODE_QMAKE_AR='$(AR)'" >> $@ + $(VERBOSE)echo "export GENODE_QMAKE_OBJCOPY='$(OBJCOPY)'" >> $@ + $(VERBOSE)echo "export GENODE_QMAKE_NM='$(NM)'" >> $@ + $(VERBOSE)echo "export GENODE_QMAKE_STRIP='$(STRIP)'" >> $@ + $(VERBOSE)echo "export GENODE_QMAKE_CFLAGS='$(GENODE_QMAKE_CFLAGS)'" >> $@ + $(VERBOSE)echo "export GENODE_QMAKE_LFLAGS_APP='$(GENODE_QMAKE_LFLAGS_APP)'" >> $@ + $(VERBOSE)echo "export GENODE_QMAKE_LFLAGS_SHLIB='$(GENODE_QMAKE_LFLAGS_SHLIB)'" >> $@ + $(VERBOSE)echo "export GENODE_QMAKE_LIBS='$(GENODE_QMAKE_LIBS)'" >> $@ + $(VERBOSE)echo "export GENODE_QMAKE_INCDIR_OPENGL='$(GENODE_QMAKE_INCDIR_OPENGL)'" >> $@ + $(VERBOSE)echo "export GENODE_QMAKE_LIBS_OPENGL='$(GENODE_QMAKE_LIBS_OPENGL)'" >> $@ + $(VERBOSE)echo "export GENODE_QMAKE_INCDIR_EGL='$(GENODE_QMAKE_INCDIR_EGL)'" >> $@ + $(VERBOSE)echo "export GENODE_QMAKE_LIBS_EGL='$(GENODE_QMAKE_LIBS_EGL)'" >> $@ + + +# +# prepare a directory named 'qmake_root' where qmake can find needed files +# + +qmake_root: + $(VERBOSE)mkdir -p $@ + +qmake_root/bin: qmake_root + $(VERBOSE)mkdir -p $@ + $(VERBOSE)ln -sf $(QT_TOOLS_DIR)/bin/* $@/ + +qmake_root/include: qmake_root + $(VERBOSE)mkdir -p $@ + $(VERBOSE)ln -snf $(QT_API_DIR)/include/* $@/ + +qmake_root/lib: qmake_root + $(VERBOSE)mkdir -p $@ + +qmake_root/lib/%.lib.so: qmake_root/lib + $(VERBOSE)ln -sf $(BUILD_BASE_DIR)/var/libcache/$*/$*.abi.so $@ + +qmake_root/lib/%.lib.a: qmake_root/lib + $(VERBOSE)ln -sf $(BUILD_BASE_DIR)/var/libcache/$*/$*.lib.a $@ + +qmake_root/mkspecs: qmake_root + $(VERBOSE)mkdir -p $@ + $(VERBOSE)ln -sf $(QT_API_DIR)/mkspecs/* $@/ + $(VERBOSE)ln -sf $(QMAKE_PLATFORM)/qconfig.pri $@/ + $(VERBOSE)ln -sf $(QMAKE_PLATFORM)/qmodule.pri $@/ + +qmake_prepared.tag: env.sh \ + qmake_root/bin \ + qmake_root/include \ + qmake_root/lib/libc.lib.so \ + qmake_root/lib/libm.lib.so \ + qmake_root/lib/egl.lib.so \ + qmake_root/lib/mesa.lib.so \ + qmake_root/lib/qt5_component.lib.so \ + qmake_root/lib/stdcxx.lib.so \ + qmake_root/lib/ldso_so_support.lib.a \ + qmake_root/mkspecs +# add symlinks for Qt5 libraries listed in the 'QT5_PORT_LIBS' variable +ifeq ($(CONTRIB_DIR),) + $(VERBOSE)for qt5_lib in $(QT5_PORT_LIBS); do \ + ln -sf $(BUILD_BASE_DIR)/var/libcache/$${qt5_lib}/$${qt5_lib}.abi.so qmake_root/lib/$${qt5_lib}.lib.so; \ + done +else + $(VERBOSE)for qt5_lib in $(QT5_PORT_LIBS); do \ + ln -sf $(BUILD_BASE_DIR)/bin/$${qt5_lib}.lib.so qmake_root/lib/; \ + done +endif + $(VERBOSE)touch $@ + +.PHONY: build_with_qmake + +build_with_qmake: qmake_prepared.tag + + $(VERBOSE)source env.sh && $(QMAKE) \ + -qtconf qmake_root/mkspecs/$(QMAKE_PLATFORM)/qt.conf \ + $(QMAKE_PROJECT_FILE) \ + $(QT5_OUTPUT_FILTER) + + $(VERBOSE)source env.sh && $(MAKE) $(QT5_OUTPUT_FILTER) + + $(VERBOSE)for qmake_target_binary in $(QMAKE_TARGET_BINARIES); do \ + $(STRIP) $${qmake_target_binary} -o $${qmake_target_binary}.stripped; \ + ln -sf $(CURDIR)/$${qmake_target_binary}.stripped $(PWD)/bin/$${qmake_target_binary}; \ + ln -sf $(CURDIR)/$${qmake_target_binary} $(PWD)/debug/; \ + done + +# +# build applications with qmake +# +TARGET ?= $(notdir $(QMAKE_PROJECT_FILE)).qmake_target +.PHONY: $(TARGET) +$(TARGET): build_with_qmake diff --git a/repos/libports/lib/import/import-qt5_qml.mk b/repos/libports/lib/import/import-qt5_qml.mk deleted file mode 100644 index 7627e01cac..0000000000 --- a/repos/libports/lib/import/import-qt5_qml.mk +++ /dev/null @@ -1,15 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) - -ifeq ($(CONTRIB_DIR),) -QT5_QML_INC_DIR := $(realpath $(call select_from_repositories,include/QtQml)/..) -else -QT5_QML_INC_DIR := $(QT5_PORT_DIR)/include -endif - -QT5_INC_DIR += $(QT5_QML_INC_DIR) -QT5_INC_DIR += $(QT5_QML_INC_DIR)/QtQml -QT5_INC_DIR += $(QT5_QML_INC_DIR)/QtQml/$(QT_VERSION) -QT5_INC_DIR += $(QT5_QML_INC_DIR)/QtQml/$(QT_VERSION)/QtQml -QT5_INC_DIR += $(QT5_QML_INC_DIR)/QtQml/$(QT_VERSION)/QtQml/private diff --git a/repos/libports/lib/import/import-qt5_qpa_genode.mk b/repos/libports/lib/import/import-qt5_qpa_genode.mk deleted file mode 100644 index bbf676a03c..0000000000 --- a/repos/libports/lib/import/import-qt5_qpa_genode.mk +++ /dev/null @@ -1,11 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) - -ifeq ($(CONTRIB_DIR),) -INC_DIR += $(call select_from_repositories,include/qt5/qpa_genode) \ - $(call select_from_repositories,include/QtInputSupport/$(QT_VERSION)) -else -INC_DIR += $(REP_DIR)/include/qt5/qpa_genode \ - $(QT5_PORT_DIR)/include/QtInputSupport/$(QT_VERSION) -endif diff --git a/repos/libports/lib/import/import-qt5_qpluginwidget.mk b/repos/libports/lib/import/import-qt5_qpluginwidget.mk deleted file mode 100644 index 66ec3d615d..0000000000 --- a/repos/libports/lib/import/import-qt5_qpluginwidget.mk +++ /dev/null @@ -1,4 +0,0 @@ -QT5_INC_DIR += $(realpath $(call select_from_repositories,include/qt5/qpluginwidget)/..) - -# 'qpluginwidget.h' includes 'qgenodeviewwidget.h' -include $(call select_from_repositories,lib/import/import-qt5_qgenodeviewwidget.mk) diff --git a/repos/libports/lib/import/import-qt5_qtquick2plugin.mk b/repos/libports/lib/import/import-qt5_qtquick2plugin.mk deleted file mode 100644 index 5602c0bec7..0000000000 --- a/repos/libports/lib/import/import-qt5_qtquick2plugin.mk +++ /dev/null @@ -1,3 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) diff --git a/repos/libports/lib/import/import-qt5_quick.mk b/repos/libports/lib/import/import-qt5_quick.mk deleted file mode 100644 index 18dab29f5a..0000000000 --- a/repos/libports/lib/import/import-qt5_quick.mk +++ /dev/null @@ -1,15 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) - -ifeq ($(CONTRIB_DIR),) -QT5_QUICK_INC_DIR := $(realpath $(call select_from_repositories,include/QtQuick)/..) -else -QT5_QUICK_INC_DIR := $(QT5_PORT_DIR)/include -endif - -QT5_INC_DIR += $(QT5_QUICK_INC_DIR) -QT5_INC_DIR += $(QT5_QUICK_INC_DIR)/QtQuick -QT5_INC_DIR += $(QT5_QUICK_INC_DIR)/QtQuick/$(QT_VERSION) -QT5_INC_DIR += $(QT5_QUICK_INC_DIR)/QtQuick/$(QT_VERSION)/QtQuick -QT5_INC_DIR += $(QT5_QUICK_INC_DIR)/QtQuick/$(QT_VERSION)/QtQuick/private diff --git a/repos/libports/lib/import/import-qt5_quickcontrols2.mk b/repos/libports/lib/import/import-qt5_quickcontrols2.mk deleted file mode 100644 index 08c3f83b6b..0000000000 --- a/repos/libports/lib/import/import-qt5_quickcontrols2.mk +++ /dev/null @@ -1,15 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) - -ifeq ($(CONTRIB_DIR),) -QT5_QUICKCONTROLS2_INC_DIR := $(realpath $(call select_from_repositories,include/QtQuickControls2)/..) -else -QT5_QUICKCONTROLS2_INC_DIR := $(QT5_PORT_DIR)/include -endif - -QT5_INC_DIR += $(QT5_QUICKCONTROLS2_INC_DIR) -QT5_INC_DIR += $(QT5_QUICKCONTROLS2_INC_DIR)/QtQuickControls2 -QT5_INC_DIR += $(QT5_QUICKCONTROLS2_INC_DIR)/QtQuickControls2/$(QT_VERSION) -QT5_INC_DIR += $(QT5_QUICKCONTROLS2_INC_DIR)/QtQuickControls2/$(QT_VERSION)/QtQuickControls2 -QT5_INC_DIR += $(QT5_QUICKCONTROLS2_INC_DIR)/QtQuickControls2/$(QT_VERSION)/QtQuickControls2/private diff --git a/repos/libports/lib/import/import-qt5_quicktemplates2.mk b/repos/libports/lib/import/import-qt5_quicktemplates2.mk deleted file mode 100644 index e1986a540d..0000000000 --- a/repos/libports/lib/import/import-qt5_quicktemplates2.mk +++ /dev/null @@ -1,15 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) - -ifeq ($(CONTRIB_DIR),) -QT5_QUICKTEMPLATES2_INC_DIR := $(realpath $(call select_from_repositories,include/QtQuickTemplates2)/..) -else -QT5_QUICKTEMPLATES2_INC_DIR := $(QT5_PORT_DIR)/include -endif - -QT5_INC_DIR += $(QT5_QUICKTEMPLATES2_INC_DIR) -QT5_INC_DIR += $(QT5_QUICKTEMPLATES2_INC_DIR)/QtQuickTemplates2 -QT5_INC_DIR += $(QT5_QUICKTEMPLATES2_INC_DIR)/QtQuickTemplates2/$(QT_VERSION) -QT5_INC_DIR += $(QT5_QUICKTEMPLATES2_INC_DIR)/QtQuickTemplates2/$(QT_VERSION)/QtQuickTemplates2 -QT5_INC_DIR += $(QT5_QUICKTEMPLATES2_INC_DIR)/QtQuickTemplates2/$(QT_VERSION)/QtQuickTemplates2/private diff --git a/repos/libports/lib/import/import-qt5_scriptclassic.mk b/repos/libports/lib/import/import-qt5_scriptclassic.mk deleted file mode 100644 index d6e1b7bd32..0000000000 --- a/repos/libports/lib/import/import-qt5_scriptclassic.mk +++ /dev/null @@ -1,14 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) - -ifeq ($(CONTRIB_DIR),) -QT5_SCRIPTCLASSIC_INC_DIR := $(realpath $(call select_from_repositories,include/QtScript)/..) -else -QT5_SCRIPTCLASSIC_INC_DIR := $(QT5_PORT_DIR)/include -endif - -QT5_INC_DIR += $(QT5_SCRIPTCLASSIC_INC_DIR) -QT5_INC_DIR += $(QT5_SCRIPTCLASSIC_INC_DIR)/QtScript - -QT_DEFINES += -DQ_SCRIPT_EXPORT= diff --git a/repos/libports/lib/import/import-qt5_sql.mk b/repos/libports/lib/import/import-qt5_sql.mk deleted file mode 100644 index ef9cada78e..0000000000 --- a/repos/libports/lib/import/import-qt5_sql.mk +++ /dev/null @@ -1,15 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) - -ifeq ($(CONTRIB_DIR),) -QT5_SQL_INC_DIR := $(realpath $(call select_from_repositories,include/QtSql)/..) -else -QT5_SQL_INC_DIR := $(QT5_PORT_DIR)/include -endif - -QT5_INC_DIR += $(QT5_SQL_INC_DIR) -QT5_INC_DIR += $(QT5_SQL_INC_DIR)/QtSql -QT5_INC_DIR += $(QT5_SQL_INC_DIR)/QtSql/$(QT_VERSION) -QT5_INC_DIR += $(QT5_SQL_INC_DIR)/QtSql/$(QT_VERSION)/QtSql -QT5_INC_DIR += $(QT5_SQL_INC_DIR)/QtSql/$(QT_VERSION)/QtSql/private diff --git a/repos/libports/lib/import/import-qt5_svg.mk b/repos/libports/lib/import/import-qt5_svg.mk deleted file mode 100644 index d18cfade1c..0000000000 --- a/repos/libports/lib/import/import-qt5_svg.mk +++ /dev/null @@ -1,15 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) - -ifeq ($(CONTRIB_DIR),) -QT5_SVG_INC_DIR := $(realpath $(call select_from_repositories,include/QtSvg)/..) -else -QT5_SVG_INC_DIR := $(QT5_PORT_DIR)/include -endif - -QT5_INC_DIR += $(QT5_SVG_INC_DIR) -QT5_INC_DIR += $(QT5_SVG_INC_DIR)/QtSvg -QT5_INC_DIR += $(QT5_SVG_INC_DIR)/QtSvg/$(QT_VERSION) -QT5_INC_DIR += $(QT5_SVG_INC_DIR)/QtSvg/$(QT_VERSION)/QtSvg -QT5_INC_DIR += $(QT5_SVG_INC_DIR)/QtSvg/$(QT_VERSION)/QtSvg/private diff --git a/repos/libports/lib/import/import-qt5_test.mk b/repos/libports/lib/import/import-qt5_test.mk deleted file mode 100644 index 7a079ceb01..0000000000 --- a/repos/libports/lib/import/import-qt5_test.mk +++ /dev/null @@ -1,15 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) - -ifeq ($(CONTRIB_DIR),) -QT5_TEST_INC_DIR := $(realpath $(call select_from_repositories,include/QtTest)/..) -else -QT5_TEST_INC_DIR := $(QT5_PORT_DIR)/include -endif - -QT5_INC_DIR += $(QT5_TEST_INC_DIR) -QT5_INC_DIR += $(QT5_TEST_INC_DIR)/QtTest -QT5_INC_DIR += $(QT5_TEST_INC_DIR)/QtTest/$(QT_VERSION) -QT5_INC_DIR += $(QT5_TEST_INC_DIR)/QtTest/$(QT_VERSION)/QtTest -QT5_INC_DIR += $(QT5_TEST_INC_DIR)/QtTest/$(QT_VERSION)/QtTest/private diff --git a/repos/libports/lib/import/import-qt5_ui_tools.mk b/repos/libports/lib/import/import-qt5_ui_tools.mk deleted file mode 100644 index 893070753a..0000000000 --- a/repos/libports/lib/import/import-qt5_ui_tools.mk +++ /dev/null @@ -1,27 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) - -ifeq ($(CONTRIB_DIR),) -QT5_DESIGNER_INC_DIR := $(realpath $(call select_from_repositories,include/QtDesigner)/..) -else -QT5_DESIGNER_INC_DIR := $(QT5_PORT_DIR)/include -endif - -QT5_INC_DIR += $(QT5_DESIGNER_INC_DIR) -QT5_INC_DIR += $(QT5_DESIGNER_INC_DIR)/QtDesigner -QT5_INC_DIR += $(QT5_DESIGNER_INC_DIR)/QtDesigner/$(QT_VERSION) -QT5_INC_DIR += $(QT5_DESIGNER_INC_DIR)/QtDesigner/$(QT_VERSION)/QtDesigner -QT5_INC_DIR += $(QT5_DESIGNER_INC_DIR)/QtDesigner/$(QT_VERSION)/QtDesigner/private - -ifeq ($(CONTRIB_DIR),) -QT5_UI_TOOLS_INC_DIR := $(realpath $(call select_from_repositories,include/QtUiTools)/..) -else -QT5_UI_TOOLS_INC_DIR := $(QT5_PORT_DIR)/include -endif - -QT5_INC_DIR += $(QT5_UI_TOOLS_INC_DIR) -QT5_INC_DIR += $(QT5_UI_TOOLS_INC_DIR)/QtUiTools -QT5_INC_DIR += $(QT5_UI_TOOLS_INC_DIR)/QtUiTools/$(QT_VERSION) -QT5_INC_DIR += $(QT5_UI_TOOLS_INC_DIR)/QtUiTools/$(QT_VERSION)/QtUiTools -QT5_INC_DIR += $(QT5_UI_TOOLS_INC_DIR)/QtUiTools/$(QT_VERSION)/QtUiTools/private diff --git a/repos/libports/lib/import/import-qt5_virtualkeyboard.mk b/repos/libports/lib/import/import-qt5_virtualkeyboard.mk deleted file mode 100644 index 5edf823d87..0000000000 --- a/repos/libports/lib/import/import-qt5_virtualkeyboard.mk +++ /dev/null @@ -1,15 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) - -ifeq ($(CONTRIB_DIR),) -QT5_VIRTUALKEYBOARD_INC_DIR := $(realpath $(call select_from_repositories,include/QtVirtualKeyboard)/..) -else -QT5_VIRTUALKEYBOARD_INC_DIR := $(QT5_PORT_DIR)/include -endif - -QT5_INC_DIR += $(QT5_VIRTUALKEYBOARD_INC_DIR) -QT5_INC_DIR += $(QT5_VIRTUALKEYBOARD_INC_DIR)/QtVirtualKeyboard -QT5_INC_DIR += $(QT5_VIRTUALKEYBOARD_INC_DIR)/QtVirtualKeyboard/$(QT_VERSION) -QT5_INC_DIR += $(QT5_VIRTUALKEYBOARD_INC_DIR)/QtVirtualKeyboard/$(QT_VERSION)/QtVirtualKeyboard -QT5_INC_DIR += $(QT5_VIRTUALKEYBOARD_INC_DIR)/QtVirtualKeyboard/$(QT_VERSION)/QtVirtualKeyboard/private diff --git a/repos/libports/lib/import/import-qt5_webcore.mk b/repos/libports/lib/import/import-qt5_webcore.mk deleted file mode 100644 index 5602c0bec7..0000000000 --- a/repos/libports/lib/import/import-qt5_webcore.mk +++ /dev/null @@ -1,3 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) diff --git a/repos/libports/lib/import/import-qt5_webkit.mk b/repos/libports/lib/import/import-qt5_webkit.mk deleted file mode 100644 index 4407694615..0000000000 --- a/repos/libports/lib/import/import-qt5_webkit.mk +++ /dev/null @@ -1,15 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) - -ifeq ($(CONTRIB_DIR),) -QT5_WEBKIT_INC_DIR := $(realpath $(call select_from_repositories,include/QtWebKit)/..) -else -QT5_WEBKIT_INC_DIR := $(QT5_PORT_DIR)/include -endif - -QT5_INC_DIR += $(QT5_WEBKIT_INC_DIR) -QT5_INC_DIR += $(QT5_WEBKIT_INC_DIR)/QtWebKit -QT5_INC_DIR += $(QT5_WEBKIT_INC_DIR)/QtWebKit/$(QT_VERSION) -QT5_INC_DIR += $(QT5_WEBKIT_INC_DIR)/QtWebKit/$(QT_VERSION)/QtWebKit -QT5_INC_DIR += $(QT5_WEBKIT_INC_DIR)/QtWebKit/$(QT_VERSION)/QtWebKit/private diff --git a/repos/libports/lib/import/import-qt5_webkitwidgets.mk b/repos/libports/lib/import/import-qt5_webkitwidgets.mk deleted file mode 100644 index 3a001bc29c..0000000000 --- a/repos/libports/lib/import/import-qt5_webkitwidgets.mk +++ /dev/null @@ -1,15 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) - -ifeq ($(CONTRIB_DIR),) -QT5_WEBKITWIDGETS_INC_DIR := $(realpath $(call select_from_repositories,include/QtWebKitWidgets)/..) -else -QT5_WEBKITWIDGETS_INC_DIR := $(QT5_PORT_DIR)/include -endif - -QT5_INC_DIR += $(QT5_WEBKITWIDGETS_INC_DIR) -QT5_INC_DIR += $(QT5_WEBKITWIDGETS_INC_DIR)/QtWebKitWidgets -QT5_INC_DIR += $(QT5_WEBKITWIDGETS_INC_DIR)/QtWebKitWidgets/$(QT_VERSION) -QT5_INC_DIR += $(QT5_WEBKITWIDGETS_INC_DIR)/QtWebKitWidgets/$(QT_VERSION)/QtWebKitWidgets -QT5_INC_DIR += $(QT5_WEBKITWIDGETS_INC_DIR)/QtWebKitWidgets/$(QT_VERSION)/QtWebKitWidgets/private diff --git a/repos/libports/lib/import/import-qt5_widgets.mk b/repos/libports/lib/import/import-qt5_widgets.mk deleted file mode 100644 index 236bc392a7..0000000000 --- a/repos/libports/lib/import/import-qt5_widgets.mk +++ /dev/null @@ -1,15 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) - -ifeq ($(CONTRIB_DIR),) -QT5_WIDGETS_INC_DIR := $(realpath $(call select_from_repositories,include/QtWidgets)/..) -else -QT5_WIDGETS_INC_DIR := $(QT5_PORT_DIR)/include -endif - -QT5_INC_DIR += $(QT5_WIDGETS_INC_DIR) -QT5_INC_DIR += $(QT5_WIDGETS_INC_DIR)/QtWidgets -QT5_INC_DIR += $(QT5_WIDGETS_INC_DIR)/QtWidgets/$(QT_VERSION) -QT5_INC_DIR += $(QT5_WIDGETS_INC_DIR)/QtWidgets/$(QT_VERSION)/QtWidgets -QT5_INC_DIR += $(QT5_WIDGETS_INC_DIR)/QtWidgets/$(QT_VERSION)/QtWidgets/private diff --git a/repos/libports/lib/import/import-qt5_wtf.mk b/repos/libports/lib/import/import-qt5_wtf.mk deleted file mode 100644 index 5602c0bec7..0000000000 --- a/repos/libports/lib/import/import-qt5_wtf.mk +++ /dev/null @@ -1,3 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) diff --git a/repos/libports/lib/import/import-qt5_xml.mk b/repos/libports/lib/import/import-qt5_xml.mk deleted file mode 100644 index f1f9ab6fb4..0000000000 --- a/repos/libports/lib/import/import-qt5_xml.mk +++ /dev/null @@ -1,15 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) - -ifeq ($(CONTRIB_DIR),) -QT5_XML_INC_DIR := $(realpath $(call select_from_repositories,include/QtXml)/..) -else -QT5_XML_INC_DIR := $(QT5_PORT_DIR)/include -endif - -QT5_INC_DIR += $(QT5_XML_INC_DIR) -QT5_INC_DIR += $(QT5_XML_INC_DIR)/QtXml -QT5_INC_DIR += $(QT5_XML_INC_DIR)/QtXml/$(QT_VERSION) -QT5_INC_DIR += $(QT5_XML_INC_DIR)/QtXml/$(QT_VERSION)/QtXml -QT5_INC_DIR += $(QT5_XML_INC_DIR)/QtXml/$(QT_VERSION)/QtXml/private diff --git a/repos/libports/lib/mk/libQt5Core.mk b/repos/libports/lib/mk/libQt5Core.mk new file mode 100644 index 0000000000..d8a67178fd --- /dev/null +++ b/repos/libports/lib/mk/libQt5Core.mk @@ -0,0 +1,6 @@ +# +# This individual library description file is needed to get the abi +# library generated when building Qt5 packages. +# + +LIBS = qt5_base diff --git a/repos/libports/lib/mk/libQt5Gui.mk b/repos/libports/lib/mk/libQt5Gui.mk new file mode 100644 index 0000000000..d8a67178fd --- /dev/null +++ b/repos/libports/lib/mk/libQt5Gui.mk @@ -0,0 +1,6 @@ +# +# This individual library description file is needed to get the abi +# library generated when building Qt5 packages. +# + +LIBS = qt5_base diff --git a/repos/libports/lib/mk/libQt5Network.mk b/repos/libports/lib/mk/libQt5Network.mk new file mode 100644 index 0000000000..d8a67178fd --- /dev/null +++ b/repos/libports/lib/mk/libQt5Network.mk @@ -0,0 +1,6 @@ +# +# This individual library description file is needed to get the abi +# library generated when building Qt5 packages. +# + +LIBS = qt5_base diff --git a/repos/libports/lib/mk/libQt5PrintSupport.mk b/repos/libports/lib/mk/libQt5PrintSupport.mk new file mode 100644 index 0000000000..d8a67178fd --- /dev/null +++ b/repos/libports/lib/mk/libQt5PrintSupport.mk @@ -0,0 +1,6 @@ +# +# This individual library description file is needed to get the abi +# library generated when building Qt5 packages. +# + +LIBS = qt5_base diff --git a/repos/libports/lib/mk/libQt5Qml.mk b/repos/libports/lib/mk/libQt5Qml.mk new file mode 100644 index 0000000000..a1e8b27d37 --- /dev/null +++ b/repos/libports/lib/mk/libQt5Qml.mk @@ -0,0 +1,6 @@ +# +# This individual library description file is needed to get the abi +# library generated when building Qt5 packages. +# + +LIBS = qt5_declarative diff --git a/repos/libports/lib/mk/libQt5Quick.mk b/repos/libports/lib/mk/libQt5Quick.mk new file mode 100644 index 0000000000..a1e8b27d37 --- /dev/null +++ b/repos/libports/lib/mk/libQt5Quick.mk @@ -0,0 +1,6 @@ +# +# This individual library description file is needed to get the abi +# library generated when building Qt5 packages. +# + +LIBS = qt5_declarative diff --git a/repos/libports/lib/mk/libQt5QuickWidgets.mk b/repos/libports/lib/mk/libQt5QuickWidgets.mk new file mode 100644 index 0000000000..a1e8b27d37 --- /dev/null +++ b/repos/libports/lib/mk/libQt5QuickWidgets.mk @@ -0,0 +1,6 @@ +# +# This individual library description file is needed to get the abi +# library generated when building Qt5 packages. +# + +LIBS = qt5_declarative diff --git a/repos/libports/lib/mk/libQt5Sql.mk b/repos/libports/lib/mk/libQt5Sql.mk new file mode 100644 index 0000000000..d8a67178fd --- /dev/null +++ b/repos/libports/lib/mk/libQt5Sql.mk @@ -0,0 +1,6 @@ +# +# This individual library description file is needed to get the abi +# library generated when building Qt5 packages. +# + +LIBS = qt5_base diff --git a/repos/libports/lib/mk/libQt5Svg.mk b/repos/libports/lib/mk/libQt5Svg.mk new file mode 100644 index 0000000000..8594fef171 --- /dev/null +++ b/repos/libports/lib/mk/libQt5Svg.mk @@ -0,0 +1,6 @@ +# +# This individual library description file is needed to get the abi +# library generated when building Qt5 packages. +# + +LIBS = qt5_svg diff --git a/repos/libports/lib/mk/libQt5Test.mk b/repos/libports/lib/mk/libQt5Test.mk new file mode 100644 index 0000000000..d8a67178fd --- /dev/null +++ b/repos/libports/lib/mk/libQt5Test.mk @@ -0,0 +1,6 @@ +# +# This individual library description file is needed to get the abi +# library generated when building Qt5 packages. +# + +LIBS = qt5_base diff --git a/repos/libports/lib/mk/libQt5VirtualKeyboard.mk b/repos/libports/lib/mk/libQt5VirtualKeyboard.mk new file mode 100644 index 0000000000..5dcdd8c4ab --- /dev/null +++ b/repos/libports/lib/mk/libQt5VirtualKeyboard.mk @@ -0,0 +1,6 @@ +# +# This individual library description file is needed to get the abi +# library generated when building Qt5 packages. +# + +LIBS = qt5_virtualkeyboard diff --git a/repos/libports/lib/mk/libQt5Widgets.mk b/repos/libports/lib/mk/libQt5Widgets.mk new file mode 100644 index 0000000000..d8a67178fd --- /dev/null +++ b/repos/libports/lib/mk/libQt5Widgets.mk @@ -0,0 +1,6 @@ +# +# This individual library description file is needed to get the abi +# library generated when building Qt5 packages. +# + +LIBS = qt5_base diff --git a/repos/libports/lib/mk/libqgenode.mk b/repos/libports/lib/mk/libqgenode.mk new file mode 100644 index 0000000000..d8a67178fd --- /dev/null +++ b/repos/libports/lib/mk/libqgenode.mk @@ -0,0 +1,6 @@ +# +# This individual library description file is needed to get the abi +# library generated when building Qt5 packages. +# + +LIBS = qt5_base diff --git a/repos/libports/lib/mk/libqgenodeviewwidget.mk b/repos/libports/lib/mk/libqgenodeviewwidget.mk new file mode 100644 index 0000000000..b520df5631 --- /dev/null +++ b/repos/libports/lib/mk/libqgenodeviewwidget.mk @@ -0,0 +1,18 @@ +QMAKE_PROJECT_FILE = $(REP_DIR)/src/lib/qgenodeviewwidget/qgenodeviewwidget.pro + +QMAKE_TARGET_BINARIES = libqgenodeviewwidget.lib.so + +QT5_PORT_LIBS = libQt5Core libQt5Gui libQt5Widgets + +LIBS = libc libm mesa qoost stdcxx $(QT5_PORT_LIBS) + +include $(call select_from_repositories,lib/import/import-qt5_qmake.mk) + +qmake_root/include/qgenodeviewwidget: qmake_root/include + ln -snf $(call select_from_repositories,include/qgenodeviewwidget) $@ + +qmake_prepared.tag: qmake_root/include/qgenodeviewwidget + +ifeq ($(called_from_lib_mk),yes) +all: build_with_qmake +endif diff --git a/repos/libports/lib/mk/libqpluginwidget.mk b/repos/libports/lib/mk/libqpluginwidget.mk new file mode 100644 index 0000000000..fa262a57cc --- /dev/null +++ b/repos/libports/lib/mk/libqpluginwidget.mk @@ -0,0 +1,22 @@ +QMAKE_PROJECT_FILE = $(REP_DIR)/src/lib/qpluginwidget/qpluginwidget.pro + +QMAKE_TARGET_BINARIES = libqpluginwidget.lib.so + +QT5_PORT_LIBS = libQt5Core libQt5Gui libQt5Network libQt5Widgets libqgenode + +LIBS = libc libm libqgenodeviewwidget mesa qoost stdcxx zlib $(QT5_PORT_LIBS) + +include $(call select_from_repositories,lib/import/import-qt5_qmake.mk) + +QT5_GENODE_LIBS_SHLIB += libqgenodeviewwidget.lib.so libqgenode.lib.so + +qmake_root/include/qpluginwidget: qmake_root/include + ln -snf $(call select_from_repositories,include/qpluginwidget) $@ + +qmake_prepared.tag: qmake_root/include/qpluginwidget \ + qmake_root/lib/libqgenodeviewwidget.lib.so \ + qmake_root/lib/libqgenode.lib.so + +ifeq ($(called_from_lib_mk),yes) +all: build_with_qmake +endif diff --git a/repos/libports/lib/mk/qt5.inc b/repos/libports/lib/mk/qt5.inc deleted file mode 100644 index c77cc9e031..0000000000 --- a/repos/libports/lib/mk/qt5.inc +++ /dev/null @@ -1,22 +0,0 @@ -QT_SOURCES_FILTER_OUT += $(COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT) -QT_SOURCES_FILTERED = $(filter-out $(QT_SOURCES_FILTER_OUT), $(QT_SOURCES)) - -SRC_CC += $(filter %.cpp, $(QT_SOURCES_FILTERED)) -SRC_CC += $(filter %.cc, $(QT_SOURCES_FILTERED)) -SRC_C += $(filter %.c, $(QT_SOURCES_FILTERED)) - -COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTERED = $(filter-out $(COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT), $(COMPILER_MOC_HEADER_MAKE_ALL_FILES)) -$(addsuffix .o,$(basename $(SRC_CC))): $(COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTERED) - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES_FILTERED = $(filter-out $(COMPILER_MOC_SOURCE_MAKE_ALL_FILES_FILTER_OUT), $(COMPILER_MOC_SOURCE_MAKE_ALL_FILES)) -$(addsuffix .o,$(basename $(SRC_CC))): $(COMPILER_MOC_SOURCE_MAKE_ALL_FILES_FILTERED) - -QT5_INC_DIR += $(REP_DIR)/src/lib/qt5/qtbase/src/corelib/global - -QT5_INC_DIR += $(addprefix $(REP_DIR)/src/lib/qt5/, $(QT_INCPATH)) -QT5_INC_DIR += $(addprefix $(QT5_PORT_DIR)/src/lib/qt5/, $(QT_INCPATH)) -QT5_INC_DIR += $(addprefix $(QT5_CONTRIB_DIR)/, $(QT_INCPATH)) - -vpath % $(addprefix $(REP_DIR)/src/lib/qt5/, $(QT_VPATH)) -vpath % $(addprefix $(QT5_PORT_DIR)/src/lib/qt5/, $(QT_VPATH)) -vpath % $(addprefix $(QT5_CONTRIB_DIR)/, $(QT_VPATH)) diff --git a/repos/libports/lib/mk/qt5_angle.inc b/repos/libports/lib/mk/qt5_angle.inc deleted file mode 100644 index 6a0decf1b6..0000000000 --- a/repos/libports/lib/mk/qt5_angle.inc +++ /dev/null @@ -1,15 +0,0 @@ -include $(call select_from_repositories,lib/import/import-qt5_angle.mk) - -SHARED_LIB = yes - -include $(REP_DIR)/lib/mk/qt5_angle_generated.inc - -QT_INCPATH += qtwebkit/Source/ThirdParty/ANGLE/generated - -QT_VPATH += qtwebkit/Source/ThirdParty/ANGLE/generated - -include $(REP_DIR)/lib/mk/qt5.inc - -LIBS += qt5_opengl - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_angle_generated.inc b/repos/libports/lib/mk/qt5_angle_generated.inc deleted file mode 100644 index 1ba262fcf0..0000000000 --- a/repos/libports/lib/mk/qt5_angle_generated.inc +++ /dev/null @@ -1,97 +0,0 @@ -QT_DEFINES += -DBUILDING_QT__=1 -DNDEBUG -DENABLE_3D_RENDERING=1 -DENABLE_ACCELERATED_2D_CANVAS=1 -DENABLE_BLOB=1 -DENABLE_CANVAS_PATH=1 -DENABLE_CHANNEL_MESSAGING=1 -DENABLE_CSS_BOX_DECORATION_BREAK=1 -DENABLE_CSS_COMPOSITING=1 -DENABLE_CSS_EXCLUSIONS=1 -DENABLE_CSS_FILTERS=1 -DENABLE_CSS_IMAGE_SET=1 -DENABLE_CSS_REGIONS=1 -DENABLE_CSS_SHAPES=1 -DENABLE_CSS_STICKY_POSITION=1 -DENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=1 -DENABLE_DATALIST_ELEMENT=1 -DENABLE_DETAILS_ELEMENT=1 -DENABLE_DOWNLOAD_ATTRIBUTE=1 -DENABLE_FAST_MOBILE_SCROLLING=1 -DENABLE_FILTERS=1 -DENABLE_FTPDIR=1 -DENABLE_FULLSCREEN_API=1 -DENABLE_GESTURE_EVENTS=1 -DENABLE_ICONDATABASE=1 -DENABLE_IFRAME_SEAMLESS=1 -DENABLE_INPUT_TYPE_COLOR=1 -DENABLE_INSPECTOR=1 -DENABLE_INSPECTOR_SERVER=1 -DENABLE_JAVASCRIPT_DEBUGGER=1 -DENABLE_LEGACY_NOTIFICATIONS=1 -DENABLE_LEGACY_VIEWPORT_ADAPTION=1 -DENABLE_LEGACY_VENDOR_PREFIXES=1 -DENABLE_LEGACY_WEB_AUDIO=1 -DENABLE_LINK_PREFETCH=1 -DENABLE_METER_ELEMENT=1 -DENABLE_MHTML=1 -DENABLE_NOTIFICATIONS=1 -DENABLE_PAGE_VISIBILITY_API=1 -DENABLE_PROGRESS_ELEMENT=1 -DENABLE_RESOLUTION_MEDIA_QUERY=1 -DENABLE_REQUEST_ANIMATION_FRAME=1 -DENABLE_SHARED_WORKERS=1 -DENABLE_SMOOTH_SCROLLING=1 -DENABLE_SQL_DATABASE=1 -DENABLE_SUBPIXEL_LAYOUT=1 -DENABLE_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_TOUCH_ADJUSTMENT=1 -DENABLE_TOUCH_EVENTS=1 -DENABLE_TOUCH_SLIDER=1 -DENABLE_VIEW_MODE_CSS_MEDIA=1 -DENABLE_WEB_SOCKETS=1 -DENABLE_WEB_TIMING=1 -DENABLE_WORKERS=1 -DENABLE_XHR_TIMEOUT=1 -DWTF_USE_TILED_BACKING_STORE=1 -DWTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=1 -DHAVE_QTPRINTSUPPORT=1 -DHAVE_QSTYLE=1 -DHAVE_QTTESTLIB=1 -DWTF_USE_LIBJPEG=1 -DWTF_USE_LIBPNG=1 -DHAVE_FONTCONFIG=1 -DPLUGIN_ARCHITECTURE_UNSUPPORTED=1 -DWTF_USE_3D_GRAPHICS=1 -DENABLE_WEBGL=1 -DENABLE_BATTERY_STATUS=0 -DENABLE_CANVAS_PROXY=0 -DENABLE_CSP_NEXT=0 -DENABLE_CSS_GRID_LAYOUT=0 -DENABLE_CSS_HIERARCHIES=0 -DENABLE_CSS_IMAGE_ORIENTATION=0 -DENABLE_CSS_IMAGE_RESOLUTION=0 -DENABLE_CSS_SHADERS=0 -DENABLE_CSS_VARIABLES=0 -DENABLE_CSS3_CONDITIONAL_RULES=0 -DENABLE_CSS3_TEXT=0 -DENABLE_CSS3_TEXT_LINE_BREAK=0 -DENABLE_DASHBOARD_SUPPORT=0 -DENABLE_DATAGRID=0 -DENABLE_DATA_TRANSFER_ITEMS=0 -DENABLE_DEVICE_ORIENTATION=0 -DENABLE_DIRECTORY_UPLOAD=0 -DENABLE_FILE_SYSTEM=0 -DENABLE_FONT_LOAD_EVENTS=0 -DENABLE_GAMEPAD=0 -DENABLE_GEOLOCATION=0 -DENABLE_HIGH_DPI_CANVAS=0 -DENABLE_INDEXED_DATABASE=0 -DENABLE_INPUT_SPEECH=0 -DENABLE_INPUT_TYPE_DATE=0 -DENABLE_INPUT_TYPE_DATETIME_INCOMPLETE=0 -DENABLE_INPUT_TYPE_DATETIMELOCAL=0 -DENABLE_INPUT_TYPE_MONTH=0 -DENABLE_INPUT_TYPE_TIME=0 -DENABLE_INPUT_TYPE_WEEK=0 -DENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 -DENABLE_MATHML=0 -DENABLE_MEDIA_SOURCE=0 -DENABLE_MEDIA_STATISTICS=0 -DENABLE_MEDIA_STREAM=0 -DENABLE_MICRODATA=0 -DENABLE_MOUSE_CURSOR_SCALE=0 -DENABLE_NAVIGATOR_CONTENT_UTILS=0 -DENABLE_NETSCAPE_PLUGIN_API=0 -DENABLE_NETWORK_INFO=0 -DENABLE_NOSNIFF=0 -DENABLE_ORIENTATION_EVENTS=0 -DENABLE_PROXIMITY_EVENTS=0 -DENABLE_QUOTA=0 -DENABLE_RESOURCE_TIMING=0 -DENABLE_SCRIPTED_SPEECH=0 -DENABLE_SECCOMP_FILTERS=0 -DENABLE_SHADOW_DOM=0 -DENABLE_STYLE_SCOPED=0 -DENABLE_TEMPLATE_ELEMENT=0 -DENABLE_TEXT_AUTOSIZING=0 -DENABLE_THREADED_HTML_PARSER=0 -DENABLE_TOUCH_ICON_LOADING=0 -DENABLE_USER_TIMING=0 -DENABLE_VIBRATION=0 -DENABLE_VIDEO=0 -DENABLE_VIDEO_TRACK=0 -DENABLE_WEB_AUDIO=0 -DENABLE_XSLT=0 -DBUILDING_ANGLE -DBUILDING_WEBKIT -DQT_ASCII_CAST_WARNINGS -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG - -QT_INCPATH += \ - qtwebkit/Source/ThirdParty/ANGLE \ - qtwebkit/Source/ThirdParty/ANGLE/include/GLSLANG \ - qtwebkit/Source/ThirdParty/ANGLE/include/KHR \ - qtwebkit/Source/ThirdParty/ANGLE/src \ - qtwebkit/Source/ThirdParty/ANGLE/src/compiler/preprocessor \ - qtwebkit/Source/ThirdParty/ANGLE/include \ - qtwebkit/Source/ThirdParty/ANGLE/include \ - qtwebkit/Source/ThirdParty/ANGLE/include/GLSLANG \ - qtwebkit/Source/ThirdParty/ANGLE/include/KHR \ - qtwebkit/Source/ThirdParty/ANGLE/src \ - qtwebkit/Source/ThirdParty/ANGLE/src/compiler/preprocessor \ - qtwebkit/Source \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - BuiltInFunctionEmulator.cpp \ - CodeGenGLSL.cpp \ - Compiler.cpp \ - debug.cpp \ - DependencyGraph.cpp \ - DependencyGraphBuilder.cpp \ - DependencyGraphOutput.cpp \ - DependencyGraphTraverse.cpp \ - DetectCallDepth.cpp \ - DetectDiscontinuity.cpp \ - Diagnostics.cpp \ - DirectiveHandler.cpp \ - ForLoopUnroll.cpp \ - InfoSink.cpp \ - Initialize.cpp \ - InitializeDll.cpp \ - InitializeParseContext.cpp \ - Intermediate.cpp \ - intermOut.cpp \ - IntermTraverse.cpp \ - MapLongVariableNames.cpp \ - OutputESSL.cpp \ - OutputGLSL.cpp \ - OutputGLSLBase.cpp \ - OutputHLSL.cpp \ - parseConst.cpp \ - ParseHelper.cpp \ - PoolAlloc.cpp \ - QualifierAlive.cpp \ - RemoveTree.cpp \ - SearchSymbol.cpp \ - ShaderLang.cpp \ - SymbolTable.cpp \ - RestrictFragmentShaderTiming.cpp \ - RestrictVertexShaderTiming.cpp \ - TranslatorESSL.cpp \ - TranslatorGLSL.cpp \ - TranslatorHLSL.cpp \ - Uniform.cpp \ - UnfoldShortCircuit.cpp \ - util.cpp \ - ValidateLimitations.cpp \ - VariableInfo.cpp \ - VariablePacker.cpp \ - VersionGLSL.cpp \ - DiagnosticsBase.cpp \ - DirectiveHandlerBase.cpp \ - DirectiveParser.cpp \ - Input.cpp \ - Lexer.cpp \ - Macro.cpp \ - MacroExpander.cpp \ - Preprocessor.cpp \ - Token.cpp \ - ArrayBoundsClamper.cpp \ - ossource_posix.cpp \ - glslang_lex.cpp \ - Tokenizer_lex.cpp \ - glslang_tab.cpp \ - ExpressionParser_tab.cpp - -QT_VPATH += \ - qtwebkit/Source/ThirdParty/ANGLE/src/compiler \ - qtwebkit/Source/ThirdParty/ANGLE/src/compiler/depgraph \ - qtwebkit/Source/ThirdParty/ANGLE/src/compiler/preprocessor \ - qtwebkit/Source/ThirdParty/ANGLE/src/compiler/timing \ - qtwebkit/Source/ThirdParty/ANGLE/src/third_party/compiler \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - - diff --git a/repos/libports/lib/mk/qt5_base.mk b/repos/libports/lib/mk/qt5_base.mk new file mode 100644 index 0000000000..def9e3d594 --- /dev/null +++ b/repos/libports/lib/mk/qt5_base.mk @@ -0,0 +1,106 @@ +include $(call select_from_repositories,lib/import/import-qt5_qmake.mk) + +LIBS = base libc libm stdcxx qt5_component egl mesa qoost + +built.tag: qmake_prepared.tag qmake_root/lib/ld.lib.so + + @# + @# run qmake + @# + + $(VERBOSE)source env.sh && $(QMAKE) \ + -qtconf qmake_root/mkspecs/$(QMAKE_PLATFORM)/qt.conf \ + $(QT_DIR)/qtbase/qtbase.pro \ + -- \ + -prefix /qt \ + -xplatform $(QMAKE_PLATFORM) \ + -qpa genode \ + -opensource \ + -confirm-license \ + -no-pch \ + -release \ + -no-strip \ + -opengl desktop \ + -no-feature-dbus \ + -no-feature-networkinterface \ + -no-feature-process \ + $(QT5_OUTPUT_FILTER) + + @# + @# build + @# + + $(VERBOSE)source env.sh && $(MAKE) sub-src $(QT5_OUTPUT_FILTER) + + @# + @# install into local 'install' directory + @# + + $(VERBOSE)$(MAKE) INSTALL_ROOT=$(CURDIR)/install sub-src-install_subtargets $(QT5_OUTPUT_FILTER) + + $(VERBOSE) ln -sf .$(CURDIR)/qmake_root install/qt + + @# + @# create stripped versions + @# + + $(VERBOSE)cd $(CURDIR)/install/qt/lib && \ + $(STRIP) libQt5Core.lib.so -o libQt5Core.lib.so.stripped && \ + $(STRIP) libQt5Gui.lib.so -o libQt5Gui.lib.so.stripped && \ + $(STRIP) libQt5Network.lib.so -o libQt5Network.lib.so.stripped && \ + $(STRIP) libQt5PrintSupport.lib.so -o libQt5PrintSupport.lib.so.stripped && \ + $(STRIP) libQt5Sql.lib.so -o libQt5Sql.lib.so.stripped && \ + $(STRIP) libQt5Test.lib.so -o libQt5Test.lib.so.stripped && \ + $(STRIP) libQt5Widgets.lib.so -o libQt5Widgets.lib.so.stripped + + $(VERBOSE)cd $(CURDIR)/install/qt/plugins/platforms && \ + $(STRIP) libqgenode.lib.so -o libqgenode.lib.so.stripped + + $(VERBOSE)cd $(CURDIR)/install/qt/plugins/imageformats && \ + $(STRIP) libqjpeg.lib.so -o libqjpeg.lib.so.stripped + + @# + @# create symlinks in 'bin' directory + @# + + $(VERBOSE)ln -sf $(CURDIR)/install/qt/lib/libQt5Core.lib.so.stripped $(PWD)/bin/libQt5Core.lib.so + $(VERBOSE)ln -sf $(CURDIR)/install/qt/lib/libQt5Gui.lib.so.stripped $(PWD)/bin/libQt5Gui.lib.so + $(VERBOSE)ln -sf $(CURDIR)/install/qt/lib/libQt5Network.lib.so.stripped $(PWD)/bin/libQt5Network.lib.so + $(VERBOSE)ln -sf $(CURDIR)/install/qt/lib/libQt5PrintSupport.lib.so.stripped $(PWD)/bin/libQt5PrintSupport.lib.so + $(VERBOSE)ln -sf $(CURDIR)/install/qt/lib/libQt5Sql.lib.so.stripped $(PWD)/bin/libQt5Sql.lib.so + $(VERBOSE)ln -sf $(CURDIR)/install/qt/lib/libQt5Test.lib.so.stripped $(PWD)/bin/libQt5Test.lib.so + $(VERBOSE)ln -sf $(CURDIR)/install/qt/lib/libQt5Widgets.lib.so.stripped $(PWD)/bin/libQt5Widgets.lib.so + $(VERBOSE)ln -sf $(CURDIR)/install/qt/plugins/platforms/libqgenode.lib.so.stripped $(PWD)/bin/libqgenode.lib.so + $(VERBOSE)ln -sf $(CURDIR)/install/qt/plugins/imageformats/libqjpeg.lib.so.stripped $(PWD)/bin/libqjpeg.lib.so + + @# + @# create symlinks in 'debug' directory + @# + + $(VERBOSE)ln -sf $(CURDIR)/install/qt/lib/libQt5Core.lib.so $(PWD)/debug/ + $(VERBOSE)ln -sf $(CURDIR)/install/qt/lib/libQt5Gui.lib.so $(PWD)/debug/ + $(VERBOSE)ln -sf $(CURDIR)/install/qt/lib/libQt5Network.lib.so $(PWD)/debug/ + $(VERBOSE)ln -sf $(CURDIR)/install/qt/lib/libQt5PrintSupport.lib.so $(PWD)/debug/ + $(VERBOSE)ln -sf $(CURDIR)/install/qt/lib/libQt5Sql.lib.so $(PWD)/debug/ + $(VERBOSE)ln -sf $(CURDIR)/install/qt/lib/libQt5Test.lib.so $(PWD)/debug/ + $(VERBOSE)ln -sf $(CURDIR)/install/qt/lib/libQt5Widgets.lib.so $(PWD)/debug/ + $(VERBOSE)ln -sf $(CURDIR)/install/qt/plugins/platforms/libqgenode.lib.so $(PWD)/debug/libqgenode.lib.so + $(VERBOSE)ln -sf $(CURDIR)/install/qt/plugins/imageformats/libqjpeg.lib.so $(PWD)/debug/libqjpeg.lib.so + + @# + @# create tar archives + @# + + $(VERBOSE)tar chf $(PWD)/bin/qt5_libqgenode.tar --transform='s/\.stripped//' -C install qt/plugins/platforms/libqgenode.lib.so.stripped + $(VERBOSE)tar chf $(PWD)/bin/qt5_libqjpeg.tar --transform='s/\.stripped//' -C install qt/plugins/imageformats/libqjpeg.lib.so.stripped + + @# + @# mark as done + @# + + $(VERBOSE)touch $@ + + +ifeq ($(called_from_lib_mk),yes) +all: built.tag +endif diff --git a/repos/libports/lib/mk/qt5_component.mk b/repos/libports/lib/mk/qt5_component.mk index 8e18e14338..9acd1138d5 100644 --- a/repos/libports/lib/mk/qt5_component.mk +++ b/repos/libports/lib/mk/qt5_component.mk @@ -4,6 +4,6 @@ LIBS = libc SHARED_LIB = yes -vpath qt_component.cc $(REP_DIR)/src/lib/qt5 +vpath qt_component.cc $(REP_DIR)/src/lib/qt5_component CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_core.mk b/repos/libports/lib/mk/qt5_core.mk deleted file mode 100644 index 4975158039..0000000000 --- a/repos/libports/lib/mk/qt5_core.mk +++ /dev/null @@ -1,27 +0,0 @@ -include $(call select_from_repositories,lib/import/import-qt5_core.mk) - -SHARED_LIB = yes - -# use default warning level to avoid noise when compiling contrib code -CC_WARN = -Wno-unused-but-set-variable -Wno-deprecated-declarations - -include $(REP_DIR)/lib/mk/qt5_core_generated.inc - -# remove unsupported UNIX-specific files -QT_SOURCES_FILTER_OUT = \ - forkfd_qt.cpp \ - moc_qfilesystemwatcher_inotify_p.cpp \ - qfilesystemwatcher_inotify.cpp - -# remove unneeded files to prevent moc warnings -COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT = \ - -include $(REP_DIR)/lib/mk/qt5.inc - -# reduce 'not implemented yet' noise -SRC_CC += libc_dummies.cc -vpath libc_dummies.cc $(REP_DIR)/src/lib/qt5 - -LIBS += zlib qt5_pcre2 libc libm - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_core_generated.inc b/repos/libports/lib/mk/qt5_core_generated.inc deleted file mode 100644 index 59967acada..0000000000 --- a/repos/libports/lib/mk/qt5_core_generated.inc +++ /dev/null @@ -1,363 +0,0 @@ -QT_DEFINES += -DQT_NO_USING_NAMESPACE -DQT_NO_FOREACH -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_BUILD_CORE_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DPCRE2_CODE_UNIT_WIDTH=16 - -QT_INCPATH += \ - qtbase/src/corelib \ - qtbase/src/3rdparty/harfbuzz/src \ - qtbase/src/3rdparty/md5 \ - qtbase/src/3rdparty/md4 \ - qtbase/src/3rdparty/sha3 \ - qtbase/src/3rdparty \ - qtbase/src/3rdparty/double-conversion/include \ - qtbase/src/3rdparty/double-conversion/include/double-conversion \ - qtbase/src/3rdparty/forkfd \ - qtbase/src/3rdparty/tinycbor/src \ - qtbase/include \ - qtbase/include/QtCore \ - qtbase/include/QtCore/5.13.0 \ - qtbase/include/QtCore/5.13.0/QtCore \ - qtbase/src/3rdparty/pcre2/src \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - qabstractanimation.cpp \ - qvariantanimation.cpp \ - qpropertyanimation.cpp \ - qanimationgroup.cpp \ - qsequentialanimationgroup.cpp \ - qparallelanimationgroup.cpp \ - qpauseanimation.cpp \ - qendian.cpp \ - qglobal.cpp \ - qlibraryinfo.cpp \ - qmalloc.cpp \ - qnumeric.cpp \ - qfloat16.cpp \ - qoperatingsystemversion.cpp \ - qlogging.cpp \ - qrandom.cpp \ - qhooks.cpp \ - minimum-linux.S \ - qversiontagging.cpp \ - qrunnable.cpp \ - qthread.cpp \ - qthread_unix.cpp \ - qatomic.cpp \ - qmutex.cpp \ - qmutexpool.cpp \ - qreadwritelock.cpp \ - qsemaphore.cpp \ - qthreadpool.cpp \ - qthreadstorage.cpp \ - qwaitcondition_unix.cpp \ - qexception.cpp \ - qfutureinterface.cpp \ - qfuturewatcher.cpp \ - qresultstore.cpp \ - qarraydata.cpp \ - qbitarray.cpp \ - qbytearray.cpp \ - qbytearraylist.cpp \ - qbytearraymatcher.cpp \ - qcollator.cpp \ - qcryptographichash.cpp \ - qdatetime.cpp \ - qeasingcurve.cpp \ - qfreelist.cpp \ - qhash.cpp \ - qline.cpp \ - qlinkedlist.cpp \ - qlist.cpp \ - qlocale.cpp \ - qlocale_tools.cpp \ - qpoint.cpp \ - qmap.cpp \ - qmargins.cpp \ - qmessageauthenticationcode.cpp \ - qcontiguouscache.cpp \ - qrect.cpp \ - qregexp.cpp \ - qrefcount.cpp \ - qringbuffer.cpp \ - qshareddata.cpp \ - qsharedpointer.cpp \ - qsimd.cpp \ - qsize.cpp \ - qstring.cpp \ - qstringbuilder.cpp \ - qstringlist.cpp \ - qstringview.cpp \ - qtextboundaryfinder.cpp \ - qtimeline.cpp \ - qunicodetools.cpp \ - qvsnprintf.cpp \ - qversionnumber.cpp \ - qlocale_unix.cpp \ - qcollator_posix.cpp \ - qtimezone.cpp \ - qtimezoneprivate.cpp \ - qtimezoneprivate_tz.cpp \ - qdatetimeparser.cpp \ - qregularexpression.cpp \ - qcommandlineoption.cpp \ - qcommandlineparser.cpp \ - harfbuzz-buffer.c \ - harfbuzz-gdef.c \ - harfbuzz-gsub.c \ - harfbuzz-gpos.c \ - harfbuzz-impl.c \ - harfbuzz-open.c \ - harfbuzz-stream.c \ - harfbuzz-shaper-all.cpp \ - qharfbuzz.cpp \ - bignum.cc \ - bignum-dtoa.cc \ - cached-powers.cc \ - diy-fp.cc \ - double-conversion.cc \ - fast-dtoa.cc \ - fixed-dtoa.cc \ - strtod.cc \ - qabstractfileengine.cpp \ - qbuffer.cpp \ - qdataurl.cpp \ - qtldurl.cpp \ - qdebug.cpp \ - qdir.cpp \ - qdiriterator.cpp \ - qfile.cpp \ - qfiledevice.cpp \ - qfileinfo.cpp \ - qipaddress.cpp \ - qiodevice.cpp \ - qlockfile.cpp \ - qnoncontiguousbytedevice.cpp \ - qstorageinfo.cpp \ - qtemporarydir.cpp \ - qtemporaryfile.cpp \ - qresource.cpp \ - qresource_iterator.cpp \ - qsavefile.cpp \ - qstandardpaths.cpp \ - qurl.cpp \ - qurlidna.cpp \ - qurlquery.cpp \ - qurlrecode.cpp \ - qfsfileengine.cpp \ - qfsfileengine_iterator.cpp \ - qfilesystementry.cpp \ - qfilesystemengine.cpp \ - qfileselector.cpp \ - qloggingcategory.cpp \ - qloggingregistry.cpp \ - qfilesystemwatcher.cpp \ - qfilesystemwatcher_polling.cpp \ - qprocess.cpp \ - qprocess_unix.cpp \ - qsettings.cpp \ - qfsfileengine_unix.cpp \ - qfilesystemengine_unix.cpp \ - qlockfile_unix.cpp \ - qfilesystemiterator_unix.cpp \ - forkfd_qt.cpp \ - qstandardpaths_unix.cpp \ - qstorageinfo_stub.cpp \ - qabstractitemmodel.cpp \ - qitemselectionmodel.cpp \ - qabstractproxymodel.cpp \ - qconcatenatetablesproxymodel.cpp \ - qidentityproxymodel.cpp \ - qsortfilterproxymodel.cpp \ - qtransposeproxymodel.cpp \ - qstringlistmodel.cpp \ - qfactoryinterface.cpp \ - qpluginloader.cpp \ - qfactoryloader.cpp \ - quuid.cpp \ - qlibrary.cpp \ - qelfparser_p.cpp \ - qmachparser.cpp \ - qlibrary_unix.cpp \ - qabstracteventdispatcher.cpp \ - qabstractnativeeventfilter.cpp \ - qbasictimer.cpp \ - qdeadlinetimer.cpp \ - qelapsedtimer.cpp \ - qeventloop.cpp \ - qcoreapplication.cpp \ - qcoreevent.cpp \ - qmetaobject.cpp \ - qmetatype.cpp \ - qmetaobjectbuilder.cpp \ - qmimedata.cpp \ - qobject.cpp \ - qobjectcleanuphandler.cpp \ - qsignalmapper.cpp \ - qsocketnotifier.cpp \ - qtimer.cpp \ - qtranslator.cpp \ - qvariant.cpp \ - qcoreglobaldata.cpp \ - qsharedmemory.cpp \ - qsystemsemaphore.cpp \ - qpointer.cpp \ - qmath.cpp \ - qsystemerror.cpp \ - qtestsupport_core.cpp \ - qcore_unix.cpp \ - qeventdispatcher_unix.cpp \ - qtimerinfo_unix.cpp \ - qelapsedtimer_unix.cpp \ - qsharedmemory_posix.cpp \ - qsharedmemory_systemv.cpp \ - qsharedmemory_unix.cpp \ - qsystemsemaphore_posix.cpp \ - qsystemsemaphore_systemv.cpp \ - qsystemsemaphore_unix.cpp \ - qutfcodec.cpp \ - qlatincodec.cpp \ - qsimplecodec.cpp \ - qtextcodec.cpp \ - qisciicodec.cpp \ - qtsciicodec.cpp \ - qgb18030codec.cpp \ - qjpunicode.cpp \ - qeucjpcodec.cpp \ - qjiscodec.cpp \ - qsjiscodec.cpp \ - qeuckrcodec.cpp \ - qbig5codec.cpp \ - qcborstream.cpp \ - qcbordiagnostic.cpp \ - qcborvalue.cpp \ - qdatastream.cpp \ - qjson.cpp \ - qjsoncbor.cpp \ - qjsondocument.cpp \ - qjsonobject.cpp \ - qjsonarray.cpp \ - qjsonvalue.cpp \ - qjsonwriter.cpp \ - qjsonparser.cpp \ - qtextstream.cpp \ - qxmlstream.cpp \ - qxmlutils.cpp \ - qstatemachine.cpp \ - qabstractstate.cpp \ - qstate.cpp \ - qfinalstate.cpp \ - qhistorystate.cpp \ - qabstracttransition.cpp \ - qsignaltransition.cpp \ - qeventtransition.cpp \ - qmimedatabase.cpp \ - qmimetype.cpp \ - qmimemagicrulematcher.cpp \ - qmimetypeparser.cpp \ - qmimemagicrule.cpp \ - qmimeglobpattern.cpp \ - qmimeprovider.cpp \ - qfloat16tables.cpp \ - qrc_mimetypes.cpp \ - moc_qtransposeproxymodel.cpp \ - moc_qmimetype.cpp - -QT_VPATH += \ - qtbase/src/3rdparty/double-conversion \ - qtbase/src/3rdparty/harfbuzz/src \ - qtbase/src/corelib/animation \ - qtbase/src/corelib/codecs \ - qtbase/src/corelib/global \ - qtbase/src/corelib/io \ - qtbase/src/corelib/itemmodels \ - qtbase/src/corelib/kernel \ - qtbase/src/corelib/mimetypes \ - qtbase/src/corelib/plugin \ - qtbase/src/corelib/serialization \ - qtbase/src/corelib/statemachine \ - qtbase/src/corelib/thread \ - qtbase/src/corelib/tools \ - qtbase/src/corelib/tools/qstring_compat.cpp global \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - moc_qabstractanimation.cpp \ - moc_qabstractanimation_p.cpp \ - moc_qvariantanimation.cpp \ - moc_qpropertyanimation.cpp \ - moc_qanimationgroup.cpp \ - moc_qsequentialanimationgroup.cpp \ - moc_qparallelanimationgroup.cpp \ - moc_qpauseanimation.cpp \ - moc_qnamespace.cpp \ - moc_qthread.cpp \ - moc_qthreadpool.cpp \ - moc_qfuturewatcher.cpp \ - moc_qcryptographichash.cpp \ - moc_qeasingcurve.cpp \ - moc_qlocale.cpp \ - moc_qtimeline.cpp \ - moc_qbuffer.cpp \ - moc_qfile.cpp \ - moc_qfiledevice.cpp \ - moc_qiodevice.cpp \ - moc_qnoncontiguousbytedevice_p.cpp \ - moc_qtemporaryfile.cpp \ - moc_qsavefile.cpp \ - moc_qstandardpaths.cpp \ - moc_qfileselector.cpp \ - moc_qfilesystemwatcher.cpp \ - moc_qfilesystemwatcher_p.cpp \ - moc_qfilesystemwatcher_polling_p.cpp \ - moc_qprocess.cpp \ - moc_qsettings.cpp \ - moc_qabstractitemmodel.cpp \ - moc_qitemselectionmodel.cpp \ - moc_qabstractproxymodel.cpp \ - moc_qconcatenatetablesproxymodel.cpp \ - moc_qidentityproxymodel.cpp \ - moc_qsortfilterproxymodel.cpp \ - moc_qtransposeproxymodel.cpp \ - moc_qstringlistmodel.cpp \ - moc_qpluginloader.cpp \ - moc_qfactoryloader_p.cpp \ - moc_qlibrary.cpp \ - moc_qabstracteventdispatcher.cpp \ - moc_qeventloop.cpp \ - moc_qcoreapplication.cpp \ - moc_qcoreevent.cpp \ - moc_qmimedata.cpp \ - moc_qobject.cpp \ - moc_qsignalmapper.cpp \ - moc_qsocketnotifier.cpp \ - moc_qtimer.cpp \ - moc_qtranslator.cpp \ - moc_qobjectcleanuphandler.cpp \ - moc_qsharedmemory.cpp \ - moc_qeventdispatcher_unix_p.cpp \ - moc_qcborcommon.cpp \ - moc_qcborvalue.cpp \ - moc_qcborstream.cpp \ - moc_qtextstream_p.cpp \ - moc_qstatemachine.cpp \ - moc_qabstractstate.cpp \ - moc_qstate.cpp \ - moc_qfinalstate.cpp \ - moc_qhistorystate.cpp \ - moc_qabstracttransition.cpp \ - moc_qsignaltransition.cpp \ - moc_qeventtransition.cpp \ - moc_qmimetype.cpp - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - qtimer.moc \ - qstatemachine.moc \ - qhistorystate.moc - diff --git a/repos/libports/lib/mk/qt5_declarative.mk b/repos/libports/lib/mk/qt5_declarative.mk new file mode 100644 index 0000000000..fbf8dd3aa1 --- /dev/null +++ b/repos/libports/lib/mk/qt5_declarative.mk @@ -0,0 +1,96 @@ +include $(call select_from_repositories,lib/import/import-qt5_qmake.mk) + +QT5_PORT_LIBS = libQt5Core libQt5Gui libQt5Network libQt5Sql libQt5Test libQt5Widgets + +LIBS = libc libm mesa stdcxx $(QT5_PORT_LIBS) + +built.tag: qmake_prepared.tag + + @# + @# run qmake + @# + + $(VERBOSE)source env.sh && $(QMAKE) \ + -qtconf qmake_root/mkspecs/$(QMAKE_PLATFORM)/qt.conf \ + $(QT_DIR)/qtdeclarative/qtdeclarative.pro \ + -- \ + -no-feature-qml-devtools \ + $(QT5_OUTPUT_FILTER) + + @# + @# build + @# + + $(VERBOSE)source env.sh && $(MAKE) sub-src $(QT5_OUTPUT_FILTER) + + @# + @# install into local 'install' directory + @# + + $(VERBOSE)$(MAKE) INSTALL_ROOT=$(CURDIR)/install sub-src-install_subtargets $(QT5_OUTPUT_FILTER) + + $(VERBOSE)ln -sf .$(CURDIR)/qmake_root install/qt + + @# + @# create stripped versions + @# + + $(VERBOSE)cd $(CURDIR)/install/qt/lib && \ + $(STRIP) libQt5Qml.lib.so -o libQt5Qml.lib.so.stripped && \ + $(STRIP) libQt5Quick.lib.so -o libQt5Quick.lib.so.stripped && \ + $(STRIP) libQt5QuickWidgets.lib.so -o libQt5QuickWidgets.lib.so.stripped + + $(VERBOSE)cd $(CURDIR)/install/qt/qml/Qt/labs/folderlistmodel && \ + $(STRIP) libqmlfolderlistmodelplugin.lib.so -o libqmlfolderlistmodelplugin.lib.so.stripped + + $(VERBOSE)cd $(CURDIR)/install/qt/qml/QtQuick.2 && \ + $(STRIP) libqtquick2plugin.lib.so -o libqtquick2plugin.lib.so.stripped + + $(VERBOSE)cd $(CURDIR)/install/qt/qml/QtQuick/Layouts && \ + $(STRIP) libqquicklayoutsplugin.lib.so -o libqquicklayoutsplugin.lib.so.stripped + + $(VERBOSE)cd $(CURDIR)/install/qt/qml/QtQuick/Window.2 && \ + $(STRIP) libwindowplugin.lib.so -o libwindowplugin.lib.so.stripped + + @# + @# create symlinks in 'bin' directory + @# + + $(VERBOSE)ln -sf $(CURDIR)/install/qt/lib/libQt5Qml.lib.so.stripped $(PWD)/bin/libQt5Qml.lib.so + $(VERBOSE)ln -sf $(CURDIR)/install/qt/lib/libQt5Quick.lib.so.stripped $(PWD)/bin/libQt5Quick.lib.so + $(VERBOSE)ln -sf $(CURDIR)/install/qt/lib/libQt5QuickWidgets.lib.so.stripped $(PWD)/bin/libQt5QuickWidgets.lib.so + + $(VERBOSE)ln -sf $(CURDIR)/install/qt/qml/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.lib.so.stripped $(PWD)/bin/libqmlfolderlistmodelplugin.lib.so + $(VERBOSE)ln -sf $(CURDIR)/install/qt/qml/QtQuick.2/libqtquick2plugin.lib.so.stripped $(PWD)/bin/libqtquick2plugin.lib.so + $(VERBOSE)ln -sf $(CURDIR)/install/qt/qml/QtQuick/Layouts/libqquicklayoutsplugin.lib.so.stripped $(PWD)/bin/libqquicklayoutsplugin.lib.so + $(VERBOSE)ln -sf $(CURDIR)/install/qt/qml/QtQuick/Window.2/libwindowplugin.lib.so.stripped $(PWD)/bin/libwindowplugin.lib.so + + @# + @# create symlinks in 'debug' directory + @# + + $(VERBOSE)ln -sf $(CURDIR)/install/qt/lib/libQt5Qml.lib.so $(PWD)/debug/ + $(VERBOSE)ln -sf $(CURDIR)/install/qt/lib/libQt5Quick.lib.so $(PWD)/debug/ + $(VERBOSE)ln -sf $(CURDIR)/install/qt/lib/libQt5QuickWidgets.lib.so $(PWD)/debug/ + + $(VERBOSE)ln -sf $(CURDIR)/install/qt/qml/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.lib.so $(PWD)/debug/ + $(VERBOSE)ln -sf $(CURDIR)/install/qt/qml/QtQuick.2/libqtquick2plugin.lib.so $(PWD)/debug/ + $(VERBOSE)ln -sf $(CURDIR)/install/qt/qml/QtQuick/Layouts/libqquicklayoutsplugin.lib.so $(PWD)/debug/ + $(VERBOSE)ln -sf $(CURDIR)/install/qt/qml/QtQuick/Window.2/libwindowplugin.lib.so $(PWD)/debug/ + + @# + @# create tar archives + @# + + $(VERBOSE)tar chf $(PWD)/bin/qt5_declarative_qml.tar --exclude='*.lib.so' --transform='s/\.stripped//' -C install qt/qml + + @# + @# mark as done + @# + + $(VERBOSE)touch $@ + + +ifeq ($(called_from_lib_mk),yes) +all: built.tag +endif diff --git a/repos/libports/lib/mk/qt5_gui.mk b/repos/libports/lib/mk/qt5_gui.mk deleted file mode 100644 index bb0e0d7bac..0000000000 --- a/repos/libports/lib/mk/qt5_gui.mk +++ /dev/null @@ -1,34 +0,0 @@ -include $(call select_from_repositories,lib/import/import-qt5_gui.mk) - -SHARED_LIB = yes - -ifeq ($(filter-out $(SPECS),x86),) -CC_OPT += -mno-sse2 -endif - -# use default warning level to avoid noise when compiling contrib code -CC_WARN = -Wno-unused-but-set-variable -Wno-deprecated-declarations - -include $(REP_DIR)/lib/mk/qt5_gui_generated.inc - -QT_SOURCES_FILTER_OUT = \ - qdrawhelper_sse2.cpp \ - qimage_sse2.cpp - -ifeq ($(filter-out $(SPECS),arm_64),) -QT_DEFINES += -UENABLE_PIXMAN_DRAWHELPERS -QT_SOURCES += qdrawhelper_neon.cpp \ - qimage_neon.cpp \ - qimagescale_neon.cpp -endif - -# remove unneeded files to prevent moc warnings -COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT = \ - moc_qsessionmanager.cpp \ - qrc_qmake_webgradients.cpp - -include $(REP_DIR)/lib/mk/qt5.inc - -LIBS += qt5_core zlib libpng - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_gui_generated.inc b/repos/libports/lib/mk/qt5_gui_generated.inc deleted file mode 100644 index ef52dbe945..0000000000 --- a/repos/libports/lib/mk/qt5_gui_generated.inc +++ /dev/null @@ -1,402 +0,0 @@ -QT_DEFINES += -DQT_NO_USING_NAMESPACE -DQT_NO_FOREACH -DENABLE_PIXMAN_DRAWHELPERS -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_BUILD_GUI_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_CORE_LIB - -QT_INCPATH += \ - qtbase/src/gui \ - qtbase/include \ - qtbase/include/QtGui \ - qtbase/include/QtGui/5.13.0 \ - qtbase/include/QtGui/5.13.0/QtGui \ - qtbase/include/QtCore/5.13.0 \ - qtbase/include/QtCore/5.13.0/QtCore \ - qtbase/include/QtCore \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - qgenericpluginfactory.cpp \ - qgenericplugin.cpp \ - qwindowsysteminterface.cpp \ - qplatforminputcontextfactory.cpp \ - qplatforminputcontextplugin.cpp \ - qplatforminputcontext.cpp \ - qplatformintegration.cpp \ - qplatformscreen.cpp \ - qplatformintegrationfactory.cpp \ - qplatformintegrationplugin.cpp \ - qplatformtheme.cpp \ - qplatformthemefactory.cpp \ - qplatformthemeplugin.cpp \ - qplatformwindow.cpp \ - qplatformoffscreensurface.cpp \ - qplatformcursor.cpp \ - qplatformclipboard.cpp \ - qplatformnativeinterface.cpp \ - qsessionmanager.cpp \ - qsurfaceformat.cpp \ - qguiapplication.cpp \ - qwindow.cpp \ - qoffscreensurface.cpp \ - qplatformsurface.cpp \ - qsurface.cpp \ - qclipboard.cpp \ - qcursor.cpp \ - qevent.cpp \ - qinputmethod.cpp \ - qinternalmimedata.cpp \ - qkeysequence.cpp \ - qkeymapper.cpp \ - qpalette.cpp \ - qguivariant.cpp \ - qscreen.cpp \ - qshortcutmap.cpp \ - qstylehints.cpp \ - qtouchdevice.cpp \ - qplatformsharedgraphicscache.cpp \ - qplatformdialoghelper.cpp \ - qplatformservices.cpp \ - qplatformsystemtrayicon.cpp \ - qplatformsessionmanager.cpp \ - qplatformmenu.cpp \ - qpixelformat.cpp \ - qpaintdevicewindow.cpp \ - qrasterwindow.cpp \ - qplatformgraphicsbuffer.cpp \ - qplatformgraphicsbufferhelper.cpp \ - qinputdevicemanager.cpp \ - qhighdpiscaling.cpp \ - qtestsupport_gui.cpp \ - qdnd.cpp \ - qdrag.cpp \ - qplatformdrag.cpp \ - qshapedpixmapdndwindow.cpp \ - qsimpledrag.cpp \ - qplatformopenglcontext.cpp \ - qopenglcontext.cpp \ - qopenglwindow.cpp \ - qbitmap.cpp \ - qimage.cpp \ - qimage_conversions.cpp \ - qimageiohandler.cpp \ - qimagereader.cpp \ - qimagereaderwriterhelpers.cpp \ - qimagewriter.cpp \ - qpaintengine_pic.cpp \ - qpicture.cpp \ - qpictureformatplugin.cpp \ - qpixmap.cpp \ - qpixmapcache.cpp \ - qplatformpixmap.cpp \ - qpixmap_raster.cpp \ - qpixmap_blitter.cpp \ - qimagepixmapcleanuphooks.cpp \ - qicon.cpp \ - qiconloader.cpp \ - qiconengine.cpp \ - qiconengineplugin.cpp \ - qmovie.cpp \ - qbmphandler.cpp \ - qppmhandler.cpp \ - qxbmhandler.cpp \ - qxpmhandler.cpp \ - qpnghandler.cpp \ - qfont.cpp \ - qfontengine.cpp \ - qfontengineglyphcache.cpp \ - qfontsubset.cpp \ - qfontmetrics.cpp \ - qfontdatabase.cpp \ - qtextengine.cpp \ - qtextlayout.cpp \ - qtextformat.cpp \ - qtextobject.cpp \ - qtextoption.cpp \ - qfragmentmap.cpp \ - qtextdocument.cpp \ - qtextdocument_p.cpp \ - qtexthtmlparser.cpp \ - qabstracttextdocumentlayout.cpp \ - qtextdocumentlayout.cpp \ - qtextcursor.cpp \ - qtextdocumentfragment.cpp \ - qtextimagehandler.cpp \ - qtexttable.cpp \ - qtextlist.cpp \ - qtextdocumentwriter.cpp \ - qsyntaxhighlighter.cpp \ - qstatictext.cpp \ - qrawfont.cpp \ - qglyphrun.cpp \ - qdistancefield.cpp \ - qinputcontrol.cpp \ - qfontengine_qpf2.cpp \ - qplatformfontdatabase.cpp \ - qtextodfwriter.cpp \ - qzip.cpp \ - qcssparser.cpp \ - qbackingstore.cpp \ - qbezier.cpp \ - qblendfunctions.cpp \ - qblittable.cpp \ - qbrush.cpp \ - qcolor.cpp \ - qcolorprofile.cpp \ - qcompositionfunctions.cpp \ - qcosmeticstroker.cpp \ - qemulationpaintengine.cpp \ - qgrayraster.c \ - qimagescale.cpp \ - qmatrix.cpp \ - qmemrotate.cpp \ - qoutlinemapper.cpp \ - qpagedpaintdevice.cpp \ - qpagelayout.cpp \ - qpagesize.cpp \ - qpaintdevice.cpp \ - qpaintengine.cpp \ - qpaintengineex.cpp \ - qpaintengine_blitter.cpp \ - qpaintengine_raster.cpp \ - qpainter.cpp \ - qpainterpath.cpp \ - qpathclipper.cpp \ - qpdf.cpp \ - qpdfwriter.cpp \ - qpen.cpp \ - qpolygon.cpp \ - qrasterizer.cpp \ - qregion.cpp \ - qstroker.cpp \ - qtextureglyphcache.cpp \ - qtransform.cpp \ - qtriangulatingstroker.cpp \ - qtriangulator.cpp \ - qplatformbackingstore.cpp \ - qpathsimplifier.cpp \ - qcssutil.cpp \ - qdesktopservices.cpp \ - qvalidator.cpp \ - qgridlayoutengine.cpp \ - qabstractlayoutstyleinfo.cpp \ - qlayoutpolicy.cpp \ - qshaderformat.cpp \ - qshadergenerator.cpp \ - qshadergraph.cpp \ - qshadergraphloader.cpp \ - qshaderlanguage.cpp \ - qshadernode.cpp \ - qshadernodeport.cpp \ - qshadernodesloader.cpp \ - qtexturefiledata.cpp \ - qtexturefilereader.cpp \ - qpkmhandler.cpp \ - qktxhandler.cpp \ - qastchandler.cpp \ - qgenericmatrix.cpp \ - qmatrix4x4.cpp \ - qquaternion.cpp \ - qvector2d.cpp \ - qvector3d.cpp \ - qvector4d.cpp \ - qopengl.cpp \ - qopenglfunctions.cpp \ - qopenglframebufferobject.cpp \ - qopenglpaintdevice.cpp \ - qopenglbuffer.cpp \ - qopenglshaderprogram.cpp \ - qopenglgradientcache.cpp \ - qopengltexturecache.cpp \ - qopenglengineshadermanager.cpp \ - qopengl2pexvertexarray.cpp \ - qopenglpaintengine.cpp \ - qopenglcustomshaderstage.cpp \ - qopengltextureglyphcache.cpp \ - qopenglversionfunctions.cpp \ - qopenglversionfunctionsfactory.cpp \ - qopenglvertexarrayobject.cpp \ - qopengldebug.cpp \ - qopengltextureblitter.cpp \ - qopengltexture.cpp \ - qopengltexturehelper.cpp \ - qopengltextureuploader.cpp \ - qopenglpixeltransferoptions.cpp \ - qopenglprogrambinarycache.cpp \ - qopenglfunctions_1_0.cpp \ - qopenglfunctions_1_1.cpp \ - qopenglfunctions_1_2.cpp \ - qopenglfunctions_1_3.cpp \ - qopenglfunctions_1_4.cpp \ - qopenglfunctions_1_5.cpp \ - qopenglfunctions_2_0.cpp \ - qopenglfunctions_2_1.cpp \ - qopenglfunctions_3_0.cpp \ - qopenglfunctions_3_1.cpp \ - qopenglfunctions_3_2_core.cpp \ - qopenglfunctions_3_3_core.cpp \ - qopenglfunctions_4_0_core.cpp \ - qopenglfunctions_4_1_core.cpp \ - qopenglfunctions_4_2_core.cpp \ - qopenglfunctions_4_3_core.cpp \ - qopenglfunctions_4_4_core.cpp \ - qopenglfunctions_4_5_core.cpp \ - qopenglfunctions_3_2_compatibility.cpp \ - qopenglfunctions_3_3_compatibility.cpp \ - qopenglfunctions_4_0_compatibility.cpp \ - qopenglfunctions_4_1_compatibility.cpp \ - qopenglfunctions_4_2_compatibility.cpp \ - qopenglfunctions_4_3_compatibility.cpp \ - qopenglfunctions_4_4_compatibility.cpp \ - qopenglfunctions_4_5_compatibility.cpp \ - qopengltimerquery.cpp \ - qguivariantanimation.cpp \ - qstandarditemmodel.cpp \ - qimage_compat.cpp \ - qdrawhelper.cpp \ - qdrawhelper_sse2.cpp \ - qrc_qpdf.cpp \ - qrc_qmake_webgradients.cpp \ - moc_qgenericplugin.cpp \ - moc_qplatforminputcontext.cpp \ - moc_qplatforminputcontextplugin_p.cpp \ - moc_qplatformintegrationplugin.cpp \ - moc_qplatformthemeplugin.cpp \ - moc_qplatformnativeinterface.cpp \ - moc_qplatformmenu.cpp \ - moc_qsurfaceformat.cpp \ - moc_qoffscreensurface.cpp \ - moc_qsurface.cpp \ - moc_qclipboard.cpp \ - moc_qevent.cpp \ - moc_qinternalmimedata_p.cpp \ - moc_qkeysequence.cpp \ - moc_qkeymapper_p.cpp \ - moc_qpalette.cpp \ - moc_qsessionmanager.cpp \ - moc_qscreen.cpp \ - moc_qstylehints.cpp \ - moc_qtouchdevice.cpp \ - moc_qplatformsharedgraphicscache.cpp \ - moc_qplatformdialoghelper.cpp \ - moc_qpaintdevicewindow.cpp \ - moc_qrasterwindow.cpp \ - moc_qplatformgraphicsbuffer.cpp \ - moc_qinputdevicemanager_p.cpp \ - moc_qdnd_p.cpp \ - moc_qdrag.cpp \ - moc_qshapedpixmapdndwindow_p.cpp \ - moc_qopenglwindow.cpp \ - moc_qimage.cpp \ - moc_qimageiohandler.cpp \ - moc_qpictureformatplugin.cpp \ - moc_qiconengineplugin.cpp \ - moc_qfont.cpp \ - moc_qfontdatabase.cpp \ - moc_qtextformat.cpp \ - moc_qtextobject.cpp \ - moc_qtextdocument.cpp \ - moc_qtextimagehandler_p.cpp \ - moc_qtexttable.cpp \ - moc_qtextlist.cpp \ - moc_qinputcontrol_p.cpp \ - moc_qbrush.cpp \ - moc_qpainter.cpp \ - moc_qpdfwriter.cpp \ - moc_qplatformbackingstore.cpp \ - moc_qvalidator.cpp \ - moc_qlayoutpolicy_p.cpp \ - moc_qshaderlanguage_p.cpp \ - moc_qopenglshaderprogram.cpp \ - moc_qopenglengineshadermanager_p.cpp \ - moc_qopengltexture.cpp \ - moc_qopengltimerquery.cpp - -QT_VPATH += \ - qtbase/src/gui/animation \ - qtbase/src/gui/image \ - qtbase/src/gui/itemmodels \ - qtbase/src/gui/kernel \ - qtbase/src/gui/math3d \ - qtbase/src/gui/opengl \ - qtbase/src/gui/painting \ - qtbase/src/gui/text \ - qtbase/src/gui/util \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - moc_qgenericplugin.cpp \ - moc_qplatforminputcontext.cpp \ - moc_qplatforminputcontextplugin_p.cpp \ - moc_qplatformintegrationplugin.cpp \ - moc_qplatformthemeplugin.cpp \ - moc_qplatformnativeinterface.cpp \ - moc_qplatformmenu.cpp \ - moc_qsurfaceformat.cpp \ - moc_qguiapplication.cpp \ - moc_qwindow.cpp \ - moc_qoffscreensurface.cpp \ - moc_qsurface.cpp \ - moc_qclipboard.cpp \ - moc_qevent.cpp \ - moc_qinputmethod.cpp \ - moc_qinternalmimedata_p.cpp \ - moc_qkeysequence.cpp \ - moc_qkeymapper_p.cpp \ - moc_qpalette.cpp \ - moc_qsessionmanager.cpp \ - moc_qscreen.cpp \ - moc_qstylehints.cpp \ - moc_qtouchdevice.cpp \ - moc_qplatformsharedgraphicscache.cpp \ - moc_qplatformdialoghelper.cpp \ - moc_qplatformsystemtrayicon.cpp \ - moc_qpaintdevicewindow.cpp \ - moc_qrasterwindow.cpp \ - moc_qplatformgraphicsbuffer.cpp \ - moc_qinputdevicemanager_p.cpp \ - moc_qdnd_p.cpp \ - moc_qdrag.cpp \ - moc_qshapedpixmapdndwindow_p.cpp \ - moc_qopenglcontext.cpp \ - moc_qopenglwindow.cpp \ - moc_qimage.cpp \ - moc_qimageiohandler.cpp \ - moc_qpictureformatplugin.cpp \ - moc_qiconengineplugin.cpp \ - moc_qmovie.cpp \ - moc_qfont.cpp \ - moc_qfontdatabase.cpp \ - moc_qtextformat.cpp \ - moc_qtextobject.cpp \ - moc_qtextdocument.cpp \ - moc_qabstracttextdocumentlayout.cpp \ - moc_qtextdocumentlayout_p.cpp \ - moc_qtextimagehandler_p.cpp \ - moc_qtexttable.cpp \ - moc_qtextlist.cpp \ - moc_qsyntaxhighlighter.cpp \ - moc_qinputcontrol_p.cpp \ - moc_qbrush.cpp \ - moc_qpainter.cpp \ - moc_qpdfwriter.cpp \ - moc_qplatformbackingstore.cpp \ - moc_qvalidator.cpp \ - moc_qlayoutpolicy_p.cpp \ - moc_qshaderlanguage_p.cpp \ - moc_qopenglshaderprogram.cpp \ - moc_qopenglengineshadermanager_p.cpp \ - moc_qopenglvertexarrayobject.cpp \ - moc_qopengldebug.cpp \ - moc_qopengltexture.cpp \ - moc_qopengltimerquery.cpp \ - moc_qstandarditemmodel.cpp - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - qpixmapcache.moc \ - qdesktopservices.moc - diff --git a/repos/libports/lib/mk/qt5_jscore.inc b/repos/libports/lib/mk/qt5_jscore.inc deleted file mode 100644 index 631e6585e7..0000000000 --- a/repos/libports/lib/mk/qt5_jscore.inc +++ /dev/null @@ -1,22 +0,0 @@ -include $(call select_from_repositories,lib/import/import-qt5_jscore.mk) - -SHARED_LIB = yes - -# additional defines for the Genode version -CC_OPT += -DSQLITE_NO_SYNC=1 -DSQLITE_THREADSAFE=0 - -# enable C++ functions that use C99 math functions (disabled by default in the Genode tool chain) -CC_CXX_OPT += -D_GLIBCXX_USE_C99_MATH - -# use default warning level to avoid noise when compiling contrib code -CC_WARN = - -include $(REP_DIR)/lib/mk/qt5_jscore_generated.inc - -QT_INCPATH += qtwebkit/Source/JavaScriptCore/generated - -include $(REP_DIR)/lib/mk/qt5.inc - -LIBS += qt5_network qt5_core icu libc libm - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_jscore_generated.inc b/repos/libports/lib/mk/qt5_jscore_generated.inc deleted file mode 100644 index 9571232e92..0000000000 --- a/repos/libports/lib/mk/qt5_jscore_generated.inc +++ /dev/null @@ -1,365 +0,0 @@ -QT_DEFINES += -DBUILDING_QT__=1 -DNDEBUG -DENABLE_3D_RENDERING=1 -DENABLE_ACCELERATED_2D_CANVAS=1 -DENABLE_BLOB=1 -DENABLE_CANVAS_PATH=1 -DENABLE_CHANNEL_MESSAGING=1 -DENABLE_CSS_BOX_DECORATION_BREAK=1 -DENABLE_CSS_COMPOSITING=1 -DENABLE_CSS_EXCLUSIONS=1 -DENABLE_CSS_FILTERS=1 -DENABLE_CSS_IMAGE_SET=1 -DENABLE_CSS_REGIONS=1 -DENABLE_CSS_SHAPES=1 -DENABLE_CSS_STICKY_POSITION=1 -DENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=1 -DENABLE_DATALIST_ELEMENT=1 -DENABLE_DETAILS_ELEMENT=1 -DENABLE_DOWNLOAD_ATTRIBUTE=1 -DENABLE_FAST_MOBILE_SCROLLING=1 -DENABLE_FILTERS=1 -DENABLE_FTPDIR=1 -DENABLE_FULLSCREEN_API=1 -DENABLE_GESTURE_EVENTS=1 -DENABLE_ICONDATABASE=1 -DENABLE_IFRAME_SEAMLESS=1 -DENABLE_INPUT_TYPE_COLOR=1 -DENABLE_INSPECTOR=1 -DENABLE_INSPECTOR_SERVER=1 -DENABLE_JAVASCRIPT_DEBUGGER=1 -DENABLE_LEGACY_NOTIFICATIONS=1 -DENABLE_LEGACY_VIEWPORT_ADAPTION=1 -DENABLE_LEGACY_VENDOR_PREFIXES=1 -DENABLE_LEGACY_WEB_AUDIO=1 -DENABLE_LINK_PREFETCH=1 -DENABLE_METER_ELEMENT=1 -DENABLE_MHTML=1 -DENABLE_NOTIFICATIONS=1 -DENABLE_PAGE_VISIBILITY_API=1 -DENABLE_PROGRESS_ELEMENT=1 -DENABLE_RESOLUTION_MEDIA_QUERY=1 -DENABLE_REQUEST_ANIMATION_FRAME=1 -DENABLE_SHARED_WORKERS=1 -DENABLE_SMOOTH_SCROLLING=1 -DENABLE_SQL_DATABASE=1 -DENABLE_SUBPIXEL_LAYOUT=1 -DENABLE_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_TOUCH_ADJUSTMENT=1 -DENABLE_TOUCH_EVENTS=1 -DENABLE_TOUCH_SLIDER=1 -DENABLE_VIEW_MODE_CSS_MEDIA=1 -DENABLE_WEB_SOCKETS=1 -DENABLE_WEB_TIMING=1 -DENABLE_WORKERS=1 -DENABLE_XHR_TIMEOUT=1 -DWTF_USE_TILED_BACKING_STORE=1 -DWTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=1 -DHAVE_QTPRINTSUPPORT=1 -DHAVE_QSTYLE=1 -DHAVE_QTTESTLIB=1 -DWTF_USE_LIBJPEG=1 -DWTF_USE_LIBPNG=1 -DHAVE_FONTCONFIG=1 -DPLUGIN_ARCHITECTURE_UNSUPPORTED=1 -DWTF_USE_3D_GRAPHICS=1 -DENABLE_WEBGL=1 -DENABLE_BATTERY_STATUS=0 -DENABLE_CANVAS_PROXY=0 -DENABLE_CSP_NEXT=0 -DENABLE_CSS_GRID_LAYOUT=0 -DENABLE_CSS_HIERARCHIES=0 -DENABLE_CSS_IMAGE_ORIENTATION=0 -DENABLE_CSS_IMAGE_RESOLUTION=0 -DENABLE_CSS_SHADERS=0 -DENABLE_CSS_VARIABLES=0 -DENABLE_CSS3_CONDITIONAL_RULES=0 -DENABLE_CSS3_TEXT=0 -DENABLE_CSS3_TEXT_LINE_BREAK=0 -DENABLE_DASHBOARD_SUPPORT=0 -DENABLE_DATAGRID=0 -DENABLE_DATA_TRANSFER_ITEMS=0 -DENABLE_DEVICE_ORIENTATION=0 -DENABLE_DIRECTORY_UPLOAD=0 -DENABLE_FILE_SYSTEM=0 -DENABLE_FONT_LOAD_EVENTS=0 -DENABLE_GAMEPAD=0 -DENABLE_GEOLOCATION=0 -DENABLE_HIGH_DPI_CANVAS=0 -DENABLE_INDEXED_DATABASE=0 -DENABLE_INPUT_SPEECH=0 -DENABLE_INPUT_TYPE_DATE=0 -DENABLE_INPUT_TYPE_DATETIME_INCOMPLETE=0 -DENABLE_INPUT_TYPE_DATETIMELOCAL=0 -DENABLE_INPUT_TYPE_MONTH=0 -DENABLE_INPUT_TYPE_TIME=0 -DENABLE_INPUT_TYPE_WEEK=0 -DENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 -DENABLE_MATHML=0 -DENABLE_MEDIA_SOURCE=0 -DENABLE_MEDIA_STATISTICS=0 -DENABLE_MEDIA_STREAM=0 -DENABLE_MICRODATA=0 -DENABLE_MOUSE_CURSOR_SCALE=0 -DENABLE_NAVIGATOR_CONTENT_UTILS=0 -DENABLE_NETSCAPE_PLUGIN_API=0 -DENABLE_NETWORK_INFO=0 -DENABLE_NOSNIFF=0 -DENABLE_ORIENTATION_EVENTS=0 -DENABLE_PROXIMITY_EVENTS=0 -DENABLE_QUOTA=0 -DENABLE_RESOURCE_TIMING=0 -DENABLE_SCRIPTED_SPEECH=0 -DENABLE_SECCOMP_FILTERS=0 -DENABLE_SHADOW_DOM=0 -DENABLE_STYLE_SCOPED=0 -DENABLE_TEMPLATE_ELEMENT=0 -DENABLE_TEXT_AUTOSIZING=0 -DENABLE_THREADED_HTML_PARSER=0 -DENABLE_TOUCH_ICON_LOADING=0 -DENABLE_USER_TIMING=0 -DENABLE_VIBRATION=0 -DENABLE_VIDEO=0 -DENABLE_VIDEO_TRACK=0 -DENABLE_WEB_AUDIO=0 -DENABLE_XSLT=0 -DSTATICALLY_LINKED_WITH_WTF -DBUILDING_JavaScriptCore -DBUILDING_WEBKIT -DQT_ASCII_CAST_WARNINGS -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_CORE_LIB - -QT_INCPATH += \ - qtwebkit/Source/JavaScriptCore \ - qtwebkit/Source/JavaScriptCore \ - qtwebkit/Source \ - qtwebkit/Source/WTF \ - qtwebkit/Source/JavaScriptCore/assembler \ - qtwebkit/Source/JavaScriptCore/bytecode \ - qtwebkit/Source/JavaScriptCore/bytecompiler \ - qtwebkit/Source/JavaScriptCore/heap \ - qtwebkit/Source/JavaScriptCore/dfg \ - qtwebkit/Source/JavaScriptCore/debugger \ - qtwebkit/Source/JavaScriptCore/disassembler \ - qtwebkit/Source/JavaScriptCore/interpreter \ - qtwebkit/Source/JavaScriptCore/jit \ - qtwebkit/Source/JavaScriptCore/llint \ - qtwebkit/Source/JavaScriptCore/parser \ - qtwebkit/Source/JavaScriptCore/profiler \ - qtwebkit/Source/JavaScriptCore/runtime \ - qtwebkit/Source/JavaScriptCore/tools \ - qtwebkit/Source/JavaScriptCore/yarr \ - qtwebkit/Source/JavaScriptCore/API \ - qtwebkit/Source/JavaScriptCore/ForwardingHeaders \ - qtwebkit/Source/JavaScriptCore/disassembler/udis86 \ - qtwebkit/Source \ - qtwebkit/Source/WTF \ - qtbase/include \ - qtbase/include/QtCore \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - YarrInterpreter.cpp \ - YarrPattern.cpp \ - YarrSyntaxChecker.cpp \ - YarrCanonicalizeUCS2.cpp \ - JSBase.cpp \ - JSCallbackConstructor.cpp \ - JSCallbackFunction.cpp \ - JSCallbackObject.cpp \ - JSClassRef.cpp \ - JSContextRef.cpp \ - JSObjectRef.cpp \ - JSScriptRef.cpp \ - JSStringRef.cpp \ - JSStringRefQt.cpp \ - JSValueRef.cpp \ - JSWeakObjectMapRefPrivate.cpp \ - OpaqueJSString.cpp \ - ARMAssembler.cpp \ - ARMv7Assembler.cpp \ - LinkBuffer.cpp \ - MacroAssembler.cpp \ - MacroAssemblerARM.cpp \ - ArrayAllocationProfile.cpp \ - ArrayProfile.cpp \ - CallLinkInfo.cpp \ - CallLinkStatus.cpp \ - CodeBlock.cpp \ - CodeBlockHash.cpp \ - CodeOrigin.cpp \ - CodeType.cpp \ - DFGExitProfile.cpp \ - ExecutionCounter.cpp \ - ExitKind.cpp \ - GetByIdStatus.cpp \ - JumpTable.cpp \ - LazyOperandValueProfile.cpp \ - MethodOfGettingAValueProfile.cpp \ - Opcode.cpp \ - PolymorphicPutByIdList.cpp \ - PreciseJumpTargets.cpp \ - PutByIdStatus.cpp \ - ReduceWhitespace.cpp \ - ResolveGlobalStatus.cpp \ - SamplingTool.cpp \ - SpecialPointer.cpp \ - SpeculatedType.cpp \ - StructureStubClearingWatchpoint.cpp \ - StructureStubInfo.cpp \ - UnlinkedCodeBlock.cpp \ - Watchpoint.cpp \ - BytecodeGenerator.cpp \ - NodesCodegen.cpp \ - CopiedSpace.cpp \ - CopyVisitor.cpp \ - ConservativeRoots.cpp \ - DFGCodeBlocks.cpp \ - Weak.cpp \ - WeakBlock.cpp \ - WeakHandleOwner.cpp \ - WeakSet.cpp \ - HandleSet.cpp \ - HandleStack.cpp \ - BlockAllocator.cpp \ - GCThreadSharedData.cpp \ - GCThread.cpp \ - Heap.cpp \ - HeapStatistics.cpp \ - HeapTimer.cpp \ - IncrementalSweeper.cpp \ - JITStubRoutineSet.cpp \ - MachineStackMarker.cpp \ - MarkStack.cpp \ - MarkedAllocator.cpp \ - MarkedBlock.cpp \ - MarkedSpace.cpp \ - SlotVisitor.cpp \ - SuperRegion.cpp \ - VTableSpectrum.cpp \ - WriteBarrierSupport.cpp \ - DebuggerActivation.cpp \ - DebuggerCallFrame.cpp \ - Debugger.cpp \ - DFGAbstractState.cpp \ - DFGArgumentsSimplificationPhase.cpp \ - DFGArrayMode.cpp \ - DFGAssemblyHelpers.cpp \ - DFGBackwardsPropagationPhase.cpp \ - DFGByteCodeParser.cpp \ - DFGCapabilities.cpp \ - DFGCommon.cpp \ - DFGCFAPhase.cpp \ - DFGCFGSimplificationPhase.cpp \ - DFGCPSRethreadingPhase.cpp \ - DFGConstantFoldingPhase.cpp \ - DFGCSEPhase.cpp \ - DFGDCEPhase.cpp \ - DFGDisassembler.cpp \ - DFGDominators.cpp \ - DFGDriver.cpp \ - DFGEdge.cpp \ - DFGFixupPhase.cpp \ - DFGGraph.cpp \ - DFGJITCompiler.cpp \ - DFGLongLivedState.cpp \ - DFGMinifiedNode.cpp \ - DFGNode.cpp \ - DFGNodeFlags.cpp \ - DFGOperations.cpp \ - DFGOSREntry.cpp \ - DFGOSRExit.cpp \ - DFGOSRExitCompiler.cpp \ - DFGOSRExitCompiler64.cpp \ - DFGOSRExitCompiler32_64.cpp \ - DFGOSRExitJumpPlaceholder.cpp \ - DFGPhase.cpp \ - DFGPredictionPropagationPhase.cpp \ - DFGPredictionInjectionPhase.cpp \ - DFGRepatch.cpp \ - DFGSpeculativeJIT.cpp \ - DFGSpeculativeJIT32_64.cpp \ - DFGSpeculativeJIT64.cpp \ - DFGTypeCheckHoistingPhase.cpp \ - DFGThunks.cpp \ - DFGUnificationPhase.cpp \ - DFGUseKind.cpp \ - DFGValueSource.cpp \ - DFGVariableAccessDataDump.cpp \ - DFGVariableEvent.cpp \ - DFGVariableEventStream.cpp \ - DFGValidate.cpp \ - DFGVirtualRegisterAllocationPhase.cpp \ - Disassembler.cpp \ - AbstractPC.cpp \ - CallFrame.cpp \ - Interpreter.cpp \ - JSStack.cpp \ - ClosureCallStubRoutine.cpp \ - ExecutableAllocatorFixedVMPool.cpp \ - ExecutableAllocator.cpp \ - HostCallReturnValue.cpp \ - GCAwareJITStubRoutine.cpp \ - JITArithmetic.cpp \ - JITArithmetic32_64.cpp \ - JITCall.cpp \ - JITCall32_64.cpp \ - JITCode.cpp \ - JIT.cpp \ - JITDisassembler.cpp \ - JITExceptions.cpp \ - JITOpcodes.cpp \ - JITOpcodes32_64.cpp \ - JITPropertyAccess.cpp \ - JITPropertyAccess32_64.cpp \ - JITStubRoutine.cpp \ - JITStubs.cpp \ - JITThunks.cpp \ - JumpReplacementWatchpoint.cpp \ - ThunkGenerators.cpp \ - LLIntCLoop.cpp \ - LLIntData.cpp \ - LLIntEntrypoints.cpp \ - LLIntExceptions.cpp \ - LLIntSlowPaths.cpp \ - LLIntThunks.cpp \ - LowLevelInterpreter.cpp \ - Lexer.cpp \ - Nodes.cpp \ - ParserArena.cpp \ - Parser.cpp \ - SourceProvider.cpp \ - SourceProviderCache.cpp \ - ProfilerBytecode.cpp \ - ProfilerBytecodeSequence.cpp \ - ProfilerBytecodes.cpp \ - ProfilerCompilation.cpp \ - ProfilerCompilationKind.cpp \ - ProfilerCompiledBytecode.cpp \ - ProfilerDatabase.cpp \ - ProfilerOrigin.cpp \ - ProfilerOriginStack.cpp \ - ProfilerOSRExit.cpp \ - ProfilerOSRExitSite.cpp \ - ProfilerProfiledBytecodes.cpp \ - Profile.cpp \ - ProfileGenerator.cpp \ - ProfileNode.cpp \ - LegacyProfiler.cpp \ - ArgList.cpp \ - Arguments.cpp \ - ArrayConstructor.cpp \ - ArrayPrototype.cpp \ - BooleanConstructor.cpp \ - BooleanObject.cpp \ - BooleanPrototype.cpp \ - CallData.cpp \ - CodeCache.cpp \ - CodeSpecializationKind.cpp \ - CommonIdentifiers.cpp \ - Completion.cpp \ - ConstructData.cpp \ - DateConstructor.cpp \ - DateConversion.cpp \ - DateInstance.cpp \ - DatePrototype.cpp \ - ErrorConstructor.cpp \ - Error.cpp \ - ErrorInstance.cpp \ - ErrorPrototype.cpp \ - ExceptionHelpers.cpp \ - Executable.cpp \ - FunctionConstructor.cpp \ - FunctionExecutableDump.cpp \ - FunctionPrototype.cpp \ - GCActivityCallback.cpp \ - GetterSetter.cpp \ - Options.cpp \ - Identifier.cpp \ - IndexingType.cpp \ - InitializeThreading.cpp \ - InternalFunction.cpp \ - JSActivation.cpp \ - JSAPIValueWrapper.cpp \ - JSArray.cpp \ - JSCell.cpp \ - JSDateMath.cpp \ - JSFunction.cpp \ - JSBoundFunction.cpp \ - VM.cpp \ - JSGlobalObject.cpp \ - JSGlobalObjectFunctions.cpp \ - JSProxy.cpp \ - JSLock.cpp \ - JSNotAnObject.cpp \ - JSObject.cpp \ - JSONObject.cpp \ - JSPropertyNameIterator.cpp \ - JSSegmentedVariableObject.cpp \ - JSWithScope.cpp \ - JSNameScope.cpp \ - JSScope.cpp \ - JSString.cpp \ - JSStringJoiner.cpp \ - JSSymbolTableObject.cpp \ - JSCJSValue.cpp \ - JSVariableObject.cpp \ - JSWrapperObject.cpp \ - LiteralParser.cpp \ - Lookup.cpp \ - MathObject.cpp \ - MemoryStatistics.cpp \ - NameConstructor.cpp \ - NameInstance.cpp \ - NamePrototype.cpp \ - NativeErrorConstructor.cpp \ - NativeErrorPrototype.cpp \ - NumberConstructor.cpp \ - NumberObject.cpp \ - NumberPrototype.cpp \ - ObjectConstructor.cpp \ - ObjectPrototype.cpp \ - Operations.cpp \ - PropertyDescriptor.cpp \ - PropertyNameArray.cpp \ - PropertySlot.cpp \ - PropertyTable.cpp \ - PrototypeMap.cpp \ - RegExpConstructor.cpp \ - RegExpCachedResult.cpp \ - RegExpMatchesArray.cpp \ - RegExp.cpp \ - RegExpObject.cpp \ - RegExpPrototype.cpp \ - RegExpCache.cpp \ - SamplingCounter.cpp \ - SmallStrings.cpp \ - SparseArrayValueMap.cpp \ - StrictEvalActivation.cpp \ - StringConstructor.cpp \ - StringObject.cpp \ - StringPrototype.cpp \ - StringRecursionChecker.cpp \ - StructureChain.cpp \ - Structure.cpp \ - StructureRareData.cpp \ - SymbolTable.cpp \ - Watchdog.cpp \ - WatchdogNone.cpp \ - CodeProfile.cpp \ - CodeProfiling.cpp \ - YarrJIT.cpp \ - UDis86Disassembler.cpp \ - udis86.c \ - udis86_decode.c \ - udis86_input.c \ - udis86_itab_holder.c \ - udis86_syn-att.c \ - udis86_syn-intel.c \ - udis86_syn.c - -QT_VPATH += \ - qtwebkit/Source/JavaScriptCore/API \ - qtwebkit/Source/JavaScriptCore/assembler \ - qtwebkit/Source/JavaScriptCore/bytecode \ - qtwebkit/Source/JavaScriptCore/bytecompiler \ - qtwebkit/Source/JavaScriptCore/debugger \ - qtwebkit/Source/JavaScriptCore/dfg \ - qtwebkit/Source/JavaScriptCore/disassembler \ - qtwebkit/Source/JavaScriptCore/disassembler/udis86 \ - qtwebkit/Source/JavaScriptCore/heap \ - qtwebkit/Source/JavaScriptCore/interpreter \ - qtwebkit/Source/JavaScriptCore/jit \ - qtwebkit/Source/JavaScriptCore/llint \ - qtwebkit/Source/JavaScriptCore/parser \ - qtwebkit/Source/JavaScriptCore/profiler \ - qtwebkit/Source/JavaScriptCore/runtime \ - qtwebkit/Source/JavaScriptCore/tools \ - qtwebkit/Source/JavaScriptCore/yarr \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - - diff --git a/repos/libports/lib/mk/qt5_network.mk b/repos/libports/lib/mk/qt5_network.mk deleted file mode 100644 index 54ed5a58c0..0000000000 --- a/repos/libports/lib/mk/qt5_network.mk +++ /dev/null @@ -1,29 +0,0 @@ -include $(call select_from_repositories,lib/import/import-qt5_network.mk) - -SHARED_LIB = yes - -# use default warning level to avoid noise when compiling contrib code -CC_WARN = - -include $(REP_DIR)/lib/mk/qt5_network_generated.inc - -# remove unneeded files to prevent moc warnings -COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT = \ - moc_qbearerengine_p.cpp \ - moc_qbearerplugin_p.cpp \ - moc_qnetworkaccessdebugpipebackend_p.cpp \ - moc_qnetworkconfigmanager.cpp \ - moc_qnetworkconfigmanager_p.cpp \ - moc_qnetworksession.cpp \ - moc_qnetworksession_p.cpp \ - moc_qsslsocket_openssl_p.cpp - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES_FILTER_OUT = \ - -include $(REP_DIR)/lib/mk/qt5.inc - -QT5_INC_DIR += $(QT5_CONTRIB_DIR)/qtbase/src/network/access - -LIBS += qt5_core zlib libc libssl - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_network_generated.inc b/repos/libports/lib/mk/qt5_network_generated.inc deleted file mode 100644 index 014d277bd8..0000000000 --- a/repos/libports/lib/mk/qt5_network_generated.inc +++ /dev/null @@ -1,211 +0,0 @@ -QT_DEFINES += -DQT_NO_USING_NAMESPACE -DQT_NO_FOREACH -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_BUILD_NETWORK_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_CORE_LIB - -QT_INCPATH += \ - qtbase/src/network \ - qtbase/src/network/kernel \ - qtbase/include \ - qtbase/include/QtNetwork \ - qtbase/include/QtNetwork/5.13.0 \ - qtbase/include/QtNetwork/5.13.0/QtNetwork \ - qtbase/include/QtCore/5.13.0 \ - qtbase/include/QtCore/5.13.0/QtCore \ - qtbase/include/QtCore \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - qnetworkaccessauthenticationmanager.cpp \ - qnetworkaccessmanager.cpp \ - qnetworkaccesscache.cpp \ - qnetworkaccessbackend.cpp \ - qnetworkaccessdebugpipebackend.cpp \ - qnetworkaccessfilebackend.cpp \ - qnetworkaccesscachebackend.cpp \ - qnetworkcookie.cpp \ - qnetworkcookiejar.cpp \ - qnetworkrequest.cpp \ - qnetworkreply.cpp \ - qnetworkreplyimpl.cpp \ - qnetworkreplydataimpl.cpp \ - qnetworkreplyfileimpl.cpp \ - qabstractnetworkcache.cpp \ - qnetworkfile.cpp \ - qhsts.cpp \ - qhstspolicy.cpp \ - qftp.cpp \ - qnetworkaccessftpbackend.cpp \ - qnetworkdiskcache.cpp \ - qhstsstore.cpp \ - bitstreams.cpp \ - huffman.cpp \ - hpack.cpp \ - hpacktable.cpp \ - http2frames.cpp \ - http2streams.cpp \ - http2protocol.cpp \ - qabstractprotocolhandler.cpp \ - qhttp2protocolhandler.cpp \ - qhttpmultipart.cpp \ - qhttpnetworkconnection.cpp \ - qhttpnetworkconnectionchannel.cpp \ - qhttpnetworkheader.cpp \ - qhttpnetworkreply.cpp \ - qhttpnetworkrequest.cpp \ - qhttpprotocolhandler.cpp \ - qhttpthreaddelegate.cpp \ - qnetworkreplyhttpimpl.cpp \ - qspdyprotocolhandler.cpp \ - qnetworksession.cpp \ - qnetworkconfigmanager.cpp \ - qnetworkconfiguration.cpp \ - qnetworkconfigmanager_p.cpp \ - qbearerengine.cpp \ - qbearerplugin.cpp \ - qsharednetworksession.cpp \ - qauthenticator.cpp \ - qhostaddress.cpp \ - qhostinfo.cpp \ - qnetworkdatagram.cpp \ - qnetworkinterface.cpp \ - qnetworkproxy.cpp \ - qurlinfo.cpp \ - qdnslookup.cpp \ - qdnslookup_unix.cpp \ - qhostinfo_unix.cpp \ - qnetworkinterface_linux.cpp \ - qnetworkproxy_generic.cpp \ - qabstractsocketengine.cpp \ - qabstractsocket.cpp \ - qtcpsocket.cpp \ - qudpsocket.cpp \ - qtcpserver.cpp \ - qsocks5socketengine.cpp \ - qhttpsocketengine.cpp \ - qnativesocketengine.cpp \ - qnativesocketengine_unix.cpp \ - qlocalsocket.cpp \ - qlocalserver.cpp \ - qlocalsocket_unix.cpp \ - qlocalserver_unix.cpp \ - qasn1element.cpp \ - qssl.cpp \ - qsslcertificate.cpp \ - qsslcertificateextension.cpp \ - qsslconfiguration.cpp \ - qsslcipher.cpp \ - qssldiffiehellmanparameters.cpp \ - qsslellipticcurve.cpp \ - qsslkey_p.cpp \ - qsslerror.cpp \ - qsslsocket.cpp \ - qsslpresharedkeyauthenticator.cpp \ - qocspresponse.cpp \ - qdtls.cpp \ - qsslsocket_openssl_symbols.cpp \ - qssldiffiehellmanparameters_openssl.cpp \ - qsslcertificate_openssl.cpp \ - qsslellipticcurve_openssl.cpp \ - qsslkey_openssl.cpp \ - qsslsocket_openssl.cpp \ - qsslcontext_openssl.cpp \ - qdtls_openssl.cpp \ - qsslsocket_opensslpre11.cpp \ - qsslcontext_opensslpre11.cpp \ - qpassworddigestor.cpp \ - moc_qnetworkaccesscache_p.cpp \ - moc_qnetworkaccessbackend_p.cpp \ - moc_qnetworkaccessdebugpipebackend_p.cpp \ - moc_qnetworkaccessfilebackend_p.cpp \ - moc_qnetworkcookiejar.cpp \ - moc_qnetworkreply.cpp \ - moc_qabstractnetworkcache.cpp \ - moc_qnetworkfile_p.cpp \ - moc_qnetworkaccessftpbackend_p.cpp \ - moc_qnetworkdiskcache.cpp \ - moc_qhttp2protocolhandler_p.cpp \ - moc_qhttpmultipart.cpp \ - moc_qhttpnetworkreply_p.cpp \ - moc_qhttpthreaddelegate_p.cpp \ - moc_qnetworkreplyhttpimpl_p.cpp \ - moc_qspdyprotocolhandler_p.cpp \ - moc_qnetworkconfigmanager_p.cpp \ - moc_qnetworksession_p.cpp \ - moc_qbearerplugin_p.cpp \ - moc_qhostinfo_p.cpp \ - moc_qnetworkproxy.cpp \ - moc_qdnslookup_p.cpp \ - moc_qabstractsocketengine_p.cpp \ - moc_qtcpsocket.cpp \ - moc_qudpsocket.cpp \ - moc_qsocks5socketengine_p.cpp \ - moc_qhttpsocketengine_p.cpp \ - moc_qnativesocketengine_p.cpp \ - moc_qdtls.cpp - -QT_VPATH += \ - qtbase/src/network/access \ - qtbase/src/network/access/http2 \ - qtbase/src/network/bearer \ - qtbase/src/network/kernel \ - qtbase/src/network/socket \ - qtbase/src/network/ssl \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - moc_qnetworkaccessmanager.cpp \ - moc_qnetworkaccesscache_p.cpp \ - moc_qnetworkaccessbackend_p.cpp \ - moc_qnetworkaccessdebugpipebackend_p.cpp \ - moc_qnetworkaccessfilebackend_p.cpp \ - moc_qnetworkcookiejar.cpp \ - moc_qnetworkreply.cpp \ - moc_qnetworkreplyimpl_p.cpp \ - moc_qnetworkreplydataimpl_p.cpp \ - moc_qnetworkreplyfileimpl_p.cpp \ - moc_qabstractnetworkcache.cpp \ - moc_qnetworkfile_p.cpp \ - moc_qftp_p.cpp \ - moc_qnetworkaccessftpbackend_p.cpp \ - moc_qnetworkdiskcache.cpp \ - moc_qhttp2protocolhandler_p.cpp \ - moc_qhttpmultipart.cpp \ - moc_qhttpnetworkconnection_p.cpp \ - moc_qhttpnetworkconnectionchannel_p.cpp \ - moc_qhttpnetworkreply_p.cpp \ - moc_qhttpthreaddelegate_p.cpp \ - moc_qnetworkreplyhttpimpl_p.cpp \ - moc_qspdyprotocolhandler_p.cpp \ - moc_qnetworksession.cpp \ - moc_qnetworkconfigmanager.cpp \ - moc_qnetworkconfigmanager_p.cpp \ - moc_qnetworksession_p.cpp \ - moc_qbearerengine_p.cpp \ - moc_qbearerplugin_p.cpp \ - moc_qhostinfo_p.cpp \ - moc_qnetworkinterface.cpp \ - moc_qnetworkproxy.cpp \ - moc_qdnslookup.cpp \ - moc_qdnslookup_p.cpp \ - moc_qabstractsocketengine_p.cpp \ - moc_qabstractsocket.cpp \ - moc_qtcpsocket.cpp \ - moc_qudpsocket.cpp \ - moc_qtcpserver.cpp \ - moc_qsocks5socketengine_p.cpp \ - moc_qhttpsocketengine_p.cpp \ - moc_qnativesocketengine_p.cpp \ - moc_qlocalserver.cpp \ - moc_qlocalsocket.cpp \ - moc_qsslsocket.cpp \ - moc_qdtls.cpp - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - qftp.moc - diff --git a/repos/libports/lib/mk/qt5_opengl.mk b/repos/libports/lib/mk/qt5_opengl.mk deleted file mode 100644 index ffe567e294..0000000000 --- a/repos/libports/lib/mk/qt5_opengl.mk +++ /dev/null @@ -1,11 +0,0 @@ -include $(call select_from_repositories,lib/import/import-qt5_opengl.mk) - -SHARED_LIB = yes - -include $(REP_DIR)/lib/mk/qt5_opengl_generated.inc - -include $(REP_DIR)/lib/mk/qt5.inc - -LIBS += qt5_core qt5_gui qt5_widgets - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_opengl_generated.inc b/repos/libports/lib/mk/qt5_opengl_generated.inc deleted file mode 100644 index 6418b2dc72..0000000000 --- a/repos/libports/lib/mk/qt5_opengl_generated.inc +++ /dev/null @@ -1,64 +0,0 @@ -QT_DEFINES += -DQT_NO_USING_NAMESPACE -DQT_NO_FOREACH -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_BUILD_OPENGL_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB - -QT_INCPATH += \ - qtbase/src/opengl \ - qtbase/include \ - qtbase/include/QtOpenGL \ - qtbase/include/QtOpenGL/5.13.0 \ - qtbase/include/QtOpenGL/5.13.0/QtOpenGL \ - qtbase/include/QtWidgets/5.13.0 \ - qtbase/include/QtWidgets/5.13.0/QtWidgets \ - qtbase/include/QtGui/5.13.0 \ - qtbase/include/QtGui/5.13.0/QtGui \ - qtbase/include/QtCore/5.13.0 \ - qtbase/include/QtCore/5.13.0/QtCore \ - qtbase/include/QtWidgets \ - qtbase/include/QtGui \ - qtbase/include/QtCore \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - qgl.cpp \ - qglcolormap.cpp \ - qglfunctions.cpp \ - qglpixelbuffer.cpp \ - qglframebufferobject.cpp \ - qglpaintdevice.cpp \ - qglbuffer.cpp \ - qglshaderprogram.cpp \ - qglgradientcache.cpp \ - qglengineshadermanager.cpp \ - qgl2pexvertexarray.cpp \ - qpaintengineex_opengl2.cpp \ - qglcustomshaderstage.cpp \ - qtextureglyphcache_gl.cpp \ - qgraphicsshadereffect.cpp \ - moc_qgl.cpp \ - moc_qgl_p.cpp \ - moc_qglshaderprogram.cpp \ - moc_qglengineshadermanager_p.cpp \ - moc_qgraphicsshadereffect_p.cpp - -QT_VPATH += \ - qtbase/src/opengl \ - qtbase/src/opengl/gl2paintengineex \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - moc_qgl.cpp \ - moc_qgl_p.cpp \ - moc_qglshaderprogram.cpp \ - moc_qglengineshadermanager_p.cpp \ - moc_qgraphicsshadereffect_p.cpp - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - - diff --git a/repos/libports/lib/mk/qt5_pcre2.mk b/repos/libports/lib/mk/qt5_pcre2.mk deleted file mode 100644 index 4a394b740f..0000000000 --- a/repos/libports/lib/mk/qt5_pcre2.mk +++ /dev/null @@ -1,7 +0,0 @@ -include $(call select_from_repositories,lib/import/import-qt5_pcre2.mk) - -include $(REP_DIR)/lib/mk/qt5_pcre2_generated.inc - -include $(REP_DIR)/lib/mk/qt5.inc - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_pcre2_generated.inc b/repos/libports/lib/mk/qt5_pcre2_generated.inc deleted file mode 100644 index 93c260d271..0000000000 --- a/repos/libports/lib/mk/qt5_pcre2_generated.inc +++ /dev/null @@ -1,49 +0,0 @@ -QT_DEFINES += -DPCRE2_CODE_UNIT_WIDTH=16 -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DHAVE_CONFIG_H -DQT_NO_DYNAMIC_CAST -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE - -QT_INCPATH += \ - qtbase/src/3rdparty/pcre2 \ - qtbase/src/3rdparty/pcre2/src \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - pcre2_auto_possess.c \ - pcre2_chartables.c \ - pcre2_compile.c \ - pcre2_config.c \ - pcre2_context.c \ - pcre2_dfa_match.c \ - pcre2_error.c \ - pcre2_extuni.c \ - pcre2_find_bracket.c \ - pcre2_jit_compile.c \ - pcre2_maketables.c \ - pcre2_match.c \ - pcre2_match_data.c \ - pcre2_newline.c \ - pcre2_ord2utf.c \ - pcre2_pattern_info.c \ - pcre2_script_run.c \ - pcre2_serialize.c \ - pcre2_string_utils.c \ - pcre2_study.c \ - pcre2_substitute.c \ - pcre2_substring.c \ - pcre2_tables.c \ - pcre2_ucd.c \ - pcre2_valid_utf.c \ - pcre2_xclass.c - -QT_VPATH += \ - qtbase/src/3rdparty/pcre2/src \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - - diff --git a/repos/libports/lib/mk/qt5_printsupport.mk b/repos/libports/lib/mk/qt5_printsupport.mk deleted file mode 100644 index e7f1d7fb0a..0000000000 --- a/repos/libports/lib/mk/qt5_printsupport.mk +++ /dev/null @@ -1,25 +0,0 @@ -include $(call select_from_repositories,lib/import/import-qt5_printsupport.mk) - -SHARED_LIB = yes - -# use default warning level to avoid noise when compiling contrib code -CC_WARN = - -include $(REP_DIR)/lib/mk/qt5_printsupport_generated.inc - -# remove unneeded files to prevent moc warnings -COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT = \ - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES_FILTER_OUT = \ - -# UI headers -moc_qpagesetupdialog_unix_p.o: ui_qpagesetupwidget.h -qprintdialog_unix.o: ui_qprintpropertieswidget.h -qprintdialog_unix.o: ui_qprintsettingsoutput.h -qprintdialog_unix.o: ui_qprintwidget.h - -include $(REP_DIR)/lib/mk/qt5.inc - -LIBS += qt5_core qt5_gui qt5_widgets - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_printsupport_generated.inc b/repos/libports/lib/mk/qt5_printsupport_generated.inc deleted file mode 100644 index 347949cf12..0000000000 --- a/repos/libports/lib/mk/qt5_printsupport_generated.inc +++ /dev/null @@ -1,71 +0,0 @@ -QT_DEFINES += -DQT_NO_USING_NAMESPACE -DQT_NO_FOREACH -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_BUILD_PRINTSUPPORT_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB - -QT_INCPATH += \ - qtbase/src/printsupport \ - qtbase/src/printsupport/widgets \ - qtbase/src/printsupport/dialogs \ - qtbase/src/plugins/printsupport/cups \ - qtbase/include \ - qtbase/include/QtPrintSupport \ - qtbase/include/QtPrintSupport/5.13.0 \ - qtbase/include/QtPrintSupport/5.13.0/QtPrintSupport \ - qtbase/include/QtWidgets/5.13.0 \ - qtbase/include/QtWidgets/5.13.0/QtWidgets \ - qtbase/include/QtGui/5.13.0 \ - qtbase/include/QtGui/5.13.0/QtGui \ - qtbase/include/QtCore/5.13.0 \ - qtbase/include/QtCore/5.13.0/QtCore \ - qtbase/include/QtWidgets \ - qtbase/include/QtGui \ - qtbase/include/QtCore \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - qpaintengine_alpha.cpp \ - qprintdevice.cpp \ - qprintengine_pdf.cpp \ - qprinter.cpp \ - qprinterinfo.cpp \ - qplatformprintdevice.cpp \ - qplatformprintplugin.cpp \ - qplatformprintersupport.cpp \ - qpaintengine_preview.cpp \ - qprintpreviewwidget.cpp \ - qprintdialog_unix.cpp \ - qpagesetupdialog_unix.cpp \ - qabstractprintdialog.cpp \ - qpagesetupdialog.cpp \ - qprintpreviewdialog.cpp \ - qrc_qprintdialog.cpp \ - moc_qplatformprintplugin.cpp \ - moc_qabstractprintdialog.cpp \ - moc_qpagesetupdialog_unix_p.cpp - -QT_VPATH += \ - qtbase/src/printsupport/dialogs \ - qtbase/src/printsupport/kernel \ - qtbase/src/printsupport/widgets \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - moc_qplatformprintplugin.cpp \ - moc_qprintpreviewwidget.cpp \ - moc_qabstractprintdialog.cpp \ - moc_qpagesetupdialog.cpp \ - moc_qprintdialog.cpp \ - moc_qpagesetupdialog_unix_p.cpp \ - moc_qprintpreviewdialog.cpp - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - qprintpreviewwidget.moc \ - qprintdialog_unix.moc \ - qprintpreviewdialog.moc - diff --git a/repos/libports/lib/mk/qt5_qgenodeviewwidget.mk b/repos/libports/lib/mk/qt5_qgenodeviewwidget.mk deleted file mode 100644 index 431b7ec7db..0000000000 --- a/repos/libports/lib/mk/qt5_qgenodeviewwidget.mk +++ /dev/null @@ -1,13 +0,0 @@ -include $(call select_from_repositories,lib/import/import-qt5_qgenodeviewwidget.mk) - -SHARED_LIB = yes - -SRC_CC = qgenodeviewwidget.cpp \ - moc_qgenodeviewwidget.cpp - -vpath %.h $(call select_from_repositories,include/qt5/qgenodeviewwidget) -vpath %.cpp $(REP_DIR)/src/lib/qt5/qgenodeviewwidget - -LIBS += libc qoost qt5_core qt5_gui qt5_qpa_genode qt5_widgets - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_qjpeg.mk b/repos/libports/lib/mk/qt5_qjpeg.mk deleted file mode 100644 index 7571f664ad..0000000000 --- a/repos/libports/lib/mk/qt5_qjpeg.mk +++ /dev/null @@ -1,17 +0,0 @@ -include $(call select_from_repositories,lib/import/import-qt5_qjpeg.mk) - -SHARED_LIB = yes - -SRC_CC = main.cpp \ - moc_main.cpp \ - qjpeghandler.cpp \ - import_plugin.cc - -INC_DIR += $(QT5_CONTRIB_DIR)/qtbase/src/plugins/imageformats/jpeg - -LIBS += qt5_gui qt5_core libc jpeg - -vpath % $(REP_DIR)/src/lib/qt5/qtbase/src/plugins/imageformats/jpeg -vpath % $(QT5_CONTRIB_DIR)/qtbase/src/plugins/imageformats/jpeg - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_qml.mk b/repos/libports/lib/mk/qt5_qml.mk deleted file mode 100644 index eaacdb3d8f..0000000000 --- a/repos/libports/lib/mk/qt5_qml.mk +++ /dev/null @@ -1,24 +0,0 @@ -include $(call select_from_repositories,lib/import/import-qt5_qml.mk) - -SHARED_LIB = yes - -include $(REP_DIR)/lib/mk/qt5_qml_generated.inc - -# remove unneeded files to prevent moc warnings -COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT = \ - moc_qqmlabstractprofileradapter_p.cpp \ - moc_qqmldebugconnector_p.cpp \ - moc_qqmldebugservice_p.cpp \ - moc_qqmldebugserviceinterfaces_p.cpp \ - moc_qqmlprofiler_p.cpp \ - moc_qv4debugging_p.cpp \ - moc_qv4profiling_p.cpp \ - - -QT_VPATH += qtdeclarative/src/qml - -include $(REP_DIR)/lib/mk/qt5.inc - -LIBS += qt5_network qt5_core libc - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_qml_generated.inc b/repos/libports/lib/mk/qt5_qml_generated.inc deleted file mode 100644 index a761d4de1c..0000000000 --- a/repos/libports/lib/mk/qt5_qml_generated.inc +++ /dev/null @@ -1,323 +0,0 @@ -QT_DEFINES += -DQT_NO_URL_CAST_FROM_STRING -DQT_NO_INTEGER_EVENT_COORDINATES -DQT_NO_FOREACH -DWTF_EXPORT_PRIVATE= -DJS_EXPORT_PRIVATE= -DENABLE_ASSEMBLER_WX_EXCLUSIVE=1 -DWTFReportAssertionFailure=qmlWTFReportAssertionFailure -DWTFReportAssertionFailureWithMessage=qmlWTFReportAssertionFailureWithMessage -DWTFReportBacktrace=qmlWTFReportBacktrace -DWTFInvokeCrashHook=qmlWTFInvokeCrashHook -DENABLE_LLINT=0 -DENABLE_DFG_JIT=0 -DENABLE_DFG_JIT_UTILITY_METHODS=1 -DENABLE_JIT_CONSTANT_BLINDING=0 -DBUILDING_QT__ -DWTF_USE_UDIS86=0 -DNDEBUG -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_BUILD_QML_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_NETWORK_LIB -DQT_CORE_LIB - -QT_INCPATH += \ - qtdeclarative/src/qml \ - qtdeclarative/src/qml/memory \ - qtdeclarative/src/qml/compiler \ - qtdeclarative/src/qml/jsruntime \ - qtdeclarative/src/qml/jit \ - qtdeclarative/src/qml/debugger \ - qtdeclarative/src/qml/qmldirparser \ - qtdeclarative/src/qml/animations \ - qtdeclarative/src/3rdparty/masm/jit \ - qtdeclarative/src/3rdparty/masm/assembler \ - qtdeclarative/src/3rdparty/masm/runtime \ - qtdeclarative/src/3rdparty/masm/wtf \ - qtdeclarative/src/3rdparty/masm/stubs \ - qtdeclarative/src/3rdparty/masm/stubs/runtime \ - qtdeclarative/src/3rdparty/masm/stubs/wtf \ - qtdeclarative/src/3rdparty/masm \ - qtdeclarative/src/3rdparty/masm/disassembler \ - qtdeclarative/src/3rdparty/masm/disassembler/udis86 \ - qtdeclarative/include \ - qtdeclarative/include/QtQml \ - qtdeclarative/include/QtQml/5.13.0 \ - qtdeclarative/include/QtQml/5.13.0/QtQml \ - qtbase/include/QtCore/5.13.0 \ - qtbase/include/QtCore/5.13.0/QtCore \ - qtbase/include \ - qtbase/include/QtNetwork \ - qtbase/include/QtCore \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - qqmlchangeset.cpp \ - qqmllistaccessor.cpp \ - qqmllistcompositor.cpp \ - qqmlpropertymap.cpp \ - qqmladaptormodel.cpp \ - qv4mm.cpp \ - qqmljsast.cpp \ - qqmljsastvisitor.cpp \ - qqmljsengine_p.cpp \ - qqmljslexer.cpp \ - qv4bytecodegenerator.cpp \ - qv4compileddata.cpp \ - qv4compiler.cpp \ - qv4compilercontext.cpp \ - qv4compilerscanfunctions.cpp \ - qv4codegen.cpp \ - qqmlirbuilder.cpp \ - qv4instr_moth.cpp \ - qv4bytecodehandler.cpp \ - qqmltypecompiler.cpp \ - qqmlpropertycachecreator.cpp \ - qqmlpropertyvalidator.cpp \ - qv4compilationunitmapper.cpp \ - qv4compilationunitmapper_unix.cpp \ - qjsengine.cpp \ - qjsvalue.cpp \ - qjsvalueiterator.cpp \ - qv4context.cpp \ - qv4persistent.cpp \ - qv4lookup.cpp \ - qv4identifier.cpp \ - qv4identifiertable.cpp \ - qv4managed.cpp \ - qv4internalclass.cpp \ - qv4sparsearray.cpp \ - qv4atomics.cpp \ - qv4arraydata.cpp \ - qv4arrayobject.cpp \ - qv4arrayiterator.cpp \ - qv4argumentsobject.cpp \ - qv4booleanobject.cpp \ - qv4dateobject.cpp \ - qv4errorobject.cpp \ - qv4function.cpp \ - qv4functionobject.cpp \ - qv4generatorobject.cpp \ - qv4globalobject.cpp \ - qv4iterator.cpp \ - qv4jsonobject.cpp \ - qv4mathobject.cpp \ - qv4memberdata.cpp \ - qv4numberobject.cpp \ - qv4object.cpp \ - qv4objectproto.cpp \ - qv4propertykey.cpp \ - qv4proxy.cpp \ - qv4qmlcontext.cpp \ - qv4reflect.cpp \ - qv4regexpobject.cpp \ - qv4stackframe.cpp \ - qv4stringiterator.cpp \ - qv4stringobject.cpp \ - qv4variantobject.cpp \ - qv4objectiterator.cpp \ - qv4regexp.cpp \ - qv4runtimecodegen.cpp \ - qv4serialize.cpp \ - qv4script.cpp \ - qv4symbol.cpp \ - qv4setobject.cpp \ - qv4setiterator.cpp \ - qv4include.cpp \ - qv4qobjectwrapper.cpp \ - qv4arraybuffer.cpp \ - qv4typedarray.cpp \ - qv4dataview.cpp \ - qv4vme_moth.cpp \ - qv4mapobject.cpp \ - qv4mapiterator.cpp \ - qv4estable.cpp \ - qv4module.cpp \ - qv4promiseobject.cpp \ - qv4sequenceobject.cpp \ - qv4engine.cpp \ - qv4runtime.cpp \ - qv4string.cpp \ - qv4value.cpp \ - qv4executableallocator.cpp \ - qv4functiontable_unix.cpp \ - qv4jithelpers.cpp \ - qv4baselinejit.cpp \ - qv4baselineassembler.cpp \ - qv4assemblercommon.cpp \ - qqmlopenmetaobject.cpp \ - qqmlvmemetaobject.cpp \ - qqmlengine.cpp \ - qqmlexpression.cpp \ - qqmlproperty.cpp \ - qqmlcomponent.cpp \ - qqmlincubator.cpp \ - qqmlcontext.cpp \ - qqmlcustomparser.cpp \ - qqmlpropertyvaluesource.cpp \ - qqmlpropertyvalueinterceptor.cpp \ - qqmlproxymetaobject.cpp \ - qqmlvme.cpp \ - qqmlboundsignal.cpp \ - qqmlmetatype.cpp \ - qqmlstringconverters.cpp \ - qqmlparserstatus.cpp \ - qqmltypeloader.cpp \ - qqmlinfo.cpp \ - qqmlvaluetype.cpp \ - qqmlcleanup.cpp \ - qqmlpropertycache.cpp \ - qqmlnotifier.cpp \ - qqmltypenotavailable.cpp \ - qqmltypenamecache.cpp \ - qqmlscriptstring.cpp \ - qqmlnetworkaccessmanagerfactory.cpp \ - qqmlextensionplugin.cpp \ - qqmlimport.cpp \ - qqmllist.cpp \ - qqmljavascriptexpression.cpp \ - qqmlabstractbinding.cpp \ - qqmlvaluetypeproxybinding.cpp \ - qqmlglobal.cpp \ - qqmlfile.cpp \ - qqmlplatform.cpp \ - qqmlbinding.cpp \ - qqmlabstracturlinterceptor.cpp \ - qqmlapplicationengine.cpp \ - qqmllistwrapper.cpp \ - qqmlvaluetypewrapper.cpp \ - qqmltypewrapper.cpp \ - qqmlfileselector.cpp \ - qqmlobjectcreator.cpp \ - qqmldelayedcallqueue.cpp \ - qqmlloggingcategory.cpp \ - qqmlxmlhttprequest.cpp \ - qqmllocale.cpp \ - qintrusivelist.cpp \ - qhashedstring.cpp \ - qqmlthread.cpp \ - qv8engine.cpp \ - qv4domerrors.cpp \ - qv4sqlerrors.cpp \ - qqmlbuiltinfunctions.cpp \ - qqmldirparser.cpp \ - qqmlerror.cpp \ - qabstractanimationjob.cpp \ - qanimationgroupjob.cpp \ - qsequentialanimationgroupjob.cpp \ - qparallelanimationgroupjob.cpp \ - qcontinuinganimationgroupjob.cpp \ - qpauseanimationjob.cpp \ - qqmlbind.cpp \ - qqmlconnections.cpp \ - qqmlmodelsmodule.cpp \ - qqmlmodelindexvaluetype.cpp \ - qqmlobjectmodel.cpp \ - qquickpackage.cpp \ - qqmlinstantiator.cpp \ - qqmltableinstancemodel.cpp \ - qquickworkerscript.cpp \ - qqmllistmodel.cpp \ - qqmllistmodelworkeragent.cpp \ - qqmldelegatemodel.cpp \ - qqmldelegatecomponent.cpp \ - qqmltimer.cpp \ - ARMv7Assembler.cpp \ - LinkBuffer.cpp \ - PrintStream.cpp \ - FilePrintStream.cpp \ - OSAllocatorPosix.cpp \ - PageAllocationAligned.cpp \ - PageBlock.cpp \ - WTFStubs.cpp \ - Options.cpp \ - Disassembler.cpp \ - UDis86Disassembler.cpp \ - ARMv7Disassembler.cpp \ - ARMv7DOpcode.cpp \ - Mips32Disassembler.cpp \ - Mips32Opcode.cpp \ - ARM64Disassembler.cpp \ - A64DOpcode.cpp \ - YarrCanonicalizeUCS2.cpp \ - YarrCanonicalizeUnicode.cpp \ - YarrInterpreter.cpp \ - YarrJIT.cpp \ - YarrPattern.cpp \ - YarrSyntaxChecker.cpp \ - YarrUnicodeProperties.cpp qqmljsgrammar.cpp \ - qqmljsparser.cpp \ - moc_qqmlpropertymap.cpp \ - moc_qv4debugging_p.cpp \ - moc_qv4profiling_p.cpp \ - moc_qv4promiseobject_p.cpp \ - moc_qqmlcomponentattached_p.cpp \ - moc_qqmldebugconnector_p.cpp \ - moc_qqmldebugserviceinterfaces_p.cpp \ - moc_qqmlprofiler_p.cpp \ - moc_qqmllistmodel_p_p.cpp \ - moc_qqmldelegatemodel_p_p.cpp \ - moc_qqmldelegatecomponent_p.cpp - -QT_VPATH += \ - qtdeclarative/src/3rdparty/masm/assembler \ - qtdeclarative/src/3rdparty/masm/disassembler \ - qtdeclarative/src/3rdparty/masm/disassembler/ARM64 \ - qtdeclarative/src/3rdparty/masm/disassembler/ARMv7 \ - qtdeclarative/src/3rdparty/masm/disassembler/mips32 \ - qtdeclarative/src/3rdparty/masm/stubs \ - qtdeclarative/src/3rdparty/masm/stubs/yarr \ - qtdeclarative/src/3rdparty/masm/wtf \ - qtdeclarative/src/3rdparty/masm/yarr \ - qtdeclarative/src/qml/animations \ - qtdeclarative/src/qml/compiler \ - qtdeclarative/src/qml/jit \ - qtdeclarative/src/qml/jsapi \ - qtdeclarative/src/qml/jsruntime \ - qtdeclarative/src/qml/memory \ - qtdeclarative/src/qml/parser \ - qtdeclarative/src/qml/qml \ - qtdeclarative/src/qml/qml/ftw \ - qtdeclarative/src/qml/qml/v8 \ - qtdeclarative/src/qml/qmldirparser \ - qtdeclarative/src/qml/types \ - qtdeclarative/src/qml/util \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - moc_qqmlpropertymap.cpp \ - moc_qjsengine.cpp \ - moc_qv4debugging_p.cpp \ - moc_qv4include_p.cpp \ - moc_qv4qobjectwrapper_p.cpp \ - moc_qv4profiling_p.cpp \ - moc_qv4promiseobject_p.cpp \ - moc_qqmlglobal_p.cpp \ - moc_qqmlcomponent.cpp \ - moc_qqmlengine.cpp \ - moc_qqmlcontext.cpp \ - moc_qqmlexpression.cpp \ - moc_qqmlvaluetype_p.cpp \ - moc_qqmltypenotavailable_p.cpp \ - moc_qqmlextensionplugin.cpp \ - moc_qqmlcomponentattached_p.cpp \ - moc_qqmlplatform_p.cpp \ - moc_qqmlapplicationengine.cpp \ - moc_qqmlfileselector.cpp \ - moc_qqmldelayedcallqueue_p.cpp \ - moc_qqmlloggingcategory_p.cpp \ - moc_qqmllocale_p.cpp \ - moc_qqmldebugconnector_p.cpp \ - moc_qqmldebugserviceinterfaces_p.cpp \ - moc_qqmlprofiler_p.cpp \ - moc_qabstractanimationjob_p.cpp \ - moc_qqmlbind_p.cpp \ - moc_qqmlconnections_p.cpp \ - moc_qqmlmodelindexvaluetype_p.cpp \ - moc_qqmlobjectmodel_p.cpp \ - moc_qquickpackage_p.cpp \ - moc_qqmlinstantiator_p.cpp \ - moc_qqmltableinstancemodel_p.cpp \ - moc_qquickworkerscript_p.cpp \ - moc_qqmllistmodel_p.cpp \ - moc_qqmllistmodel_p_p.cpp \ - moc_qqmllistmodelworkeragent_p.cpp \ - moc_qqmldelegatemodel_p.cpp \ - moc_qqmldelegatemodel_p_p.cpp \ - moc_qqmldelegatecomponent_p.cpp \ - moc_qqmltimer_p.cpp - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - qqmladaptormodel.moc \ - qqmltypeloader.moc \ - qqmlfile.moc \ - qqmlxmlhttprequest.moc \ - qquickworkerscript.moc - diff --git a/repos/libports/lib/mk/qt5_qmlfolderlistmodelplugin.mk b/repos/libports/lib/mk/qt5_qmlfolderlistmodelplugin.mk deleted file mode 100644 index fc91ebd794..0000000000 --- a/repos/libports/lib/mk/qt5_qmlfolderlistmodelplugin.mk +++ /dev/null @@ -1,45 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) - -SHARED_LIB = yes - -include $(REP_DIR)/lib/mk/qt5_qmlfolderlistmodelplugin_generated.inc - -QT_DEFINES += -UQT_STATICPLUGIN - -include $(REP_DIR)/lib/mk/qt5.inc - -LIBS += qt5_core qt5_gui qt5_qml qt5_quick - -# install the QML plugin - -QML_PLUGIN_NAME := qt5_qmlfolderlistmodelplugin -QML_INSTALL_DIR := qt/qml/Qt/labs/folderlistmodel - -QML_PLUGIN := $(QML_INSTALL_DIR)/$(QML_PLUGIN_NAME).lib.so -TAR_ARCHIVE := $(BUILD_BASE_DIR)/bin/$(QML_PLUGIN_NAME).tar - -$(QML_INSTALL_DIR): - $(VERBOSE)mkdir -p $@ - -$(QML_PLUGIN): $(QML_INSTALL_DIR) $(QML_PLUGIN_NAME).lib.so.stripped - $(VERBOSE)cp $(QML_PLUGIN_NAME).lib.so.stripped $@ - -$(TAR_ARCHIVE): $(QML_PLUGIN) - $(VERBOSE)tar cf $@ qt - -ifneq ($(call select_from_ports,qt5),) -$(QML_PLUGIN_NAME).lib.tag: $(TAR_ARCHIVE) -endif - -# -# unfortunately, these clean rules don't trigger -# - -clean-tar_archive: - rm -rf $(TAR_ARCHIVE) - -clean: clean-tar_archive - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_qmlfolderlistmodelplugin_generated.inc b/repos/libports/lib/mk/qt5_qmlfolderlistmodelplugin_generated.inc deleted file mode 100644 index b3d4ae6899..0000000000 --- a/repos/libports/lib/mk/qt5_qmlfolderlistmodelplugin_generated.inc +++ /dev/null @@ -1,40 +0,0 @@ -QT_DEFINES += -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_PLUGIN -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB - -QT_INCPATH += \ - qtdeclarative/src/imports/folderlistmodel \ - qtdeclarative/include/QtQml/5.13.0 \ - qtdeclarative/include/QtQml/5.13.0/QtQml \ - qtbase/include/QtCore/5.13.0 \ - qtbase/include/QtCore/5.13.0/QtCore \ - qtdeclarative/include \ - qtdeclarative/include/QtQml \ - qtbase/include \ - qtbase/include/QtNetwork \ - qtbase/include/QtCore \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - qquickfolderlistmodel.cpp \ - plugin.cpp \ - fileinfothread.cpp \ - moc_fileinfothread_p.cpp - -QT_VPATH += \ - qtdeclarative/src/imports/folderlistmodel \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - moc_qquickfolderlistmodel.cpp \ - moc_fileinfothread_p.cpp - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - plugin.moc - diff --git a/repos/libports/lib/mk/qt5_qpa_genode.mk b/repos/libports/lib/mk/qt5_qpa_genode.mk deleted file mode 100644 index 36a392cd86..0000000000 --- a/repos/libports/lib/mk/qt5_qpa_genode.mk +++ /dev/null @@ -1,55 +0,0 @@ -include $(call select_from_repositories,lib/import/import-qt5_qpa_genode.mk) - -SHARED_LIB = yes - -SRC_CC = qgenericunixeventdispatcher.cpp \ - qunixeventdispatcher.cpp \ - qfontengine_ft.cpp \ - qfreetypefontdatabase.cpp \ - qeglconvenience.cpp \ - moc_qunixeventdispatcher_qpa_p.cpp - -SRC_CC += main.cpp \ - qgenodeclipboard.cpp \ - qgenodecursor.cpp \ - qgenodeglcontext.cpp \ - qgenodeintegration.cpp \ - qgenodeplatformwindow.cpp \ - qgenodewindowsurface.cpp \ - moc_qgenodeclipboard.cpp \ - moc_qgenodeplatformwindow.cpp \ - moc_qgenodewindowsurface.cpp \ - moc_qgenodeintegrationplugin.cpp - -ifeq ($(CONTRIB_DIR),) - -INC_DIR += $(call select_from_repositories,include/QtEglSupport/$(QT_VERSION)) \ - $(call select_from_repositories,include/QtEglSupport/$(QT_VERSION)/QtEglSupport/private) \ - $(call select_from_repositories,include/QtEventDispatcherSupport/$(QT_VERSION)) \ - $(call select_from_repositories,include/QtEventDispatcherSupport/$(QT_VERSION)/QtEventDispatcherSupport/private) \ - $(call select_from_repositories,include/QtFontDatabaseSupport/$(QT_VERSION)) \ - $(call select_from_repositories,include/QtFontDatabaseSupport/$(QT_VERSION)/QtFontDatabaseSupport/private) \ - $(call select_from_repositories,include/QtInputSupport/$(QT_VERSION)/QtInputSupport/private) - -vpath qunixeventdispatcher_qpa_p.h $(call select_from_repositories,include/QtEventDispatcherSupport/$(QT_VERSION)/QtEventDispatcherSupport/private) -vpath qgenodeplatformwindow.h $(call select_from_repositories,include/qt5/qpa_genode) - -else - -INC_DIR += $(QT5_PORT_DIR)/include/QtEglSupport/$(QT_VERSION) \ - $(QT5_PORT_DIR)/include/QtEventDispatcherSupport/$(QT_VERSION) \ - $(QT5_PORT_DIR)/include/QtFontDatabaseSupport/$(QT_VERSION) \ - $(QT5_PORT_DIR)/include/QtInputSupport/$(QT_VERSION) - -vpath %.h $(REP_DIR)/include/qt5/qpa_genode - -endif - -LIBS += qt5_gui qt5_core qoost egl freetype libc - -vpath % $(QT5_CONTRIB_DIR)/qtbase/src/platformsupport/eglconvenience -vpath % $(QT5_CONTRIB_DIR)/qtbase/src/platformsupport/eventdispatchers -vpath % $(QT5_CONTRIB_DIR)/qtbase/src/platformsupport/fontdatabases/freetype -vpath % $(REP_DIR)/src/lib/qt5/qtbase/src/plugins/platforms/genode - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_qpluginwidget.mk b/repos/libports/lib/mk/qt5_qpluginwidget.mk deleted file mode 100644 index e7c2cac4af..0000000000 --- a/repos/libports/lib/mk/qt5_qpluginwidget.mk +++ /dev/null @@ -1,13 +0,0 @@ -include $(call select_from_repositories,lib/import/import-qt5_qpluginwidget.mk) - -SHARED_LIB = yes - -SRC_CC = qpluginwidget.cpp \ - moc_qpluginwidget.cpp - -vpath %.h $(call select_from_repositories,include/qt5/qpluginwidget) -vpath %.cpp $(REP_DIR)/src/lib/qt5/qpluginwidget - -LIBS += libc qoost qt5_core qt5_gui qt5_network qt5_qgenodeviewwidget qt5_qpa_genode qt5_widgets zlib - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_qquicklayoutsplugin.mk b/repos/libports/lib/mk/qt5_qquicklayoutsplugin.mk deleted file mode 100644 index 27055aa3a1..0000000000 --- a/repos/libports/lib/mk/qt5_qquicklayoutsplugin.mk +++ /dev/null @@ -1,45 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) - -SHARED_LIB = yes - -include $(REP_DIR)/lib/mk/qt5_qquicklayoutsplugin_generated.inc - -QT_DEFINES += -UQT_STATICPLUGIN - -include $(REP_DIR)/lib/mk/qt5.inc - -LIBS += qt5_core qt5_gui qt5_qml qt5_quick - -# install the QML plugin - -QML_PLUGIN_NAME := qt5_qquicklayoutsplugin -QML_INSTALL_DIR := qt/qml/QtQuick/Layouts - -QML_PLUGIN := $(QML_INSTALL_DIR)/$(QML_PLUGIN_NAME).lib.so -TAR_ARCHIVE := $(BUILD_BASE_DIR)/bin/$(QML_PLUGIN_NAME).tar - -$(QML_INSTALL_DIR): - $(VERBOSE)mkdir -p $@ - -$(QML_PLUGIN): $(QML_INSTALL_DIR) $(QML_PLUGIN_NAME).lib.so.stripped - $(VERBOSE)cp $(QML_PLUGIN_NAME).lib.so.stripped $@ - -$(TAR_ARCHIVE): $(QML_PLUGIN) - $(VERBOSE)tar cf $@ qt - -ifneq ($(call select_from_ports,qt5),) -$(QML_PLUGIN_NAME).lib.tag: $(TAR_ARCHIVE) -endif - -# -# unfortunately, these clean rules don't trigger -# - -clean-tar_archive: - rm -rf $(TAR_ARCHIVE) - -clean: clean-tar_archive - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_qquicklayoutsplugin_generated.inc b/repos/libports/lib/mk/qt5_qquicklayoutsplugin_generated.inc deleted file mode 100644 index 84acd6f12f..0000000000 --- a/repos/libports/lib/mk/qt5_qquicklayoutsplugin_generated.inc +++ /dev/null @@ -1,50 +0,0 @@ -QT_DEFINES += -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_PLUGIN -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB - -QT_INCPATH += \ - qtdeclarative/src/imports/layouts \ - qtdeclarative/include/QtQuick/5.13.0 \ - qtdeclarative/include/QtQuick/5.13.0/QtQuick \ - qtbase/include/QtGui/5.13.0 \ - qtbase/include/QtGui/5.13.0/QtGui \ - qtdeclarative/include \ - qtdeclarative/include/QtQuick \ - qtbase/include \ - qtbase/include/QtGui \ - qtdeclarative/include/QtQml/5.13.0 \ - qtdeclarative/include/QtQml/5.13.0/QtQml \ - qtbase/include/QtCore/5.13.0 \ - qtbase/include/QtCore/5.13.0/QtCore \ - qtdeclarative/include/QtQml \ - qtbase/include/QtNetwork \ - qtbase/include/QtCore \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - plugin.cpp \ - qquicklayout.cpp \ - qquicklinearlayout.cpp \ - qquickstacklayout.cpp \ - qquickgridlayoutengine.cpp \ - qquicklayoutstyleinfo.cpp \ - moc_qquicklayout_p.cpp - -QT_VPATH += \ - qtdeclarative/src/imports/layouts \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - moc_qquicklayout_p.cpp \ - moc_qquicklinearlayout_p.cpp \ - moc_qquickstacklayout_p.cpp - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - plugin.moc - diff --git a/repos/libports/lib/mk/qt5_qtquick2plugin.mk b/repos/libports/lib/mk/qt5_qtquick2plugin.mk deleted file mode 100644 index de2237f71d..0000000000 --- a/repos/libports/lib/mk/qt5_qtquick2plugin.mk +++ /dev/null @@ -1,45 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) - -SHARED_LIB = yes - -include $(REP_DIR)/lib/mk/qt5_qtquick2plugin_generated.inc - -QT_DEFINES += -UQT_STATICPLUGIN - -include $(REP_DIR)/lib/mk/qt5.inc - -LIBS += qt5_core qt5_gui qt5_qml qt5_quick - -# install the QML plugin - -QML_PLUGIN_NAME := qt5_qtquick2plugin -QML_INSTALL_DIR := qt/qml/QtQuick.2 - -QML_PLUGIN := $(QML_INSTALL_DIR)/$(QML_PLUGIN_NAME).lib.so -TAR_ARCHIVE := $(BUILD_BASE_DIR)/bin/$(QML_PLUGIN_NAME).tar - -$(QML_INSTALL_DIR): - $(VERBOSE)mkdir -p $@ - -$(QML_PLUGIN): $(QML_INSTALL_DIR) $(QML_PLUGIN_NAME).lib.so.stripped - $(VERBOSE)cp $(QML_PLUGIN_NAME).lib.so.stripped $@ - -$(TAR_ARCHIVE): $(QML_PLUGIN) - $(VERBOSE)tar cf $@ qt - -ifneq ($(call select_from_ports,qt5),) -$(QML_PLUGIN_NAME).lib.tag: $(TAR_ARCHIVE) -endif - -# -# unfortunately, these clean rules don't trigger -# - -clean-tar_archive: - rm -rf $(TAR_ARCHIVE) - -clean: clean-tar_archive - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_qtquick2plugin_generated.inc b/repos/libports/lib/mk/qt5_qtquick2plugin_generated.inc deleted file mode 100644 index 870360e9f4..0000000000 --- a/repos/libports/lib/mk/qt5_qtquick2plugin_generated.inc +++ /dev/null @@ -1,42 +0,0 @@ -QT_DEFINES += -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_PLUGIN -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB - -QT_INCPATH += \ - qtdeclarative/src/imports/qtquick2 \ - qtdeclarative/include/QtQuick/5.13.0 \ - qtdeclarative/include/QtQuick/5.13.0/QtQuick \ - qtbase/include/QtGui/5.13.0 \ - qtbase/include/QtGui/5.13.0/QtGui \ - qtdeclarative/include \ - qtdeclarative/include/QtQuick \ - qtbase/include \ - qtbase/include/QtGui \ - qtdeclarative/include/QtQml/5.13.0 \ - qtdeclarative/include/QtQml/5.13.0/QtQml \ - qtbase/include/QtCore/5.13.0 \ - qtbase/include/QtCore/5.13.0/QtCore \ - qtdeclarative/include/QtQml \ - qtbase/include/QtNetwork \ - qtbase/include/QtCore \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - plugin.cpp - -QT_VPATH += \ - qtdeclarative/src/imports/qtquick2 \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - plugin.moc - diff --git a/repos/libports/lib/mk/qt5_qtquickcontrols2plugin.mk b/repos/libports/lib/mk/qt5_qtquickcontrols2plugin.mk deleted file mode 100644 index 8d75612078..0000000000 --- a/repos/libports/lib/mk/qt5_qtquickcontrols2plugin.mk +++ /dev/null @@ -1,45 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) - -SHARED_LIB = yes - -include $(REP_DIR)/lib/mk/qt5_qtquickcontrols2plugin_generated.inc - -QT_DEFINES += -UQT_STATICPLUGIN - -include $(REP_DIR)/lib/mk/qt5.inc - -LIBS += qt5_core qt5_gui qt5_qml qt5_quick qt5_quickcontrols2 qt5_quicktemplates2 - -# install the QML plugin - -QML_PLUGIN_NAME := qt5_qtquickcontrols2plugin -QML_INSTALL_DIR := qt/qml/QtQuick/Controls.2 - -QML_PLUGIN := $(QML_INSTALL_DIR)/$(QML_PLUGIN_NAME).lib.so -TAR_ARCHIVE := $(BUILD_BASE_DIR)/bin/$(QML_PLUGIN_NAME).tar - -$(QML_INSTALL_DIR): - $(VERBOSE)mkdir -p $@ - -$(QML_PLUGIN): $(QML_INSTALL_DIR) $(QML_PLUGIN_NAME).lib.so.stripped - $(VERBOSE)cp $(QML_PLUGIN_NAME).lib.so.stripped $@ - -$(TAR_ARCHIVE): $(QML_PLUGIN) - $(VERBOSE)tar cf $@ qt - -ifneq ($(call select_from_ports,qt5),) -$(QML_PLUGIN_NAME).lib.tag: $(TAR_ARCHIVE) -endif - -# -# unfortunately, these clean rules don't trigger -# - -clean-tar_archive: - rm -rf $(TAR_ARCHIVE) - -clean: clean-tar_archive - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_qtquickcontrols2plugin_generated.inc b/repos/libports/lib/mk/qt5_qtquickcontrols2plugin_generated.inc deleted file mode 100644 index 45a403af91..0000000000 --- a/repos/libports/lib/mk/qt5_qtquickcontrols2plugin_generated.inc +++ /dev/null @@ -1,63 +0,0 @@ -QT_DEFINES += -DQT_NO_FOREACH -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_PLUGIN -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_QUICKTEMPLATES2_LIB -DQT_QUICKCONTROLS2_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB - -QT_INCPATH += \ - qtquickcontrols2/src/imports/controls \ - qtdeclarative/include \ - qtdeclarative/include/QtQuick \ - qtbase/include \ - qtbase/include/QtGui \ - qtdeclarative/include/QtQml \ - qtbase/include/QtNetwork \ - qtbase/include/QtCore \ - qtdeclarative/include/QtQuick/5.13.0 \ - qtdeclarative/include/QtQuick/5.13.0/QtQuick \ - qtbase/include/QtGui/5.13.0 \ - qtbase/include/QtGui/5.13.0/QtGui \ - qtdeclarative/include/QtQml/5.13.0 \ - qtdeclarative/include/QtQml/5.13.0/QtQml \ - qtbase/include/QtCore/5.13.0 \ - qtbase/include/QtCore/5.13.0/QtCore \ - qtquickcontrols2/include/QtQuickTemplates2/5.13.0 \ - qtquickcontrols2/include/QtQuickTemplates2/5.13.0/QtQuickTemplates2 \ - qtquickcontrols2/include \ - qtquickcontrols2/include/QtQuickTemplates2 \ - qtquickcontrols2/include/QtQuickControls2/5.13.0 \ - qtquickcontrols2/include/QtQuickControls2/5.13.0/QtQuickControls2 \ - qtquickcontrols2/include/QtQuickControls2 \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - qquickdefaultbusyindicator.cpp \ - qquickdefaultdial.cpp \ - qquickdefaultprogressbar.cpp \ - qquickdefaultstyle.cpp \ - qquickdefaulttheme.cpp \ - qtquickcontrols2plugin.cpp \ - qrc_qtquickcontrols2plugin.cpp \ - qrc_qmake_QtQuick_Controls_2.cpp \ - moc_qquickdefaultbusyindicator_p.cpp \ - moc_qquickdefaultdial_p.cpp \ - moc_qquickdefaultprogressbar_p.cpp \ - moc_qquickdefaultstyle_p.cpp - -QT_VPATH += \ - qtquickcontrols2/src/imports/controls \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - moc_qquickdefaultbusyindicator_p.cpp \ - moc_qquickdefaultdial_p.cpp \ - moc_qquickdefaultprogressbar_p.cpp \ - moc_qquickdefaultstyle_p.cpp - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - qtquickcontrols2plugin.moc - diff --git a/repos/libports/lib/mk/qt5_qtquicktemplates2plugin.mk b/repos/libports/lib/mk/qt5_qtquicktemplates2plugin.mk deleted file mode 100644 index 7bfeb01dc3..0000000000 --- a/repos/libports/lib/mk/qt5_qtquicktemplates2plugin.mk +++ /dev/null @@ -1,45 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) - -SHARED_LIB = yes - -include $(REP_DIR)/lib/mk/qt5_qtquicktemplates2plugin_generated.inc - -QT_DEFINES += -UQT_STATICPLUGIN - -include $(REP_DIR)/lib/mk/qt5.inc - -LIBS += qt5_core qt5_gui qt5_qml qt5_quick qt5_quicktemplates2 - -# install the QML plugin - -QML_PLUGIN_NAME := qt5_qtquicktemplates2plugin -QML_INSTALL_DIR := qt/qml/QtQuick/Templates.2 - -QML_PLUGIN := $(QML_INSTALL_DIR)/$(QML_PLUGIN_NAME).lib.so -TAR_ARCHIVE := $(BUILD_BASE_DIR)/bin/$(QML_PLUGIN_NAME).tar - -$(QML_INSTALL_DIR): - $(VERBOSE)mkdir -p $@ - -$(QML_PLUGIN): $(QML_INSTALL_DIR) $(QML_PLUGIN_NAME).lib.so.stripped - $(VERBOSE)cp $(QML_PLUGIN_NAME).lib.so.stripped $@ - -$(TAR_ARCHIVE): $(QML_PLUGIN) - $(VERBOSE)tar cf $@ qt - -ifneq ($(call select_from_ports,qt5),) -$(QML_PLUGIN_NAME).lib.tag: $(TAR_ARCHIVE) -endif - -# -# unfortunately, these clean rules don't trigger -# - -clean-tar_archive: - rm -rf $(TAR_ARCHIVE) - -clean: clean-tar_archive - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_qtquicktemplates2plugin_generated.inc b/repos/libports/lib/mk/qt5_qtquicktemplates2plugin_generated.inc deleted file mode 100644 index 2e566a8f24..0000000000 --- a/repos/libports/lib/mk/qt5_qtquicktemplates2plugin_generated.inc +++ /dev/null @@ -1,46 +0,0 @@ -QT_DEFINES += -DQT_NO_FOREACH -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_PLUGIN -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_QUICKTEMPLATES2_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB - -QT_INCPATH += \ - qtquickcontrols2/src/imports/templates \ - qtdeclarative/include \ - qtdeclarative/include/QtQuick \ - qtbase/include \ - qtbase/include/QtGui \ - qtdeclarative/include/QtQml \ - qtbase/include/QtNetwork \ - qtbase/include/QtCore \ - qtdeclarative/include/QtQuick/5.13.0 \ - qtdeclarative/include/QtQuick/5.13.0/QtQuick \ - qtbase/include/QtGui/5.13.0 \ - qtbase/include/QtGui/5.13.0/QtGui \ - qtdeclarative/include/QtQml/5.13.0 \ - qtdeclarative/include/QtQml/5.13.0/QtQml \ - qtbase/include/QtCore/5.13.0 \ - qtbase/include/QtCore/5.13.0/QtCore \ - qtquickcontrols2/include/QtQuickTemplates2/5.13.0 \ - qtquickcontrols2/include/QtQuickTemplates2/5.13.0/QtQuickTemplates2 \ - qtquickcontrols2/include \ - qtquickcontrols2/include/QtQuickTemplates2 \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - qtquicktemplates2plugin.cpp - -QT_VPATH += \ - qtquickcontrols2/src/imports/templates \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - qtquicktemplates2plugin.moc - diff --git a/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardplugin.mk b/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardplugin.mk deleted file mode 100644 index 7f1fba1017..0000000000 --- a/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardplugin.mk +++ /dev/null @@ -1,45 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) - -SHARED_LIB = yes - -include $(REP_DIR)/lib/mk/qt5_qtquickvirtualkeyboardplugin_generated.inc - -QT_DEFINES += -UQT_STATICPLUGIN - -include $(REP_DIR)/lib/mk/qt5.inc - -LIBS += qt5_core qt5_gui qt5_qml qt5_virtualkeyboard - -# install the QML plugin - -QML_PLUGIN_NAME := qt5_qtquickvirtualkeyboardplugin -QML_INSTALL_DIR := qt/qml/QtQuick/VirtualKeyboard - -QML_PLUGIN := $(QML_INSTALL_DIR)/$(QML_PLUGIN_NAME).lib.so -TAR_ARCHIVE := $(BUILD_BASE_DIR)/bin/$(QML_PLUGIN_NAME).tar - -$(QML_INSTALL_DIR): - $(VERBOSE)mkdir -p $@ - -$(QML_PLUGIN): $(QML_INSTALL_DIR) $(QML_PLUGIN_NAME).lib.so.stripped - $(VERBOSE)cp $(QML_PLUGIN_NAME).lib.so.stripped $@ - -$(TAR_ARCHIVE): $(QML_PLUGIN) - $(VERBOSE)tar cf $@ qt - -ifneq ($(call select_from_ports,qt5),) -$(QML_PLUGIN_NAME).lib.tag: $(TAR_ARCHIVE) -endif - -# -# unfortunately, these clean rules don't trigger -# - -clean-tar_archive: - rm -rf $(TAR_ARCHIVE) - -clean: clean-tar_archive - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardplugin_generated.inc b/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardplugin_generated.inc deleted file mode 100644 index 546a43ac95..0000000000 --- a/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardplugin_generated.inc +++ /dev/null @@ -1,43 +0,0 @@ -QT_DEFINES += -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_PLUGIN -DQT_VIRTUALKEYBOARD_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB - -QT_INCPATH += \ - qtvirtualkeyboard/src/import \ - qtvirtualkeyboard/include/QtVirtualKeyboard/5.13.0 \ - qtvirtualkeyboard/include/QtVirtualKeyboard/5.13.0/QtVirtualKeyboard \ - qtvirtualkeyboard/include \ - qtvirtualkeyboard/include/QtVirtualKeyboard \ - qtdeclarative/include \ - qtdeclarative/include/QtQuick \ - qtbase/include/QtGui/5.13.0 \ - qtbase/include/QtGui/5.13.0/QtGui \ - qtbase/include \ - qtbase/include/QtGui \ - qtdeclarative/include/QtQml \ - qtbase/include/QtNetwork \ - qtbase/include/QtCore/5.13.0 \ - qtbase/include/QtCore/5.13.0/QtCore \ - qtbase/include/QtCore \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - qtquickvirtualkeyboardplugin.cpp \ - moc_qtquickvirtualkeyboardplugin.cpp - -QT_VPATH += \ - qtvirtualkeyboard/src/import \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - moc_qtquickvirtualkeyboardplugin.cpp - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - - diff --git a/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardsettingsplugin.mk b/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardsettingsplugin.mk deleted file mode 100644 index f513c8b633..0000000000 --- a/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardsettingsplugin.mk +++ /dev/null @@ -1,45 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) - -SHARED_LIB = yes - -include $(REP_DIR)/lib/mk/qt5_qtquickvirtualkeyboardsettingsplugin_generated.inc - -QT_DEFINES += -UQT_STATICPLUGIN - -include $(REP_DIR)/lib/mk/qt5.inc - -LIBS += qt5_qml qt5_virtualkeyboard - -# install the QML plugin - -QML_PLUGIN_NAME := qt5_qtquickvirtualkeyboardsettingsplugin -QML_INSTALL_DIR := qt/qml/QtQuick/VirtualKeyboard/Settings - -QML_PLUGIN := $(QML_INSTALL_DIR)/$(QML_PLUGIN_NAME).lib.so -TAR_ARCHIVE := $(BUILD_BASE_DIR)/bin/$(QML_PLUGIN_NAME).tar - -$(QML_INSTALL_DIR): - $(VERBOSE)mkdir -p $@ - -$(QML_PLUGIN): $(QML_INSTALL_DIR) $(QML_PLUGIN_NAME).lib.so.stripped - $(VERBOSE)cp $(QML_PLUGIN_NAME).lib.so.stripped $@ - -$(TAR_ARCHIVE): $(QML_PLUGIN) - $(VERBOSE)tar cf $@ qt - -ifneq ($(call select_from_ports,qt5),) -$(QML_PLUGIN_NAME).lib.tag: $(TAR_ARCHIVE) -endif - -# -# unfortunately, these clean rules don't trigger -# - -clean-tar_archive: - rm -rf $(TAR_ARCHIVE) - -clean: clean-tar_archive - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardsettingsplugin_generated.inc b/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardsettingsplugin_generated.inc deleted file mode 100644 index c5f28d60ef..0000000000 --- a/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardsettingsplugin_generated.inc +++ /dev/null @@ -1,43 +0,0 @@ -QT_DEFINES += -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_PLUGIN -DQT_VIRTUALKEYBOARD_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB - -QT_INCPATH += \ - qtvirtualkeyboard/src/settings \ - qtvirtualkeyboard/include/QtVirtualKeyboard/5.13.0 \ - qtvirtualkeyboard/include/QtVirtualKeyboard/5.13.0/QtVirtualKeyboard \ - qtvirtualkeyboard/include \ - qtvirtualkeyboard/include/QtVirtualKeyboard \ - qtdeclarative/include \ - qtdeclarative/include/QtQuick \ - qtbase/include/QtGui/5.13.0 \ - qtbase/include/QtGui/5.13.0/QtGui \ - qtbase/include \ - qtbase/include/QtGui \ - qtdeclarative/include/QtQml \ - qtbase/include/QtNetwork \ - qtbase/include/QtCore/5.13.0 \ - qtbase/include/QtCore/5.13.0/QtCore \ - qtbase/include/QtCore \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - qtquickvirtualkeyboardsettingsplugin.cpp \ - moc_qtquickvirtualkeyboardsettingsplugin.cpp - -QT_VPATH += \ - qtvirtualkeyboard/src/settings \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - moc_qtquickvirtualkeyboardsettingsplugin.cpp - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - - diff --git a/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardstylesplugin.mk b/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardstylesplugin.mk deleted file mode 100644 index f8456561e8..0000000000 --- a/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardstylesplugin.mk +++ /dev/null @@ -1,45 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) - -SHARED_LIB = yes - -include $(REP_DIR)/lib/mk/qt5_qtquickvirtualkeyboardstylesplugin_generated.inc - -QT_DEFINES += -UQT_STATICPLUGIN - -include $(REP_DIR)/lib/mk/qt5.inc - -LIBS += qt5_gui qt5_qml qt5_quick qt5_svg qt5_virtualkeyboard - -# install the QML plugin - -QML_PLUGIN_NAME := qt5_qtquickvirtualkeyboardstylesplugin -QML_INSTALL_DIR := qt/qml/QtQuick/VirtualKeyboard/Styles - -QML_PLUGIN := $(QML_INSTALL_DIR)/$(QML_PLUGIN_NAME).lib.so -TAR_ARCHIVE := $(BUILD_BASE_DIR)/bin/$(QML_PLUGIN_NAME).tar - -$(QML_INSTALL_DIR): - $(VERBOSE)mkdir -p $@ - -$(QML_PLUGIN): $(QML_INSTALL_DIR) $(QML_PLUGIN_NAME).lib.so.stripped - $(VERBOSE)cp $(QML_PLUGIN_NAME).lib.so.stripped $@ - -$(TAR_ARCHIVE): $(QML_PLUGIN) - $(VERBOSE)tar cf $@ qt - -ifneq ($(call select_from_ports,qt5),) -$(QML_PLUGIN_NAME).lib.tag: $(TAR_ARCHIVE) -endif - -# -# unfortunately, these clean rules don't trigger -# - -clean-tar_archive: - rm -rf $(TAR_ARCHIVE) - -clean: clean-tar_archive - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardstylesplugin_generated.inc b/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardstylesplugin_generated.inc deleted file mode 100644 index 5fe7282733..0000000000 --- a/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardstylesplugin_generated.inc +++ /dev/null @@ -1,48 +0,0 @@ -QT_DEFINES += -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_PLUGIN -DQT_VIRTUALKEYBOARD_LIB -DQT_QUICK_LIB -DQT_SVG_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB - -QT_INCPATH += \ - qtvirtualkeyboard/src/styles \ - qtvirtualkeyboard/include/QtVirtualKeyboard/5.13.0 \ - qtvirtualkeyboard/include/QtVirtualKeyboard/5.13.0/QtVirtualKeyboard \ - qtvirtualkeyboard/include \ - qtvirtualkeyboard/include/QtVirtualKeyboard \ - qtdeclarative/include \ - qtdeclarative/include/QtQuick \ - qtsvg/include \ - qtsvg/include/QtSvg \ - qtbase/include \ - qtbase/include/QtWidgets \ - qtbase/include/QtGui/5.13.0 \ - qtbase/include/QtGui/5.13.0/QtGui \ - qtbase/include/QtGui \ - qtdeclarative/include/QtQml \ - qtbase/include/QtNetwork \ - qtbase/include/QtCore/5.13.0 \ - qtbase/include/QtCore/5.13.0/QtCore \ - qtbase/include/QtCore \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - svgimageprovider.cpp \ - qtquickvirtualkeyboardstylesplugin.cpp \ - qrc_styles.cpp \ - moc_qtquickvirtualkeyboardstylesplugin.cpp - -QT_VPATH += \ - qtvirtualkeyboard/src/styles \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - moc_qtquickvirtualkeyboardstylesplugin.cpp - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - - diff --git a/repos/libports/lib/mk/qt5_qtvirtualkeyboardplugin.mk b/repos/libports/lib/mk/qt5_qtvirtualkeyboardplugin.mk deleted file mode 100644 index 0e668fda33..0000000000 --- a/repos/libports/lib/mk/qt5_qtvirtualkeyboardplugin.mk +++ /dev/null @@ -1,49 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) - -SHARED_LIB = yes - -include $(REP_DIR)/lib/mk/qt5_qtvirtualkeyboardplugin_generated.inc - -QT_DEFINES += -UQT_STATICPLUGIN - -include $(REP_DIR)/lib/mk/qt5.inc - -LIBS += qt5_core qt5_gui qt5_qml qt5_quick qt5_svg qt5_virtualkeyboard - -# install the Qt plugin - -QT_PLUGIN_NAME := qt5_qtvirtualkeyboardplugin -QT_PLUGIN_INSTALL_DIR := qt/plugins/platforminputcontexts -QT_PLUGIN := $(QT_PLUGIN_INSTALL_DIR)/$(QT_PLUGIN_NAME).lib.so -TAR_ARCHIVE := $(BUILD_BASE_DIR)/bin/$(QT_PLUGIN_NAME).tar - -vpath % $(QT5_CONTRIB_DIR)/qtvirtualkeyboard/src/virtualkeyboard/content -vpath % $(QT5_CONTRIB_DIR)/qtvirtualkeyboard/src/virtualkeyboard/content/styles/retro -vpath % $(QT5_CONTRIB_DIR)/qtvirtualkeyboard/src/virtualkeyboard/content/styles/default - -$(QTQUICK_INSTALL_DIR): - $(VERBOSE)mkdir -p $@ - -$(QT_PLUGIN_INSTALL_DIR): - $(VERBOSE)mkdir -p $@ - -$(QT_PLUGIN): $(QT_PLUGIN_INSTALL_DIR) $(QT_PLUGIN_NAME).lib.so.stripped - $(VERBOSE)cp $(QT_PLUGIN_NAME).lib.so.stripped $@ - -$(TAR_ARCHIVE): $(QT_PLUGIN) - $(VERBOSE)tar chf $@ qt - -$(QT_PLUGIN_NAME).lib.tag: $(TAR_ARCHIVE) - -# -# unfortunately, these clean rules don't trigger -# - -clean-tar_archive: - rm -rf $(TAR_ARCHIVE) - -clean: clean-tar_archive - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_qtvirtualkeyboardplugin_generated.inc b/repos/libports/lib/mk/qt5_qtvirtualkeyboardplugin_generated.inc deleted file mode 100644 index 2d47fdc39f..0000000000 --- a/repos/libports/lib/mk/qt5_qtvirtualkeyboardplugin_generated.inc +++ /dev/null @@ -1,44 +0,0 @@ -QT_DEFINES += -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY -DQT_DEPRECATED_WARNINGS -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_PLUGIN -DQT_VIRTUALKEYBOARD_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB - -QT_INCPATH += \ - qtvirtualkeyboard/src/plugin \ - qtvirtualkeyboard/include/QtVirtualKeyboard/5.13.0 \ - qtvirtualkeyboard/include/QtVirtualKeyboard/5.13.0/QtVirtualKeyboard \ - qtbase/include/QtGui/5.13.0 \ - qtbase/include/QtGui/5.13.0/QtGui \ - qtvirtualkeyboard/include \ - qtvirtualkeyboard/include/QtVirtualKeyboard \ - qtdeclarative/include \ - qtdeclarative/include/QtQuick \ - qtbase/include \ - qtbase/include/QtGui \ - qtdeclarative/include/QtQml \ - qtbase/include/QtNetwork \ - qtbase/include/QtCore/5.13.0 \ - qtbase/include/QtCore/5.13.0/QtCore \ - qtbase/include/QtCore \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - plugin.cpp \ - extensionloader.cpp \ - moc_plugin.cpp - -QT_VPATH += \ - qtvirtualkeyboard/src/plugin \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - moc_plugin.cpp - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - - diff --git a/repos/libports/lib/mk/qt5_quick.mk b/repos/libports/lib/mk/qt5_quick.mk deleted file mode 100644 index c623046f7f..0000000000 --- a/repos/libports/lib/mk/qt5_quick.mk +++ /dev/null @@ -1,18 +0,0 @@ -include $(call select_from_repositories,lib/import/import-qt5_quick.mk) - -SHARED_LIB = yes - -include $(REP_DIR)/lib/mk/qt5_quick_generated.inc - -# remove unneeded files to prevent moc warnings -COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT = \ - moc_qquickaccessibleattached_p.cpp \ - moc_qquickprofiler_p.cpp - -QT_INCPATH += qtdeclarative/src/quick/items - -include $(REP_DIR)/lib/mk/qt5.inc - -LIBS += qt5_core qt5_gui qt5_network qt5_qml - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_quick_generated.inc b/repos/libports/lib/mk/qt5_quick_generated.inc deleted file mode 100644 index 89b4e74a7d..0000000000 --- a/repos/libports/lib/mk/qt5_quick_generated.inc +++ /dev/null @@ -1,407 +0,0 @@ -QT_DEFINES += -DQT_NO_URL_CAST_FROM_STRING -DQT_NO_INTEGER_EVENT_COORDINATES -DQT_NO_FOREACH -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_BUILD_QUICK_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB - -QT_INCPATH += \ - qtdeclarative/src/quick \ - qtdeclarative/src/quick \ - qtdeclarative/include \ - qtdeclarative/include/QtQuick \ - qtdeclarative/include/QtQuick/5.13.0 \ - qtdeclarative/include/QtQuick/5.13.0/QtQuick \ - qtbase/include/QtGui/5.13.0 \ - qtbase/include/QtGui/5.13.0/QtGui \ - qtdeclarative/include/QtQml/5.13.0 \ - qtdeclarative/include/QtQml/5.13.0/QtQml \ - qtbase/include/QtCore/5.13.0 \ - qtbase/include/QtCore/5.13.0/QtCore \ - qtbase/include \ - qtbase/include/QtGui \ - qtdeclarative/include/QtQml \ - qtbase/include/QtNetwork \ - qtbase/include/QtCore \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - qquickapplication.cpp \ - qquickutilmodule.cpp \ - qquickanimation.cpp \ - qquicksystempalette.cpp \ - qquickspringanimation.cpp \ - qquicksmoothedanimation.cpp \ - qquickanimationcontroller.cpp \ - qquickstate.cpp \ - qquicktransitionmanager.cpp \ - qquickstatechangescript.cpp \ - qquickpropertychanges.cpp \ - qquickstategroup.cpp \ - qquicktransition.cpp \ - qquicktimeline.cpp \ - qquickpixmapcache.cpp \ - qquickbehavior.cpp \ - qquickfontloader.cpp \ - qquickstyledtext.cpp \ - qquickimageprovider.cpp \ - qquicksvgparser.cpp \ - qquickvaluetypes.cpp \ - qquickglobal.cpp \ - qquickanimator.cpp \ - qquickanimatorjob.cpp \ - qquickanimatorcontroller.cpp \ - qquickfontmetrics.cpp \ - qquicktextmetrics.cpp \ - qquickvalidator.cpp \ - qquickshortcut.cpp \ - qquickpath.cpp \ - qquickpathinterpolator.cpp \ - qsgabstractrenderer.cpp \ - qsggeometry.cpp \ - qsgmaterial.cpp \ - qsgnode.cpp \ - qsgnodeupdater.cpp \ - qsgrenderer.cpp \ - qsgrendernode.cpp \ - qsgrendererinterface.cpp \ - qsgbatchrenderer.cpp \ - qsgshaderrewriter.cpp \ - qsgareaallocator.cpp \ - qsgengine.cpp \ - qsgsimplerectnode.cpp \ - qsgsimpletexturenode.cpp \ - qsgtexture.cpp \ - qsgtextureprovider.cpp \ - qsgflatcolormaterial.cpp \ - qsgsimplematerial.cpp \ - qsgtexturematerial.cpp \ - qsgvertexcolormaterial.cpp \ - qsgrectanglenode.cpp \ - qsgimagenode.cpp \ - qsgninepatchnode.cpp \ - qsgdepthstencilbuffer.cpp \ - qsgatlastexture.cpp \ - qsgshadersourcebuilder.cpp \ - qsgadaptationlayer.cpp \ - qsgcontext.cpp \ - qsgcontextplugin.cpp \ - qsgbasicinternalrectanglenode.cpp \ - qsgbasicinternalimagenode.cpp \ - qsgbasicglyphnode.cpp \ - qsgrenderloop.cpp \ - qsgdefaultglyphnode.cpp \ - qsgdefaultglyphnode_p.cpp \ - qsgdefaultdistancefieldglyphcache.cpp \ - qsgdistancefieldglyphnode.cpp \ - qsgdistancefieldglyphnode_p.cpp \ - qsgdefaultinternalimagenode.cpp \ - qsgdefaultinternalrectanglenode.cpp \ - qsgdefaultrendercontext.cpp \ - qsgdefaultcontext.cpp \ - qsgdefaultpainternode.cpp \ - qsgdefaultrectanglenode.cpp \ - qsgdefaultimagenode.cpp \ - qsgdefaultninepatchnode.cpp \ - qsgdefaultlayer.cpp \ - qsgwindowsrenderloop.cpp \ - qsgthreadedrenderloop.cpp \ - qsgdefaultspritenode.cpp \ - qsgsoftwarecontext.cpp \ - qsgabstractsoftwarerenderer.cpp \ - qsgsoftwareglyphnode.cpp \ - qsgsoftwareinternalimagenode.cpp \ - qsgsoftwarepublicnodes.cpp \ - qsgsoftwarepainternode.cpp \ - qsgsoftwareinternalrectanglenode.cpp \ - qsgsoftwarepixmaprenderer.cpp \ - qsgsoftwarepixmaptexture.cpp \ - qsgsoftwarerenderablenode.cpp \ - qsgsoftwarerenderablenodeupdater.cpp \ - qsgsoftwarerenderer.cpp \ - qsgsoftwarerenderlistbuilder.cpp \ - qsgsoftwarerenderloop.cpp \ - qsgsoftwarelayer.cpp \ - qsgsoftwareadaptation.cpp \ - qsgsoftwarespritenode.cpp \ - qsgsoftwarethreadedrenderloop.cpp \ - qsgtexturereader.cpp \ - qsgcompressedatlastexture.cpp \ - qsgcompressedtexture.cpp \ - qquickevents.cpp \ - qquickanchors.cpp \ - qquickitem.cpp \ - qquickrectangle.cpp \ - qquickwindow.cpp \ - qquickfocusscope.cpp \ - qquickitemsmodule.cpp \ - qquickpainteditem.cpp \ - qquicktext.cpp \ - qquicktextnode.cpp \ - qquicktextnodeengine.cpp \ - qquicktextinput.cpp \ - qquicktextcontrol.cpp \ - qquicktextdocument.cpp \ - qquicktextedit.cpp \ - qquicktextutil.cpp \ - qquickimagebase.cpp \ - qquickimage.cpp \ - qquickborderimage.cpp \ - qquickscalegrid.cpp \ - qquickmousearea.cpp \ - qquickpincharea.cpp \ - qquickflickable.cpp \ - qquickloader.cpp \ - qquicktranslate.cpp \ - qquickclipnode.cpp \ - qquickview.cpp \ - qquickitemanimation.cpp \ - qquickstateoperations.cpp \ - qquickimplicitsizeitem.cpp \ - qquickaccessibleattached.cpp \ - qquickdrag.cpp \ - qquickdroparea.cpp \ - qquickmultipointtoucharea.cpp \ - qquickwindowmodule.cpp \ - qquickscreen.cpp \ - qquickwindowattached.cpp \ - qquickrendercontrol.cpp \ - qquickgraphicsinfo.cpp \ - qquickitemgrabresult.cpp \ - qquickanimatedimage.cpp \ - qquickgridview.cpp \ - qquickitemviewfxitem.cpp \ - qquickitemview.cpp \ - qquickitemviewtransition.cpp \ - qquicklistview.cpp \ - qquicktableview.cpp \ - qquickpathview.cpp \ - qquickpositioners.cpp \ - qquickflipable.cpp \ - qquickrepeater.cpp \ - qquickshadereffectsource.cpp \ - qquickshadereffectmesh.cpp \ - qquickshadereffect.cpp \ - qquickgenericshadereffect.cpp \ - qquickopenglshadereffect.cpp \ - qquickopenglshadereffectnode.cpp \ - qquickspriteengine.cpp \ - qquicksprite.cpp \ - qquickspritesequence.cpp \ - qquickanimatedsprite.cpp \ - qquickopenglinfo.cpp \ - qquickframebufferobject.cpp \ - qquickcanvasitem.cpp \ - qquickcanvascontext.cpp \ - qquickcontext2d.cpp \ - qquickcontext2dtile.cpp \ - qquickcontext2dtexture.cpp \ - qquickcontext2dcommandbuffer.cpp \ - qquickdraghandler.cpp \ - qquickhandlerpoint.cpp \ - qquickhoverhandler.cpp \ - qquickmultipointhandler.cpp \ - qquickpinchhandler.cpp \ - qquickpointerdevicehandler.cpp \ - qquickpointerhandler.cpp \ - qquickpointhandler.cpp \ - qquicksinglepointhandler.cpp \ - qquicktaphandler.cpp \ - qquickdragaxis.cpp \ - qquickdesignercustomobjectdata.cpp \ - qquickdesignersupport.cpp \ - qquickdesignersupportitems.cpp \ - qquickdesignersupportmetainfo.cpp \ - qquickdesignersupportproperties.cpp \ - qquickdesignersupportpropertychanges.cpp \ - qquickdesignersupportstates.cpp \ - qquickdesignerwindowmanager.cpp \ - qqmldesignermetaobject.cpp \ - qquickdesignercustomparserobject.cpp \ - qtquick2.cpp \ - qrc_scenegraph.cpp \ - qrc_items.cpp \ - moc_qquicksmoothedanimation_p_p.cpp \ - moc_qquicktimeline_p_p.cpp \ - moc_qquickprofiler_p.cpp \ - moc_qsgcompressedatlastexture_p.cpp \ - moc_qsgcompressedtexture_p.cpp \ - moc_qquickevents_p_p.cpp \ - moc_qquickimage_p.cpp \ - moc_qquickimage_p_p.cpp \ - moc_qquickscalegrid_p_p.cpp \ - moc_qquickflickable_p_p.cpp \ - moc_qquickdraghandler_p.cpp \ - moc_qquickhandlerpoint_p.cpp \ - moc_qquickhoverhandler_p.cpp \ - moc_qquickmultipointhandler_p.cpp \ - moc_qquickpinchhandler_p.cpp \ - moc_qquickpointerdevicehandler_p.cpp \ - moc_qquickpointerhandler_p.cpp \ - moc_qquickpointhandler_p.cpp \ - moc_qquicksinglepointhandler_p.cpp \ - moc_qquicktaphandler_p.cpp \ - moc_qquickdragaxis_p.cpp - -QT_VPATH += \ - qtdeclarative/src/quick \ - qtdeclarative/src/quick/designer \ - qtdeclarative/src/quick/handlers \ - qtdeclarative/src/quick/items \ - qtdeclarative/src/quick/items/context2d \ - qtdeclarative/src/quick/scenegraph \ - qtdeclarative/src/quick/scenegraph/adaptations/software \ - qtdeclarative/src/quick/scenegraph/compressedtexture \ - qtdeclarative/src/quick/scenegraph/coreapi \ - qtdeclarative/src/quick/scenegraph/util \ - qtdeclarative/src/quick/util \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - moc_qquickapplication_p.cpp \ - moc_qquickanimation_p.cpp \ - moc_qquicksystempalette_p.cpp \ - moc_qquickspringanimation_p.cpp \ - moc_qquickanimationcontroller_p.cpp \ - moc_qquicksmoothedanimation_p.cpp \ - moc_qquicksmoothedanimation_p_p.cpp \ - moc_qquickstate_p.cpp \ - moc_qquickstatechangescript_p.cpp \ - moc_qquickpropertychanges_p.cpp \ - moc_qquickstategroup_p.cpp \ - moc_qquicktransition_p.cpp \ - moc_qquicktimeline_p_p.cpp \ - moc_qquickpixmapcache_p.cpp \ - moc_qquickbehavior_p.cpp \ - moc_qquickfontloader_p.cpp \ - moc_qquickimageprovider.cpp \ - moc_qquickvaluetypes_p.cpp \ - moc_qquickanimator_p.cpp \ - moc_qquickanimatorjob_p.cpp \ - moc_qquickanimatorcontroller_p.cpp \ - moc_qquickprofiler_p.cpp \ - moc_qquickfontmetrics_p.cpp \ - moc_qquicktextmetrics_p.cpp \ - moc_qquickvalidator_p.cpp \ - moc_qquickshortcut_p.cpp \ - moc_qquickpath_p.cpp \ - moc_qquickpathinterpolator_p.cpp \ - moc_qsgabstractrenderer.cpp \ - moc_qsgbatchrenderer_p.cpp \ - moc_qsgengine.cpp \ - moc_qsgtexture.cpp \ - moc_qsgtexture_p.cpp \ - moc_qsgtextureprovider.cpp \ - moc_qsgatlastexture_p.cpp \ - moc_qsgadaptationlayer_p.cpp \ - moc_qsgcontext_p.cpp \ - moc_qsgcontextplugin_p.cpp \ - moc_qsgrenderloop_p.cpp \ - moc_qsgdefaultrendercontext_p.cpp \ - moc_qsgdefaultlayer_p.cpp \ - moc_qsgwindowsrenderloop_p.cpp \ - moc_qsgthreadedrenderloop_p.cpp \ - moc_qsgsoftwarecontext_p.cpp \ - moc_qsgsoftwarepixmaptexture_p.cpp \ - moc_qsgsoftwarerenderloop_p.cpp \ - moc_qsgsoftwarelayer_p.cpp \ - moc_qsgsoftwarethreadedrenderloop_p.cpp \ - moc_qsgcompressedatlastexture_p.cpp \ - moc_qsgcompressedtexture_p.cpp \ - moc_qquickevents_p_p.cpp \ - moc_qquickanchors_p.cpp \ - moc_qquickaccessibleattached_p.cpp \ - moc_qquickitem.cpp \ - moc_qquickitem_p.cpp \ - moc_qquickrectangle_p.cpp \ - moc_qquickwindow.cpp \ - moc_qquickwindow_p.cpp \ - moc_qquickfocusscope_p.cpp \ - moc_qquickpainteditem.cpp \ - moc_qquicktext_p.cpp \ - moc_qquicktextinput_p.cpp \ - moc_qquicktextcontrol_p.cpp \ - moc_qquicktextdocument.cpp \ - moc_qquicktextdocument_p.cpp \ - moc_qquicktextedit_p.cpp \ - moc_qquicktextutil_p.cpp \ - moc_qquickimagebase_p.cpp \ - moc_qquickimage_p.cpp \ - moc_qquickimage_p_p.cpp \ - moc_qquickborderimage_p.cpp \ - moc_qquickscalegrid_p_p.cpp \ - moc_qquickmousearea_p.cpp \ - moc_qquickpincharea_p.cpp \ - moc_qquickflickable_p.cpp \ - moc_qquickflickable_p_p.cpp \ - moc_qquickloader_p.cpp \ - moc_qquicktranslate_p.cpp \ - moc_qquickview.cpp \ - moc_qquickitemanimation_p.cpp \ - moc_qquickstateoperations_p.cpp \ - moc_qquickimplicitsizeitem_p.cpp \ - moc_qquickdrag_p.cpp \ - moc_qquickdroparea_p.cpp \ - moc_qquickmultipointtoucharea_p.cpp \ - moc_qquickscreen_p.cpp \ - moc_qquickwindowattached_p.cpp \ - moc_qquickwindowmodule_p.cpp \ - moc_qquickrendercontrol.cpp \ - moc_qquickgraphicsinfo_p.cpp \ - moc_qquickitemgrabresult.cpp \ - moc_qquickanimatedimage_p.cpp \ - moc_qquickgridview_p.cpp \ - moc_qquickitemview_p.cpp \ - moc_qquickitemviewtransition_p.cpp \ - moc_qquicklistview_p.cpp \ - moc_qquicktableview_p.cpp \ - moc_qquickpathview_p.cpp \ - moc_qquickpositioners_p.cpp \ - moc_qquickflipable_p.cpp \ - moc_qquickrepeater_p.cpp \ - moc_qquickshadereffectsource_p.cpp \ - moc_qquickshadereffectmesh_p.cpp \ - moc_qquickshadereffect_p.cpp \ - moc_qquickgenericshadereffect_p.cpp \ - moc_qquickopenglshadereffect_p.cpp \ - moc_qquickopenglshadereffectnode_p.cpp \ - moc_qquickspriteengine_p.cpp \ - moc_qquicksprite_p.cpp \ - moc_qquickspritesequence_p.cpp \ - moc_qquickanimatedsprite_p.cpp \ - moc_qquickopenglinfo_p.cpp \ - moc_qquickframebufferobject.cpp \ - moc_qquickcanvasitem_p.cpp \ - moc_qquickcanvascontext_p.cpp \ - moc_qquickcontext2d_p.cpp \ - moc_qquickcontext2dtexture_p.cpp \ - moc_qquickdraghandler_p.cpp \ - moc_qquickhandlerpoint_p.cpp \ - moc_qquickhoverhandler_p.cpp \ - moc_qquickmultipointhandler_p.cpp \ - moc_qquickpinchhandler_p.cpp \ - moc_qquickpointerdevicehandler_p.cpp \ - moc_qquickpointerhandler_p.cpp \ - moc_qquickpointhandler_p.cpp \ - moc_qquicksinglepointhandler_p.cpp \ - moc_qquicktaphandler_p.cpp \ - moc_qquickdragaxis_p.cpp \ - moc_qquickdesignerwindowmanager_p.cpp \ - moc_qquickdesignercustomparserobject_p.cpp - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - qquickpixmapcache.moc \ - qquickfontloader.moc \ - qsgcontext.moc \ - qsgrenderloop.moc \ - qsgthreadedrenderloop.moc \ - qsgsoftwarethreadedrenderloop.moc \ - qquickwindow.moc \ - qquickflipable.moc \ - qquickshadereffectsource.moc \ - qquickopenglshadereffectnode.moc \ - qquickframebufferobject.moc - diff --git a/repos/libports/lib/mk/qt5_quickcontrols2.mk b/repos/libports/lib/mk/qt5_quickcontrols2.mk index ccf7b2ce69..24c43fb73a 100644 --- a/repos/libports/lib/mk/qt5_quickcontrols2.mk +++ b/repos/libports/lib/mk/qt5_quickcontrols2.mk @@ -1,11 +1,82 @@ -include $(call select_from_repositories,lib/import/import-qt5_quickcontrols2.mk) +include $(call select_from_repositories,lib/import/import-qt5_qmake.mk) -SHARED_LIB = yes +QT5_PORT_LIBS += libQt5Core libQt5Gui libQt5Network libQt5Widgets +QT5_PORT_LIBS += libQt5Qml libQt5Quick -LIBS += qt5_core qt5_gui qt5_qml qt5_quick qt5_quicktemplates2 +LIBS = libc libm mesa stdcxx $(QT5_PORT_LIBS) -include $(REP_DIR)/lib/mk/qt5_quickcontrols2_generated.inc +built.tag: qmake_prepared.tag -include $(REP_DIR)/lib/mk/qt5.inc + @# + @# run qmake + @# -CC_CXX_WARN_STRICT = + $(VERBOSE)source env.sh && $(QMAKE) \ + -qtconf qmake_root/mkspecs/$(QMAKE_PLATFORM)/qt.conf \ + $(QT_DIR)/qtquickcontrols2/qtquickcontrols2.pro \ + $(QT5_OUTPUT_FILTER) + + @# + @# build + @# + + $(VERBOSE)source env.sh && $(MAKE) sub-src $(QT5_OUTPUT_FILTER) + + @# + @# install into local 'install' directory + @# + + $(VERBOSE)$(MAKE) INSTALL_ROOT=$(CURDIR)/install sub-src-install_subtargets $(QT5_OUTPUT_FILTER) + + $(VERBOSE)ln -sf .$(CURDIR)/qmake_root install/qt + + @# + @# create stripped versions + @# + + $(VERBOSE)cd $(CURDIR)/install/qt/lib && \ + $(STRIP) libQt5QuickControls2.lib.so -o libQt5QuickControls2.lib.so.stripped && \ + $(STRIP) libQt5QuickTemplates2.lib.so -o libQt5QuickTemplates2.lib.so.stripped + + $(VERBOSE)cd $(CURDIR)/install/qt/qml/QtQuick/Controls.2 && \ + $(STRIP) libqtquickcontrols2plugin.lib.so -o libqtquickcontrols2plugin.lib.so.stripped + + $(VERBOSE)cd $(CURDIR)/install/qt/qml/QtQuick/Templates.2 && \ + $(STRIP) libqtquicktemplates2plugin.lib.so -o libqtquicktemplates2plugin.lib.so.stripped + + @# + @# create symlinks in 'bin' directory + @# + + $(VERBOSE)ln -sf $(CURDIR)/install/qt/lib/libQt5QuickControls2.lib.so.stripped $(PWD)/bin/libQt5QuickControls2.lib.so + $(VERBOSE)ln -sf $(CURDIR)/install/qt/lib/libQt5QuickTemplates2.lib.so.stripped $(PWD)/bin/libQt5QuickTemplates2.lib.so + + $(VERBOSE)ln -sf $(CURDIR)/install/qt/qml/QtQuick/Controls.2/libqtquickcontrols2plugin.lib.so.stripped $(PWD)/bin/libqtquickcontrols2plugin.lib.so + $(VERBOSE)ln -sf $(CURDIR)/install/qt/qml/QtQuick/Templates.2/libqtquicktemplates2plugin.lib.so.stripped $(PWD)/bin/libqtquicktemplates2plugin.lib.so + + @# + @# create symlinks in 'debug' directory + @# + + $(VERBOSE)ln -sf $(CURDIR)/install/qt/lib/libQt5QuickControls2.lib.so $(PWD)/debug/ + $(VERBOSE)ln -sf $(CURDIR)/install/qt/lib/libQt5QuickTemplates2.lib.so $(PWD)/debug/ + + $(VERBOSE)ln -sf $(CURDIR)/install/qt/qml/QtQuick/Controls.2/libqtquickcontrols2plugin.lib.so $(PWD)/debug/ + $(VERBOSE)ln -sf $(CURDIR)/install/qt/qml/QtQuick/Templates.2/libqtquicktemplates2plugin.lib.so $(PWD)/debug/ + + @# + @# create tar archives + @# + + $(VERBOSE)tar chf $(PWD)/bin/qt5_quickcontrols2_qml.tar --exclude='*.lib.so' --transform='s/\.stripped//' -C install qt/qml + + @# + @# mark as done + @# + + $(VERBOSE)touch $@ + + +ifeq ($(called_from_lib_mk),yes) +all: built.tag +endif diff --git a/repos/libports/lib/mk/qt5_quickcontrols2_generated.inc b/repos/libports/lib/mk/qt5_quickcontrols2_generated.inc deleted file mode 100644 index 299127cec2..0000000000 --- a/repos/libports/lib/mk/qt5_quickcontrols2_generated.inc +++ /dev/null @@ -1,91 +0,0 @@ -QT_DEFINES += -DQT_NO_FOREACH -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_BUILD_QUICKCONTROLS2_LIB -DQT_BUILDING_QT -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_QUICKTEMPLATES2_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB - -QT_INCPATH += \ - qtquickcontrols2/src/quickcontrols2 \ - qtquickcontrols2/include \ - qtquickcontrols2/include/QtQuickControls2 \ - qtquickcontrols2/include/QtQuickControls2/5.13.0 \ - qtquickcontrols2/include/QtQuickControls2/5.13.0/QtQuickControls2 \ - qtdeclarative/include \ - qtdeclarative/include/QtQuick \ - qtbase/include \ - qtbase/include/QtGui \ - qtdeclarative/include/QtQml \ - qtbase/include/QtNetwork \ - qtbase/include/QtCore \ - qtdeclarative/include/QtQuick/5.13.0 \ - qtdeclarative/include/QtQuick/5.13.0/QtQuick \ - qtbase/include/QtGui/5.13.0 \ - qtbase/include/QtGui/5.13.0/QtGui \ - qtdeclarative/include/QtQml/5.13.0 \ - qtdeclarative/include/QtQml/5.13.0/QtQml \ - qtbase/include/QtCore/5.13.0 \ - qtbase/include/QtCore/5.13.0/QtCore \ - qtquickcontrols2/include/QtQuickTemplates2/5.13.0 \ - qtquickcontrols2/include/QtQuickTemplates2/5.13.0/QtQuickTemplates2 \ - qtquickcontrols2/include/QtQuickTemplates2 \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - qquickanimatednode.cpp \ - qquickattachedobject.cpp \ - qquickchecklabel.cpp \ - qquickclippedtext.cpp \ - qquickcolor.cpp \ - qquickcolorimage.cpp \ - qquickiconimage.cpp \ - qquickiconlabel.cpp \ - qquickitemgroup.cpp \ - qquickmnemoniclabel.cpp \ - qquickpaddedrectangle.cpp \ - qquickplaceholdertext.cpp \ - qquickstyle.cpp \ - qquickstyleplugin.cpp \ - qquickstyleselector.cpp \ - qquicktumblerview.cpp \ - moc_qquickanimatednode_p.cpp \ - moc_qquickattachedobject_p.cpp \ - moc_qquickchecklabel_p.cpp \ - moc_qquickclippedtext_p.cpp \ - moc_qquickcolor_p.cpp \ - moc_qquickcolorimage_p.cpp \ - moc_qquickiconimage_p.cpp \ - moc_qquickiconlabel_p.cpp \ - moc_qquickitemgroup_p.cpp \ - moc_qquickmnemoniclabel_p.cpp \ - moc_qquickpaddedrectangle_p.cpp \ - moc_qquickplaceholdertext_p.cpp \ - moc_qquickstyleplugin_p.cpp \ - moc_qquicktumblerview_p.cpp - -QT_VPATH += \ - qtquickcontrols2/src/quickcontrols2 \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - moc_qquickanimatednode_p.cpp \ - moc_qquickattachedobject_p.cpp \ - moc_qquickchecklabel_p.cpp \ - moc_qquickclippedtext_p.cpp \ - moc_qquickcolor_p.cpp \ - moc_qquickcolorimage_p.cpp \ - moc_qquickiconimage_p.cpp \ - moc_qquickiconlabel_p.cpp \ - moc_qquickitemgroup_p.cpp \ - moc_qquickmnemoniclabel_p.cpp \ - moc_qquickpaddedrectangle_p.cpp \ - moc_qquickplaceholdertext_p.cpp \ - moc_qquickstyleplugin_p.cpp \ - moc_qquicktumblerview_p.cpp - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - - diff --git a/repos/libports/lib/mk/qt5_quicktemplates2.mk b/repos/libports/lib/mk/qt5_quicktemplates2.mk deleted file mode 100644 index 90c0dacdde..0000000000 --- a/repos/libports/lib/mk/qt5_quicktemplates2.mk +++ /dev/null @@ -1,11 +0,0 @@ -include $(call select_from_repositories,lib/import/import-qt5_quicktemplates2.mk) - -SHARED_LIB = yes - -LIBS += qt5_core qt5_gui qt5_qml qt5_quick - -include $(REP_DIR)/lib/mk/qt5_quicktemplates2_generated.inc - -include $(REP_DIR)/lib/mk/qt5.inc - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_quicktemplates2_generated.inc b/repos/libports/lib/mk/qt5_quicktemplates2_generated.inc deleted file mode 100644 index 5fbcb0c36b..0000000000 --- a/repos/libports/lib/mk/qt5_quicktemplates2_generated.inc +++ /dev/null @@ -1,226 +0,0 @@ -QT_DEFINES += -DQT_NO_FOREACH -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_BUILD_QUICKTEMPLATES2_LIB -DQT_BUILDING_QT -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB - -QT_INCPATH += \ - qtquickcontrols2/src/quicktemplates2 \ - qtquickcontrols2/src/quicktemplates2 \ - qtquickcontrols2/include \ - qtquickcontrols2/include/QtQuickTemplates2 \ - qtquickcontrols2/include/QtQuickTemplates2/5.13.0 \ - qtquickcontrols2/include/QtQuickTemplates2/5.13.0/QtQuickTemplates2 \ - qtdeclarative/include \ - qtdeclarative/include/QtQuick \ - qtbase/include \ - qtbase/include/QtGui \ - qtdeclarative/include/QtQml \ - qtbase/include/QtNetwork \ - qtbase/include/QtCore \ - qtdeclarative/include/QtQuick/5.13.0 \ - qtdeclarative/include/QtQuick/5.13.0/QtQuick \ - qtbase/include/QtGui/5.13.0 \ - qtbase/include/QtGui/5.13.0/QtGui \ - qtdeclarative/include/QtQml/5.13.0 \ - qtdeclarative/include/QtQml/5.13.0/QtQml \ - qtbase/include/QtCore/5.13.0 \ - qtbase/include/QtCore/5.13.0/QtCore \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - qquickabstractbutton.cpp \ - qquickaction.cpp \ - qquickactiongroup.cpp \ - qquickapplicationwindow.cpp \ - qquickbusyindicator.cpp \ - qquickbutton.cpp \ - qquickbuttongroup.cpp \ - qquickcheckbox.cpp \ - qquickcheckdelegate.cpp \ - qquickcombobox.cpp \ - qquickcontainer.cpp \ - qquickcontentitem.cpp \ - qquickcontrol.cpp \ - qquickdeferredexecute.cpp \ - qquickdelaybutton.cpp \ - qquickdial.cpp \ - qquickdialog.cpp \ - qquickdialogbuttonbox.cpp \ - qquickdrawer.cpp \ - qquickframe.cpp \ - qquickgroupbox.cpp \ - qquickicon.cpp \ - qquickitemdelegate.cpp \ - qquicklabel.cpp \ - qquickmenu.cpp \ - qquickmenubar.cpp \ - qquickmenubaritem.cpp \ - qquickmenuitem.cpp \ - qquickmenuseparator.cpp \ - qquickoverlay.cpp \ - qquickpage.cpp \ - qquickpageindicator.cpp \ - qquickpalette.cpp \ - qquickpaletteprovider.cpp \ - qquickpane.cpp \ - qquickpopup.cpp \ - qquickpopupanchors.cpp \ - qquickpopupitem.cpp \ - qquickpopuppositioner.cpp \ - qquickpresshandler.cpp \ - qquickprogressbar.cpp \ - qquickradiobutton.cpp \ - qquickradiodelegate.cpp \ - qquickrangeslider.cpp \ - qquickroundbutton.cpp \ - qquickscrollbar.cpp \ - qquickscrollindicator.cpp \ - qquickscrollview.cpp \ - qquickshortcutcontext.cpp \ - qquickslider.cpp \ - qquickspinbox.cpp \ - qquicksplitview.cpp \ - qquickstackelement.cpp \ - qquickstacktransition.cpp \ - qquickstackview.cpp \ - qquickstackview_p.cpp \ - qquickswipedelegate.cpp \ - qquickswipeview.cpp \ - qquickswitch.cpp \ - qquickswitchdelegate.cpp \ - qquicktabbar.cpp \ - qquicktabbutton.cpp \ - qquicktextarea.cpp \ - qquicktextfield.cpp \ - qquicktheme.cpp \ - qquicktoolbar.cpp \ - qquicktoolbutton.cpp \ - qquicktoolseparator.cpp \ - qquicktooltip.cpp \ - qquickvelocitycalculator.cpp \ - qquicktumbler.cpp \ - moc_qquickabstractbutton_p.cpp \ - moc_qquickbusyindicator_p.cpp \ - moc_qquickbutton_p.cpp \ - moc_qquickcombobox_p.cpp \ - moc_qquickcontentitem_p.cpp \ - moc_qquickcontrol_p.cpp \ - moc_qquickdelaybutton_p.cpp \ - moc_qquickdial_p.cpp \ - moc_qquickdialog_p.cpp \ - moc_qquickdialogbuttonbox_p.cpp \ - moc_qquickdrawer_p.cpp \ - moc_qquickframe_p.cpp \ - moc_qquickgroupbox_p.cpp \ - moc_qquickicon_p.cpp \ - moc_qquickitemdelegate_p.cpp \ - moc_qquicklabel_p.cpp \ - moc_qquickmenubaritem_p.cpp \ - moc_qquickmenuitem_p.cpp \ - moc_qquickmenuseparator_p.cpp \ - moc_qquickoverlay_p.cpp \ - moc_qquickpage_p.cpp \ - moc_qquickpageindicator_p.cpp \ - moc_qquickpalette_p.cpp \ - moc_qquickpopupanchors_p.cpp \ - moc_qquickpopupitem_p_p.cpp \ - moc_qquickprogressbar_p.cpp \ - moc_qquickradiobutton_p.cpp \ - moc_qquickradiodelegate_p.cpp \ - moc_qquickrangeslider_p.cpp \ - moc_qquickroundbutton_p.cpp \ - moc_qquickscrollbar_p.cpp \ - moc_qquickscrollindicator_p.cpp \ - moc_qquickslider_p.cpp \ - moc_qquickspinbox_p.cpp \ - moc_qquickstackview_p.cpp \ - moc_qquickswipe_p.cpp \ - moc_qquickswipedelegate_p.cpp \ - moc_qquickswipeview_p.cpp \ - moc_qquickswitch_p.cpp \ - moc_qquickswitchdelegate_p.cpp \ - moc_qquicktabbar_p.cpp \ - moc_qquicktabbutton_p.cpp \ - moc_qquicktextarea_p.cpp \ - moc_qquicktextfield_p.cpp \ - moc_qquicktoolbar_p.cpp \ - moc_qquicktoolbutton_p.cpp \ - moc_qquicktoolseparator_p.cpp \ - moc_qquicktooltip_p.cpp - -QT_VPATH += \ - qtquickcontrols2/src/quicktemplates2 \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - moc_qquickabstractbutton_p.cpp \ - moc_qquickaction_p.cpp \ - moc_qquickactiongroup_p.cpp \ - moc_qquickapplicationwindow_p.cpp \ - moc_qquickbusyindicator_p.cpp \ - moc_qquickbutton_p.cpp \ - moc_qquickbuttongroup_p.cpp \ - moc_qquickcheckbox_p.cpp \ - moc_qquickcheckdelegate_p.cpp \ - moc_qquickcombobox_p.cpp \ - moc_qquickcontainer_p.cpp \ - moc_qquickcontentitem_p.cpp \ - moc_qquickcontrol_p.cpp \ - moc_qquickdelaybutton_p.cpp \ - moc_qquickdial_p.cpp \ - moc_qquickdialog_p.cpp \ - moc_qquickdialogbuttonbox_p.cpp \ - moc_qquickdrawer_p.cpp \ - moc_qquickframe_p.cpp \ - moc_qquickgroupbox_p.cpp \ - moc_qquickicon_p.cpp \ - moc_qquickitemdelegate_p.cpp \ - moc_qquicklabel_p.cpp \ - moc_qquickmenu_p.cpp \ - moc_qquickmenubar_p.cpp \ - moc_qquickmenubaritem_p.cpp \ - moc_qquickmenuitem_p.cpp \ - moc_qquickmenuseparator_p.cpp \ - moc_qquickoverlay_p.cpp \ - moc_qquickpage_p.cpp \ - moc_qquickpageindicator_p.cpp \ - moc_qquickpalette_p.cpp \ - moc_qquickpane_p.cpp \ - moc_qquickpopup_p.cpp \ - moc_qquickpopupanchors_p.cpp \ - moc_qquickpopupitem_p_p.cpp \ - moc_qquickprogressbar_p.cpp \ - moc_qquickradiobutton_p.cpp \ - moc_qquickradiodelegate_p.cpp \ - moc_qquickrangeslider_p.cpp \ - moc_qquickroundbutton_p.cpp \ - moc_qquickscrollbar_p.cpp \ - moc_qquickscrollindicator_p.cpp \ - moc_qquickscrollview_p.cpp \ - moc_qquickslider_p.cpp \ - moc_qquickspinbox_p.cpp \ - moc_qquicksplitview_p.cpp \ - moc_qquickstackview_p.cpp \ - moc_qquickswipe_p.cpp \ - moc_qquickswipedelegate_p.cpp \ - moc_qquickswipeview_p.cpp \ - moc_qquickswitch_p.cpp \ - moc_qquickswitchdelegate_p.cpp \ - moc_qquicktabbar_p.cpp \ - moc_qquicktabbutton_p.cpp \ - moc_qquicktextarea_p.cpp \ - moc_qquicktextfield_p.cpp \ - moc_qquicktoolbar_p.cpp \ - moc_qquicktoolbutton_p.cpp \ - moc_qquicktoolseparator_p.cpp \ - moc_qquicktooltip_p.cpp \ - moc_qquicktumbler_p.cpp - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - - diff --git a/repos/libports/lib/mk/qt5_scriptclassic.mk b/repos/libports/lib/mk/qt5_scriptclassic.mk deleted file mode 100644 index d721d5e072..0000000000 --- a/repos/libports/lib/mk/qt5_scriptclassic.mk +++ /dev/null @@ -1,18 +0,0 @@ -include $(call select_from_repositories,lib/import/import-qt5_scriptclassic.mk) - -SHARED_LIB = yes - -# use default warning level to avoid noise when compiling contrib code -CC_WARN = - -include $(REP_DIR)/lib/mk/qt5_scriptclassic_generated.inc - -include $(REP_DIR)/lib/mk/qt5.inc - -LIBS += libc qt5_core qt5_gui qt5_widgets - -INC_DIR += $(QT5_PORT_DIR)/src/lib/qt5/qtscriptclassic-1.0_1-opensource/src - -vpath % $(QT5_PORT_DIR)/src/lib/qt5/qtscriptclassic-1.0_1-opensource/src - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_scriptclassic_generated.inc b/repos/libports/lib/mk/qt5_scriptclassic_generated.inc deleted file mode 100644 index 88a0aed26a..0000000000 --- a/repos/libports/lib/mk/qt5_scriptclassic_generated.inc +++ /dev/null @@ -1,60 +0,0 @@ -QT_SOURCES = \ - qscriptasm.cpp \ - qscriptast.cpp \ - qscriptastvisitor.cpp \ - qscriptcompiler.cpp \ - qscriptecmaarray.cpp \ - qscriptecmaboolean.cpp \ - qscriptecmacore.cpp \ - qscriptecmadate.cpp \ - qscriptecmafunction.cpp \ - qscriptecmaglobal.cpp \ - qscriptecmamath.cpp \ - qscriptecmanumber.cpp \ - qscriptecmaobject.cpp \ - qscriptecmaregexp.cpp \ - qscriptecmastring.cpp \ - qscriptecmaerror.cpp \ - qscriptcontext_p.cpp \ - qscriptengine.cpp \ - qscriptengine_p.cpp \ - qscriptengineagent.cpp \ - qscriptextenumeration.cpp \ - qscriptextvariant.cpp \ - qscriptcontext.cpp \ - qscriptcontextinfo.cpp \ - qscriptfunction.cpp \ - qscriptgrammar.cpp \ - qscriptlexer.cpp \ - qscriptclassdata.cpp \ - qscriptparser.cpp \ - qscriptprettypretty.cpp \ - qscriptxmlgenerator.cpp \ - qscriptsyntaxchecker.cpp \ - qscriptstring.cpp \ - qscriptclass.cpp \ - qscriptclasspropertyiterator.cpp \ - qscriptvalueiteratorimpl.cpp \ - qscriptvalueiterator.cpp \ - qscriptvalueimpl.cpp \ - qscriptvalue.cpp \ - qscriptextqobject.cpp \ - qscriptable.cpp \ - qscriptextensionplugin.cpp \ - moc_qscriptextensionplugin.cpp - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in spec-qt5.mk) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - moc_qscriptengine.cpp \ - moc_qscriptextensionplugin.cpp - -# source files generated from existing source files ('%.moc: %.cpp' rule in spec-qt5.mk) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - qscriptextqobject.moc diff --git a/repos/libports/lib/mk/qt5_sql.mk b/repos/libports/lib/mk/qt5_sql.mk deleted file mode 100644 index 0d5e1bdff5..0000000000 --- a/repos/libports/lib/mk/qt5_sql.mk +++ /dev/null @@ -1,19 +0,0 @@ -include $(call select_from_repositories,lib/import/import-qt5_sql.mk) - -SHARED_LIB = yes - -# use default warning level to avoid noise when compiling contrib code -CC_WARN = - -include $(REP_DIR)/lib/mk/qt5_sql_generated.inc - -# remove unneeded files to prevent moc warnings -COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT = \ - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES_FILTER_OUT = \ - -include $(REP_DIR)/lib/mk/qt5.inc - -LIBS += qt5_core - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_sql_generated.inc b/repos/libports/lib/mk/qt5_sql_generated.inc deleted file mode 100644 index 5d0a3561dc..0000000000 --- a/repos/libports/lib/mk/qt5_sql_generated.inc +++ /dev/null @@ -1,57 +0,0 @@ -QT_DEFINES += -DQT_NO_USING_NAMESPACE -DQT_NO_CAST_FROM_ASCII -DQT_NO_FOREACH -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_BUILD_SQL_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_CORE_LIB - -QT_INCPATH += \ - qtbase/src/sql \ - qtbase/include \ - qtbase/include/QtSql \ - qtbase/include/QtSql/5.13.0 \ - qtbase/include/QtSql/5.13.0/QtSql \ - qtbase/include/QtCore/5.13.0 \ - qtbase/include/QtCore/5.13.0/QtCore \ - qtbase/include/QtCore \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - qsqlquery.cpp \ - qsqldatabase.cpp \ - qsqlfield.cpp \ - qsqlrecord.cpp \ - qsqldriver.cpp \ - qsqldriverplugin.cpp \ - qsqlerror.cpp \ - qsqlresult.cpp \ - qsqlindex.cpp \ - qsqlcachedresult.cpp \ - qsqlquerymodel.cpp \ - qsqltablemodel.cpp \ - qsqlrelationaldelegate.cpp \ - qsqlrelationaltablemodel.cpp \ - moc_qsqldriver.cpp \ - moc_qsqldriverplugin.cpp \ - moc_qsqlquerymodel.cpp \ - moc_qsqltablemodel.cpp \ - moc_qsqlrelationaltablemodel.cpp - -QT_VPATH += \ - qtbase/src/sql/kernel \ - qtbase/src/sql/models \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - moc_qsqldriver.cpp \ - moc_qsqldriverplugin.cpp \ - moc_qsqlquerymodel.cpp \ - moc_qsqltablemodel.cpp \ - moc_qsqlrelationaltablemodel.cpp - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - - diff --git a/repos/libports/lib/mk/qt5_svg.mk b/repos/libports/lib/mk/qt5_svg.mk index d98eef6e68..34325ae79c 100644 --- a/repos/libports/lib/mk/qt5_svg.mk +++ b/repos/libports/lib/mk/qt5_svg.mk @@ -1,11 +1,73 @@ -include $(call select_from_repositories,lib/import/import-qt5_svg.mk) +include $(call select_from_repositories,lib/import/import-qt5_qmake.mk) -SHARED_LIB = yes +QT5_PORT_LIBS = libQt5Core libQt5Gui libQt5Widgets -LIBS += qt5_core qt5_gui qt5_widgets zlib +LIBS = libc libm mesa stdcxx $(QT5_PORT_LIBS) -include $(REP_DIR)/lib/mk/qt5_svg_generated.inc +built.tag: qmake_prepared.tag -include $(REP_DIR)/lib/mk/qt5.inc + @# + @# run qmake + @# -CC_CXX_WARN_STRICT = + $(VERBOSE)source env.sh && $(QMAKE) \ + -qtconf qmake_root/mkspecs/$(QMAKE_PLATFORM)/qt.conf \ + $(QT_DIR)/qtsvg/qtsvg.pro \ + $(QT5_OUTPUT_FILTER) + + @# + @# build + @# + + $(VERBOSE)source env.sh && $(MAKE) sub-src $(QT5_OUTPUT_FILTER) + + @# + @# install into local 'install' directory + @# + + $(VERBOSE)$(MAKE) INSTALL_ROOT=$(CURDIR)/install sub-src-install_subtargets $(QT5_OUTPUT_FILTER) + + $(VERBOSE)ln -sf .$(CURDIR)/qmake_root install/qt + + @# + @# create stripped versions + @# + + $(VERBOSE)cd $(CURDIR)/install/qt/lib && \ + $(STRIP) libQt5Svg.lib.so -o libQt5Svg.lib.so.stripped + + $(VERBOSE)cd $(CURDIR)/install/qt/plugins/imageformats && \ + $(STRIP) libqsvg.lib.so -o libqsvg.lib.so.stripped + + @# + @# create symlinks in 'bin' directory + @# + + $(VERBOSE)ln -sf $(CURDIR)/install/qt/lib/libQt5Svg.lib.so.stripped $(PWD)/bin/libQt5Svg.lib.so + + $(VERBOSE)ln -sf $(CURDIR)/install/qt/plugins/imageformats/libqsvg.lib.so.stripped $(PWD)/bin/libqsvg.lib.so + + @# + @# create symlinks in 'debug' directory + @# + + $(VERBOSE)ln -sf $(CURDIR)/install/qt/lib/libQt5Svg.lib.so $(PWD)/debug/ + + $(VERBOSE)ln -sf $(CURDIR)/install/qt/plugins/imageformats/libqsvg.lib.so $(PWD)/debug/ + + @# + @# create tar archives + @# + + $(VERBOSE)tar chf $(PWD)/bin/qt5_libqsvg.tar --transform='s/\.stripped//' -C install qt/plugins/imageformats/libqsvg.lib.so.stripped + + @# + @# mark as done + @# + + $(VERBOSE)touch $@ + + +ifeq ($(called_from_lib_mk),yes) +all: built.tag +endif diff --git a/repos/libports/lib/mk/qt5_svg_generated.inc b/repos/libports/lib/mk/qt5_svg_generated.inc deleted file mode 100644 index d03d22e11f..0000000000 --- a/repos/libports/lib/mk/qt5_svg_generated.inc +++ /dev/null @@ -1,54 +0,0 @@ -QT_DEFINES += -DQT_NO_FOREACH -DQT_NO_USING_NAMESPACE -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_BUILD_SVG_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB - -QT_INCPATH += \ - qtsvg/src/svg \ - qtsvg/include \ - qtsvg/include/QtSvg \ - qtsvg/include/QtSvg/5.13.0 \ - qtsvg/include/QtSvg/5.13.0/QtSvg \ - qtbase/include/QtWidgets/5.13.0 \ - qtbase/include/QtWidgets/5.13.0/QtWidgets \ - qtbase/include/QtGui/5.13.0 \ - qtbase/include/QtGui/5.13.0/QtGui \ - qtbase/include/QtCore/5.13.0 \ - qtbase/include/QtCore/5.13.0/QtCore \ - qtbase/include \ - qtbase/include/QtWidgets \ - qtbase/include/QtGui \ - qtbase/include/QtCore \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - qsvggraphics.cpp \ - qsvghandler.cpp \ - qsvgnode.cpp \ - qsvgstructure.cpp \ - qsvgstyle.cpp \ - qsvgfont.cpp \ - qsvgtinydocument.cpp \ - qsvgrenderer.cpp \ - qsvgwidget.cpp \ - qgraphicssvgitem.cpp \ - qsvggenerator.cpp \ - moc_qsvgwidget.cpp - -QT_VPATH += \ - qtsvg/src/svg \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - moc_qsvgrenderer.cpp \ - moc_qsvgwidget.cpp \ - moc_qgraphicssvgitem.cpp - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - - diff --git a/repos/libports/lib/mk/qt5_test.mk b/repos/libports/lib/mk/qt5_test.mk deleted file mode 100644 index 352e0194ad..0000000000 --- a/repos/libports/lib/mk/qt5_test.mk +++ /dev/null @@ -1,11 +0,0 @@ -include $(call select_from_repositories,lib/import/import-qt5_test.mk) - -SHARED_LIB = yes - -include $(REP_DIR)/lib/mk/qt5_test_generated.inc - -include $(REP_DIR)/lib/mk/qt5.inc - -LIBS += qt5_core - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_test_generated.inc b/repos/libports/lib/mk/qt5_test_generated.inc deleted file mode 100644 index 1e7edf7ee0..0000000000 --- a/repos/libports/lib/mk/qt5_test_generated.inc +++ /dev/null @@ -1,62 +0,0 @@ -QT_DEFINES += -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII -DQT_NO_FOREACH -DQT_NO_DATASTREAM -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_BUILD_TESTLIB_LIB -DQT_BUILDING_QT -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_CORE_LIB - -QT_INCPATH += \ - qtbase/src/testlib \ - qtbase/include \ - qtbase/include/QtTest \ - qtbase/include/QtTest/5.13.0 \ - qtbase/include/QtTest/5.13.0/QtTest \ - qtbase/include/QtCore/5.13.0 \ - qtbase/include/QtCore/5.13.0/QtCore \ - qtbase/include/QtCore \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - qtestcase.cpp \ - qtestlog.cpp \ - qtesttable.cpp \ - qtestdata.cpp \ - qtestresult.cpp \ - qasciikey.cpp \ - qplaintestlogger.cpp \ - qxmltestlogger.cpp \ - qsignaldumper.cpp \ - qabstracttestlogger.cpp \ - qbenchmark.cpp \ - qbenchmarkmeasurement.cpp \ - qbenchmarkvalgrind.cpp \ - qbenchmarkevent.cpp \ - qbenchmarkperfevents.cpp \ - qbenchmarkmetric.cpp \ - qcsvbenchmarklogger.cpp \ - qteamcitylogger.cpp \ - qtestelement.cpp \ - qtestelementattribute.cpp \ - qtestmouse.cpp \ - qtestxunitstreamer.cpp \ - qxunittestlogger.cpp \ - qtestblacklist.cpp \ - qtaptestlogger.cpp \ - qabstractitemmodeltester.cpp \ - moc_qtesteventloop.cpp \ - moc_qabstractitemmodeltester.cpp - -QT_VPATH += \ - qtbase/src/testlib \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - moc_qtesteventloop.cpp \ - moc_qabstractitemmodeltester.cpp - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - - diff --git a/repos/libports/lib/mk/qt5_ui_tools.mk b/repos/libports/lib/mk/qt5_ui_tools.mk deleted file mode 100644 index d257be4d0d..0000000000 --- a/repos/libports/lib/mk/qt5_ui_tools.mk +++ /dev/null @@ -1,19 +0,0 @@ -include $(call select_from_repositories,lib/import/import-qt5_ui_tools.mk) - -SHARED_LIB = yes - -# use default warning level to avoid noise when compiling contrib code -CC_WARN = - -include $(REP_DIR)/lib/mk/qt5_ui_tools_generated.inc - -# remove unneeded files to prevent moc warnings -COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT = \ - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES_FILTER_OUT = \ - -include $(REP_DIR)/lib/mk/qt5.inc - -LIBS += qt5_core qt5_gui qt5_widgets - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_ui_tools_generated.inc b/repos/libports/lib/mk/qt5_ui_tools_generated.inc deleted file mode 100644 index 9566fe879e..0000000000 --- a/repos/libports/lib/mk/qt5_ui_tools_generated.inc +++ /dev/null @@ -1,48 +0,0 @@ -QT_DEFINES += -DQT_DESIGNER -DQT_USE_QSTRINGBUILDER -DQFORMINTERNAL_NAMESPACE -DQT_DESIGNER_STATIC -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_BUILD_UITOOLS_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_UIPLUGIN_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB - -QT_INCPATH += \ - qttools/src/designer/src/uitools \ - qttools/src/designer/src/lib/uilib \ - qttools/include \ - qttools/include/QtUiTools \ - qttools/include/QtUiTools/5.13.0 \ - qttools/include/QtUiTools/5.13.0/QtUiTools \ - qtbase/include \ - qtbase/include/QtWidgets \ - qtbase/include/QtGui \ - qtbase/include/QtCore \ - qttools/include/QtUiPlugin \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - abstractformbuilder.cpp \ - formbuilder.cpp \ - ui4.cpp \ - properties.cpp \ - formbuilderextra.cpp \ - resourcebuilder.cpp \ - textbuilder.cpp \ - quiloader.cpp \ - moc_properties_p.cpp \ - moc_quiloader.cpp - -QT_VPATH += \ - qttools/src/designer/src/lib/uilib \ - qttools/src/designer/src/uitools \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - moc_properties_p.cpp \ - moc_quiloader.cpp - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - quiloader.moc - diff --git a/repos/libports/lib/mk/qt5_virtualkeyboard.mk b/repos/libports/lib/mk/qt5_virtualkeyboard.mk index ad12196fd5..d9f96df908 100644 --- a/repos/libports/lib/mk/qt5_virtualkeyboard.mk +++ b/repos/libports/lib/mk/qt5_virtualkeyboard.mk @@ -1,15 +1,93 @@ -include $(call select_from_repositories,lib/import/import-qt5_virtualkeyboard.mk) +include $(call select_from_repositories,lib/import/import-qt5_qmake.mk) -SHARED_LIB = yes +QT5_PORT_LIBS = libQt5Core libQt5Gui libQt5Network libQt5Widgets +QT5_PORT_LIBS += libQt5Qml libQt5Quick +QT5_PORT_LIBS += libQt5Svg -include $(REP_DIR)/lib/mk/qt5_virtualkeyboard_generated.inc +LIBS = libc libm mesa stdcxx $(QT5_PORT_LIBS) -QT_VPATH += qtvirtualkeyboard/src/virtualkeyboard/content \ - qtvirtualkeyboard/src/virtualkeyboard/content/styles/default \ - qtvirtualkeyboard/src/virtualkeyboard/content/styles/retro +built.tag: qmake_prepared.tag -include $(REP_DIR)/lib/mk/qt5.inc + @# + @# run qmake + @# -LIBS += qt5_core qt5_gui qt5_network qt5_qml qt5_quick + $(VERBOSE)source env.sh && $(QMAKE) \ + -qtconf qmake_root/mkspecs/$(QMAKE_PLATFORM)/qt.conf \ + $(QT_DIR)/qtvirtualkeyboard/qtvirtualkeyboard.pro \ + $(QT5_OUTPUT_FILTER) -CC_CXX_WARN_STRICT = + @# + @# build + @# + + $(VERBOSE)source env.sh && $(MAKE) sub-src $(QT5_OUTPUT_FILTER) + + @# + @# install into local 'install' directory + @# + + $(VERBOSE)$(MAKE) INSTALL_ROOT=$(CURDIR)/install sub-src-install_subtargets $(QT5_OUTPUT_FILTER) + + $(VERBOSE)ln -sf .$(CURDIR)/qmake_root install/qt + + @# + @# create stripped versions + @# + + $(VERBOSE)cd $(CURDIR)/install/qt/lib && \ + $(STRIP) libQt5VirtualKeyboard.lib.so -o libQt5VirtualKeyboard.lib.so.stripped + + $(VERBOSE)cd $(CURDIR)/install/qt/plugins/platforminputcontexts && \ + $(STRIP) libqtvirtualkeyboardplugin.lib.so -o libqtvirtualkeyboardplugin.lib.so.stripped + + $(VERBOSE)cd $(CURDIR)/install/qt/qml/QtQuick/VirtualKeyboard && \ + $(STRIP) libqtquickvirtualkeyboardplugin.lib.so -o libqtquickvirtualkeyboardplugin.lib.so.stripped + + $(VERBOSE)cd $(CURDIR)/install/qt/qml/QtQuick/VirtualKeyboard/Settings && \ + $(STRIP) libqtquickvirtualkeyboardsettingsplugin.lib.so -o libqtquickvirtualkeyboardsettingsplugin.lib.so.stripped + + $(VERBOSE)cd $(CURDIR)/install/qt/qml/QtQuick/VirtualKeyboard/Styles && \ + $(STRIP) libqtquickvirtualkeyboardstylesplugin.lib.so -o libqtquickvirtualkeyboardstylesplugin.lib.so.stripped + + @# + @# create symlinks in 'bin' directory + @# + + $(VERBOSE)ln -sf $(CURDIR)/install/qt/lib/libQt5VirtualKeyboard.lib.so.stripped $(PWD)/bin/libQt5VirtualKeyboard.lib.so + + $(VERBOSE)ln -sf $(CURDIR)/install/qt/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.lib.so.stripped $(PWD)/bin/libqtvirtualkeyboardplugin.lib.so + + $(VERBOSE)ln -sf $(CURDIR)/install/qt/qml/QtQuick/VirtualKeyboard/libqtquickvirtualkeyboardplugin.lib.so.stripped $(PWD)/bin/libqtquickvirtualkeyboardplugin.lib.so + $(VERBOSE)ln -sf $(CURDIR)/install/qt/qml/QtQuick/VirtualKeyboard/Settings/libqtquickvirtualkeyboardsettingsplugin.lib.so.stripped $(PWD)/bin/libqtquickvirtualkeyboardsettingsplugin.lib.so + $(VERBOSE)ln -sf $(CURDIR)/install/qt/qml/QtQuick/VirtualKeyboard/Styles/libqtquickvirtualkeyboardstylesplugin.lib.so.stripped $(PWD)/bin/libqtquickvirtualkeyboardstylesplugin.lib.so + + @# + @# create symlinks in 'debug' directory + @# + + $(VERBOSE)ln -sf $(CURDIR)/install/qt/lib/libQt5VirtualKeyboard.lib.so $(PWD)/debug/ + + $(VERBOSE)ln -sf $(CURDIR)/install/qt/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.lib.so $(PWD)/debug/ + + $(VERBOSE)ln -sf $(CURDIR)/install/qt/qml/QtQuick/VirtualKeyboard/libqtquickvirtualkeyboardplugin.lib.so $(PWD)/debug/ + $(VERBOSE)ln -sf $(CURDIR)/install/qt/qml/QtQuick/VirtualKeyboard/Settings/libqtquickvirtualkeyboardsettingsplugin.lib.so $(PWD)/debug/ + $(VERBOSE)ln -sf $(CURDIR)/install/qt/qml/QtQuick/VirtualKeyboard/Styles/libqtquickvirtualkeyboardstylesplugin.lib.so $(PWD)/debug/ + + @# + @# create tar archives + @# + + $(VERBOSE)tar chf $(PWD)/bin/qt5_libqtvirtualkeyboardplugin.tar --transform='s/\.stripped//' -C install qt/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.lib.so.stripped + $(VERBOSE)tar chf $(PWD)/bin/qt5_virtualkeyboard_qml.tar --exclude='*.lib.so' --transform='s/\.stripped//' -C install qt/qml + + @# + @# mark as done + @# + + $(VERBOSE)touch $@ + + +ifeq ($(called_from_lib_mk),yes) +all: built.tag +endif diff --git a/repos/libports/lib/mk/qt5_virtualkeyboard_generated.inc b/repos/libports/lib/mk/qt5_virtualkeyboard_generated.inc deleted file mode 100644 index 76d58d5783..0000000000 --- a/repos/libports/lib/mk/qt5_virtualkeyboard_generated.inc +++ /dev/null @@ -1,119 +0,0 @@ -QT_DEFINES += -DQVIRTUALKEYBOARD_LIBRARY -DQT_VIRTUALKEYBOARD_DEFAULT_STYLE=\"default\" -DQT_VIRTUALKEYBOARD_DEFAULT_LAYOUTS_DIR=\"qrc:/QtQuick/VirtualKeyboard/content/layouts\" -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY -DQT_VIRTUALKEYBOARD_DESKTOP -DHAVE_LAYOUTS -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_BUILD_VIRTUALKEYBOARD_LIB -DQT_BUILDING_QT -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB - -QT_INCPATH += \ - qtvirtualkeyboard/src/virtualkeyboard \ - qtvirtualkeyboard/include \ - qtvirtualkeyboard/include/QtVirtualKeyboard \ - qtvirtualkeyboard/include/QtVirtualKeyboard/5.13.0 \ - qtvirtualkeyboard/include/QtVirtualKeyboard/5.13.0/QtVirtualKeyboard \ - qtdeclarative/include \ - qtdeclarative/include/QtQuick \ - qtbase/include/QtGui/5.13.0 \ - qtbase/include/QtGui/5.13.0/QtGui \ - qtbase/include \ - qtbase/include/QtGui \ - qtdeclarative/include/QtQml \ - qtbase/include/QtNetwork \ - qtbase/include/QtCore/5.13.0 \ - qtbase/include/QtCore/5.13.0/QtCore \ - qtbase/include/QtCore \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - platforminputcontext.cpp \ - qvirtualkeyboardinputcontext.cpp \ - qvirtualkeyboardinputcontext_p.cpp \ - qvirtualkeyboardabstractinputmethod.cpp \ - plaininputmethod.cpp \ - qvirtualkeyboardinputengine.cpp \ - shifthandler.cpp \ - inputmethod.cpp \ - inputselectionhandle.cpp \ - qvirtualkeyboardselectionlistmodel.cpp \ - fallbackinputmethod.cpp \ - abstractinputpanel.cpp \ - appinputpanel.cpp \ - enterkeyaction.cpp \ - enterkeyactionattachedtype.cpp \ - settings.cpp \ - virtualkeyboardsettings.cpp \ - qvirtualkeyboardtrace.cpp \ - desktopinputselectioncontrol.cpp \ - shadowinputcontext.cpp \ - gesturerecognizer.cpp \ - handwritinggesturerecognizer.cpp \ - qvirtualkeyboardextensionplugin.cpp \ - desktopinputpanel.cpp \ - inputview.cpp \ - qrc_virtualkeyboard_default_style.cpp \ - qrc_virtualkeyboard_retro_style.cpp \ - qrc_virtualkeyboard_content.cpp \ - qrc_qmake_virtualkeyboard_layouts.cpp \ - moc_platforminputcontext_p.cpp \ - moc_qvirtualkeyboardinputcontext.cpp \ - moc_qvirtualkeyboardinputcontext_p.cpp \ - moc_qvirtualkeyboardabstractinputmethod.cpp \ - moc_plaininputmethod_p.cpp \ - moc_qvirtualkeyboardinputengine.cpp \ - moc_shifthandler_p.cpp \ - moc_inputmethod_p.cpp \ - moc_inputselectionhandle_p.cpp \ - moc_qvirtualkeyboardselectionlistmodel.cpp \ - moc_fallbackinputmethod_p.cpp \ - moc_abstractinputpanel_p.cpp \ - moc_appinputpanel_p.cpp \ - moc_enterkeyaction_p.cpp \ - moc_enterkeyactionattachedtype_p.cpp \ - moc_settings_p.cpp \ - moc_virtualkeyboardsettings_p.cpp \ - moc_qvirtualkeyboardtrace.cpp \ - moc_desktopinputselectioncontrol_p.cpp \ - moc_shadowinputcontext_p.cpp \ - moc_gesturerecognizer_p.cpp \ - moc_handwritinggesturerecognizer_p.cpp \ - moc_qvirtualkeyboardextensionplugin.cpp \ - moc_desktopinputpanel_p.cpp \ - moc_inputview_p.cpp - -QT_VPATH += \ - qtvirtualkeyboard/src/virtualkeyboard \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - moc_platforminputcontext_p.cpp \ - moc_qvirtualkeyboardinputcontext.cpp \ - moc_qvirtualkeyboardinputcontext_p.cpp \ - moc_qvirtualkeyboardabstractinputmethod.cpp \ - moc_plaininputmethod_p.cpp \ - moc_qvirtualkeyboardinputengine.cpp \ - moc_shifthandler_p.cpp \ - moc_inputmethod_p.cpp \ - moc_inputselectionhandle_p.cpp \ - moc_qvirtualkeyboardselectionlistmodel.cpp \ - moc_fallbackinputmethod_p.cpp \ - moc_abstractinputpanel_p.cpp \ - moc_appinputpanel_p.cpp \ - moc_enterkeyaction_p.cpp \ - moc_enterkeyactionattachedtype_p.cpp \ - moc_settings_p.cpp \ - moc_virtualkeyboardsettings_p.cpp \ - moc_qvirtualkeyboardtrace.cpp \ - moc_desktopinputselectioncontrol_p.cpp \ - moc_shadowinputcontext_p.cpp \ - moc_gesturerecognizer_p.cpp \ - moc_handwritinggesturerecognizer_p.cpp \ - moc_qvirtualkeyboardextensionplugin.cpp \ - moc_desktopinputpanel_p.cpp \ - moc_inputview_p.cpp - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - - diff --git a/repos/libports/lib/mk/qt5_webcore.inc b/repos/libports/lib/mk/qt5_webcore.inc deleted file mode 100644 index 13aa300d0f..0000000000 --- a/repos/libports/lib/mk/qt5_webcore.inc +++ /dev/null @@ -1,38 +0,0 @@ -include $(call select_from_repositories,lib/import/import-qt5_webcore.mk) - -SHARED_LIB = yes - -# gnu++17 causes compile errors -CC_CXX_OPT_STD += -std=gnu++11 - -# additional defines for the Genode version -CC_OPT += -DSQLITE_NO_SYNC=1 -DSQLITE_THREADSAFE=0 - -# enable C++ functions that use C99 math functions (disabled by default in the Genode tool chain) -CC_CXX_OPT += -D_GLIBCXX_USE_C99_MATH - -# use default warning level to avoid noise when compiling contrib code -CC_WARN = -Wno-deprecated-declarations - -CC_OPT_sqlite3 += -Wno-int-to-pointer-cast -Wno-pointer-to-int-cast - -# make sure that the correct "Comment.h" file gets included -QT_INCPATH := qtwebkit/Source/WebCore/dom - -include $(REP_DIR)/lib/mk/qt5_webcore_generated.inc - -QT_INCPATH += qtwebkit/Source/WebCore/generated - -QT_VPATH += qtwebkit/Source/WebCore/generated - -# InspectorBackendCommands.qrc, WebKit.qrc -QT_VPATH += qtwebkit/Source/WebCore/inspector/front-end - -# WebCore.qrc -QT_VPATH += qtwebkit/Source/WebCore - -include $(REP_DIR)/lib/mk/qt5.inc - -LIBS += qt5_angle qt5_wtf qt5_jscore qt5_sql qt5_network qt5_gui qt5_core icu jpeg libpng zlib libc libm - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_webcore_generated.inc b/repos/libports/lib/mk/qt5_webcore_generated.inc deleted file mode 100644 index ab089189bb..0000000000 --- a/repos/libports/lib/mk/qt5_webcore_generated.inc +++ /dev/null @@ -1,1747 +0,0 @@ -QT_DEFINES += -DSQLITE_CORE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_OMIT_COMPLETE -DBUILDING_QT__=1 -DNDEBUG -DENABLE_3D_RENDERING=1 -DENABLE_ACCELERATED_2D_CANVAS=1 -DENABLE_BLOB=1 -DENABLE_CANVAS_PATH=1 -DENABLE_CHANNEL_MESSAGING=1 -DENABLE_CSS_BOX_DECORATION_BREAK=1 -DENABLE_CSS_COMPOSITING=1 -DENABLE_CSS_EXCLUSIONS=1 -DENABLE_CSS_FILTERS=1 -DENABLE_CSS_IMAGE_SET=1 -DENABLE_CSS_REGIONS=1 -DENABLE_CSS_SHAPES=1 -DENABLE_CSS_STICKY_POSITION=1 -DENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=1 -DENABLE_DATALIST_ELEMENT=1 -DENABLE_DETAILS_ELEMENT=1 -DENABLE_DOWNLOAD_ATTRIBUTE=1 -DENABLE_FAST_MOBILE_SCROLLING=1 -DENABLE_FILTERS=1 -DENABLE_FTPDIR=1 -DENABLE_FULLSCREEN_API=1 -DENABLE_GESTURE_EVENTS=1 -DENABLE_ICONDATABASE=1 -DENABLE_IFRAME_SEAMLESS=1 -DENABLE_INPUT_TYPE_COLOR=1 -DENABLE_INSPECTOR=1 -DENABLE_INSPECTOR_SERVER=1 -DENABLE_JAVASCRIPT_DEBUGGER=1 -DENABLE_LEGACY_NOTIFICATIONS=1 -DENABLE_LEGACY_VIEWPORT_ADAPTION=1 -DENABLE_LEGACY_VENDOR_PREFIXES=1 -DENABLE_LEGACY_WEB_AUDIO=1 -DENABLE_LINK_PREFETCH=1 -DENABLE_METER_ELEMENT=1 -DENABLE_MHTML=1 -DENABLE_NOTIFICATIONS=1 -DENABLE_PAGE_VISIBILITY_API=1 -DENABLE_PROGRESS_ELEMENT=1 -DENABLE_RESOLUTION_MEDIA_QUERY=1 -DENABLE_REQUEST_ANIMATION_FRAME=1 -DENABLE_SHARED_WORKERS=1 -DENABLE_SMOOTH_SCROLLING=1 -DENABLE_SQL_DATABASE=1 -DENABLE_SUBPIXEL_LAYOUT=1 -DENABLE_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_TOUCH_ADJUSTMENT=1 -DENABLE_TOUCH_EVENTS=1 -DENABLE_TOUCH_SLIDER=1 -DENABLE_VIEW_MODE_CSS_MEDIA=1 -DENABLE_WEB_SOCKETS=1 -DENABLE_WEB_TIMING=1 -DENABLE_WORKERS=1 -DENABLE_XHR_TIMEOUT=1 -DWTF_USE_TILED_BACKING_STORE=1 -DWTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=1 -DHAVE_QTPRINTSUPPORT=1 -DHAVE_QSTYLE=1 -DHAVE_QTTESTLIB=1 -DWTF_USE_LIBJPEG=1 -DWTF_USE_LIBPNG=1 -DHAVE_FONTCONFIG=1 -DPLUGIN_ARCHITECTURE_UNSUPPORTED=1 -DWTF_USE_3D_GRAPHICS=1 -DENABLE_WEBGL=1 -DENABLE_BATTERY_STATUS=0 -DENABLE_CANVAS_PROXY=0 -DENABLE_CSP_NEXT=0 -DENABLE_CSS_GRID_LAYOUT=0 -DENABLE_CSS_HIERARCHIES=0 -DENABLE_CSS_IMAGE_ORIENTATION=0 -DENABLE_CSS_IMAGE_RESOLUTION=0 -DENABLE_CSS_SHADERS=0 -DENABLE_CSS_VARIABLES=0 -DENABLE_CSS3_CONDITIONAL_RULES=0 -DENABLE_CSS3_TEXT=0 -DENABLE_CSS3_TEXT_LINE_BREAK=0 -DENABLE_DASHBOARD_SUPPORT=0 -DENABLE_DATAGRID=0 -DENABLE_DATA_TRANSFER_ITEMS=0 -DENABLE_DEVICE_ORIENTATION=0 -DENABLE_DIRECTORY_UPLOAD=0 -DENABLE_FILE_SYSTEM=0 -DENABLE_FONT_LOAD_EVENTS=0 -DENABLE_GAMEPAD=0 -DENABLE_GEOLOCATION=0 -DENABLE_HIGH_DPI_CANVAS=0 -DENABLE_INDEXED_DATABASE=0 -DENABLE_INPUT_SPEECH=0 -DENABLE_INPUT_TYPE_DATE=0 -DENABLE_INPUT_TYPE_DATETIME_INCOMPLETE=0 -DENABLE_INPUT_TYPE_DATETIMELOCAL=0 -DENABLE_INPUT_TYPE_MONTH=0 -DENABLE_INPUT_TYPE_TIME=0 -DENABLE_INPUT_TYPE_WEEK=0 -DENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 -DENABLE_MATHML=0 -DENABLE_MEDIA_SOURCE=0 -DENABLE_MEDIA_STATISTICS=0 -DENABLE_MEDIA_STREAM=0 -DENABLE_MICRODATA=0 -DENABLE_MOUSE_CURSOR_SCALE=0 -DENABLE_NAVIGATOR_CONTENT_UTILS=0 -DENABLE_NETSCAPE_PLUGIN_API=0 -DENABLE_NETWORK_INFO=0 -DENABLE_NOSNIFF=0 -DENABLE_ORIENTATION_EVENTS=0 -DENABLE_PROXIMITY_EVENTS=0 -DENABLE_QUOTA=0 -DENABLE_RESOURCE_TIMING=0 -DENABLE_SCRIPTED_SPEECH=0 -DENABLE_SECCOMP_FILTERS=0 -DENABLE_SHADOW_DOM=0 -DENABLE_STYLE_SCOPED=0 -DENABLE_TEMPLATE_ELEMENT=0 -DENABLE_TEXT_AUTOSIZING=0 -DENABLE_THREADED_HTML_PARSER=0 -DENABLE_TOUCH_ICON_LOADING=0 -DENABLE_USER_TIMING=0 -DENABLE_VIBRATION=0 -DENABLE_VIDEO=0 -DENABLE_VIDEO_TRACK=0 -DENABLE_WEB_AUDIO=0 -DENABLE_XSLT=0 -DSTATICALLY_LINKED_WITH_ANGLE -DSTATICALLY_LINKED_WITH_JavaScriptCore -DSTATICALLY_LINKED_WITH_WTF -DBUILDING_WebCore -DBUILDING_WEBKIT -DQT_ASCII_CAST_WARNINGS -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_SQL_LIB -DQT_CORE_LIB - -QT_INCPATH += \ - qtwebkit/Source/WebCore \ - qtwebkit/Source/WebCore \ - qtwebkit/Source/WebCore/Modules/filesystem \ - qtwebkit/Source/WebCore/Modules/geolocation \ - qtwebkit/Source/WebCore/Modules/indexeddb \ - qtwebkit/Source/WebCore/Modules/mediasource \ - qtwebkit/Source/WebCore/Modules/navigatorcontentutils \ - qtwebkit/Source/WebCore/Modules/notifications \ - qtwebkit/Source/WebCore/Modules/proximity \ - qtwebkit/Source/WebCore/Modules/quota \ - qtwebkit/Source/WebCore/Modules/webaudio \ - qtwebkit/Source/WebCore/Modules/webdatabase \ - qtwebkit/Source/WebCore/Modules/websockets \ - qtwebkit/Source/WebCore/accessibility \ - qtwebkit/Source/WebCore/bindings \ - qtwebkit/Source/WebCore/bindings/generic \ - qtwebkit/Source/WebCore/bridge \ - qtwebkit/Source/WebCore/bridge/qt \ - qtwebkit/Source/WebCore/css \ - qtwebkit/Source/WebCore/dom \ - qtwebkit/Source/WebCore/dom/default \ - qtwebkit/Source/WebCore/editing \ - qtwebkit/Source/WebCore/fileapi \ - qtwebkit/Source/WebCore/history \ - qtwebkit/Source/WebCore/html \ - qtwebkit/Source/WebCore/html/canvas \ - qtwebkit/Source/WebCore/html/forms \ - qtwebkit/Source/WebCore/html/parser \ - qtwebkit/Source/WebCore/html/shadow \ - qtwebkit/Source/WebCore/html/track \ - qtwebkit/Source/WebCore/inspector \ - qtwebkit/Source/WebCore/loader \ - qtwebkit/Source/WebCore/loader/appcache \ - qtwebkit/Source/WebCore/loader/archive \ - qtwebkit/Source/WebCore/loader/cache \ - qtwebkit/Source/WebCore/loader/icon \ - qtwebkit/Source/WebCore/mathml \ - qtwebkit/Source/WebCore/page \ - qtwebkit/Source/WebCore/page/animation \ - qtwebkit/Source/WebCore/page/qt \ - qtwebkit/Source/WebCore/page/scrolling \ - qtwebkit/Source/WebCore/page/scrolling/coordinatedgraphics \ - qtwebkit/Source/WebCore/platform \ - qtwebkit/Source/WebCore/platform/animation \ - qtwebkit/Source/WebCore/platform/audio \ - qtwebkit/Source/WebCore/platform/graphics \ - qtwebkit/Source/WebCore/platform/graphics/cpu/arm \ - qtwebkit/Source/WebCore/platform/graphics/cpu/arm/filters \ - qtwebkit/Source/WebCore/platform/graphics/filters \ - qtwebkit/Source/WebCore/platform/graphics/filters/texmap \ - qtwebkit/Source/WebCore/platform/graphics/opengl \ - qtwebkit/Source/WebCore/platform/graphics/opentype \ - qtwebkit/Source/WebCore/platform/graphics/qt \ - qtwebkit/Source/WebCore/platform/graphics/surfaces \ - qtwebkit/Source/WebCore/platform/graphics/texmap \ - qtwebkit/Source/WebCore/platform/graphics/texmap/coordinated \ - qtwebkit/Source/WebCore/platform/graphics/transforms \ - qtwebkit/Source/WebCore/platform/image-decoders \ - qtwebkit/Source/WebCore/platform/image-decoders/bmp \ - qtwebkit/Source/WebCore/platform/image-decoders/ico \ - qtwebkit/Source/WebCore/platform/image-decoders/gif \ - qtwebkit/Source/WebCore/platform/image-decoders/jpeg \ - qtwebkit/Source/WebCore/platform/image-decoders/png \ - qtwebkit/Source/WebCore/platform/image-decoders/webp \ - qtwebkit/Source/WebCore/platform/leveldb \ - qtwebkit/Source/WebCore/platform/mock \ - qtwebkit/Source/WebCore/platform/network \ - qtwebkit/Source/WebCore/platform/network/qt \ - qtwebkit/Source/WebCore/platform/qt \ - qtwebkit/Source/WebCore/platform/sql \ - qtwebkit/Source/WebCore/platform/text \ - qtwebkit/Source/WebCore/platform/text/transcoder \ - qtwebkit/Source/WebCore/plugins \ - qtwebkit/Source/WebCore/rendering \ - qtwebkit/Source/WebCore/rendering/mathml \ - qtwebkit/Source/WebCore/rendering/shapes \ - qtwebkit/Source/WebCore/rendering/style \ - qtwebkit/Source/WebCore/rendering/svg \ - qtwebkit/Source/WebCore/storage \ - qtwebkit/Source/WebCore/svg \ - qtwebkit/Source/WebCore/svg/animation \ - qtwebkit/Source/WebCore/svg/graphics \ - qtwebkit/Source/WebCore/svg/graphics/filters \ - qtwebkit/Source/WebCore/svg/properties \ - qtwebkit/Source/WebCore/testing \ - qtwebkit/Source/WebCore/websockets \ - qtwebkit/Source/WebCore/workers \ - qtwebkit/Source/WebCore/xml \ - qtwebkit/Source/WebCore/xml/parser \ - qtwebkit/Source/ThirdParty \ - qtwebkit/Source/WebCore/bridge/jsc \ - qtwebkit/Source/WebCore/bindings/js \ - qtwebkit/Source/WebCore/bridge/c \ - qtwebkit/Source/WebCore/testing/js \ - qtbase/src/3rdparty/sqlite \ - qtwebkit/Source/WebCore/platform/graphics/gpu \ - qtwebkit/Source/WebCore/platform/graphics/gpu \ - qtwebkit/Source/WebCore/loader/archive/mhtml \ - qtwebkit/Source \ - qtwebkit/Source/ThirdParty/ANGLE/include/GLSLANG \ - qtwebkit/Source/ThirdParty/ANGLE/include/KHR \ - qtwebkit/Source/JavaScriptCore \ - qtwebkit/Source \ - qtwebkit/Source/WTF \ - qtwebkit/Source/JavaScriptCore/assembler \ - qtwebkit/Source/JavaScriptCore/bytecode \ - qtwebkit/Source/JavaScriptCore/bytecompiler \ - qtwebkit/Source/JavaScriptCore/heap \ - qtwebkit/Source/JavaScriptCore/dfg \ - qtwebkit/Source/JavaScriptCore/debugger \ - qtwebkit/Source/JavaScriptCore/disassembler \ - qtwebkit/Source/JavaScriptCore/interpreter \ - qtwebkit/Source/JavaScriptCore/jit \ - qtwebkit/Source/JavaScriptCore/llint \ - qtwebkit/Source/JavaScriptCore/parser \ - qtwebkit/Source/JavaScriptCore/profiler \ - qtwebkit/Source/JavaScriptCore/runtime \ - qtwebkit/Source/JavaScriptCore/tools \ - qtwebkit/Source/JavaScriptCore/yarr \ - qtwebkit/Source/JavaScriptCore/API \ - qtwebkit/Source/JavaScriptCore/ForwardingHeaders \ - qtwebkit/Source/JavaScriptCore/disassembler/udis86 \ - qtwebkit/Source/WTF \ - qtbase/include/QtGui/5.13.0 \ - qtbase/include/QtGui/5.13.0/QtGui \ - qtbase/include \ - qtbase/include/QtGui \ - qtbase/include/QtNetwork \ - qtbase/include/QtSql \ - qtbase/include/QtCore/5.13.0 \ - qtbase/include/QtCore/5.13.0/QtCore \ - qtbase/include/QtCore \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - Coordinates.cpp \ - Geolocation.cpp \ - GeolocationController.cpp \ - NavigatorGeolocation.cpp \ - DOMWindowWebDatabase.cpp \ - Database.cpp \ - DatabaseAuthorizer.cpp \ - DatabaseBackendBase.cpp \ - DatabaseContext.cpp \ - DatabaseServer.cpp \ - DatabaseSync.cpp \ - WorkerGlobalScopeWebDatabase.cpp \ - AccessibilityMenuList.cpp \ - AccessibilityMenuListOption.cpp \ - AccessibilityMenuListPopup.cpp \ - AccessibilityMockObject.cpp \ - AccessibilitySpinButton.cpp \ - ActiveDOMCallback.cpp \ - BindingSecurity.cpp \ - RuntimeEnabledFeatures.cpp \ - ScriptControllerBase.cpp \ - JSAudioBufferCustom.cpp \ - JSDeviceMotionEventCustom.cpp \ - JSFileReaderCustom.cpp \ - JSMessagePortCustom.cpp \ - JSRTCStatsResponseCustom.cpp \ - PageScriptDebugServer.cpp \ - ScriptController.cpp \ - ScriptControllerQt.cpp \ - ScriptObject.cpp \ - ScriptProfile.cpp \ - ScriptValue.cpp \ - IdentifierRep.cpp \ - NP_jsobject.cpp \ - CRuntimeObject.cpp \ - c_class.cpp \ - c_instance.cpp \ - c_runtime.cpp \ - c_utility.cpp \ - BridgeJSC.cpp \ - npruntime.cpp \ - qt_class.cpp \ - qt_instance.cpp \ - qt_pixmapruntime.cpp \ - qt_runtime.cpp \ - runtime_array.cpp \ - runtime_method.cpp \ - runtime_object.cpp \ - runtime_root.cpp \ - WebCoreTestSupport.cpp \ - DOMFilePath.cpp \ - DOMFileSystem.cpp \ - DOMFileSystemBase.cpp \ - DOMFileSystemSync.cpp \ - DOMWindowFileSystem.cpp \ - DirectoryEntry.cpp \ - DirectoryEntrySync.cpp \ - DirectoryReader.cpp \ - DirectoryReaderSync.cpp \ - Entry.cpp \ - EntryArray.cpp \ - EntryArraySync.cpp \ - EntryBase.cpp \ - EntrySync.cpp \ - FileEntry.cpp \ - FileEntrySync.cpp \ - FileWriter.cpp \ - FileWriterBase.cpp \ - FileWriterSync.cpp \ - LocalFileSystem.cpp \ - WorkerGlobalScopeFileSystem.cpp \ - NavigatorContentUtils.cpp \ - DOMWindowNotifications.cpp \ - Notification.cpp \ - NotificationCenter.cpp \ - NotificationController.cpp \ - WorkerGlobalScopeNotifications.cpp \ - DeviceProximityController.cpp \ - DeviceProximityEvent.cpp \ - BasicShapeFunctions.cpp \ - CSSCalculationValue.cpp \ - CSSFontFaceLoadEvent.cpp \ - CSSImageSetValue.cpp \ - CSSPrimitiveValue.cpp \ - CSSProperty.cpp \ - CSSSupportsRule.cpp \ - CSSToStyleMap.cpp \ - FontFeatureValue.cpp \ - FontLoader.cpp \ - FontValue.cpp \ - LengthFunctions.cpp \ - MediaFeatureNames.cpp \ - PropertySetCSSStyleDeclaration.cpp \ - RGBColor.cpp \ - SelectorChecker.cpp \ - ShadowValue.cpp \ - StyleInvalidationAnalysis.cpp \ - StyleMedia.cpp \ - StyleRule.cpp \ - StyleRuleImport.cpp \ - StyleSheet.cpp \ - StyleSheetContents.cpp \ - StyleSheetList.cpp \ - TransformFunctions.cpp \ - WebKitCSSArrayFunctionValue.cpp \ - WebKitCSSFilterRule.cpp \ - WebKitCSSFilterValue.cpp \ - WebKitCSSKeyframeRule.cpp \ - WebKitCSSKeyframesRule.cpp \ - WebKitCSSMatrix.cpp \ - WebKitCSSMatFunctionValue.cpp \ - WebKitCSSMixFunctionValue.cpp \ - WebKitCSSRegionRule.cpp \ - WebKitCSSSVGDocumentValue.cpp \ - WebKitCSSShaderValue.cpp \ - WebKitCSSTransformValue.cpp \ - WebKitCSSViewportRule.cpp \ - ComposedShadowTreeWalker.cpp \ - DocumentStyleSheetCollection.cpp \ - DOMError.cpp \ - ElementRareData.cpp \ - GenericEventQueue.cpp \ - GestureEvent.cpp \ - MicroDataItemList.cpp \ - NamedNodeMap.cpp \ - Node.cpp \ - NodeRareData.cpp \ - NodeTraversal.cpp \ - PropertyNodeList.cpp \ - QualifiedName.cpp \ - ScriptedAnimationController.cpp \ - PlatformMessagePortChannel.cpp \ - AsyncFileStream.cpp \ - Blob.cpp \ - BlobURL.cpp \ - File.cpp \ - FileException.cpp \ - FileList.cpp \ - FileReader.cpp \ - FileReaderLoader.cpp \ - FileReaderSync.cpp \ - FileThread.cpp \ - ThreadableBlobRegistry.cpp \ - WebKitBlobBuilder.cpp \ - BackForwardController.cpp \ - BackForwardListImpl.cpp \ - CachedFrame.cpp \ - CachedPage.cpp \ - HistoryItem.cpp \ - HistoryItemQt.cpp \ - PageCache.cpp \ - BaseButtonInputType.cpp \ - BaseCheckableInputType.cpp \ - BaseChooserOnlyDateAndTimeInputType.cpp \ - BaseClickableWithKeyInputType.cpp \ - BaseDateAndTimeInputType.cpp \ - BaseTextInputType.cpp \ - ButtonInputType.cpp \ - CheckboxInputType.cpp \ - ClassList.cpp \ - ColorInputType.cpp \ - DOMFormData.cpp \ - DOMSettableTokenList.cpp \ - DOMTokenList.cpp \ - DOMURL.cpp \ - DateInputType.cpp \ - DateTimeInputType.cpp \ - DateTimeLocalInputType.cpp \ - EmailInputType.cpp \ - FTPDirectoryDocument.cpp \ - FileInputType.cpp \ - FormAssociatedElement.cpp \ - FormController.cpp \ - FormDataList.cpp \ - HTMLAllCollection.cpp \ - HTMLCollection.cpp \ - HTMLDocument.cpp \ - HTMLFormControlsCollection.cpp \ - HTMLImageLoader.cpp \ - HTMLNameCollection.cpp \ - HTMLOptionsCollection.cpp \ - HTMLOutputElement.cpp \ - HTMLParserErrorCodes.cpp \ - HTMLPropertiesCollection.cpp \ - HTMLTableRowsCollection.cpp \ - HTMLViewSourceDocument.cpp \ - HiddenInputType.cpp \ - ImageData.cpp \ - ImageDocument.cpp \ - ImageInputType.cpp \ - InputType.cpp \ - InputTypeNames.cpp \ - LabelableElement.cpp \ - LabelsNodeList.cpp \ - LinkRelAttribute.cpp \ - MediaDocument.cpp \ - MicroDataAttributeTokenList.cpp \ - MicroDataItemValue.cpp \ - MonthInputType.cpp \ - NumberInputType.cpp \ - PasswordInputType.cpp \ - PluginDocument.cpp \ - RadioInputType.cpp \ - RadioNodeList.cpp \ - RangeInputType.cpp \ - ResetInputType.cpp \ - SearchInputType.cpp \ - StepRange.cpp \ - SubmitInputType.cpp \ - TelephoneInputType.cpp \ - TextDocument.cpp \ - TextFieldInputType.cpp \ - TextInputType.cpp \ - TimeInputType.cpp \ - TypeAhead.cpp \ - URLInputType.cpp \ - ValidationMessage.cpp \ - ValidityState.cpp \ - WeekInputType.cpp \ - CanvasGradient.cpp \ - CanvasPathMethods.cpp \ - CanvasPattern.cpp \ - CanvasProxy.cpp \ - CanvasRenderingContext.cpp \ - CanvasRenderingContext2D.cpp \ - CanvasStyle.cpp \ - DataView.cpp \ - FileIconLoader.cpp \ - BackgroundHTMLInputStream.cpp \ - BackgroundHTMLParser.cpp \ - CSSPreloadScanner.cpp \ - CompactHTMLToken.cpp \ - HTMLConstructionSite.cpp \ - HTMLDocumentParser.cpp \ - HTMLElementStack.cpp \ - HTMLEntityParser.cpp \ - HTMLEntitySearch.cpp \ - HTMLFormattingElementList.cpp \ - HTMLIdentifier.cpp \ - HTMLMetaCharsetParser.cpp \ - HTMLParserIdioms.cpp \ - HTMLParserOptions.cpp \ - HTMLParserScheduler.cpp \ - HTMLParserThread.cpp \ - HTMLPreloadScanner.cpp \ - HTMLResourcePreloader.cpp \ - HTMLScriptRunner.cpp \ - HTMLSourceTracker.cpp \ - HTMLTokenizer.cpp \ - HTMLTreeBuilder.cpp \ - HTMLTreeBuilderSimulator.cpp \ - HTMLViewSourceParser.cpp \ - TextDocumentParser.cpp \ - TextViewSourceParser.cpp \ - XSSAuditor.cpp \ - XSSAuditorDelegate.cpp \ - ContentDistributor.cpp \ - DetailsMarkerControl.cpp \ - InsertionPoint.cpp \ - MediaControls.cpp \ - MediaControlsApple.cpp \ - MeterShadowElement.cpp \ - ProgressShadowElement.cpp \ - SliderThumbElement.cpp \ - SpinButtonElement.cpp \ - TextControlInnerElements.cpp \ - DOMApplicationCache.cpp \ - ManifestParser.cpp \ - ArchiveResource.cpp \ - ArchiveResourceCollection.cpp \ - MemoryCache.cpp \ - CachedCSSStyleSheet.cpp \ - CachedFont.cpp \ - CachedImage.cpp \ - CachedRawResource.cpp \ - CachedResourceHandle.cpp \ - CachedResource.cpp \ - CachedScript.cpp \ - CachedShader.cpp \ - CachedSVGDocument.cpp \ - CachedSVGDocumentReference.cpp \ - CachedXSLStyleSheet.cpp \ - CookieJar.cpp \ - CrossOriginAccessControl.cpp \ - CrossOriginPreflightResultCache.cpp \ - CachedResourceLoader.cpp \ - CachedResourceRequest.cpp \ - CachedResourceRequestInitiators.cpp \ - DocumentLoadTiming.cpp \ - DocumentLoader.cpp \ - DocumentThreadableLoader.cpp \ - DocumentWriter.cpp \ - EmptyClients.cpp \ - FormState.cpp \ - FormSubmission.cpp \ - FrameLoadRequest.cpp \ - FrameLoader.cpp \ - FrameLoaderStateMachine.cpp \ - HistoryController.cpp \ - FTPDirectoryParser.cpp \ - IconController.cpp \ - IconDatabaseBase.cpp \ - IconLoader.cpp \ - ImageLoader.cpp \ - LinkLoader.cpp \ - LoaderStrategy.cpp \ - MixedContentChecker.cpp \ - NavigationAction.cpp \ - NetscapePlugInStreamLoader.cpp \ - PingLoader.cpp \ - PlaceholderDocument.cpp \ - PolicyCallback.cpp \ - PolicyChecker.cpp \ - ProgressTracker.cpp \ - NavigationScheduler.cpp \ - ResourceBuffer.cpp \ - ResourceLoader.cpp \ - ResourceLoadNotifier.cpp \ - ResourceLoadScheduler.cpp \ - SinkDocument.cpp \ - SubframeLoader.cpp \ - SubresourceLoader.cpp \ - TextResourceDecoder.cpp \ - ThreadableLoader.cpp \ - AnimationBase.cpp \ - AnimationController.cpp \ - CompositeAnimation.cpp \ - CSSPropertyAnimation.cpp \ - ImplicitAnimation.cpp \ - KeyframeAnimation.cpp \ - AutoscrollController.cpp \ - BarProp.cpp \ - CaptionUserPreferences.cpp \ - Chrome.cpp \ - Console.cpp \ - ContentSecurityPolicy.cpp \ - ContextMenuController.cpp \ - Crypto.cpp \ - DeviceController.cpp \ - DiagnosticLoggingKeys.cpp \ - DOMSelection.cpp \ - DOMTimer.cpp \ - DOMWindow.cpp \ - DOMWindowExtension.cpp \ - DOMWindowProperty.cpp \ - DragController.cpp \ - EventHandler.cpp \ - EventSource.cpp \ - FeatureObserver.cpp \ - FocusController.cpp \ - Frame.cpp \ - FrameActionScheduler.cpp \ - FrameDestructionObserver.cpp \ - FrameTree.cpp \ - FrameView.cpp \ - GestureTapHighlighter.cpp \ - GroupSettings.cpp \ - History.cpp \ - Location.cpp \ - MouseEventWithHitTestResults.cpp \ - Navigator.cpp \ - NavigatorBase.cpp \ - OriginAccessEntry.cpp \ - Page.cpp \ - PageActivityAssertionToken.cpp \ - PageConsole.cpp \ - PageGroup.cpp \ - PageGroupLoadDeferrer.cpp \ - PageThrottler.cpp \ - PageVisibilityState.cpp \ - Performance.cpp \ - PerformanceEntry.cpp \ - PerformanceEntryList.cpp \ - PerformanceNavigation.cpp \ - PerformanceResourceTiming.cpp \ - PerformanceTiming.cpp \ - PrintContext.cpp \ - Screen.cpp \ - ScrollingConstraints.cpp \ - ScrollingCoordinator.cpp \ - SecurityOrigin.cpp \ - SecurityPolicy.cpp \ - Settings.cpp \ - SpatialNavigation.cpp \ - TouchAdjustment.cpp \ - SuspendableTimer.cpp \ - UserContentURLPattern.cpp \ - WindowFeatures.cpp \ - WindowFocusAllowedIndicator.cpp \ - PluginData.cpp \ - DOMPluginArray.cpp \ - DOMPlugin.cpp \ - PluginMainThreadScheduler.cpp \ - DOMMimeType.cpp \ - DOMMimeTypeArray.cpp \ - Animation.cpp \ - AnimationList.cpp \ - Arena.cpp \ - BidiContext.cpp \ - DateTimeFormat.cpp \ - Hyphenation.cpp \ - LocaleNone.cpp \ - LocaleToScriptMappingDefault.cpp \ - PlatformLocale.cpp \ - QuotedPrintable.cpp \ - CalculationValue.cpp \ - Clock.cpp \ - ClockGeneric.cpp \ - ContentType.cpp \ - CrossThreadCopier.cpp \ - DatabaseStrategy.cpp \ - DateComponents.cpp \ - Decimal.cpp \ - DragData.cpp \ - DragImage.cpp \ - FileChooser.cpp \ - FileStream.cpp \ - FileSystem.cpp \ - HistogramSupport.cpp \ - FontDescription.cpp \ - FontGenericFamilies.cpp \ - FontGlyphs.cpp \ - FontFeatureSettings.cpp \ - BitmapImage.cpp \ - Color.cpp \ - CrossfadeGeneratedImage.cpp \ - FloatPoint3D.cpp \ - FloatPoint.cpp \ - FloatPolygon.cpp \ - FloatQuad.cpp \ - FloatRect.cpp \ - FloatSize.cpp \ - FontData.cpp \ - Font.cpp \ - FontCache.cpp \ - FontFastPath.cpp \ - LayoutBoxExtent.cpp \ - LayoutRect.cpp \ - GeneratedImage.cpp \ - GeneratorGeneratedImage.cpp \ - GlyphPageTreeNode.cpp \ - Gradient.cpp \ - GraphicsContext.cpp \ - GraphicsLayer.cpp \ - GraphicsLayerAnimation.cpp \ - GraphicsLayerUpdater.cpp \ - GraphicsLayerTransform.cpp \ - GraphicsTypes.cpp \ - Image.cpp \ - ImageBuffer.cpp \ - ImageOrientation.cpp \ - ImageSource.cpp \ - IntRect.cpp \ - Path.cpp \ - PathTraversalState.cpp \ - Pattern.cpp \ - FontQt.cpp \ - Region.cpp \ - RoundedRect.cpp \ - SegmentedFontData.cpp \ - ShadowBlur.cpp \ - SVGGlyph.cpp \ - SimpleFontData.cpp \ - StringTruncator.cpp \ - GraphicsSurface.cpp \ - GraphicsSurfaceQt.cpp \ - SurrogatePairAwareTextIterator.cpp \ - TextRun.cpp \ - TiledBackingStore.cpp \ - AffineTransform.cpp \ - TransformationMatrix.cpp \ - MatrixTransformOperation.cpp \ - Matrix3DTransformOperation.cpp \ - PerspectiveTransformOperation.cpp \ - RotateTransformOperation.cpp \ - ScaleTransformOperation.cpp \ - SkewTransformOperation.cpp \ - TransformOperations.cpp \ - TransformState.cpp \ - TranslateTransformOperation.cpp \ - WidthIterator.cpp \ - ImageDecoder.cpp \ - BMPImageDecoder.cpp \ - BMPImageReader.cpp \ - GIFImageDecoder.cpp \ - GIFImageReader.cpp \ - KillRingNone.cpp \ - KURL.cpp \ - Language.cpp \ - Length.cpp \ - LengthBox.cpp \ - LineEnding.cpp \ - LevelDBDatabase.cpp \ - LevelDBTransaction.cpp \ - LevelDBWriteBatch.cpp \ - LinkHash.cpp \ - Logging.cpp \ - MemoryPressureHandler.cpp \ - MIMETypeRegistry.cpp \ - DeviceMotionClientMock.cpp \ - DeviceOrientationClientMock.cpp \ - GeolocationClientMock.cpp \ - PlatformSpeechSynthesizerMock.cpp \ - ScrollbarThemeMock.cpp \ - AuthenticationChallengeBase.cpp \ - BlobData.cpp \ - BlobRegistry.cpp \ - BlobRegistryImpl.cpp \ - BlobResourceHandle.cpp \ - Credential.cpp \ - CredentialStorage.cpp \ - FormData.cpp \ - FormDataBuilder.cpp \ - HTTPHeaderMap.cpp \ - HTTPParsers.cpp \ - MIMEHeader.cpp \ - NetworkStateNotifier.cpp \ - NetworkStorageSessionStub.cpp \ - ParsedContentType.cpp \ - ProtectionSpace.cpp \ - ProxyServer.cpp \ - ResourceErrorBase.cpp \ - ResourceHandle.cpp \ - ResourceHandleClient.cpp \ - ResourceLoadTiming.cpp \ - ResourceRequestBase.cpp \ - ResourceResponseBase.cpp \ - NotImplemented.cpp \ - RegularExpression.cpp \ - PlatformEvent.cpp \ - PlatformInstrumentation.cpp \ - RuntimeApplicationChecks.cpp \ - RunLoop.cpp \ - SchemeRegistry.cpp \ - ScrollableArea.cpp \ - ScrollAnimator.cpp \ - Scrollbar.cpp \ - ScrollbarTheme.cpp \ - ScrollbarThemeComposite.cpp \ - ScrollView.cpp \ - SharedBuffer.cpp \ - SharedBufferChunkReader.cpp \ - SQLiteAuthorizer.cpp \ - SQLiteDatabase.cpp \ - SQLiteFileSystem.cpp \ - SQLiteStatement.cpp \ - SQLiteTransaction.cpp \ - SQLValue.cpp \ - SegmentedString.cpp \ - ThreadGlobalData.cpp \ - ThreadTimers.cpp \ - Timer.cpp \ - UnicodeRange.cpp \ - FontTranscoder.cpp \ - UUID.cpp \ - Widget.cpp \ - PlatformStrategies.cpp \ - IFrameShimSupport.cpp \ - PluginDatabase.cpp \ - PluginDebug.cpp \ - PluginPackage.cpp \ - PluginStream.cpp \ - PluginView.cpp \ - FlowThreadController.cpp \ - RenderFlexibleBox.cpp \ - RenderFlowThread.cpp \ - RenderGeometryMap.cpp \ - RenderGrid.cpp \ - RenderLayerBacking.cpp \ - RenderLayerFilterInfo.cpp \ - RenderNamedFlowThread.cpp \ - RenderRegion.cpp \ - RenderRegionSet.cpp \ - PolygonShape.cpp \ - RectangleShape.cpp \ - Shape.cpp \ - ShapeInfo.cpp \ - ShapeInsideInfo.cpp \ - ShapeInterval.cpp \ - ShapeOutsideInfo.cpp \ - BasicShapes.cpp \ - StyleCachedImageSet.cpp \ - StyleCachedShader.cpp \ - StyleCustomFilterProgram.cpp \ - StyleCustomFilterProgramCache.cpp \ - StorageThread.cpp \ - Storage.cpp \ - StorageAreaImpl.cpp \ - StorageAreaSync.cpp \ - StorageEvent.cpp \ - StorageEventDispatcher.cpp \ - StorageMap.cpp \ - StorageNamespace.cpp \ - StorageNamespaceImpl.cpp \ - StorageSyncManager.cpp \ - StorageStrategy.cpp \ - StorageTracker.cpp \ - Internals.cpp \ - InternalSettings.cpp \ - DOMParser.cpp \ - NativeXPathNSResolver.cpp \ - XMLHttpRequest.cpp \ - XMLHttpRequestException.cpp \ - XMLHttpRequestProgressEventThrottle.cpp \ - XMLHttpRequestUpload.cpp \ - XMLErrors.cpp \ - XMLSerializer.cpp \ - XPathEvaluator.cpp \ - XPathException.cpp \ - XPathExpression.cpp \ - XPathExpressionNode.cpp \ - XPathFunctions.cpp \ - XPathNodeSet.cpp \ - XPathNSResolver.cpp \ - XPathParser.cpp \ - XPathPath.cpp \ - XPathPredicate.cpp \ - XPathResult.cpp \ - XPathStep.cpp \ - XPathUtil.cpp \ - XPathValue.cpp \ - XPathVariableReference.cpp \ - AccessibilityObjectQt.cpp \ - DragControllerQt.cpp \ - EventHandlerQt.cpp \ - TransformationMatrixQt.cpp \ - ColorQt.cpp \ - FontPlatformDataQt.cpp \ - FloatPointQt.cpp \ - FloatRectQt.cpp \ - FloatSizeQt.cpp \ - GradientQt.cpp \ - GraphicsContextQt.cpp \ - IconQt.cpp \ - ImageBufferQt.cpp \ - ImageBufferDataQt.cpp \ - ImageDecoderQt.cpp \ - ImageQt.cpp \ - IntPointQt.cpp \ - IntRectQt.cpp \ - IntSizeQt.cpp \ - PathQt.cpp \ - PatternQt.cpp \ - StillImageQt.cpp \ - GraphicsLayerTextureMapper.cpp \ - TextureMapper.cpp \ - TextureMapperBackingStore.cpp \ - TextureMapperFPSCounter.cpp \ - TextureMapperImageBuffer.cpp \ - TextureMapperLayer.cpp \ - TextureMapperSurfaceBackingStore.cpp \ - TextureMapperTile.cpp \ - TextureMapperTiledBackingStore.cpp \ - DNSResolveQueue.cpp \ - MIMESniffing.cpp \ - CookieJarQt.cpp \ - CredentialStorageQt.cpp \ - ResourceHandleQt.cpp \ - ResourceRequestQt.cpp \ - DNSQt.cpp \ - NetworkStateNotifierQt.cpp \ - ProxyServerQt.cpp \ - QtMIMETypeSniffer.cpp \ - QNetworkReplyHandler.cpp \ - Cursor.cpp \ - ContextMenu.cpp \ - ContextMenuItem.cpp \ - ClipboardQt.cpp \ - ContextMenuItemNone.cpp \ - ContextMenuNone.cpp \ - CursorQt.cpp \ - DragDataQt.cpp \ - DragImageQt.cpp \ - EventLoopQt.cpp \ - FileSystemQt.cpp \ - RunLoopQt.cpp \ - SharedBufferQt.cpp \ - ThirdPartyCookiesQt.cpp \ - UserAgentQt.cpp \ - FontCacheQt.cpp \ - FontCustomPlatformDataQt.cpp \ - GlyphPageTreeNodeQt.cpp \ - SimpleFontDataQt.cpp \ - TileQt.cpp \ - KURLQt.cpp \ - MIMETypeRegistryQt.cpp \ - PasteboardQt.cpp \ - PlatformKeyboardEventQt.cpp \ - PlatformScreenQt.cpp \ - RenderThemeQStyle.cpp \ - RenderThemeQt.cpp \ - RenderThemeQtMobile.cpp \ - ScrollbarThemeQStyle.cpp \ - ScrollbarThemeQt.cpp \ - ScrollViewQt.cpp \ - SharedTimerQt.cpp \ - SoundQt.cpp \ - LoggingQt.cpp \ - LanguageQt.cpp \ - LocalizedStringsQt.cpp \ - TemporaryLinkStubsQt.cpp \ - TextBoundariesQt.cpp \ - TextBreakIteratorInternalICUQt.cpp \ - WidgetQt.cpp \ - XMLDocumentParserQt.cpp \ - ScrollAnimatorNone.cpp \ - SmartReplaceICU.cpp \ - PluginPackageNone.cpp \ - PluginViewNone.cpp \ - ChangeVersionWrapper.cpp \ - DatabaseBackend.cpp \ - DatabaseBackendContext.cpp \ - DatabaseBackendSync.cpp \ - DatabaseBase.cpp \ - DatabaseManager.cpp \ - DatabaseTask.cpp \ - DatabaseThread.cpp \ - DatabaseTracker.cpp \ - OriginLock.cpp \ - SQLException.cpp \ - SQLResultSet.cpp \ - SQLResultSetRowList.cpp \ - SQLStatement.cpp \ - SQLStatementBackend.cpp \ - SQLStatementSync.cpp \ - SQLTransaction.cpp \ - SQLTransactionBackend.cpp \ - SQLTransactionBackendSync.cpp \ - SQLTransactionClient.cpp \ - SQLTransactionCoordinator.cpp \ - SQLTransactionStateMachine.cpp \ - SQLTransactionSync.cpp \ - IconDatabase.cpp \ - IconRecord.cpp \ - PageURLRecord.cpp \ - WorkerThreadableLoader.cpp \ - WorkerNavigator.cpp \ - AbstractWorker.cpp \ - DedicatedWorkerGlobalScope.cpp \ - DedicatedWorkerThread.cpp \ - Worker.cpp \ - WorkerGlobalScope.cpp \ - WorkerEventQueue.cpp \ - WorkerLocation.cpp \ - WorkerMessagingProxy.cpp \ - WorkerRunLoop.cpp \ - WorkerThread.cpp \ - WorkerScriptLoader.cpp \ - DefaultSharedWorkerRepository.cpp \ - SharedWorker.cpp \ - SharedWorkerGlobalScope.cpp \ - SharedWorkerRepository.cpp \ - SharedWorkerThread.cpp \ - RenderFullScreen.cpp \ - FELightingNEON.cpp \ - CustomFilterValidatedProgramTextureMapper.cpp \ - CustomFilterGlobalContext.cpp \ - CustomFilterOperation.cpp \ - CustomFilterParameterList.cpp \ - ValidatedCustomFilterOperation.cpp \ - CustomFilterProgram.cpp \ - CustomFilterProgramInfo.cpp \ - CustomFilterCompiledProgram.cpp \ - CustomFilterMesh.cpp \ - CustomFilterMeshGenerator.cpp \ - CustomFilterRenderer.cpp \ - CustomFilterValidatedProgram.cpp \ - DistantLightSource.cpp \ - FEBlend.cpp \ - FEColorMatrix.cpp \ - FEComponentTransfer.cpp \ - FEComposite.cpp \ - FEConvolveMatrix.cpp \ - FECustomFilter.cpp \ - FEDiffuseLighting.cpp \ - FEDisplacementMap.cpp \ - FEDropShadow.cpp \ - FEFlood.cpp \ - FEGaussianBlur.cpp \ - FELighting.cpp \ - FEMerge.cpp \ - FEMorphology.cpp \ - FEOffset.cpp \ - FESpecularLighting.cpp \ - FETile.cpp \ - FETurbulence.cpp \ - FilterOperations.cpp \ - FilterOperation.cpp \ - FilterEffect.cpp \ - PointLightSource.cpp \ - SpotLightSource.cpp \ - SourceAlpha.cpp \ - SourceGraphic.cpp \ - SVGCSSComputedStyleDeclaration.cpp \ - SVGCSSParser.cpp \ - SVGCSSStyleSelector.cpp \ - SMILTime.cpp \ - SMILTimeContainer.cpp \ - SVGSMILElement.cpp \ - SVGFEImage.cpp \ - SVGFilter.cpp \ - SVGFilterBuilder.cpp \ - SVGImage.cpp \ - SVGImageCache.cpp \ - SVGImageForContainer.cpp \ - SVGAnimatedProperty.cpp \ - SVGAttributeToPropertyMap.cpp \ - SVGPathSegListPropertyTearOff.cpp \ - WebSocket.cpp \ - WebSocketChannel.cpp \ - WebSocketDeflateFramer.cpp \ - WebSocketDeflater.cpp \ - WebSocketExtensionDispatcher.cpp \ - WebSocketExtensionParser.cpp \ - WebSocketFrame.cpp \ - WebSocketHandshake.cpp \ - WorkerThreadableWebSocketChannel.cpp \ - ThreadableWebSocketChannel.cpp \ - ThreadableWebSocketChannelClientWrapper.cpp \ - SocketStreamErrorBase.cpp \ - SocketStreamHandleBase.cpp \ - SocketStreamHandleQt.cpp \ - JSWebGLRenderingContextCustom.cpp \ - CanvasContextAttributes.cpp \ - WebGLObject.cpp \ - WebGLBuffer.cpp \ - WebGLCompressedTextureATC.cpp \ - WebGLCompressedTexturePVRTC.cpp \ - WebGLCompressedTextureS3TC.cpp \ - WebGLContextAttributes.cpp \ - WebGLContextEvent.cpp \ - WebGLContextGroup.cpp \ - WebGLContextObject.cpp \ - WebGLDebugRendererInfo.cpp \ - WebGLDebugShaders.cpp \ - WebGLDepthTexture.cpp \ - WebGLExtension.cpp \ - WebGLFramebuffer.cpp \ - WebGLGetInfo.cpp \ - WebGLLoseContext.cpp \ - WebGLProgram.cpp \ - WebGLRenderbuffer.cpp \ - WebGLRenderingContext.cpp \ - WebGLShader.cpp \ - WebGLShaderPrecisionFormat.cpp \ - WebGLSharedObject.cpp \ - EXTDrawBuffers.cpp \ - EXTTextureFilterAnisotropic.cpp \ - OESStandardDerivatives.cpp \ - OESTextureFloat.cpp \ - OESTextureHalfFloat.cpp \ - OESVertexArrayObject.cpp \ - OESElementIndexUint.cpp \ - WebGLTexture.cpp \ - WebGLUniformLocation.cpp \ - WebGLVertexArrayObjectOES.cpp \ - ScrollingStateFixedNode.cpp \ - ScrollingStateNode.cpp \ - ScrollingStateScrollingNode.cpp \ - ScrollingStateStickyNode.cpp \ - ScrollingStateTree.cpp \ - ScrollingCoordinatorCoordinatedGraphics.cpp \ - ScrollingStateNodeCoordinatedGraphics.cpp \ - ScrollingStateScrollingNodeCoordinatedGraphics.cpp \ - ANGLEWebKitBridge.cpp \ - GraphicsContext3D.cpp \ - DrawingBuffer.cpp \ - DrawingBufferQt.cpp \ - Texture.cpp \ - TilingData.cpp \ - GraphicsContext3DOpenGLCommon.cpp \ - Extensions3DOpenGLCommon.cpp \ - GraphicsContext3DQt.cpp \ - QFramebufferPaintDevice.cpp \ - TextureMapperGL.cpp \ - TextureMapperShaderProgram.cpp \ - AreaAllocator.cpp \ - CompositingCoordinator.cpp \ - CoordinatedBackingStore.cpp \ - CoordinatedGraphicsLayer.cpp \ - CoordinatedGraphicsScene.cpp \ - CoordinatedImageBacking.cpp \ - CoordinatedSurface.cpp \ - CoordinatedTile.cpp \ - UpdateAtlas.cpp \ - GraphicsContext3DOpenGL.cpp \ - Extensions3DOpenGL.cpp \ - Archive.cpp \ - ArchiveFactory.cpp \ - MHTMLArchive.cpp \ - MHTMLParser.cpp \ - PageSerializer.cpp \ - ICOImageDecoder.cpp \ - PNGImageDecoder.cpp \ - JPEGImageDecoder.cpp \ - sqlite3.c \ - MathMLElementFactory.cpp \ - MathMLNames.cpp \ - SVGElementFactory.cpp \ - JSSVGElementWrapperFactory.cpp \ - SVGNames.cpp \ - XLinkNames.cpp \ - CSSPropertyNames.cpp \ - CSSValueKeywords.cpp \ - InternalSettingsGenerated.cpp \ - JSDOMFileSystem.cpp \ - JSDOMFileSystemSync.cpp \ - JSDOMWindowFileSystem.cpp \ - JSDirectoryEntry.cpp \ - JSDirectoryEntrySync.cpp \ - JSDirectoryReader.cpp \ - JSDirectoryReaderSync.cpp \ - JSEntriesCallback.cpp \ - JSEntry.cpp \ - JSEntryArray.cpp \ - JSEntryArraySync.cpp \ - JSEntryCallback.cpp \ - JSEntrySync.cpp \ - JSErrorCallback.cpp \ - JSFileCallback.cpp \ - JSFileEntry.cpp \ - JSFileEntrySync.cpp \ - JSFileSystemCallback.cpp \ - JSFileWriter.cpp \ - JSFileWriterCallback.cpp \ - JSMetadata.cpp \ - JSMetadataCallback.cpp \ - JSWorkerGlobalScopeFileSystem.cpp \ - JSCoordinates.cpp \ - JSGeolocation.cpp \ - JSGeoposition.cpp \ - JSNavigatorGeolocation.cpp \ - JSPositionCallback.cpp \ - JSPositionError.cpp \ - JSPositionErrorCallback.cpp \ - JSDOMWindowIndexedDatabase.cpp \ - JSIDBAny.cpp \ - JSIDBCursor.cpp \ - JSIDBCursorWithValue.cpp \ - JSIDBDatabase.cpp \ - JSIDBFactory.cpp \ - JSIDBIndex.cpp \ - JSIDBKeyRange.cpp \ - JSIDBObjectStore.cpp \ - JSIDBOpenDBRequest.cpp \ - JSIDBRequest.cpp \ - JSIDBTransaction.cpp \ - JSIDBVersionChangeEvent.cpp \ - JSWorkerGlobalScopeIndexedDatabase.cpp \ - JSDOMWindowNotifications.cpp \ - JSNotification.cpp \ - JSNotificationCenter.cpp \ - JSNotificationPermissionCallback.cpp \ - JSWorkerGlobalScopeNotifications.cpp \ - JSDOMWindowQuota.cpp \ - JSNavigatorStorageQuota.cpp \ - JSStorageInfo.cpp \ - JSStorageErrorCallback.cpp \ - JSStorageQuota.cpp \ - JSStorageQuotaCallback.cpp \ - JSStorageUsageCallback.cpp \ - JSWorkerNavigatorStorageQuota.cpp \ - JSAudioBuffer.cpp \ - JSAudioBufferCallback.cpp \ - JSAudioBufferSourceNode.cpp \ - JSChannelMergerNode.cpp \ - JSChannelSplitterNode.cpp \ - JSAudioContext.cpp \ - JSAudioDestinationNode.cpp \ - JSGainNode.cpp \ - JSAudioListener.cpp \ - JSAudioNode.cpp \ - JSPannerNode.cpp \ - JSAudioParam.cpp \ - JSAudioProcessingEvent.cpp \ - JSBiquadFilterNode.cpp \ - JSConvolverNode.cpp \ - JSDelayNode.cpp \ - JSDynamicsCompressorNode.cpp \ - JSScriptProcessorNode.cpp \ - JSMediaElementAudioSourceNode.cpp \ - JSMediaStreamAudioSourceNode.cpp \ - JSOfflineAudioContext.cpp \ - JSOfflineAudioCompletionEvent.cpp \ - JSOscillatorNode.cpp \ - JSAnalyserNode.cpp \ - JSWaveShaperNode.cpp \ - JSPeriodicWave.cpp \ - JSDOMWindowWebDatabase.cpp \ - JSDatabase.cpp \ - JSDatabaseCallback.cpp \ - JSDatabaseSync.cpp \ - JSSQLError.cpp \ - JSSQLException.cpp \ - JSSQLResultSet.cpp \ - JSSQLResultSetRowList.cpp \ - JSSQLStatementCallback.cpp \ - JSSQLStatementErrorCallback.cpp \ - JSSQLTransaction.cpp \ - JSSQLTransactionCallback.cpp \ - JSSQLTransactionErrorCallback.cpp \ - JSSQLTransactionSync.cpp \ - JSSQLTransactionSyncCallback.cpp \ - JSWorkerGlobalScopeWebDatabase.cpp \ - JSCloseEvent.cpp \ - JSWebSocket.cpp \ - JSCounter.cpp \ - JSCSSCharsetRule.cpp \ - JSCSSFontFaceLoadEvent.cpp \ - JSCSSFontFaceRule.cpp \ - JSCSSHostRule.cpp \ - JSCSSImportRule.cpp \ - JSCSSMediaRule.cpp \ - JSCSSPageRule.cpp \ - JSCSSPrimitiveValue.cpp \ - JSCSSRule.cpp \ - JSCSSRuleList.cpp \ - JSCSSStyleDeclaration.cpp \ - JSCSSStyleRule.cpp \ - JSCSSStyleSheet.cpp \ - JSCSSSupportsRule.cpp \ - JSCSSValue.cpp \ - JSCSSValueList.cpp \ - JSDOMWindowCSS.cpp \ - JSFontLoader.cpp \ - JSMediaList.cpp \ - JSMediaQueryList.cpp \ - JSRect.cpp \ - JSRGBColor.cpp \ - JSStyleMedia.cpp \ - JSStyleSheet.cpp \ - JSStyleSheetList.cpp \ - JSWebKitCSSFilterRule.cpp \ - JSWebKitCSSFilterValue.cpp \ - JSWebKitCSSKeyframeRule.cpp \ - JSWebKitCSSKeyframesRule.cpp \ - JSWebKitCSSMatrix.cpp \ - JSWebKitCSSMixFunctionValue.cpp \ - JSWebKitCSSRegionRule.cpp \ - JSWebKitCSSTransformValue.cpp \ - JSWebKitCSSViewportRule.cpp \ - JSAttr.cpp \ - JSBeforeLoadEvent.cpp \ - JSCharacterData.cpp \ - JSChildNode.cpp \ - JSClientRect.cpp \ - JSClientRectList.cpp \ - JSClipboard.cpp \ - JSCDATASection.cpp \ - JSComment.cpp \ - JSCompositionEvent.cpp \ - JSCustomEvent.cpp \ - JSDataTransferItem.cpp \ - JSDataTransferItemList.cpp \ - JSDeviceMotionEvent.cpp \ - JSDeviceOrientationEvent.cpp \ - JSDocumentFragment.cpp \ - JSDocument.cpp \ - JSDocumentType.cpp \ - JSDOMCoreException.cpp \ - JSDOMError.cpp \ - JSDOMImplementation.cpp \ - JSDOMStringList.cpp \ - JSDOMStringMap.cpp \ - JSElement.cpp \ - JSEntity.cpp \ - JSEntityReference.cpp \ - JSErrorEvent.cpp \ - JSEvent.cpp \ - JSEventException.cpp \ - JSEventTarget.cpp \ - JSFocusEvent.cpp \ - JSHashChangeEvent.cpp \ - JSKeyboardEvent.cpp \ - JSMouseEvent.cpp \ - JSMessageChannel.cpp \ - JSMessageEvent.cpp \ - JSMessagePort.cpp \ - JSMutationEvent.cpp \ - JSMutationObserver.cpp \ - JSMutationRecord.cpp \ - JSNamedNodeMap.cpp \ - JSNode.cpp \ - JSNodeFilter.cpp \ - JSNodeIterator.cpp \ - JSNodeList.cpp \ - JSNotation.cpp \ - JSOverflowEvent.cpp \ - JSPageTransitionEvent.cpp \ - JSPopStateEvent.cpp \ - JSProcessingInstruction.cpp \ - JSProgressEvent.cpp \ - JSPropertyNodeList.cpp \ - JSRangeException.cpp \ - JSRange.cpp \ - JSRequestAnimationFrameCallback.cpp \ - JSShadowRoot.cpp \ - JSStringCallback.cpp \ - JSText.cpp \ - JSTextEvent.cpp \ - JSTouch.cpp \ - JSTouchEvent.cpp \ - JSTouchList.cpp \ - JSTransitionEvent.cpp \ - JSTreeWalker.cpp \ - JSUIEvent.cpp \ - JSWebKitAnimationEvent.cpp \ - JSWebKitNamedFlow.cpp \ - JSDOMNamedFlowCollection.cpp \ - JSWebKitTransitionEvent.cpp \ - JSWheelEvent.cpp \ - JSBlob.cpp \ - JSFile.cpp \ - JSFileError.cpp \ - JSFileException.cpp \ - JSFileList.cpp \ - JSFileReader.cpp \ - JSFileReaderSync.cpp \ - JSArrayBufferView.cpp \ - JSArrayBuffer.cpp \ - JSDataView.cpp \ - JSInt8Array.cpp \ - JSFloat32Array.cpp \ - JSFloat64Array.cpp \ - JSCanvasGradient.cpp \ - JSInt32Array.cpp \ - JSCanvasPattern.cpp \ - JSCanvasProxy.cpp \ - JSCanvasRenderingContext.cpp \ - JSCanvasRenderingContext2D.cpp \ - JSDOMPath.cpp \ - JSEXTDrawBuffers.cpp \ - JSEXTTextureFilterAnisotropic.cpp \ - JSOESStandardDerivatives.cpp \ - JSOESTextureFloat.cpp \ - JSOESTextureHalfFloat.cpp \ - JSOESVertexArrayObject.cpp \ - JSOESElementIndexUint.cpp \ - JSWebGLActiveInfo.cpp \ - JSWebGLBuffer.cpp \ - JSWebGLCompressedTextureATC.cpp \ - JSWebGLCompressedTexturePVRTC.cpp \ - JSWebGLCompressedTextureS3TC.cpp \ - JSWebGLContextAttributes.cpp \ - JSWebGLContextEvent.cpp \ - JSWebGLDebugRendererInfo.cpp \ - JSWebGLDebugShaders.cpp \ - JSWebGLDepthTexture.cpp \ - JSWebGLFramebuffer.cpp \ - JSWebGLLoseContext.cpp \ - JSWebGLProgram.cpp \ - JSWebGLRenderbuffer.cpp \ - JSWebGLRenderingContext.cpp \ - JSWebGLShader.cpp \ - JSWebGLShaderPrecisionFormat.cpp \ - JSInt16Array.cpp \ - JSWebGLTexture.cpp \ - JSWebGLUniformLocation.cpp \ - JSWebGLVertexArrayObjectOES.cpp \ - JSUint8Array.cpp \ - JSUint8ClampedArray.cpp \ - JSUint32Array.cpp \ - JSUint16Array.cpp \ - JSDOMFormData.cpp \ - JSDOMSettableTokenList.cpp \ - JSDOMTokenList.cpp \ - JSDOMURL.cpp \ - JSHTMLAllCollection.cpp \ - JSHTMLAudioElement.cpp \ - JSHTMLAnchorElement.cpp \ - JSHTMLAppletElement.cpp \ - JSHTMLAreaElement.cpp \ - JSHTMLBaseElement.cpp \ - JSHTMLBaseFontElement.cpp \ - JSHTMLBodyElement.cpp \ - JSHTMLBRElement.cpp \ - JSHTMLButtonElement.cpp \ - JSHTMLCanvasElement.cpp \ - JSHTMLCollection.cpp \ - JSHTMLDataListElement.cpp \ - JSHTMLDetailsElement.cpp \ - JSHTMLDialogElement.cpp \ - JSHTMLDirectoryElement.cpp \ - JSHTMLDivElement.cpp \ - JSHTMLDListElement.cpp \ - JSHTMLDocument.cpp \ - JSHTMLElement.cpp \ - JSHTMLEmbedElement.cpp \ - JSHTMLFieldSetElement.cpp \ - JSHTMLFontElement.cpp \ - JSHTMLFormControlsCollection.cpp \ - JSHTMLFormElement.cpp \ - JSHTMLFrameElement.cpp \ - JSHTMLFrameSetElement.cpp \ - JSHTMLHeadElement.cpp \ - JSHTMLHeadingElement.cpp \ - JSHTMLHRElement.cpp \ - JSHTMLHtmlElement.cpp \ - JSHTMLIFrameElement.cpp \ - JSHTMLImageElement.cpp \ - JSHTMLInputElement.cpp \ - JSHTMLKeygenElement.cpp \ - JSHTMLLabelElement.cpp \ - JSHTMLLegendElement.cpp \ - JSHTMLLIElement.cpp \ - JSHTMLLinkElement.cpp \ - JSHTMLMapElement.cpp \ - JSHTMLMarqueeElement.cpp \ - JSHTMLMediaElement.cpp \ - JSHTMLMenuElement.cpp \ - JSHTMLMetaElement.cpp \ - JSHTMLMeterElement.cpp \ - JSHTMLModElement.cpp \ - JSHTMLObjectElement.cpp \ - JSHTMLOListElement.cpp \ - JSHTMLOptGroupElement.cpp \ - JSHTMLOptionElement.cpp \ - JSHTMLOptionsCollection.cpp \ - JSHTMLOutputElement.cpp \ - JSHTMLParagraphElement.cpp \ - JSHTMLParamElement.cpp \ - JSHTMLPreElement.cpp \ - JSHTMLProgressElement.cpp \ - JSHTMLPropertiesCollection.cpp \ - JSHTMLQuoteElement.cpp \ - JSHTMLScriptElement.cpp \ - JSHTMLSelectElement.cpp \ - JSHTMLSourceElement.cpp \ - JSHTMLSpanElement.cpp \ - JSHTMLStyleElement.cpp \ - JSHTMLTableCaptionElement.cpp \ - JSHTMLTableCellElement.cpp \ - JSHTMLTableColElement.cpp \ - JSHTMLTableElement.cpp \ - JSHTMLTableRowElement.cpp \ - JSHTMLTableSectionElement.cpp \ - JSHTMLTextAreaElement.cpp \ - JSHTMLTitleElement.cpp \ - JSHTMLTrackElement.cpp \ - JSHTMLUListElement.cpp \ - JSHTMLUnknownElement.cpp \ - JSHTMLVideoElement.cpp \ - JSImageData.cpp \ - JSMediaController.cpp \ - JSMediaError.cpp \ - JSMicroDataItemValue.cpp \ - JSRadioNodeList.cpp \ - JSTextMetrics.cpp \ - JSTimeRanges.cpp \ - JSValidityState.cpp \ - JSVoidCallback.cpp \ - JSHTMLContentElement.cpp \ - JSInjectedScriptHost.cpp \ - JSInspectorFrontendHost.cpp \ - JSJavaScriptCallFrame.cpp \ - JSScriptProfile.cpp \ - JSScriptProfileNode.cpp \ - JSDOMApplicationCache.cpp \ - JSBarProp.cpp \ - JSConsole.cpp \ - JSCrypto.cpp \ - JSDOMSecurityPolicy.cpp \ - JSDOMSelection.cpp \ - JSDOMWindow.cpp \ - JSEventSource.cpp \ - JSHistory.cpp \ - JSLocation.cpp \ - JSNavigator.cpp \ - JSPerformance.cpp \ - JSPerformanceEntry.cpp \ - JSPerformanceEntryList.cpp \ - JSPerformanceNavigation.cpp \ - JSPerformanceResourceTiming.cpp \ - JSPerformanceTiming.cpp \ - JSScreen.cpp \ - JSSpeechInputEvent.cpp \ - JSSpeechInputResult.cpp \ - JSSpeechInputResultList.cpp \ - JSWebKitPoint.cpp \ - JSWindowBase64.cpp \ - JSWindowTimers.cpp \ - JSWorkerNavigator.cpp \ - JSDOMPlugin.cpp \ - JSDOMMimeType.cpp \ - JSDOMPluginArray.cpp \ - JSDOMMimeTypeArray.cpp \ - JSStorage.cpp \ - JSStorageEvent.cpp \ - JSInternals.cpp \ - JSInternalSettings.cpp \ - JSMallocStatistics.cpp \ - JSMemoryInfo.cpp \ - JSTypeConversions.cpp \ - JSAbstractWorker.cpp \ - JSDedicatedWorkerGlobalScope.cpp \ - JSSharedWorker.cpp \ - JSSharedWorkerGlobalScope.cpp \ - JSWorker.cpp \ - JSWorkerGlobalScope.cpp \ - JSWorkerLocation.cpp \ - JSDOMParser.cpp \ - JSXMLHttpRequest.cpp \ - JSXMLHttpRequestException.cpp \ - JSXMLHttpRequestProgressEvent.cpp \ - JSXMLHttpRequestUpload.cpp \ - JSXMLSerializer.cpp \ - JSXPathNSResolver.cpp \ - JSXPathException.cpp \ - JSXPathExpression.cpp \ - JSXPathResult.cpp \ - JSXPathEvaluator.cpp \ - JSXSLTProcessor.cpp \ - JSSVGAElement.cpp \ - JSSVGAltGlyphDefElement.cpp \ - JSSVGAltGlyphElement.cpp \ - JSSVGAltGlyphItemElement.cpp \ - JSSVGAngle.cpp \ - JSSVGAnimateColorElement.cpp \ - JSSVGAnimateMotionElement.cpp \ - JSSVGAnimatedAngle.cpp \ - JSSVGAnimatedBoolean.cpp \ - JSSVGAnimatedEnumeration.cpp \ - JSSVGAnimatedInteger.cpp \ - JSSVGAnimatedLength.cpp \ - JSSVGAnimatedLengthList.cpp \ - JSSVGAnimatedNumber.cpp \ - JSSVGAnimatedNumberList.cpp \ - JSSVGAnimatedPreserveAspectRatio.cpp \ - JSSVGAnimatedRect.cpp \ - JSSVGAnimatedString.cpp \ - JSSVGAnimatedTransformList.cpp \ - JSSVGAnimateElement.cpp \ - JSSVGAnimateTransformElement.cpp \ - JSSVGAnimationElement.cpp \ - JSSVGCircleElement.cpp \ - JSSVGClipPathElement.cpp \ - JSSVGColor.cpp \ - JSSVGComponentTransferFunctionElement.cpp \ - JSSVGCursorElement.cpp \ - JSSVGDefsElement.cpp \ - JSSVGDescElement.cpp \ - JSSVGDocument.cpp \ - JSSVGElement.cpp \ - JSSVGElementInstance.cpp \ - JSSVGElementInstanceList.cpp \ - JSSVGEllipseElement.cpp \ - JSSVGException.cpp \ - JSSVGExternalResourcesRequired.cpp \ - JSSVGFEBlendElement.cpp \ - JSSVGFEColorMatrixElement.cpp \ - JSSVGFEComponentTransferElement.cpp \ - JSSVGFECompositeElement.cpp \ - JSSVGFEConvolveMatrixElement.cpp \ - JSSVGFEDiffuseLightingElement.cpp \ - JSSVGFEDisplacementMapElement.cpp \ - JSSVGFEDistantLightElement.cpp \ - JSSVGFEDropShadowElement.cpp \ - JSSVGFEFloodElement.cpp \ - JSSVGFEFuncAElement.cpp \ - JSSVGFEFuncBElement.cpp \ - JSSVGFEFuncGElement.cpp \ - JSSVGFEFuncRElement.cpp \ - JSSVGFEGaussianBlurElement.cpp \ - JSSVGFEImageElement.cpp \ - JSSVGFEMergeElement.cpp \ - JSSVGFEMergeNodeElement.cpp \ - JSSVGFEMorphologyElement.cpp \ - JSSVGFEOffsetElement.cpp \ - JSSVGFEPointLightElement.cpp \ - JSSVGFESpecularLightingElement.cpp \ - JSSVGFESpotLightElement.cpp \ - JSSVGFETileElement.cpp \ - JSSVGFETurbulenceElement.cpp \ - JSSVGFilterElement.cpp \ - JSSVGFilterPrimitiveStandardAttributes.cpp \ - JSSVGFitToViewBox.cpp \ - JSSVGFontElement.cpp \ - JSSVGFontFaceElement.cpp \ - JSSVGFontFaceFormatElement.cpp \ - JSSVGFontFaceNameElement.cpp \ - JSSVGFontFaceSrcElement.cpp \ - JSSVGFontFaceUriElement.cpp \ - JSSVGForeignObjectElement.cpp \ - JSSVGGElement.cpp \ - JSSVGGlyphElement.cpp \ - JSSVGGlyphRefElement.cpp \ - JSSVGGradientElement.cpp \ - JSSVGGraphicsElement.cpp \ - JSSVGHKernElement.cpp \ - JSSVGImageElement.cpp \ - JSSVGLength.cpp \ - JSSVGLengthList.cpp \ - JSSVGLinearGradientElement.cpp \ - JSSVGLineElement.cpp \ - JSSVGMarkerElement.cpp \ - JSSVGMaskElement.cpp \ - JSSVGMatrix.cpp \ - JSSVGMetadataElement.cpp \ - JSSVGMissingGlyphElement.cpp \ - JSSVGMPathElement.cpp \ - JSSVGNumber.cpp \ - JSSVGNumberList.cpp \ - JSSVGPaint.cpp \ - JSSVGPathElement.cpp \ - JSSVGPathSegArcAbs.cpp \ - JSSVGPathSegArcRel.cpp \ - JSSVGPathSegClosePath.cpp \ - JSSVGPathSegCurvetoCubicAbs.cpp \ - JSSVGPathSegCurvetoCubicRel.cpp \ - JSSVGPathSegCurvetoCubicSmoothAbs.cpp \ - JSSVGPathSegCurvetoCubicSmoothRel.cpp \ - JSSVGPathSegCurvetoQuadraticAbs.cpp \ - JSSVGPathSegCurvetoQuadraticRel.cpp \ - JSSVGPathSegCurvetoQuadraticSmoothAbs.cpp \ - JSSVGPathSegCurvetoQuadraticSmoothRel.cpp \ - JSSVGPathSeg.cpp \ - JSSVGPathSegLinetoAbs.cpp \ - JSSVGPathSegLinetoHorizontalAbs.cpp \ - JSSVGPathSegLinetoHorizontalRel.cpp \ - JSSVGPathSegLinetoRel.cpp \ - JSSVGPathSegLinetoVerticalAbs.cpp \ - JSSVGPathSegLinetoVerticalRel.cpp \ - JSSVGPathSegList.cpp \ - JSSVGPathSegMovetoAbs.cpp \ - JSSVGPathSegMovetoRel.cpp \ - JSSVGPatternElement.cpp \ - JSSVGPoint.cpp \ - JSSVGPointList.cpp \ - JSSVGPolygonElement.cpp \ - JSSVGPolylineElement.cpp \ - JSSVGPreserveAspectRatio.cpp \ - JSSVGRadialGradientElement.cpp \ - JSSVGRectElement.cpp \ - JSSVGRect.cpp \ - JSSVGRenderingIntent.cpp \ - JSSVGScriptElement.cpp \ - JSSVGSetElement.cpp \ - JSSVGStopElement.cpp \ - JSSVGStringList.cpp \ - JSSVGStyleElement.cpp \ - JSSVGStyledElement.cpp \ - JSSVGSVGElement.cpp \ - JSSVGSwitchElement.cpp \ - JSSVGSymbolElement.cpp \ - JSSVGTests.cpp \ - JSSVGTextContentElement.cpp \ - JSSVGTextElement.cpp \ - JSSVGTextPathElement.cpp \ - JSSVGTextPositioningElement.cpp \ - JSSVGTitleElement.cpp \ - JSSVGTransform.cpp \ - JSSVGTransformList.cpp \ - JSSVGTRefElement.cpp \ - JSSVGTSpanElement.cpp \ - JSSVGURIReference.cpp \ - JSSVGUnitTypes.cpp \ - JSSVGUseElement.cpp \ - JSSVGViewElement.cpp \ - JSSVGVKernElement.cpp \ - JSSVGViewSpec.cpp \ - JSSVGZoomAndPan.cpp \ - JSSVGZoomEvent.cpp \ - JSInternalSettingsGenerated.cpp \ - InspectorFrontend.cpp \ - InspectorBackendDispatcher.cpp \ - InspectorTypeBuilder.cpp \ - CSSGrammar.cpp \ - HTMLElementFactory.cpp \ - JSHTMLElementWrapperFactory.cpp \ - HTMLNames.cpp \ - XMLNSNames.cpp \ - XMLNames.cpp \ - WebKitFontFamilyNames.cpp \ - EventFactory.cpp \ - ExceptionCodeDescription.cpp \ - HTMLEntityTable.cpp \ - ColorData.cpp \ - UserAgentStyleSheetsData.cpp \ - PlugInsResourcesData.cpp \ - XPathGrammar.cpp \ - RenderSVGAllInOne.cpp \ - SVGAllInOne.cpp \ - AccessibilityAllInOne.cpp \ - InspectorAllInOne.cpp \ - ApplicationCacheAllInOne.cpp \ - TextAllInOne.cpp \ - StyleAllInOne.cpp \ - HTMLElementsAllInOne.cpp \ - EditingAllInOne.cpp \ - RenderingAllInOne.cpp \ - CSSAllInOne.cpp \ - MediaAllInOne.cpp \ - DOMAllInOne.cpp \ - JSBindingsAllInOne.cpp \ - qrc_WebCore.cpp \ - qrc_WebKit.cpp \ - qrc_InspectorBackendCommands.cpp \ - moc_QtMIMETypeSniffer.cpp - -QT_VPATH += \ - qtbase/src/3rdparty/sqlite \ - qtwebkit/Source/WebCore/Modules/filesystem \ - qtwebkit/Source/WebCore/Modules/geolocation \ - qtwebkit/Source/WebCore/Modules/navigatorcontentutils \ - qtwebkit/Source/WebCore/Modules/notifications \ - qtwebkit/Source/WebCore/Modules/proximity \ - qtwebkit/Source/WebCore/Modules/webdatabase \ - qtwebkit/Source/WebCore/Modules/websockets \ - qtwebkit/Source/WebCore/accessibility \ - qtwebkit/Source/WebCore/accessibility/qt \ - qtwebkit/Source/WebCore/bindings \ - qtwebkit/Source/WebCore/bindings/generic \ - qtwebkit/Source/WebCore/bindings/js \ - qtwebkit/Source/WebCore/bridge \ - qtwebkit/Source/WebCore/bridge/c \ - qtwebkit/Source/WebCore/bridge/jsc \ - qtwebkit/Source/WebCore/bridge/qt \ - qtwebkit/Source/WebCore/css \ - qtwebkit/Source/WebCore/dom \ - qtwebkit/Source/WebCore/dom/default \ - qtwebkit/Source/WebCore/editing \ - qtwebkit/Source/WebCore/fileapi \ - qtwebkit/Source/WebCore/history \ - qtwebkit/Source/WebCore/history/qt \ - qtwebkit/Source/WebCore/html \ - qtwebkit/Source/WebCore/html/canvas \ - qtwebkit/Source/WebCore/html/forms \ - qtwebkit/Source/WebCore/html/parser \ - qtwebkit/Source/WebCore/html/shadow \ - qtwebkit/Source/WebCore/inspector \ - qtwebkit/Source/WebCore/loader \ - qtwebkit/Source/WebCore/loader/appcache \ - qtwebkit/Source/WebCore/loader/archive \ - qtwebkit/Source/WebCore/loader/archive/mhtml \ - qtwebkit/Source/WebCore/loader/cache \ - qtwebkit/Source/WebCore/loader/icon \ - qtwebkit/Source/WebCore/page \ - qtwebkit/Source/WebCore/page/animation \ - qtwebkit/Source/WebCore/page/qt \ - qtwebkit/Source/WebCore/page/scrolling \ - qtwebkit/Source/WebCore/page/scrolling/coordinatedgraphics \ - qtwebkit/Source/WebCore/platform \ - qtwebkit/Source/WebCore/platform/animation \ - qtwebkit/Source/WebCore/platform/graphics \ - qtwebkit/Source/WebCore/platform/graphics/cpu/arm/filters \ - qtwebkit/Source/WebCore/platform/graphics/filters \ - qtwebkit/Source/WebCore/platform/graphics/filters/texmap \ - qtwebkit/Source/WebCore/platform/graphics/gpu \ - qtwebkit/Source/WebCore/platform/graphics/gpu/qt \ - qtwebkit/Source/WebCore/platform/graphics/opengl \ - qtwebkit/Source/WebCore/platform/graphics/qt \ - qtwebkit/Source/WebCore/platform/graphics/surfaces \ - qtwebkit/Source/WebCore/platform/graphics/surfaces/qt \ - qtwebkit/Source/WebCore/platform/graphics/texmap \ - qtwebkit/Source/WebCore/platform/graphics/texmap/coordinated \ - qtwebkit/Source/WebCore/platform/graphics/transforms \ - qtwebkit/Source/WebCore/platform/image-decoders \ - qtwebkit/Source/WebCore/platform/image-decoders/bmp \ - qtwebkit/Source/WebCore/platform/image-decoders/gif \ - qtwebkit/Source/WebCore/platform/image-decoders/ico \ - qtwebkit/Source/WebCore/platform/image-decoders/jpeg \ - qtwebkit/Source/WebCore/platform/image-decoders/png \ - qtwebkit/Source/WebCore/platform/leveldb \ - qtwebkit/Source/WebCore/platform/mock \ - qtwebkit/Source/WebCore/platform/network \ - qtwebkit/Source/WebCore/platform/network/qt \ - qtwebkit/Source/WebCore/platform/qt \ - qtwebkit/Source/WebCore/platform/sql \ - qtwebkit/Source/WebCore/platform/text \ - qtwebkit/Source/WebCore/platform/text/qt \ - qtwebkit/Source/WebCore/platform/text/transcoder \ - qtwebkit/Source/WebCore/plugins \ - qtwebkit/Source/WebCore/rendering \ - qtwebkit/Source/WebCore/rendering/shapes \ - qtwebkit/Source/WebCore/rendering/style \ - qtwebkit/Source/WebCore/rendering/svg \ - qtwebkit/Source/WebCore/storage \ - qtwebkit/Source/WebCore/svg \ - qtwebkit/Source/WebCore/svg/animation \ - qtwebkit/Source/WebCore/svg/graphics \ - qtwebkit/Source/WebCore/svg/graphics/filters \ - qtwebkit/Source/WebCore/svg/properties \ - qtwebkit/Source/WebCore/testing \ - qtwebkit/Source/WebCore/testing/js \ - qtwebkit/Source/WebCore/workers \ - qtwebkit/Source/WebCore/xml \ - qtwebkit/Source/WebCore/xml/parser \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - moc_QtMIMETypeSniffer.cpp \ - moc_QNetworkReplyHandler.cpp \ - moc_NetworkStateNotifierPrivate.cpp \ - moc_CookieJarQt.cpp \ - moc_SocketStreamHandlePrivate.cpp - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - DNSQt.moc \ - RunLoopQt.moc \ - SharedTimerQt.moc - diff --git a/repos/libports/lib/mk/qt5_webkit.inc b/repos/libports/lib/mk/qt5_webkit.inc deleted file mode 100644 index 8c4956a3e1..0000000000 --- a/repos/libports/lib/mk/qt5_webkit.inc +++ /dev/null @@ -1,27 +0,0 @@ -include $(call select_from_repositories,lib/import/import-qt5_webkit.mk) - -SHARED_LIB = yes - -# additional defines for the Genode version -CC_OPT += -DSQLITE_NO_SYNC=1 -DSQLITE_THREADSAFE=0 - -# enable C++ functions that use C99 math functions (disabled by default in the Genode tool chain) -CC_CXX_OPT += -D_GLIBCXX_USE_C99_MATH - -# use default warning level to avoid noise when compiling contrib code -CC_WARN = -Wno-deprecated-declarations - -CC_OPT_sqlite3 += -Wno-int-to-pointer-cast -Wno-pointer-to-int-cast - -include $(REP_DIR)/lib/mk/qt5_webkit_generated.inc - -QT_INCPATH += qtwebkit/Source/WebCore/generated - -include $(REP_DIR)/lib/mk/qt5.inc - -LIBS += qt5_webcore qt5_jscore qt5_network qt5_printsupport qt5_gui qt5_core icu libc libm - -vpath %.qrc $(QT5_CONTRIB_DIR)/src/3rdparty/webkit/Source/WebCore -vpath %.qrc $(QT5_CONTRIB_DIR)/src/3rdparty/webkit/Source/WebCore/inspector/front-end - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_webkit_generated.inc b/repos/libports/lib/mk/qt5_webkit_generated.inc deleted file mode 100644 index 5dcebf3bfb..0000000000 --- a/repos/libports/lib/mk/qt5_webkit_generated.inc +++ /dev/null @@ -1,209 +0,0 @@ -QT_DEFINES += -DQT_BUILD_WEBKIT_LIB -DBUILDING_QT__=1 -DNDEBUG -DENABLE_3D_RENDERING=1 -DENABLE_ACCELERATED_2D_CANVAS=1 -DENABLE_BLOB=1 -DENABLE_CANVAS_PATH=1 -DENABLE_CHANNEL_MESSAGING=1 -DENABLE_CSS_BOX_DECORATION_BREAK=1 -DENABLE_CSS_COMPOSITING=1 -DENABLE_CSS_EXCLUSIONS=1 -DENABLE_CSS_FILTERS=1 -DENABLE_CSS_IMAGE_SET=1 -DENABLE_CSS_REGIONS=1 -DENABLE_CSS_SHAPES=1 -DENABLE_CSS_STICKY_POSITION=1 -DENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=1 -DENABLE_DATALIST_ELEMENT=1 -DENABLE_DETAILS_ELEMENT=1 -DENABLE_DOWNLOAD_ATTRIBUTE=1 -DENABLE_FAST_MOBILE_SCROLLING=1 -DENABLE_FILTERS=1 -DENABLE_FTPDIR=1 -DENABLE_FULLSCREEN_API=1 -DENABLE_GESTURE_EVENTS=1 -DENABLE_ICONDATABASE=1 -DENABLE_IFRAME_SEAMLESS=1 -DENABLE_INPUT_TYPE_COLOR=1 -DENABLE_INSPECTOR=1 -DENABLE_INSPECTOR_SERVER=1 -DENABLE_JAVASCRIPT_DEBUGGER=1 -DENABLE_LEGACY_NOTIFICATIONS=1 -DENABLE_LEGACY_VIEWPORT_ADAPTION=1 -DENABLE_LEGACY_VENDOR_PREFIXES=1 -DENABLE_LEGACY_WEB_AUDIO=1 -DENABLE_LINK_PREFETCH=1 -DENABLE_METER_ELEMENT=1 -DENABLE_MHTML=1 -DENABLE_NOTIFICATIONS=1 -DENABLE_PAGE_VISIBILITY_API=1 -DENABLE_PROGRESS_ELEMENT=1 -DENABLE_RESOLUTION_MEDIA_QUERY=1 -DENABLE_REQUEST_ANIMATION_FRAME=1 -DENABLE_SHARED_WORKERS=1 -DENABLE_SMOOTH_SCROLLING=1 -DENABLE_SQL_DATABASE=1 -DENABLE_SUBPIXEL_LAYOUT=1 -DENABLE_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_TOUCH_ADJUSTMENT=1 -DENABLE_TOUCH_EVENTS=1 -DENABLE_TOUCH_SLIDER=1 -DENABLE_VIEW_MODE_CSS_MEDIA=1 -DENABLE_WEB_SOCKETS=1 -DENABLE_WEB_TIMING=1 -DENABLE_WORKERS=1 -DENABLE_XHR_TIMEOUT=1 -DWTF_USE_TILED_BACKING_STORE=1 -DWTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=1 -DHAVE_QTPRINTSUPPORT=1 -DHAVE_QSTYLE=1 -DHAVE_QTTESTLIB=1 -DWTF_USE_LIBJPEG=1 -DWTF_USE_LIBPNG=1 -DHAVE_FONTCONFIG=1 -DPLUGIN_ARCHITECTURE_UNSUPPORTED=1 -DWTF_USE_3D_GRAPHICS=1 -DENABLE_WEBGL=1 -DENABLE_BATTERY_STATUS=0 -DENABLE_CANVAS_PROXY=0 -DENABLE_CSP_NEXT=0 -DENABLE_CSS_GRID_LAYOUT=0 -DENABLE_CSS_HIERARCHIES=0 -DENABLE_CSS_IMAGE_ORIENTATION=0 -DENABLE_CSS_IMAGE_RESOLUTION=0 -DENABLE_CSS_SHADERS=0 -DENABLE_CSS_VARIABLES=0 -DENABLE_CSS3_CONDITIONAL_RULES=0 -DENABLE_CSS3_TEXT=0 -DENABLE_CSS3_TEXT_LINE_BREAK=0 -DENABLE_DASHBOARD_SUPPORT=0 -DENABLE_DATAGRID=0 -DENABLE_DATA_TRANSFER_ITEMS=0 -DENABLE_DEVICE_ORIENTATION=0 -DENABLE_DIRECTORY_UPLOAD=0 -DENABLE_FILE_SYSTEM=0 -DENABLE_FONT_LOAD_EVENTS=0 -DENABLE_GAMEPAD=0 -DENABLE_GEOLOCATION=0 -DENABLE_HIGH_DPI_CANVAS=0 -DENABLE_INDEXED_DATABASE=0 -DENABLE_INPUT_SPEECH=0 -DENABLE_INPUT_TYPE_DATE=0 -DENABLE_INPUT_TYPE_DATETIME_INCOMPLETE=0 -DENABLE_INPUT_TYPE_DATETIMELOCAL=0 -DENABLE_INPUT_TYPE_MONTH=0 -DENABLE_INPUT_TYPE_TIME=0 -DENABLE_INPUT_TYPE_WEEK=0 -DENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 -DENABLE_MATHML=0 -DENABLE_MEDIA_SOURCE=0 -DENABLE_MEDIA_STATISTICS=0 -DENABLE_MEDIA_STREAM=0 -DENABLE_MICRODATA=0 -DENABLE_MOUSE_CURSOR_SCALE=0 -DENABLE_NAVIGATOR_CONTENT_UTILS=0 -DENABLE_NETSCAPE_PLUGIN_API=0 -DENABLE_NETWORK_INFO=0 -DENABLE_NOSNIFF=0 -DENABLE_ORIENTATION_EVENTS=0 -DENABLE_PROXIMITY_EVENTS=0 -DENABLE_QUOTA=0 -DENABLE_RESOURCE_TIMING=0 -DENABLE_SCRIPTED_SPEECH=0 -DENABLE_SECCOMP_FILTERS=0 -DENABLE_SHADOW_DOM=0 -DENABLE_STYLE_SCOPED=0 -DENABLE_TEMPLATE_ELEMENT=0 -DENABLE_TEXT_AUTOSIZING=0 -DENABLE_THREADED_HTML_PARSER=0 -DENABLE_TOUCH_ICON_LOADING=0 -DENABLE_USER_TIMING=0 -DENABLE_VIBRATION=0 -DENABLE_VIDEO=0 -DENABLE_VIDEO_TRACK=0 -DENABLE_WEB_AUDIO=0 -DENABLE_XSLT=0 -DSQLITE_CORE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_OMIT_COMPLETE -DSTATICALLY_LINKED_WITH_WebCore -DSTATICALLY_LINKED_WITH_ANGLE -DSTATICALLY_LINKED_WITH_JavaScriptCore -DSTATICALLY_LINKED_WITH_WTF -DBUILDING_WebKit1 -DBUILDING_WEBKIT -DQT_ASCII_CAST_WARNINGS -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_SQL_LIB -DQT_CORE_LIB - -QT_INCPATH += \ - qtwebkit/Source/WebKit \ - qtwebkit/Source/WebKit/qt/Api \ - qtwebkit/Source/WebKit/qt/WebCoreSupport \ - qtwebkit/Source/WTF/wtf/qt \ - qtwebkit/Source/WebKit/qt/WebCoreSupport \ - qtwebkit/Source \ - qtwebkit/Source/WebCore \ - qtwebkit/Source/WebCore/Modules/filesystem \ - qtwebkit/Source/WebCore/Modules/geolocation \ - qtwebkit/Source/WebCore/Modules/indexeddb \ - qtwebkit/Source/WebCore/Modules/mediasource \ - qtwebkit/Source/WebCore/Modules/navigatorcontentutils \ - qtwebkit/Source/WebCore/Modules/notifications \ - qtwebkit/Source/WebCore/Modules/proximity \ - qtwebkit/Source/WebCore/Modules/quota \ - qtwebkit/Source/WebCore/Modules/webaudio \ - qtwebkit/Source/WebCore/Modules/webdatabase \ - qtwebkit/Source/WebCore/Modules/websockets \ - qtwebkit/Source/WebCore/accessibility \ - qtwebkit/Source/WebCore/bindings \ - qtwebkit/Source/WebCore/bindings/generic \ - qtwebkit/Source/WebCore/bridge \ - qtwebkit/Source/WebCore/bridge/qt \ - qtwebkit/Source/WebCore/css \ - qtwebkit/Source/WebCore/dom \ - qtwebkit/Source/WebCore/dom/default \ - qtwebkit/Source/WebCore/editing \ - qtwebkit/Source/WebCore/fileapi \ - qtwebkit/Source/WebCore/history \ - qtwebkit/Source/WebCore/html \ - qtwebkit/Source/WebCore/html/canvas \ - qtwebkit/Source/WebCore/html/forms \ - qtwebkit/Source/WebCore/html/parser \ - qtwebkit/Source/WebCore/html/shadow \ - qtwebkit/Source/WebCore/html/track \ - qtwebkit/Source/WebCore/inspector \ - qtwebkit/Source/WebCore/loader \ - qtwebkit/Source/WebCore/loader/appcache \ - qtwebkit/Source/WebCore/loader/archive \ - qtwebkit/Source/WebCore/loader/cache \ - qtwebkit/Source/WebCore/loader/icon \ - qtwebkit/Source/WebCore/mathml \ - qtwebkit/Source/WebCore/page \ - qtwebkit/Source/WebCore/page/animation \ - qtwebkit/Source/WebCore/page/qt \ - qtwebkit/Source/WebCore/page/scrolling \ - qtwebkit/Source/WebCore/page/scrolling/coordinatedgraphics \ - qtwebkit/Source/WebCore/platform \ - qtwebkit/Source/WebCore/platform/animation \ - qtwebkit/Source/WebCore/platform/audio \ - qtwebkit/Source/WebCore/platform/graphics \ - qtwebkit/Source/WebCore/platform/graphics/cpu/arm \ - qtwebkit/Source/WebCore/platform/graphics/cpu/arm/filters \ - qtwebkit/Source/WebCore/platform/graphics/filters \ - qtwebkit/Source/WebCore/platform/graphics/filters/texmap \ - qtwebkit/Source/WebCore/platform/graphics/opengl \ - qtwebkit/Source/WebCore/platform/graphics/opentype \ - qtwebkit/Source/WebCore/platform/graphics/qt \ - qtwebkit/Source/WebCore/platform/graphics/surfaces \ - qtwebkit/Source/WebCore/platform/graphics/texmap \ - qtwebkit/Source/WebCore/platform/graphics/texmap/coordinated \ - qtwebkit/Source/WebCore/platform/graphics/transforms \ - qtwebkit/Source/WebCore/platform/image-decoders \ - qtwebkit/Source/WebCore/platform/image-decoders/bmp \ - qtwebkit/Source/WebCore/platform/image-decoders/ico \ - qtwebkit/Source/WebCore/platform/image-decoders/gif \ - qtwebkit/Source/WebCore/platform/image-decoders/jpeg \ - qtwebkit/Source/WebCore/platform/image-decoders/png \ - qtwebkit/Source/WebCore/platform/image-decoders/webp \ - qtwebkit/Source/WebCore/platform/leveldb \ - qtwebkit/Source/WebCore/platform/mock \ - qtwebkit/Source/WebCore/platform/network \ - qtwebkit/Source/WebCore/platform/network/qt \ - qtwebkit/Source/WebCore/platform/qt \ - qtwebkit/Source/WebCore/platform/sql \ - qtwebkit/Source/WebCore/platform/text \ - qtwebkit/Source/WebCore/platform/text/transcoder \ - qtwebkit/Source/WebCore/plugins \ - qtwebkit/Source/WebCore/rendering \ - qtwebkit/Source/WebCore/rendering/mathml \ - qtwebkit/Source/WebCore/rendering/shapes \ - qtwebkit/Source/WebCore/rendering/style \ - qtwebkit/Source/WebCore/rendering/svg \ - qtwebkit/Source/WebCore/storage \ - qtwebkit/Source/WebCore/svg \ - qtwebkit/Source/WebCore/svg/animation \ - qtwebkit/Source/WebCore/svg/graphics \ - qtwebkit/Source/WebCore/svg/graphics/filters \ - qtwebkit/Source/WebCore/svg/properties \ - qtwebkit/Source/WebCore/testing \ - qtwebkit/Source/WebCore/websockets \ - qtwebkit/Source/WebCore/workers \ - qtwebkit/Source/WebCore/xml \ - qtwebkit/Source/WebCore/xml/parser \ - qtwebkit/Source/ThirdParty \ - qtwebkit/Source/WebCore/bridge/jsc \ - qtwebkit/Source/WebCore/bindings/js \ - qtwebkit/Source/WebCore/bridge/c \ - qtwebkit/Source/WebCore/testing/js \ - qtbase/src/3rdparty/sqlite \ - qtwebkit/Source/ThirdParty/ANGLE/include/GLSLANG \ - qtwebkit/Source/ThirdParty/ANGLE/include/KHR \ - qtwebkit/Source/JavaScriptCore \ - qtwebkit/Source \ - qtwebkit/Source/WTF \ - qtwebkit/Source/JavaScriptCore/assembler \ - qtwebkit/Source/JavaScriptCore/bytecode \ - qtwebkit/Source/JavaScriptCore/bytecompiler \ - qtwebkit/Source/JavaScriptCore/heap \ - qtwebkit/Source/JavaScriptCore/dfg \ - qtwebkit/Source/JavaScriptCore/debugger \ - qtwebkit/Source/JavaScriptCore/disassembler \ - qtwebkit/Source/JavaScriptCore/interpreter \ - qtwebkit/Source/JavaScriptCore/jit \ - qtwebkit/Source/JavaScriptCore/llint \ - qtwebkit/Source/JavaScriptCore/parser \ - qtwebkit/Source/JavaScriptCore/profiler \ - qtwebkit/Source/JavaScriptCore/runtime \ - qtwebkit/Source/JavaScriptCore/tools \ - qtwebkit/Source/JavaScriptCore/yarr \ - qtwebkit/Source/JavaScriptCore/API \ - qtwebkit/Source/JavaScriptCore/ForwardingHeaders \ - qtwebkit/Source/JavaScriptCore/disassembler/udis86 \ - qtwebkit/Source/WTF \ - qtbase/include/QtGui/5.13.0 \ - qtbase/include/QtGui/5.13.0/QtGui \ - qtbase/include \ - qtbase/include/QtGui \ - qtbase/include/QtNetwork \ - qtbase/include/QtSql \ - qtbase/include/QtCore/5.13.0 \ - qtbase/include/QtCore/5.13.0/QtCore \ - qtbase/include/QtCore \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - qhttpheader.cpp \ - qwebdatabase.cpp \ - qwebelement.cpp \ - qwebhistory.cpp \ - qwebhistoryinterface.cpp \ - qwebkitglobal.cpp \ - qwebplugindatabase.cpp \ - qwebpluginfactory.cpp \ - qwebsecurityorigin.cpp \ - qwebsettings.cpp \ - qwebscriptworld.cpp \ - ChromeClientQt.cpp \ - ContextMenuClientQt.cpp \ - DragClientQt.cpp \ - DumpRenderTreeSupportQt.cpp \ - EditorClientQt.cpp \ - FrameLoaderClientQt.cpp \ - FrameNetworkingContextQt.cpp \ - GeolocationPermissionClientQt.cpp \ - InitWebCoreQt.cpp \ - InspectorClientQt.cpp \ - InspectorServerQt.cpp \ - NotificationPresenterClientQt.cpp \ - PlatformStrategiesQt.cpp \ - PopupMenuQt.cpp \ - QtPlatformPlugin.cpp \ - QtPluginWidgetAdapter.cpp \ - QtPrintContext.cpp \ - QWebFrameAdapter.cpp \ - QWebPageAdapter.cpp \ - SearchPopupMenuQt.cpp \ - TextCheckerClientQt.cpp \ - TextureMapperLayerClientQt.cpp \ - UndoStepQt.cpp \ - WebEventConversion.cpp \ - IconDatabaseClientQt.cpp \ - moc_qwebhistoryinterface.cpp \ - moc_qwebplugindatabase_p.cpp \ - moc_qwebpluginfactory.cpp \ - moc_qwebkitplatformplugin.cpp \ - moc_QtPluginWidgetAdapter.cpp - -QT_VPATH += \ - qtwebkit/Source/WebKit/qt/Api \ - qtwebkit/Source/WebKit/qt/WebCoreSupport \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - moc_qwebhistoryinterface.cpp \ - moc_qwebplugindatabase_p.cpp \ - moc_qwebpluginfactory.cpp \ - moc_qwebkitplatformplugin.cpp \ - moc_FrameLoaderClientQt.cpp \ - moc_InspectorServerQt.cpp \ - moc_NotificationPresenterClientQt.cpp \ - moc_PopupMenuQt.cpp \ - moc_QtPluginWidgetAdapter.cpp \ - moc_IconDatabaseClientQt.cpp - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - - diff --git a/repos/libports/lib/mk/qt5_webkitwidgets.inc b/repos/libports/lib/mk/qt5_webkitwidgets.inc deleted file mode 100644 index c79859203d..0000000000 --- a/repos/libports/lib/mk/qt5_webkitwidgets.inc +++ /dev/null @@ -1,24 +0,0 @@ -include $(call select_from_repositories,lib/import/import-qt5_webkitwidgets.mk) - -SHARED_LIB = yes - -# use default warning level to avoid noise when compiling contrib code -CC_WARN = - -include $(REP_DIR)/lib/mk/qt5_webkitwidgets_generated.inc - -QT_INCPATH += qtwebkit/Source/WebCore/generated - -QT_VPATH += qtwebkit/Source/WebKit/qt/Api \ - -# remove unneeded files to prevent moc warnings -COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT = \ - moc_DefaultFullScreenVideoHandler.cpp \ - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES_FILTER_OUT = \ - -include $(REP_DIR)/lib/mk/qt5.inc - -LIBS += icu qt5_core qt5_gui qt5_network qt5_opengl qt5_printsupport qt5_webkit qt5_widgets - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_webkitwidgets_generated.inc b/repos/libports/lib/mk/qt5_webkitwidgets_generated.inc deleted file mode 100644 index 56fd8d83be..0000000000 --- a/repos/libports/lib/mk/qt5_webkitwidgets_generated.inc +++ /dev/null @@ -1,199 +0,0 @@ -QT_DEFINES += -DQT_BUILD_WEBKITWIDGETS_LIB -DSQLITE_CORE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_OMIT_COMPLETE -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_BUILD_WEBKITWIDGETS_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DBUILDING_QT__=1 -DNDEBUG -DENABLE_3D_RENDERING=1 -DENABLE_ACCELERATED_2D_CANVAS=1 -DENABLE_BLOB=1 -DENABLE_CANVAS_PATH=1 -DENABLE_CHANNEL_MESSAGING=1 -DENABLE_CSS_BOX_DECORATION_BREAK=1 -DENABLE_CSS_COMPOSITING=1 -DENABLE_CSS_EXCLUSIONS=1 -DENABLE_CSS_FILTERS=1 -DENABLE_CSS_IMAGE_SET=1 -DENABLE_CSS_REGIONS=1 -DENABLE_CSS_SHAPES=1 -DENABLE_CSS_STICKY_POSITION=1 -DENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=1 -DENABLE_DATALIST_ELEMENT=1 -DENABLE_DETAILS_ELEMENT=1 -DENABLE_DOWNLOAD_ATTRIBUTE=1 -DENABLE_FAST_MOBILE_SCROLLING=1 -DENABLE_FILTERS=1 -DENABLE_FTPDIR=1 -DENABLE_FULLSCREEN_API=1 -DENABLE_GESTURE_EVENTS=1 -DENABLE_ICONDATABASE=1 -DENABLE_IFRAME_SEAMLESS=1 -DENABLE_INPUT_TYPE_COLOR=1 -DENABLE_INSPECTOR=1 -DENABLE_INSPECTOR_SERVER=1 -DENABLE_JAVASCRIPT_DEBUGGER=1 -DENABLE_LEGACY_NOTIFICATIONS=1 -DENABLE_LEGACY_VIEWPORT_ADAPTION=1 -DENABLE_LEGACY_VENDOR_PREFIXES=1 -DENABLE_LEGACY_WEB_AUDIO=1 -DENABLE_LINK_PREFETCH=1 -DENABLE_METER_ELEMENT=1 -DENABLE_MHTML=1 -DENABLE_NOTIFICATIONS=1 -DENABLE_PAGE_VISIBILITY_API=1 -DENABLE_PROGRESS_ELEMENT=1 -DENABLE_RESOLUTION_MEDIA_QUERY=1 -DENABLE_REQUEST_ANIMATION_FRAME=1 -DENABLE_SHARED_WORKERS=1 -DENABLE_SMOOTH_SCROLLING=1 -DENABLE_SQL_DATABASE=1 -DENABLE_SUBPIXEL_LAYOUT=1 -DENABLE_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_TOUCH_ADJUSTMENT=1 -DENABLE_TOUCH_EVENTS=1 -DENABLE_TOUCH_SLIDER=1 -DENABLE_VIEW_MODE_CSS_MEDIA=1 -DENABLE_WEB_SOCKETS=1 -DENABLE_WEB_TIMING=1 -DENABLE_WORKERS=1 -DENABLE_XHR_TIMEOUT=1 -DWTF_USE_TILED_BACKING_STORE=1 -DWTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=1 -DHAVE_QTPRINTSUPPORT=1 -DHAVE_QSTYLE=1 -DHAVE_QTTESTLIB=1 -DWTF_USE_LIBJPEG=1 -DWTF_USE_LIBPNG=1 -DHAVE_FONTCONFIG=1 -DPLUGIN_ARCHITECTURE_UNSUPPORTED=1 -DWTF_USE_3D_GRAPHICS=1 -DENABLE_WEBGL=1 -DENABLE_BATTERY_STATUS=0 -DENABLE_CANVAS_PROXY=0 -DENABLE_CSP_NEXT=0 -DENABLE_CSS_GRID_LAYOUT=0 -DENABLE_CSS_HIERARCHIES=0 -DENABLE_CSS_IMAGE_ORIENTATION=0 -DENABLE_CSS_IMAGE_RESOLUTION=0 -DENABLE_CSS_SHADERS=0 -DENABLE_CSS_VARIABLES=0 -DENABLE_CSS3_CONDITIONAL_RULES=0 -DENABLE_CSS3_TEXT=0 -DENABLE_CSS3_TEXT_LINE_BREAK=0 -DENABLE_DASHBOARD_SUPPORT=0 -DENABLE_DATAGRID=0 -DENABLE_DATA_TRANSFER_ITEMS=0 -DENABLE_DEVICE_ORIENTATION=0 -DENABLE_DIRECTORY_UPLOAD=0 -DENABLE_FILE_SYSTEM=0 -DENABLE_FONT_LOAD_EVENTS=0 -DENABLE_GAMEPAD=0 -DENABLE_GEOLOCATION=0 -DENABLE_HIGH_DPI_CANVAS=0 -DENABLE_INDEXED_DATABASE=0 -DENABLE_INPUT_SPEECH=0 -DENABLE_INPUT_TYPE_DATE=0 -DENABLE_INPUT_TYPE_DATETIME_INCOMPLETE=0 -DENABLE_INPUT_TYPE_DATETIMELOCAL=0 -DENABLE_INPUT_TYPE_MONTH=0 -DENABLE_INPUT_TYPE_TIME=0 -DENABLE_INPUT_TYPE_WEEK=0 -DENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 -DENABLE_MATHML=0 -DENABLE_MEDIA_SOURCE=0 -DENABLE_MEDIA_STATISTICS=0 -DENABLE_MEDIA_STREAM=0 -DENABLE_MICRODATA=0 -DENABLE_MOUSE_CURSOR_SCALE=0 -DENABLE_NAVIGATOR_CONTENT_UTILS=0 -DENABLE_NETSCAPE_PLUGIN_API=0 -DENABLE_NETWORK_INFO=0 -DENABLE_NOSNIFF=0 -DENABLE_ORIENTATION_EVENTS=0 -DENABLE_PROXIMITY_EVENTS=0 -DENABLE_QUOTA=0 -DENABLE_RESOURCE_TIMING=0 -DENABLE_SCRIPTED_SPEECH=0 -DENABLE_SECCOMP_FILTERS=0 -DENABLE_SHADOW_DOM=0 -DENABLE_STYLE_SCOPED=0 -DENABLE_TEMPLATE_ELEMENT=0 -DENABLE_TEXT_AUTOSIZING=0 -DENABLE_THREADED_HTML_PARSER=0 -DENABLE_TOUCH_ICON_LOADING=0 -DENABLE_USER_TIMING=0 -DENABLE_VIBRATION=0 -DENABLE_VIDEO=0 -DENABLE_VIDEO_TRACK=0 -DENABLE_WEB_AUDIO=0 -DENABLE_XSLT=0 -DBUILDING_WEBKIT -DQT_ASCII_CAST_WARNINGS -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_WEBKIT_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_PRINTSUPPORT_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_WEBKIT_LIB -DQT_GUI_LIB -DQT_SQL_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB - -QT_INCPATH += \ - qtwebkit/Source \ - qtwebkit/Source/WebKit/qt/Api \ - qtwebkit/Source/WebKit/qt/WidgetApi \ - qtwebkit/Source/WebKit/qt/WebCoreSupport \ - qtwebkit/Source/WebKit/qt/WidgetSupport \ - qtwebkit/Source/WTF/wtf/qt \ - qtwebkit/Source/ThirdParty/ANGLE/include/GLSLANG \ - qtwebkit/Source/ThirdParty/ANGLE/include/KHR \ - qtwebkit/Source/WebKit/qt/Api \ - qtwebkit/Source/WebKit/qt/WebCoreSupport \ - qtwebkit/Source/WTF/wtf/qt \ - qtwebkit/Source/WebCore \ - qtwebkit/Source/WebCore/Modules/filesystem \ - qtwebkit/Source/WebCore/Modules/geolocation \ - qtwebkit/Source/WebCore/Modules/indexeddb \ - qtwebkit/Source/WebCore/Modules/mediasource \ - qtwebkit/Source/WebCore/Modules/navigatorcontentutils \ - qtwebkit/Source/WebCore/Modules/notifications \ - qtwebkit/Source/WebCore/Modules/proximity \ - qtwebkit/Source/WebCore/Modules/quota \ - qtwebkit/Source/WebCore/Modules/webaudio \ - qtwebkit/Source/WebCore/Modules/webdatabase \ - qtwebkit/Source/WebCore/Modules/websockets \ - qtwebkit/Source/WebCore/accessibility \ - qtwebkit/Source/WebCore/bindings \ - qtwebkit/Source/WebCore/bindings/generic \ - qtwebkit/Source/WebCore/bridge \ - qtwebkit/Source/WebCore/bridge/qt \ - qtwebkit/Source/WebCore/css \ - qtwebkit/Source/WebCore/dom \ - qtwebkit/Source/WebCore/dom/default \ - qtwebkit/Source/WebCore/editing \ - qtwebkit/Source/WebCore/fileapi \ - qtwebkit/Source/WebCore/history \ - qtwebkit/Source/WebCore/html \ - qtwebkit/Source/WebCore/html/canvas \ - qtwebkit/Source/WebCore/html/forms \ - qtwebkit/Source/WebCore/html/parser \ - qtwebkit/Source/WebCore/html/shadow \ - qtwebkit/Source/WebCore/html/track \ - qtwebkit/Source/WebCore/inspector \ - qtwebkit/Source/WebCore/loader \ - qtwebkit/Source/WebCore/loader/appcache \ - qtwebkit/Source/WebCore/loader/archive \ - qtwebkit/Source/WebCore/loader/cache \ - qtwebkit/Source/WebCore/loader/icon \ - qtwebkit/Source/WebCore/mathml \ - qtwebkit/Source/WebCore/page \ - qtwebkit/Source/WebCore/page/animation \ - qtwebkit/Source/WebCore/page/qt \ - qtwebkit/Source/WebCore/page/scrolling \ - qtwebkit/Source/WebCore/page/scrolling/coordinatedgraphics \ - qtwebkit/Source/WebCore/platform \ - qtwebkit/Source/WebCore/platform/animation \ - qtwebkit/Source/WebCore/platform/audio \ - qtwebkit/Source/WebCore/platform/graphics \ - qtwebkit/Source/WebCore/platform/graphics/cpu/arm \ - qtwebkit/Source/WebCore/platform/graphics/cpu/arm/filters \ - qtwebkit/Source/WebCore/platform/graphics/filters \ - qtwebkit/Source/WebCore/platform/graphics/filters/texmap \ - qtwebkit/Source/WebCore/platform/graphics/opengl \ - qtwebkit/Source/WebCore/platform/graphics/opentype \ - qtwebkit/Source/WebCore/platform/graphics/qt \ - qtwebkit/Source/WebCore/platform/graphics/surfaces \ - qtwebkit/Source/WebCore/platform/graphics/texmap \ - qtwebkit/Source/WebCore/platform/graphics/texmap/coordinated \ - qtwebkit/Source/WebCore/platform/graphics/transforms \ - qtwebkit/Source/WebCore/platform/image-decoders \ - qtwebkit/Source/WebCore/platform/image-decoders/bmp \ - qtwebkit/Source/WebCore/platform/image-decoders/ico \ - qtwebkit/Source/WebCore/platform/image-decoders/gif \ - qtwebkit/Source/WebCore/platform/image-decoders/jpeg \ - qtwebkit/Source/WebCore/platform/image-decoders/png \ - qtwebkit/Source/WebCore/platform/image-decoders/webp \ - qtwebkit/Source/WebCore/platform/leveldb \ - qtwebkit/Source/WebCore/platform/mock \ - qtwebkit/Source/WebCore/platform/network \ - qtwebkit/Source/WebCore/platform/network/qt \ - qtwebkit/Source/WebCore/platform/qt \ - qtwebkit/Source/WebCore/platform/sql \ - qtwebkit/Source/WebCore/platform/text \ - qtwebkit/Source/WebCore/platform/text/transcoder \ - qtwebkit/Source/WebCore/plugins \ - qtwebkit/Source/WebCore/rendering \ - qtwebkit/Source/WebCore/rendering/mathml \ - qtwebkit/Source/WebCore/rendering/shapes \ - qtwebkit/Source/WebCore/rendering/style \ - qtwebkit/Source/WebCore/rendering/svg \ - qtwebkit/Source/WebCore/storage \ - qtwebkit/Source/WebCore/svg \ - qtwebkit/Source/WebCore/svg/animation \ - qtwebkit/Source/WebCore/svg/graphics \ - qtwebkit/Source/WebCore/svg/graphics/filters \ - qtwebkit/Source/WebCore/svg/properties \ - qtwebkit/Source/WebCore/testing \ - qtwebkit/Source/WebCore/websockets \ - qtwebkit/Source/WebCore/workers \ - qtwebkit/Source/WebCore/xml \ - qtwebkit/Source/WebCore/xml/parser \ - qtwebkit/Source/ThirdParty \ - qtwebkit/Source/WebCore/bridge/jsc \ - qtwebkit/Source/WebCore/bindings/js \ - qtwebkit/Source/WebCore/bridge/c \ - qtwebkit/Source/WebCore/testing/js \ - qtbase/src/3rdparty/sqlite \ - qtwebkit/Source/JavaScriptCore \ - qtwebkit/Source \ - qtwebkit/Source/WTF \ - qtwebkit/Source/JavaScriptCore/assembler \ - qtwebkit/Source/JavaScriptCore/bytecode \ - qtwebkit/Source/JavaScriptCore/bytecompiler \ - qtwebkit/Source/JavaScriptCore/heap \ - qtwebkit/Source/JavaScriptCore/dfg \ - qtwebkit/Source/JavaScriptCore/debugger \ - qtwebkit/Source/JavaScriptCore/disassembler \ - qtwebkit/Source/JavaScriptCore/interpreter \ - qtwebkit/Source/JavaScriptCore/jit \ - qtwebkit/Source/JavaScriptCore/llint \ - qtwebkit/Source/JavaScriptCore/parser \ - qtwebkit/Source/JavaScriptCore/profiler \ - qtwebkit/Source/JavaScriptCore/runtime \ - qtwebkit/Source/JavaScriptCore/tools \ - qtwebkit/Source/JavaScriptCore/yarr \ - qtwebkit/Source/JavaScriptCore/API \ - qtwebkit/Source/JavaScriptCore/ForwardingHeaders \ - qtwebkit/Source/JavaScriptCore/disassembler/udis86 \ - qtwebkit/Source/WTF \ - qtwebkit/Source/qt/Api \ - qtwebkit/Source/qt/WebCoreSupport \ - qtwebkit/Source \ - qtbase/include \ - qtbase/include/QtWidgets \ - qtbase/include/QtGui \ - qtbase/include/QtNetwork \ - qtbase/include/QtCore \ - qtbase/include/QtWidgets/5.13.0 \ - qtbase/include/QtWidgets/5.13.0/QtWidgets \ - qtbase/include/QtGui/5.13.0 \ - qtbase/include/QtGui/5.13.0/QtGui \ - qtbase/include/QtCore/5.13.0 \ - qtbase/include/QtCore/5.13.0/QtCore \ - qtbase/include/QtPrintSupport \ - qtbase/include/QtOpenGL \ - qtbase/include/QtSql \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - qgraphicswebview.cpp \ - qwebframe.cpp \ - qwebpage.cpp \ - qwebview.cpp \ - qwebinspector.cpp \ - QtFallbackWebPopup.cpp \ - QtWebComboBox.cpp \ - QWebUndoCommand.cpp \ - InitWebKitQt.cpp \ - InspectorClientWebPage.cpp \ - PageClientQt.cpp \ - QStyleFacadeImp.cpp \ - QGraphicsWidgetPluginImpl.cpp \ - QWidgetPluginImpl.cpp \ - moc_qwebinspector.cpp \ - moc_InspectorClientWebPage.cpp \ - moc_QtFallbackWebPopup.cpp \ - moc_QtWebComboBox.cpp \ - moc_qwebkitplatformplugin.cpp - -QT_VPATH += \ - qtwebkit/Source/WebKit/qt/WidgetApi \ - qtwebkit/Source/WebKit/qt/WidgetSupport \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - moc_qgraphicswebview.cpp \ - moc_qwebframe.cpp \ - moc_qwebpage.cpp \ - moc_qwebview.cpp \ - moc_qwebinspector.cpp \ - moc_InspectorClientWebPage.cpp \ - moc_QtFallbackWebPopup.cpp \ - moc_QtWebComboBox.cpp \ - moc_QGraphicsWidgetPluginImpl.cpp \ - moc_QWidgetPluginImpl.cpp \ - moc_qwebkitplatformplugin.cpp - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - - diff --git a/repos/libports/lib/mk/qt5_widgets.mk b/repos/libports/lib/mk/qt5_widgets.mk deleted file mode 100644 index 1ec10f070f..0000000000 --- a/repos/libports/lib/mk/qt5_widgets.mk +++ /dev/null @@ -1,14 +0,0 @@ -include $(call select_from_repositories,lib/import/import-qt5_widgets.mk) - -SHARED_LIB = yes - -include $(REP_DIR)/lib/mk/qt5_widgets_generated.inc - -# UI headers -qfiledialog.o: ui_qfiledialog.h - -include $(REP_DIR)/lib/mk/qt5.inc - -LIBS += qt5_gui qt5_core libc - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_widgets_generated.inc b/repos/libports/lib/mk/qt5_widgets_generated.inc deleted file mode 100644 index 321b832bfe..0000000000 --- a/repos/libports/lib/mk/qt5_widgets_generated.inc +++ /dev/null @@ -1,386 +0,0 @@ -QT_DEFINES += -DQT_NO_USING_NAMESPACE -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_BUILD_WIDGETS_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB - -QT_INCPATH += \ - qtbase/src/widgets \ - qtbase/src/widgets/dialogs \ - qtbase/include \ - qtbase/include/QtWidgets \ - qtbase/include/QtWidgets/5.13.0 \ - qtbase/include/QtWidgets/5.13.0/QtWidgets \ - qtbase/include/QtGui/5.13.0 \ - qtbase/include/QtGui/5.13.0/QtGui \ - qtbase/include/QtCore/5.13.0 \ - qtbase/include/QtCore/5.13.0/QtCore \ - qtbase/include/QtGui \ - qtbase/include/QtCore \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - qaction.cpp \ - qactiongroup.cpp \ - qapplication.cpp \ - qwidgetbackingstore.cpp \ - qboxlayout.cpp \ - qgridlayout.cpp \ - qlayout.cpp \ - qlayoutengine.cpp \ - qlayoutitem.cpp \ - qshortcut.cpp \ - qsizepolicy.cpp \ - qstackedlayout.cpp \ - qtooltip.cpp \ - qwidget.cpp \ - qwidgetaction.cpp \ - qgesture.cpp \ - qstandardgestures.cpp \ - qgesturerecognizer.cpp \ - qgesturemanager.cpp \ - qdesktopwidget.cpp \ - qwidgetsvariant.cpp \ - qwidgetwindow.cpp \ - qwindowcontainer.cpp \ - qtestsupport_widgets.cpp \ - qopenglwidget.cpp \ - qformlayout.cpp \ - qwhatsthis.cpp \ - qdrawutil.cpp \ - qstyle.cpp \ - qstylefactory.cpp \ - qstyleoption.cpp \ - qstyleplugin.cpp \ - qstylehelper.cpp \ - qcommonstyle.cpp \ - qproxystyle.cpp \ - qstylepainter.cpp \ - qstylesheetstyle.cpp \ - qstylesheetstyle_default.cpp \ - qpixmapstyle.cpp \ - qstyleanimation.cpp \ - qwindowsstyle.cpp \ - qfusionstyle.cpp \ - qframe.cpp \ - qabstractscrollarea.cpp \ - qfocusframe.cpp \ - qwidgetanimator.cpp \ - qabstractbutton.cpp \ - qabstractslider.cpp \ - qbuttongroup.cpp \ - qcalendarwidget.cpp \ - qcheckbox.cpp \ - qcombobox.cpp \ - qcommandlinkbutton.cpp \ - qdatetimeedit.cpp \ - qdial.cpp \ - qdockwidget.cpp \ - qdockarealayout.cpp \ - qeffects.cpp \ - qfontcombobox.cpp \ - qgroupbox.cpp \ - qkeysequenceedit.cpp \ - qlabel.cpp \ - qlcdnumber.cpp \ - qlineedit_p.cpp \ - qlineedit.cpp \ - qwidgetlinecontrol.cpp \ - qmainwindow.cpp \ - qmainwindowlayout.cpp \ - qmdiarea.cpp \ - qmdisubwindow.cpp \ - qmenu.cpp \ - qmenubar.cpp \ - qprogressbar.cpp \ - qpushbutton.cpp \ - qradiobutton.cpp \ - qwidgetresizehandler.cpp \ - qdialogbuttonbox.cpp \ - qrubberband.cpp \ - qscrollarea.cpp \ - qscrollbar.cpp \ - qsizegrip.cpp \ - qslider.cpp \ - qabstractspinbox.cpp \ - qspinbox.cpp \ - qsplashscreen.cpp \ - qsplitter.cpp \ - qstackedwidget.cpp \ - qstatusbar.cpp \ - qtabbar.cpp \ - qplaintextedit.cpp \ - qtextedit.cpp \ - qtextbrowser.cpp \ - qtabwidget.cpp \ - qtoolbar.cpp \ - qtoolbarlayout.cpp \ - qtoolbararealayout.cpp \ - qtoolbarseparator.cpp \ - qtoolbox.cpp \ - qtoolbutton.cpp \ - qtoolbarextension.cpp \ - qwidgettextcontrol.cpp \ - qcolordialog.cpp \ - qdialog.cpp \ - qerrormessage.cpp \ - qfiledialog.cpp \ - qsidebar.cpp \ - qfilesystemmodel.cpp \ - qfileinfogatherer.cpp \ - qfontdialog.cpp \ - qinputdialog.cpp \ - qmessagebox.cpp \ - qprogressdialog.cpp \ - qwizard.cpp \ - qabstractitemview.cpp \ - qheaderview.cpp \ - qbsptree.cpp \ - qabstractitemdelegate.cpp \ - qitemdelegate.cpp \ - qitemeditorfactory.cpp \ - qstyleditemdelegate.cpp \ - qcolumnview.cpp \ - qcolumnviewgrip.cpp \ - qdatawidgetmapper.cpp \ - qdirmodel.cpp \ - qlistview.cpp \ - qlistwidget.cpp \ - qtableview.cpp \ - qtablewidget.cpp \ - qtreeview.cpp \ - qtreewidget.cpp \ - qtreewidgetitemiterator.cpp \ - qfileiconprovider.cpp \ - qgraphicsgridlayout.cpp \ - qgraphicsitem.cpp \ - qgraphicsitemanimation.cpp \ - qgraphicslayout.cpp \ - qgraphicslayout_p.cpp \ - qgraphicslayoutitem.cpp \ - qgraphicslinearlayout.cpp \ - qgraphicsproxywidget.cpp \ - qgraphicsscene.cpp \ - qgraphicsscene_bsp.cpp \ - qgraphicsscenebsptreeindex.cpp \ - qgraphicssceneevent.cpp \ - qgraphicssceneindex.cpp \ - qgraphicsscenelinearindex.cpp \ - qgraphicstransform.cpp \ - qgraphicsview.cpp \ - qgraphicswidget.cpp \ - qgraphicswidget_p.cpp \ - qgraphicslayoutstyleinfo.cpp \ - qgraphicsgridlayoutengine.cpp \ - qsimplex_p.cpp \ - qgraphicsanchorlayout_p.cpp \ - qgraphicsanchorlayout.cpp \ - qsystemtrayicon.cpp \ - qcolormap.cpp \ - qcompleter.cpp \ - qscroller.cpp \ - qscrollerproperties.cpp \ - qflickgesture.cpp \ - qundostack.cpp \ - qundogroup.cpp \ - qundoview.cpp \ - qsystemtrayicon_qpa.cpp \ - qguistatemachine.cpp \ - qkeyeventtransition.cpp \ - qmouseeventtransition.cpp \ - qbasickeyeventtransition.cpp \ - qbasicmouseeventtransition.cpp \ - qgraphicseffect.cpp \ - qpixmapfilter.cpp \ - qrc_qstyle.cpp \ - qrc_qmessagebox.cpp \ - moc_qpixmapstyle_p.cpp - -QT_VPATH += \ - qtbase/src/widgets/dialogs \ - qtbase/src/widgets/effects \ - qtbase/src/widgets/graphicsview \ - qtbase/src/widgets/itemviews \ - qtbase/src/widgets/kernel \ - qtbase/src/widgets/statemachine \ - qtbase/src/widgets/styles \ - qtbase/src/widgets/util \ - qtbase/src/widgets/widgets \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - moc_qaction.cpp \ - moc_qactiongroup.cpp \ - moc_qapplication.cpp \ - moc_qwidgetbackingstore_p.cpp \ - moc_qboxlayout.cpp \ - moc_qdesktopwidget.cpp \ - moc_qgridlayout.cpp \ - moc_qlayout.cpp \ - moc_qshortcut.cpp \ - moc_qsizepolicy.cpp \ - moc_qstackedlayout.cpp \ - moc_qwidget.cpp \ - moc_qwidgetaction.cpp \ - moc_qgesture.cpp \ - moc_qgesturemanager_p.cpp \ - moc_qdesktopwidget_p.cpp \ - moc_qwidgetwindow_p.cpp \ - moc_qwindowcontainer_p.cpp \ - moc_qopenglwidget.cpp \ - moc_qformlayout.cpp \ - moc_qstyle.cpp \ - moc_qstyleplugin.cpp \ - moc_qcommonstyle.cpp \ - moc_qproxystyle.cpp \ - moc_qstylesheetstyle_p.cpp \ - moc_qpixmapstyle_p.cpp \ - moc_qstyleanimation_p.cpp \ - moc_qwindowsstyle_p.cpp \ - moc_qfusionstyle_p.cpp \ - moc_qframe.cpp \ - moc_qabstractscrollarea.cpp \ - moc_qabstractscrollarea_p.cpp \ - moc_qfocusframe.cpp \ - moc_qwidgetanimator_p.cpp \ - moc_qabstractbutton.cpp \ - moc_qabstractslider.cpp \ - moc_qbuttongroup.cpp \ - moc_qcalendarwidget.cpp \ - moc_qcheckbox.cpp \ - moc_qcombobox.cpp \ - moc_qcombobox_p.cpp \ - moc_qcommandlinkbutton.cpp \ - moc_qdatetimeedit.cpp \ - moc_qdatetimeedit_p.cpp \ - moc_qdial.cpp \ - moc_qdockwidget.cpp \ - moc_qdockwidget_p.cpp \ - moc_qfontcombobox.cpp \ - moc_qgroupbox.cpp \ - moc_qkeysequenceedit.cpp \ - moc_qlabel.cpp \ - moc_qlcdnumber.cpp \ - moc_qlineedit.cpp \ - moc_qlineedit_p.cpp \ - moc_qwidgetlinecontrol_p.cpp \ - moc_qmainwindow.cpp \ - moc_qmainwindowlayout_p.cpp \ - moc_qmdiarea.cpp \ - moc_qmdisubwindow.cpp \ - moc_qmenu.cpp \ - moc_qmenubar.cpp \ - moc_qprogressbar.cpp \ - moc_qpushbutton.cpp \ - moc_qradiobutton.cpp \ - moc_qwidgetresizehandler_p.cpp \ - moc_qdialogbuttonbox.cpp \ - moc_qrubberband.cpp \ - moc_qscrollarea.cpp \ - moc_qscrollbar.cpp \ - moc_qsizegrip.cpp \ - moc_qslider.cpp \ - moc_qabstractspinbox.cpp \ - moc_qspinbox.cpp \ - moc_qsplashscreen.cpp \ - moc_qsplitter.cpp \ - moc_qstackedwidget.cpp \ - moc_qstatusbar.cpp \ - moc_qtabbar.cpp \ - moc_qplaintextedit.cpp \ - moc_qplaintextedit_p.cpp \ - moc_qtextedit.cpp \ - moc_qtextbrowser.cpp \ - moc_qtabwidget.cpp \ - moc_qtoolbar.cpp \ - moc_qtoolbarlayout_p.cpp \ - moc_qtoolbarseparator_p.cpp \ - moc_qtoolbox.cpp \ - moc_qtoolbutton.cpp \ - moc_qtoolbarextension_p.cpp \ - moc_qwidgettextcontrol_p.cpp \ - moc_qcolordialog.cpp \ - moc_qdialog.cpp \ - moc_qerrormessage.cpp \ - moc_qfiledialog.cpp \ - moc_qsidebar_p.cpp \ - moc_qfilesystemmodel.cpp \ - moc_qfileinfogatherer_p.cpp \ - moc_qfontdialog.cpp \ - moc_qinputdialog.cpp \ - moc_qmessagebox.cpp \ - moc_qprogressdialog.cpp \ - moc_qwizard.cpp \ - moc_qabstractitemview.cpp \ - moc_qheaderview.cpp \ - moc_qabstractitemdelegate.cpp \ - moc_qitemdelegate.cpp \ - moc_qitemeditorfactory_p.cpp \ - moc_qstyleditemdelegate.cpp \ - moc_qcolumnviewgrip_p.cpp \ - moc_qcolumnview.cpp \ - moc_qdatawidgetmapper.cpp \ - moc_qdirmodel.cpp \ - moc_qlistview.cpp \ - moc_qlistwidget.cpp \ - moc_qlistwidget_p.cpp \ - moc_qtableview.cpp \ - moc_qtablewidget.cpp \ - moc_qtablewidget_p.cpp \ - moc_qtreeview.cpp \ - moc_qtreewidget.cpp \ - moc_qtreewidget_p.cpp \ - moc_qgraphicsitem.cpp \ - moc_qgraphicsitemanimation.cpp \ - moc_qgraphicsproxywidget.cpp \ - moc_qgraphicsscene.cpp \ - moc_qgraphicsscenebsptreeindex_p.cpp \ - moc_qgraphicssceneindex_p.cpp \ - moc_qgraphicsscenelinearindex_p.cpp \ - moc_qgraphicstransform.cpp \ - moc_qgraphicsview.cpp \ - moc_qgraphicswidget.cpp \ - moc_qgraphicsanchorlayout.cpp \ - moc_qsystemtrayicon.cpp \ - moc_qsystemtrayicon_p.cpp \ - moc_qcompleter.cpp \ - moc_qcompleter_p.cpp \ - moc_qscroller.cpp \ - moc_qscroller_p.cpp \ - moc_qflickgesture_p.cpp \ - moc_qundostack.cpp \ - moc_qundostack_p.cpp \ - moc_qundogroup.cpp \ - moc_qundoview.cpp \ - moc_qkeyeventtransition.cpp \ - moc_qmouseeventtransition.cpp \ - moc_qbasickeyeventtransition_p.cpp \ - moc_qbasicmouseeventtransition_p.cpp \ - moc_qgraphicseffect.cpp \ - moc_qgraphicseffect_p.cpp \ - moc_qpixmapfilter_p.cpp - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - qtooltip.moc \ - qwhatsthis.moc \ - qcalendarwidget.moc \ - qdockwidget.moc \ - qeffects.moc \ - qfontcombobox.moc \ - qmdisubwindow.moc \ - qmenu.moc \ - qtabbar.moc \ - qtoolbox.moc \ - qcolordialog.moc \ - qfontdialog.moc \ - qinputdialog.moc \ - qmessagebox.moc \ - qitemeditorfactory.moc \ - qlistwidget.moc \ - qtableview.moc \ - qundoview.moc - diff --git a/repos/libports/lib/mk/qt5_windowplugin.mk b/repos/libports/lib/mk/qt5_windowplugin.mk deleted file mode 100644 index c3f635b68b..0000000000 --- a/repos/libports/lib/mk/qt5_windowplugin.mk +++ /dev/null @@ -1,45 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) - -SHARED_LIB = yes - -include $(REP_DIR)/lib/mk/qt5_windowplugin_generated.inc - -QT_DEFINES += -UQT_STATICPLUGIN - -include $(REP_DIR)/lib/mk/qt5.inc - -LIBS += qt5_core qt5_gui qt5_qml qt5_quick - -# install the QML plugin - -QML_PLUGIN_NAME := qt5_windowplugin -QML_INSTALL_DIR := qt/qml/QtQuick/Window.2 - -QML_PLUGIN := $(QML_INSTALL_DIR)/$(QML_PLUGIN_NAME).lib.so -TAR_ARCHIVE := $(BUILD_BASE_DIR)/bin/$(QML_PLUGIN_NAME).tar - -$(QML_INSTALL_DIR): - $(VERBOSE)mkdir -p $@ - -$(QML_PLUGIN): $(QML_INSTALL_DIR) $(QML_PLUGIN_NAME).lib.so.stripped - $(VERBOSE)cp $(QML_PLUGIN_NAME).lib.so.stripped $@ - -$(TAR_ARCHIVE): $(QML_PLUGIN) - $(VERBOSE)tar cf $@ qt - -ifneq ($(call select_from_ports,qt5),) -$(QML_PLUGIN_NAME).lib.tag: $(TAR_ARCHIVE) -endif - -# -# unfortunately, these clean rules don't trigger -# - -clean-tar_archive: - rm -rf $(TAR_ARCHIVE) - -clean: clean-tar_archive - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_windowplugin_generated.inc b/repos/libports/lib/mk/qt5_windowplugin_generated.inc deleted file mode 100644 index 97dfad1561..0000000000 --- a/repos/libports/lib/mk/qt5_windowplugin_generated.inc +++ /dev/null @@ -1,42 +0,0 @@ -QT_DEFINES += -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_PLUGIN -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB - -QT_INCPATH += \ - qtdeclarative/src/imports/window \ - qtdeclarative/include/QtQuick/5.13.0 \ - qtdeclarative/include/QtQuick/5.13.0/QtQuick \ - qtbase/include/QtGui/5.13.0 \ - qtbase/include/QtGui/5.13.0/QtGui \ - qtdeclarative/include \ - qtdeclarative/include/QtQuick \ - qtbase/include \ - qtbase/include/QtGui \ - qtdeclarative/include/QtQml/5.13.0 \ - qtdeclarative/include/QtQml/5.13.0/QtQml \ - qtbase/include/QtCore/5.13.0 \ - qtbase/include/QtCore/5.13.0/QtCore \ - qtdeclarative/include/QtQml \ - qtbase/include/QtNetwork \ - qtbase/include/QtCore \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - plugin.cpp - -QT_VPATH += \ - qtdeclarative/src/imports/window \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - plugin.moc - diff --git a/repos/libports/lib/mk/qt5_wtf.inc b/repos/libports/lib/mk/qt5_wtf.inc deleted file mode 100644 index 354a4cfba9..0000000000 --- a/repos/libports/lib/mk/qt5_wtf.inc +++ /dev/null @@ -1,19 +0,0 @@ -include $(call select_from_repositories,lib/import/import-qt5_wtf.mk) - -SHARED_LIB = yes - -# use default warning level to avoid noise when compiling contrib code -CC_WARN = - -include $(REP_DIR)/lib/mk/qt5_wtf_generated.inc - -# remove unneeded files to prevent moc warnings -COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT = \ - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES_FILTER_OUT = \ - -include $(REP_DIR)/lib/mk/qt5.inc - -LIBS += qt5_core icu - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_wtf_generated.inc b/repos/libports/lib/mk/qt5_wtf_generated.inc deleted file mode 100644 index c4170d431a..0000000000 --- a/repos/libports/lib/mk/qt5_wtf_generated.inc +++ /dev/null @@ -1,101 +0,0 @@ -QT_DEFINES += -DBUILDING_QT__=1 -DNDEBUG -DENABLE_3D_RENDERING=1 -DENABLE_ACCELERATED_2D_CANVAS=1 -DENABLE_BLOB=1 -DENABLE_CANVAS_PATH=1 -DENABLE_CHANNEL_MESSAGING=1 -DENABLE_CSS_BOX_DECORATION_BREAK=1 -DENABLE_CSS_COMPOSITING=1 -DENABLE_CSS_EXCLUSIONS=1 -DENABLE_CSS_FILTERS=1 -DENABLE_CSS_IMAGE_SET=1 -DENABLE_CSS_REGIONS=1 -DENABLE_CSS_SHAPES=1 -DENABLE_CSS_STICKY_POSITION=1 -DENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=1 -DENABLE_DATALIST_ELEMENT=1 -DENABLE_DETAILS_ELEMENT=1 -DENABLE_DOWNLOAD_ATTRIBUTE=1 -DENABLE_FAST_MOBILE_SCROLLING=1 -DENABLE_FILTERS=1 -DENABLE_FTPDIR=1 -DENABLE_FULLSCREEN_API=1 -DENABLE_GESTURE_EVENTS=1 -DENABLE_ICONDATABASE=1 -DENABLE_IFRAME_SEAMLESS=1 -DENABLE_INPUT_TYPE_COLOR=1 -DENABLE_INSPECTOR=1 -DENABLE_INSPECTOR_SERVER=1 -DENABLE_JAVASCRIPT_DEBUGGER=1 -DENABLE_LEGACY_NOTIFICATIONS=1 -DENABLE_LEGACY_VIEWPORT_ADAPTION=1 -DENABLE_LEGACY_VENDOR_PREFIXES=1 -DENABLE_LEGACY_WEB_AUDIO=1 -DENABLE_LINK_PREFETCH=1 -DENABLE_METER_ELEMENT=1 -DENABLE_MHTML=1 -DENABLE_NOTIFICATIONS=1 -DENABLE_PAGE_VISIBILITY_API=1 -DENABLE_PROGRESS_ELEMENT=1 -DENABLE_RESOLUTION_MEDIA_QUERY=1 -DENABLE_REQUEST_ANIMATION_FRAME=1 -DENABLE_SHARED_WORKERS=1 -DENABLE_SMOOTH_SCROLLING=1 -DENABLE_SQL_DATABASE=1 -DENABLE_SUBPIXEL_LAYOUT=1 -DENABLE_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_TOUCH_ADJUSTMENT=1 -DENABLE_TOUCH_EVENTS=1 -DENABLE_TOUCH_SLIDER=1 -DENABLE_VIEW_MODE_CSS_MEDIA=1 -DENABLE_WEB_SOCKETS=1 -DENABLE_WEB_TIMING=1 -DENABLE_WORKERS=1 -DENABLE_XHR_TIMEOUT=1 -DWTF_USE_TILED_BACKING_STORE=1 -DWTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=1 -DHAVE_QTPRINTSUPPORT=1 -DHAVE_QSTYLE=1 -DHAVE_QTTESTLIB=1 -DWTF_USE_LIBJPEG=1 -DWTF_USE_LIBPNG=1 -DHAVE_FONTCONFIG=1 -DPLUGIN_ARCHITECTURE_UNSUPPORTED=1 -DWTF_USE_3D_GRAPHICS=1 -DENABLE_WEBGL=1 -DENABLE_BATTERY_STATUS=0 -DENABLE_CANVAS_PROXY=0 -DENABLE_CSP_NEXT=0 -DENABLE_CSS_GRID_LAYOUT=0 -DENABLE_CSS_HIERARCHIES=0 -DENABLE_CSS_IMAGE_ORIENTATION=0 -DENABLE_CSS_IMAGE_RESOLUTION=0 -DENABLE_CSS_SHADERS=0 -DENABLE_CSS_VARIABLES=0 -DENABLE_CSS3_CONDITIONAL_RULES=0 -DENABLE_CSS3_TEXT=0 -DENABLE_CSS3_TEXT_LINE_BREAK=0 -DENABLE_DASHBOARD_SUPPORT=0 -DENABLE_DATAGRID=0 -DENABLE_DATA_TRANSFER_ITEMS=0 -DENABLE_DEVICE_ORIENTATION=0 -DENABLE_DIRECTORY_UPLOAD=0 -DENABLE_FILE_SYSTEM=0 -DENABLE_FONT_LOAD_EVENTS=0 -DENABLE_GAMEPAD=0 -DENABLE_GEOLOCATION=0 -DENABLE_HIGH_DPI_CANVAS=0 -DENABLE_INDEXED_DATABASE=0 -DENABLE_INPUT_SPEECH=0 -DENABLE_INPUT_TYPE_DATE=0 -DENABLE_INPUT_TYPE_DATETIME_INCOMPLETE=0 -DENABLE_INPUT_TYPE_DATETIMELOCAL=0 -DENABLE_INPUT_TYPE_MONTH=0 -DENABLE_INPUT_TYPE_TIME=0 -DENABLE_INPUT_TYPE_WEEK=0 -DENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 -DENABLE_MATHML=0 -DENABLE_MEDIA_SOURCE=0 -DENABLE_MEDIA_STATISTICS=0 -DENABLE_MEDIA_STREAM=0 -DENABLE_MICRODATA=0 -DENABLE_MOUSE_CURSOR_SCALE=0 -DENABLE_NAVIGATOR_CONTENT_UTILS=0 -DENABLE_NETSCAPE_PLUGIN_API=0 -DENABLE_NETWORK_INFO=0 -DENABLE_NOSNIFF=0 -DENABLE_ORIENTATION_EVENTS=0 -DENABLE_PROXIMITY_EVENTS=0 -DENABLE_QUOTA=0 -DENABLE_RESOURCE_TIMING=0 -DENABLE_SCRIPTED_SPEECH=0 -DENABLE_SECCOMP_FILTERS=0 -DENABLE_SHADOW_DOM=0 -DENABLE_STYLE_SCOPED=0 -DENABLE_TEMPLATE_ELEMENT=0 -DENABLE_TEXT_AUTOSIZING=0 -DENABLE_THREADED_HTML_PARSER=0 -DENABLE_TOUCH_ICON_LOADING=0 -DENABLE_USER_TIMING=0 -DENABLE_VIBRATION=0 -DENABLE_VIDEO=0 -DENABLE_VIDEO_TRACK=0 -DENABLE_WEB_AUDIO=0 -DENABLE_XSLT=0 -DBUILDING_WTF -DBUILDING_WEBKIT -DQT_ASCII_CAST_WARNINGS -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_CORE_LIB - -QT_INCPATH += \ - qtwebkit/Source/WTF \ - qtwebkit/Source/WTF \ - qtwebkit/Source/WTF/wtf \ - qtwebkit/Source \ - qtbase/include \ - qtbase/include/QtCore \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - ArrayBuffer.cpp \ - ArrayBufferView.cpp \ - Assertions.cpp \ - BitVector.cpp \ - CryptographicallyRandomNumber.cpp \ - CurrentTime.cpp \ - DateMath.cpp \ - DataLog.cpp \ - DecimalNumber.cpp \ - dtoa.cpp \ - bignum-dtoa.cc \ - bignum.cc \ - cached-powers.cc \ - diy-fp.cc \ - double-conversion.cc \ - fast-dtoa.cc \ - fixed-dtoa.cc \ - strtod.cc \ - FastMalloc.cpp \ - FilePrintStream.cpp \ - FunctionDispatcher.cpp \ - GregorianDateTime.cpp \ - GOwnPtr.cpp \ - GRefPtr.cpp \ - HashTable.cpp \ - MD5.cpp \ - MainThread.cpp \ - MediaTime.cpp \ - MetaAllocator.cpp \ - NullPtr.cpp \ - NumberOfCores.cpp \ - RAMSize.cpp \ - OSRandomSource.cpp \ - MainThreadQt.cpp \ - StringQt.cpp \ - PageAllocationAligned.cpp \ - PageBlock.cpp \ - ParallelJobsGeneric.cpp \ - PrintStream.cpp \ - RandomNumber.cpp \ - RefCountedLeakCounter.cpp \ - SHA1.cpp \ - StackBounds.cpp \ - StringPrintStream.cpp \ - TCSystemAlloc.cpp \ - Threading.cpp \ - TypeTraits.cpp \ - WTFThreadData.cpp \ - AtomicString.cpp \ - AtomicStringTable.cpp \ - Base64.cpp \ - CString.cpp \ - StringBuilder.cpp \ - StringImpl.cpp \ - StringStatics.cpp \ - WTFString.cpp \ - CollatorDefault.cpp \ - CollatorICU.cpp \ - UTF8.cpp \ - OSAllocatorPosix.cpp \ - ThreadIdentifierDataPthreads.cpp \ - ThreadingPthreads.cpp \ - BinarySemaphore.cpp - -QT_VPATH += \ - qtwebkit/Source/WTF/wtf \ - qtwebkit/Source/WTF/wtf/dtoa \ - qtwebkit/Source/WTF/wtf/gobject \ - qtwebkit/Source/WTF/wtf/qt \ - qtwebkit/Source/WTF/wtf/text \ - qtwebkit/Source/WTF/wtf/threads \ - qtwebkit/Source/WTF/wtf/unicode \ - qtwebkit/Source/WTF/wtf/unicode/icu \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - MainThreadQt.moc - diff --git a/repos/libports/lib/mk/qt5_xml.mk b/repos/libports/lib/mk/qt5_xml.mk deleted file mode 100644 index 787a9821ff..0000000000 --- a/repos/libports/lib/mk/qt5_xml.mk +++ /dev/null @@ -1,11 +0,0 @@ -include $(call select_from_repositories,lib/import/import-qt5_xml.mk) - -SHARED_LIB = yes - -include $(REP_DIR)/lib/mk/qt5_xml_generated.inc - -include $(REP_DIR)/lib/mk/qt5.inc - -LIBS += qt5_core - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_xml_generated.inc b/repos/libports/lib/mk/qt5_xml_generated.inc deleted file mode 100644 index 07eb42753e..0000000000 --- a/repos/libports/lib/mk/qt5_xml_generated.inc +++ /dev/null @@ -1,36 +0,0 @@ -QT_DEFINES += -DQT_NO_USING_NAMESPACE -DQT_NO_FOREACH -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_BUILD_XML_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_CORE_LIB - -QT_INCPATH += \ - qtbase/src/xml \ - qtbase/include \ - qtbase/include/QtXml \ - qtbase/include/QtXml/5.13.0 \ - qtbase/include/QtXml/5.13.0/QtXml \ - qtbase/include/QtCore/5.13.0 \ - qtbase/include/QtCore/5.13.0/QtCore \ - qtbase/include/QtCore \ - qtbase/mkspecs/genode-g++ - -QT_SOURCES += \ - qdom.cpp \ - qxml.cpp - -QT_VPATH += \ - qtbase/src/xml/dom \ - qtbase/src/xml/sax \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - - diff --git a/repos/libports/lib/mk/spec/32bit/qt5_angle.mk b/repos/libports/lib/mk/spec/32bit/qt5_angle.mk deleted file mode 100644 index 516a6cb5d6..0000000000 --- a/repos/libports/lib/mk/spec/32bit/qt5_angle.mk +++ /dev/null @@ -1 +0,0 @@ -include $(REP_DIR)/lib/mk/qt5_angle.inc diff --git a/repos/libports/lib/mk/spec/32bit/qt5_jscore.mk b/repos/libports/lib/mk/spec/32bit/qt5_jscore.mk deleted file mode 100644 index cda4a2ff35..0000000000 --- a/repos/libports/lib/mk/spec/32bit/qt5_jscore.mk +++ /dev/null @@ -1 +0,0 @@ -include $(REP_DIR)/lib/mk/qt5_jscore.inc diff --git a/repos/libports/lib/mk/spec/32bit/qt5_webcore.mk b/repos/libports/lib/mk/spec/32bit/qt5_webcore.mk deleted file mode 100644 index 67e9fbace5..0000000000 --- a/repos/libports/lib/mk/spec/32bit/qt5_webcore.mk +++ /dev/null @@ -1 +0,0 @@ -include $(REP_DIR)/lib/mk/qt5_webcore.inc diff --git a/repos/libports/lib/mk/spec/32bit/qt5_webkit.mk b/repos/libports/lib/mk/spec/32bit/qt5_webkit.mk deleted file mode 100644 index d4db5de5bf..0000000000 --- a/repos/libports/lib/mk/spec/32bit/qt5_webkit.mk +++ /dev/null @@ -1 +0,0 @@ -include $(REP_DIR)/lib/mk/qt5_webkit.inc diff --git a/repos/libports/lib/mk/spec/32bit/qt5_webkitwidgets.mk b/repos/libports/lib/mk/spec/32bit/qt5_webkitwidgets.mk deleted file mode 100644 index e0827d773c..0000000000 --- a/repos/libports/lib/mk/spec/32bit/qt5_webkitwidgets.mk +++ /dev/null @@ -1 +0,0 @@ -include $(REP_DIR)/lib/mk/qt5_webkitwidgets.inc diff --git a/repos/libports/lib/mk/spec/32bit/qt5_wtf.mk b/repos/libports/lib/mk/spec/32bit/qt5_wtf.mk deleted file mode 100644 index 92d284426c..0000000000 --- a/repos/libports/lib/mk/spec/32bit/qt5_wtf.mk +++ /dev/null @@ -1 +0,0 @@ -include $(REP_DIR)/lib/mk/qt5_wtf.inc diff --git a/repos/libports/lib/mk/spec/x86_64/qt5_angle.mk b/repos/libports/lib/mk/spec/x86_64/qt5_angle.mk deleted file mode 100644 index 516a6cb5d6..0000000000 --- a/repos/libports/lib/mk/spec/x86_64/qt5_angle.mk +++ /dev/null @@ -1 +0,0 @@ -include $(REP_DIR)/lib/mk/qt5_angle.inc diff --git a/repos/libports/lib/mk/spec/x86_64/qt5_jscore.mk b/repos/libports/lib/mk/spec/x86_64/qt5_jscore.mk deleted file mode 100644 index cda4a2ff35..0000000000 --- a/repos/libports/lib/mk/spec/x86_64/qt5_jscore.mk +++ /dev/null @@ -1 +0,0 @@ -include $(REP_DIR)/lib/mk/qt5_jscore.inc diff --git a/repos/libports/lib/mk/spec/x86_64/qt5_webcore.mk b/repos/libports/lib/mk/spec/x86_64/qt5_webcore.mk deleted file mode 100644 index 67e9fbace5..0000000000 --- a/repos/libports/lib/mk/spec/x86_64/qt5_webcore.mk +++ /dev/null @@ -1 +0,0 @@ -include $(REP_DIR)/lib/mk/qt5_webcore.inc diff --git a/repos/libports/lib/mk/spec/x86_64/qt5_webkit.mk b/repos/libports/lib/mk/spec/x86_64/qt5_webkit.mk deleted file mode 100644 index d4db5de5bf..0000000000 --- a/repos/libports/lib/mk/spec/x86_64/qt5_webkit.mk +++ /dev/null @@ -1 +0,0 @@ -include $(REP_DIR)/lib/mk/qt5_webkit.inc diff --git a/repos/libports/lib/mk/spec/x86_64/qt5_webkitwidgets.mk b/repos/libports/lib/mk/spec/x86_64/qt5_webkitwidgets.mk deleted file mode 100644 index e0827d773c..0000000000 --- a/repos/libports/lib/mk/spec/x86_64/qt5_webkitwidgets.mk +++ /dev/null @@ -1 +0,0 @@ -include $(REP_DIR)/lib/mk/qt5_webkitwidgets.inc diff --git a/repos/libports/lib/mk/spec/x86_64/qt5_wtf.mk b/repos/libports/lib/mk/spec/x86_64/qt5_wtf.mk deleted file mode 100644 index 92d284426c..0000000000 --- a/repos/libports/lib/mk/spec/x86_64/qt5_wtf.mk +++ /dev/null @@ -1 +0,0 @@ -include $(REP_DIR)/lib/mk/qt5_wtf.inc diff --git a/repos/libports/lib/symbols/qt5_qgenodeviewwidget b/repos/libports/lib/symbols/libqgenodeviewwidget similarity index 50% rename from repos/libports/lib/symbols/qt5_qgenodeviewwidget rename to repos/libports/lib/symbols/libqgenodeviewwidget index 6824448b50..2b403b2261 100644 --- a/repos/libports/lib/symbols/qt5_qgenodeviewwidget +++ b/repos/libports/lib/symbols/libqgenodeviewwidget @@ -22,9 +22,41 @@ _ZN19QEmbeddedViewWidgetC2EP7QWidget T _ZN19QEmbeddedViewWidgetD0Ev T _ZN19QEmbeddedViewWidgetD1Ev T _ZN19QEmbeddedViewWidgetD2Ev T +_ZN23QGenodeViewWidgetPlugin11qt_metacallEN11QMetaObject4CallEiPPv T +_ZN23QGenodeViewWidgetPlugin11qt_metacastEPKc T +_ZN23QGenodeViewWidgetPlugin16staticMetaObjectE D 48 _ZNK17QGenodeViewWidget10metaObjectEv T _ZNK19QEmbeddedViewWidget10metaObjectEv T +_ZNK23QGenodeViewWidgetPlugin10metaObjectEv T +_ZTI17QGenodeViewWidget D 24 +_ZTI19QEmbeddedViewWidget D 24 +_ZTI23QGenodeViewWidgetPlugin D 56 +_ZTI26QGenodeViewWidgetInterface D 16 +_ZTIN6Genode11Msgbuf_base13Too_many_capsE D 24 +_ZTIN6Genode11Quota_guardINS_9Cap_quotaEE14Limit_exceededE D 24 +_ZTIN6Genode11Quota_guardINS_9Ram_quotaEE14Limit_exceededE D 24 +_ZTIN6Genode9ExceptionE D 16 +_ZTIN6Genode9Ipc_errorE D 24 +_ZTS17QGenodeViewWidget R 20 +_ZTS19QEmbeddedViewWidget R 22 +_ZTS23QGenodeViewWidgetPlugin R 26 +_ZTS26QGenodeViewWidgetInterface D 29 +_ZTSN6Genode11Msgbuf_base13Too_many_capsE D 38 +_ZTSN6Genode11Quota_guardINS_9Cap_quotaEE14Limit_exceededE D 55 +_ZTSN6Genode11Quota_guardINS_9Ram_quotaEE14Limit_exceededE D 55 +_ZTSN6Genode9ExceptionE D 20 +_ZTSN6Genode9Ipc_errorE D 20 +_ZTV17QGenodeViewWidget D 520 +_ZTV19QEmbeddedViewWidget D 520 +_ZTV23QGenodeViewWidgetPlugin D 152 +_ZTV26QGenodeViewWidgetInterface D 24 _ZThn16_N17QGenodeViewWidgetD0Ev T _ZThn16_N17QGenodeViewWidgetD1Ev T _ZThn16_N19QEmbeddedViewWidgetD0Ev T _ZThn16_N19QEmbeddedViewWidgetD1Ev T +_ZThn8_N17QGenodeViewWidgetD0Ev T +_ZThn8_N17QGenodeViewWidgetD1Ev T +_ZThn8_N19QEmbeddedViewWidgetD0Ev T +_ZThn8_N19QEmbeddedViewWidgetD1Ev T +qt_plugin_instance T +qt_plugin_query_metadata T diff --git a/repos/libports/lib/symbols/libqpluginwidget b/repos/libports/lib/symbols/libqpluginwidget new file mode 100644 index 0000000000..dfe5446f0b --- /dev/null +++ b/repos/libports/lib/symbols/libqpluginwidget @@ -0,0 +1,128 @@ +_ZN13PluginStarter11qt_metacallEN11QMetaObject4CallEiPPv T +_ZN13PluginStarter11qt_metacastEPKc T +_ZN13PluginStarter13_start_pluginER7QStringRK10QByteArray T +_ZN13PluginStarter13view_geometryEN6Genode4RectIijEENS0_5PointIiEE T +_ZN13PluginStarter16staticMetaObjectE D 48 +_ZN13PluginStarter20networkReplyFinishedEv T +_ZN13PluginStarter3runEv T +_ZN13PluginStarter8finishedEv T +_ZN13PluginStarter9view_sizeEv T +_ZN13PluginStarterC1EPN4Libc3EnvE4QUrlR7QStringiiN6Genode10CapabilityIN3Gui4ViewEEE T +_ZN13PluginStarterC2EPN4Libc3EnvE4QUrlR7QStringiiN6Genode10CapabilityIN3Gui4ViewEEE T +_ZN13QPluginWidget10paintEventEP11QPaintEvent T +_ZN13QPluginWidget11qt_metacallEN11QMetaObject4CallEiPPv T +_ZN13QPluginWidget11qt_metacastEPKc T +_ZN13QPluginWidget16staticMetaObjectE D 48 +_ZN13QPluginWidget19pluginStartFinishedEv T +_ZN13QPluginWidget4_envE B 8 +_ZN13QPluginWidget5_lastE B 8 +_ZN13QPluginWidget7cleanupEv T +_ZN13QPluginWidget9hideEventEP10QHideEvent T +_ZN13QPluginWidget9showEventEP10QShowEvent T +_ZN13QPluginWidgetC1EP7QWidget4QUrlR7QStringii T +_ZN13QPluginWidgetC2EP7QWidget4QUrlR7QStringii T +_ZN13QPluginWidgetD0Ev T +_ZN13QPluginWidgetD1Ev T +_ZN13QPluginWidgetD2Ev T +_ZN19QPluginWidgetPlugin11qt_metacallEN11QMetaObject4CallEiPPv T +_ZN19QPluginWidgetPlugin11qt_metacastEPKc T +_ZN19QPluginWidgetPlugin16staticMetaObjectE D 48 +_ZNK13PluginStarter10metaObjectEv T +_ZNK13QPluginWidget10metaObjectEv T +_ZNK19QPluginWidgetPlugin10metaObjectEv T +_ZTI13PluginStarter D 24 +_ZTI13QPluginWidget D 24 +_ZTI18Signal_wait_thread D 24 +_ZTI19QPluginWidgetPlugin D 56 +_ZTI22QPluginWidgetInterface D 16 +_ZTIN6Genode10ConnectionIN6Loader7SessionEEE D 24 +_ZTIN6Genode10ConnectionINS_11Rom_sessionEEE D 24 +_ZTIN6Genode10Rpc_clientIN6Loader7SessionEEE D 24 +_ZTIN6Genode10Rpc_clientINS_11Rom_sessionEEE D 24 +_ZTIN6Genode10Rpc_clientINS_9DataspaceEEE D 24 +_ZTIN6Genode11Msgbuf_base13Too_many_capsE D 24 +_ZTIN6Genode11NoncopyableE D 16 +_ZTIN6Genode11Rom_sessionE D 24 +_ZTIN6Genode14Rom_connection21Rom_connection_failedE D 24 +_ZTIN6Genode14Rom_connectionE D 56 +_ZTIN6Genode14Service_deniedE D 24 +_ZTIN6Genode14String_consoleE D 24 +_ZTIN6Genode15Connection_baseE D 56 +_ZTIN6Genode16Dataspace_clientE D 24 +_ZTIN6Genode18Rom_session_clientE D 24 +_ZTIN6Genode6Parent6ClientE D 24 +_ZTIN6Genode7SessionE D 16 +_ZTIN6Genode8Id_spaceINS_6Parent6ClientEE10Out_of_idsE D 40 +_ZTIN6Genode9DataspaceE D 24 +_ZTIN6Genode9ExceptionE D 16 +_ZTIN6Genode9InterfaceE D 16 +_ZTIN6Genode9Ipc_errorE D 24 +_ZTIN6Loader10ConnectionE D 56 +_ZTIN6Loader14Session_clientE D 24 +_ZTIN6Loader7Session19View_does_not_existE D 24 +_ZTIN6Loader7Session25Rom_module_does_not_existE D 24 +_ZTIN6Loader7Session9ExceptionE D 24 +_ZTIN6Loader7SessionE D 24 +_ZTS13PluginStarter R 16 +_ZTS13QPluginWidget R 16 +_ZTS18Signal_wait_thread D 21 +_ZTS19QPluginWidgetPlugin R 22 +_ZTS22QPluginWidgetInterface D 25 +_ZTSN6Genode10ConnectionIN6Loader7SessionEEE D 41 +_ZTSN6Genode10ConnectionINS_11Rom_sessionEEE D 41 +_ZTSN6Genode10Rpc_clientIN6Loader7SessionEEE D 41 +_ZTSN6Genode10Rpc_clientINS_11Rom_sessionEEE D 41 +_ZTSN6Genode10Rpc_clientINS_9DataspaceEEE D 38 +_ZTSN6Genode11Msgbuf_base13Too_many_capsE D 38 +_ZTSN6Genode11NoncopyableE D 23 +_ZTSN6Genode11Rom_sessionE D 23 +_ZTSN6Genode14Rom_connection21Rom_connection_failedE D 49 +_ZTSN6Genode14Rom_connectionE D 26 +_ZTSN6Genode14Service_deniedE D 26 +_ZTSN6Genode14String_consoleE D 26 +_ZTSN6Genode15Connection_baseE D 27 +_ZTSN6Genode16Dataspace_clientE D 28 +_ZTSN6Genode18Rom_session_clientE D 30 +_ZTSN6Genode6Parent6ClientE D 24 +_ZTSN6Genode7SessionE D 18 +_ZTSN6Genode8Id_spaceINS_6Parent6ClientEE10Out_of_idsE D 51 +_ZTSN6Genode9DataspaceE D 20 +_ZTSN6Genode9ExceptionE D 20 +_ZTSN6Genode9InterfaceE D 20 +_ZTSN6Genode9Ipc_errorE D 20 +_ZTSN6Loader10ConnectionE D 22 +_ZTSN6Loader14Session_clientE D 26 +_ZTSN6Loader7Session19View_does_not_existE D 39 +_ZTSN6Loader7Session25Rom_module_does_not_existE D 45 +_ZTSN6Loader7Session9ExceptionE D 28 +_ZTSN6Loader7SessionE D 18 +_ZTV13PluginStarter D 128 +_ZTV13QPluginWidget D 520 +_ZTV18Signal_wait_thread D 128 +_ZTV19QPluginWidgetPlugin D 168 +_ZTV22QPluginWidgetInterface D 32 +_ZTVN6Genode10ConnectionIN6Loader7SessionEEE D 32 +_ZTVN6Genode10ConnectionINS_11Rom_sessionEEE D 32 +_ZTVN6Genode10Rpc_clientIN6Loader7SessionEEE D 120 +_ZTVN6Genode10Rpc_clientINS_11Rom_sessionEEE D 56 +_ZTVN6Genode10Rpc_clientINS_9DataspaceEEE D 56 +_ZTVN6Genode11Rom_sessionE D 56 +_ZTVN6Genode14Rom_connectionE D 88 +_ZTVN6Genode14String_consoleE D 48 +_ZTVN6Genode15Connection_baseE D 32 +_ZTVN6Genode16Dataspace_clientE D 56 +_ZTVN6Genode18Rom_session_clientE D 56 +_ZTVN6Genode6Parent6ClientE D 32 +_ZTVN6Genode7SessionE D 32 +_ZTVN6Genode9DataspaceE D 56 +_ZTVN6Genode9InterfaceE D 32 +_ZTVN6Loader10ConnectionE D 152 +_ZTVN6Loader14Session_clientE D 120 +_ZTVN6Loader7SessionE D 120 +_ZThn16_N13QPluginWidgetD0Ev T +_ZThn16_N13QPluginWidgetD1Ev T +_ZThn8_N13QPluginWidgetD0Ev T +_ZThn8_N13QPluginWidgetD1Ev T +config D 8 +qt_plugin_instance T +qt_plugin_query_metadata T diff --git a/repos/libports/lib/symbols/qt5_component b/repos/libports/lib/symbols/qt5_component index 5609d30b1d..df6c65967f 100644 --- a/repos/libports/lib/symbols/qt5_component +++ b/repos/libports/lib/symbols/qt5_component @@ -1,5 +1 @@ _ZN4Libc9Component9constructERNS_3EnvE T - -# manually added symbols - -_Z17initialize_qt_guiRN6Genode3EnvE W diff --git a/repos/libports/lib/symbols/qt5_qpa_genode b/repos/libports/lib/symbols/qt5_qpa_genode deleted file mode 100644 index d52263cbca..0000000000 --- a/repos/libports/lib/symbols/qt5_qpa_genode +++ /dev/null @@ -1,283 +0,0 @@ -_Z14qt_getFreetypev T -_Z16q_printEglConfigPvS_ T -_Z17initialize_qt_guiRN6Genode3EnvE T -_Z17q_hasEglExtensionPvPKc T -_Z18q_screenSizeFromFbi T -_Z18qt_getFreetypeDatav T -_Z19q_refreshRateFromFbi T -_Z19q_screenDepthFromFbi T -_Z20q_configFromGLFormatPvRK14QSurfaceFormatbi T -_Z20q_glFormatFromConfigPvS_RK14QSurfaceFormat T -_Z24q_reduceConfigAttributesP7QVectorIiE T -_Z26q_physicalScreenSizeFromFbiRK5QSize T -_Z34q_createConfigAttributesFromFormatRK14QSurfaceFormat T -_Z41qt_static_plugin_QGenodeIntegrationPluginv T -_ZN13QFontEngineFT11boundingBoxERK12QGlyphLayout T -_ZN13QFontEngineFT11boundingBoxEj T -_ZN13QFontEngineFT11boundingBoxEjRK10QTransform T -_ZN13QFontEngineFT12loadGlyphForEj6QFixedN11QFontEngine11GlyphFormatERK10QTransformbb T -_ZN13QFontEngineFT12loadGlyphSetERK10QTransform T -_ZN13QFontEngineFT14bitmapForGlyphEj6QFixedRK10QTransform T -_ZN13QFontEngineFT15addGlyphsToPathEPjP11QFixedPointiP12QPainterPath6QFlagsIN9QTextItem10RenderFlagEE T -_ZN13QFontEngineFT16addOutlineToPathEddRK12QGlyphLayoutP12QPainterPath6QFlagsIN9QTextItem10RenderFlagEE T -_ZN13QFontEngineFT16alphaMapForGlyphEj6QFixed T -_ZN13QFontEngineFT16alphaMapForGlyphEj6QFixedRK10QTransform T -_ZN13QFontEngineFT16getUnscaledGlyphEjP12QPainterPathP15glyph_metrics_t T -_ZN13QFontEngineFT17getPointInOutlineEjijP6QFixedS1_Pj T -_ZN13QFontEngineFT18initFromFontEngineEPKS_ T -_ZN13QFontEngineFT19alphaMapBoundingBoxEj6QFixedRK10QTransformN11QFontEngine11GlyphFormatE T -_ZN13QFontEngineFT19alphaRGBMapForGlyphEj6QFixedRK10QTransform T -_ZN13QFontEngineFT19setDefaultHintStyleEN11QFontEngine9HintStyleE T -_ZN13QFontEngineFT20removeGlyphFromCacheEj T -_ZN13QFontEngineFT21setQtDefaultHintStyleEN5QFont17HintingPreferenceE T -_ZN13QFontEngineFT22lockedAlphaMapForGlyphEj6QFixedN11QFontEngine11GlyphFormatERK10QTransformP6QPoint T -_ZN13QFontEngineFT22unlockAlphaMapForGlyphEv T -_ZN13QFontEngineFT4initEN11QFontEngine6FaceIdEbNS0_11GlyphFormatEP13QFreetypeFace T -_ZN13QFontEngineFT4initEN11QFontEngine6FaceIdEbNS0_11GlyphFormatERK10QByteArray T -_ZN13QFontEngineFT5GlyphD1Ev T -_ZN13QFontEngineFT5GlyphD2Ev T -_ZN13QFontEngineFT6createERK10QByteArraydN5QFont17HintingPreferenceE T -_ZN13QFontEngineFT6createERK8QFontDefN11QFontEngine6FaceIdERK10QByteArray T -_ZN13QFontEngineFT9QGlyphSet20removeGlyphFromCacheEj6QFixed T -_ZN13QFontEngineFT9QGlyphSet5clearEv T -_ZN13QFontEngineFT9QGlyphSet8setGlyphEj6QFixedPNS_5GlyphE T -_ZN13QFontEngineFT9QGlyphSetC1Ev T -_ZN13QFontEngineFT9QGlyphSetC2Ev T -_ZN13QFontEngineFT9QGlyphSetD1Ev T -_ZN13QFontEngineFT9QGlyphSetD2Ev T -_ZN13QFontEngineFTC1ERK8QFontDef T -_ZN13QFontEngineFTC2ERK8QFontDef T -_ZN13QFontEngineFTD0Ev T -_ZN13QFontEngineFTD1Ev T -_ZN13QFontEngineFTD2Ev T -_ZN13QFreetypeFace11computeSizeERK8QFontDefPiS3_PbP6QFixed T -_ZN13QFreetypeFace14addGlyphToPathEP11FT_FaceRec_P16FT_GlyphSlotRec_RK11QFixedPointP12QPainterPathll T -_ZN13QFreetypeFace15addBitmapToPathEP16FT_GlyphSlotRec_RK11QFixedPointP12QPainterPath T -_ZN13QFreetypeFace17getPointInOutlineEjijP6QFixedS1_Pj T -_ZN13QFreetypeFace7cleanupEv T -_ZN13QFreetypeFace7getFaceERKN11QFontEngine6FaceIdERK10QByteArray T -_ZN13QFreetypeFace7releaseERKN11QFontEngine6FaceIdE T -_ZN13QGenodeCursor12changeCursorEP7QCursorP7QWindow T -_ZN13QGenodeCursorC1ERN6Genode3EnvE T -_ZN13QGenodeCursorC2ERN6Genode3EnvE T -_ZN14QtFreetypeDataD1Ev T -_ZN14QtFreetypeDataD2Ev T -_ZN16QGenodeClipboard11qt_metacallEN11QMetaObject4CallEiPPv T -_ZN16QGenodeClipboard11qt_metacastEPKc T -_ZN16QGenodeClipboard11setMimeDataEP9QMimeDataN10QClipboard4ModeE T -_ZN16QGenodeClipboard16staticMetaObjectE D 48 -_ZN16QGenodeClipboard17_handle_clipboardEv T -_ZN16QGenodeClipboard18_clipboard_changedEv T -_ZN16QGenodeClipboard8mimeDataEN10QClipboard4ModeE T -_ZN16QGenodeClipboardC1ERN6Genode3EnvE T -_ZN16QGenodeClipboardC2ERN6Genode3EnvE T -_ZN16QGenodeClipboardD0Ev T -_ZN16QGenodeClipboardD1Ev T -_ZN16QGenodeClipboardD2Ev T -_ZN16QGenodeGLContext11doneCurrentEv T -_ZN16QGenodeGLContext11makeCurrentEP16QPlatformSurface T -_ZN16QGenodeGLContext11swapBuffersEP16QPlatformSurface T -_ZN16QGenodeGLContext14getProcAddressEPKc T -_ZN16QGenodeGLContextC1EP14QOpenGLContext T -_ZN16QGenodeGLContextC2EP14QOpenGLContext T -_ZN17QEglConfigChooser12chooseConfigEv T -_ZN17QEglConfigChooserC1EPv T -_ZN17QEglConfigChooserC2EPv T -_ZN17QEglConfigChooserD0Ev T -_ZN17QEglConfigChooserD1Ev T -_ZN17QEglConfigChooserD2Ev T -_ZN18QGenodeIntegration10initializeEv T -_ZN18QGenodeIntegrationC1ERN6Genode3EnvE T -_ZN18QGenodeIntegrationC2ERN6Genode3EnvE T -_ZN20QGenodeWindowSurface11paintDeviceEv T -_ZN20QGenodeWindowSurface11qt_metacallEN11QMetaObject4CallEiPPv T -_ZN20QGenodeWindowSurface11qt_metacastEPKc T -_ZN20QGenodeWindowSurface16staticMetaObjectE D 48 -_ZN20QGenodeWindowSurface19framebuffer_changedEv T -_ZN20QGenodeWindowSurface5flushEP7QWindowRK7QRegionRK6QPoint T -_ZN20QGenodeWindowSurface6resizeERK5QSizeRK7QRegion T -_ZN20QGenodeWindowSurfaceC1EP7QWindow T -_ZN20QGenodeWindowSurfaceC2EP7QWindow T -_ZN20QGenodeWindowSurfaceD0Ev T -_ZN20QGenodeWindowSurfaceD1Ev T -_ZN20QGenodeWindowSurfaceD2Ev T -_ZN21QFreeTypeFontDatabase10fontEngineERK10QByteArraydN5QFont17HintingPreferenceE T -_ZN21QFreeTypeFontDatabase10fontEngineERK8QFontDefPv T -_ZN21QFreeTypeFontDatabase13releaseHandleEPv T -_ZN21QFreeTypeFontDatabase18addApplicationFontERK10QByteArrayRK7QString T -_ZN21QFreeTypeFontDatabase20populateFontDatabaseEv T -_ZN21QFreeTypeFontDatabase9addTTFileERK10QByteArrayS2_ T -_ZN21QGenodePlatformWindow10_key_eventEN5Input7KeycodeEN6Genode9CodepointENS_10Mapped_key5EventE T -_ZN21QGenodePlatformWindow10setOpacityEd T -_ZN21QGenodePlatformWindow10setVisibleEb T -_ZN21QGenodePlatformWindow11egl_surfaceEPv T -_ZN21QGenodePlatformWindow11framebufferEv T -_ZN21QGenodePlatformWindow11gui_sessionEv T -_ZN21QGenodePlatformWindow11qt_metacallEN11QMetaObject4CallEiPPv T -_ZN21QGenodePlatformWindow11qt_metacastEPKc T -_ZN21QGenodePlatformWindow11setGeometryERK5QRect T -_ZN21QGenodePlatformWindow11windowEventEP6QEvent T -_ZN21QGenodePlatformWindow12_create_viewEv T -_ZN21QGenodePlatformWindow13_handle_inputEv T -_ZN21QGenodePlatformWindow13_mode_changedEv T -_ZN21QGenodePlatformWindow13setWindowIconERK5QIcon T -_ZN21QGenodePlatformWindow14setWindowFlagsE6QFlagsIN2Qt10WindowTypeEE T -_ZN21QGenodePlatformWindow14setWindowStateE6QFlagsIN2Qt11WindowStateEE T -_ZN21QGenodePlatformWindow14setWindowTitleERK7QString T -_ZN21QGenodePlatformWindow15_sanitize_labelE7QString T -_ZN21QGenodePlatformWindow16staticMetaObjectE D 48 -_ZN21QGenodePlatformWindow17setWindowFilePathERK7QString T -_ZN21QGenodePlatformWindow17setWindowModifiedEb T -_ZN21QGenodePlatformWindow17startSystemResizeERK6QPointN2Qt6CornerE T -_ZN21QGenodePlatformWindow18_init_touch_deviceEv T -_ZN21QGenodePlatformWindow18propagateSizeHintsEv T -_ZN21QGenodePlatformWindow19_mouse_button_eventEN5Input7KeycodeEb T -_ZN21QGenodePlatformWindow19framebuffer_changedEv T -_ZN21QGenodePlatformWindow19setMouseGrabEnabledEb T -_ZN21QGenodePlatformWindow20_handle_mode_changedEv T -_ZN21QGenodePlatformWindow21_process_touch_eventsERK5QListIN5Input5EventEE T -_ZN21QGenodePlatformWindow21requestActivateWindowEv T -_ZN21QGenodePlatformWindow22setKeyboardGrabEnabledEb T -_ZN21QGenodePlatformWindow23_gui_session_label_listE B 8 -_ZN21QGenodePlatformWindow24_adjust_and_set_geometryERK5QRect T -_ZN21QGenodePlatformWindow26setFrameStrutEventsEnabledEb T -_ZN21QGenodePlatformWindow30handleContentOrientationChangeEN2Qt17ScreenOrientationE T -_ZN21QGenodePlatformWindow5lowerEv T -_ZN21QGenodePlatformWindow5raiseEv T -_ZN21QGenodePlatformWindow6_inputEv T -_ZN21QGenodePlatformWindow7refreshEiiii T -_ZN21QGenodePlatformWindow7setMaskERK7QRegion T -_ZN21QGenodePlatformWindow8_map_keyEN5Input7KeycodeEN6Genode9CodepointENS_10Mapped_key5EventE T -_ZN21QGenodePlatformWindow9setParentEPK15QPlatformWindow T -_ZN21QGenodePlatformWindowC1ERN6Genode3EnvEP7QWindowii T -_ZN21QGenodePlatformWindowC2ERN6Genode3EnvEP7QWindowii T -_ZN21QGenodePlatformWindowD0Ev T -_ZN21QGenodePlatformWindowD1Ev T -_ZN21QGenodePlatformWindowD2Ev T -_ZN23QUnixEventDispatcherQPA11qt_metacallEN11QMetaObject4CallEiPPv T -_ZN23QUnixEventDispatcherQPA11qt_metacastEPKc T -_ZN23QUnixEventDispatcherQPA13processEventsE6QFlagsIN10QEventLoop17ProcessEventsFlagEE T -_ZN23QUnixEventDispatcherQPA16hasPendingEventsEv T -_ZN23QUnixEventDispatcherQPA16staticMetaObjectE D 48 -_ZN23QUnixEventDispatcherQPA5flushEv T -_ZN23QUnixEventDispatcherQPAC1EP7QObject T -_ZN23QUnixEventDispatcherQPAC2EP7QObject T -_ZN23QUnixEventDispatcherQPAD0Ev T -_ZN23QUnixEventDispatcherQPAD1Ev T -_ZN23QUnixEventDispatcherQPAD2Ev T -_ZN23QtGenericUnixDispatcher25createUnixEventDispatcherEv T -_ZN24QGenodeIntegrationPlugin11qt_metacallEN11QMetaObject4CallEiPPv T -_ZN24QGenodeIntegrationPlugin11qt_metacastEPKc T -_ZN24QGenodeIntegrationPlugin16staticMetaObjectE D 48 -_ZN24QGenodeIntegrationPlugin4_envE B 8 -_ZN24QGenodeIntegrationPlugin6createERK7QStringRK11QStringList T -_ZNK13QFontEngineFT10glyphCountEv T -_ZNK13QFontEngineFT10glyphIndexEj T -_ZNK13QFontEngineFT10propertiesEv T -_ZNK13QFontEngineFT10unlockFaceEv T -_ZNK13QFontEngineFT11synthesizedEv T -_ZNK13QFontEngineFT12emSquareSizeEv T -_ZNK13QFontEngineFT12maxCharWidthEv T -_ZNK13QFontEngineFT12stringToCMapEPK5QChariP12QGlyphLayoutPi6QFlagsIN11QFontEngine10ShaperFlagEE T -_ZNK13QFontEngineFT13cloneWithSizeEd T -_ZNK13QFontEngineFT13lineThicknessEv T -_ZNK13QFontEngineFT14recalcAdvancesEP12QGlyphLayout6QFlagsIN11QFontEngine10ShaperFlagEE T -_ZNK13QFontEngineFT15non_locked_faceEv T -_ZNK13QFontEngineFT16averageCharWidthEv T -_ZNK13QFontEngineFT16getSfntTableDataEjPhPj T -_ZNK13QFontEngineFT17underlinePositionEv T -_ZNK13QFontEngineFT19scaledBitmapMetricsE6QFixed T -_ZNK13QFontEngineFT19scaledBitmapMetricsERK15glyph_metrics_tRK10QTransform T -_ZNK13QFontEngineFT22shouldUseDesignMetricsE6QFlagsIN11QFontEngine10ShaperFlagEE T -_ZNK13QFontEngineFT22supportsTransformationERK10QTransform T -_ZNK13QFontEngineFT29expectsGammaCorrectedBlendingEv T -_ZNK13QFontEngineFT6ascentEv T -_ZNK13QFontEngineFT6faceIdEv T -_ZNK13QFontEngineFT6handleEv T -_ZNK13QFontEngineFT7descentEv T -_ZNK13QFontEngineFT7leadingEv T -_ZNK13QFontEngineFT7xHeightEv T -_ZNK13QFontEngineFT8lockFaceENS_7ScalingE T -_ZNK13QFontEngineFT9capHeightEv T -_ZNK13QFontEngineFT9doKerningEP12QGlyphLayout6QFlagsIN11QFontEngine10ShaperFlagEE T -_ZNK13QFontEngineFT9loadFlagsEPNS_9QGlyphSetEN11QFontEngine11GlyphFormatEiRbRi T -_ZNK13QFontEngineFT9loadGlyphEPNS_9QGlyphSetEj6QFixedN11QFontEngine11GlyphFormatEbb T -_ZNK13QFreetypeFace10propertiesEv T -_ZNK13QFreetypeFace12getSfntTableEjPhPj T -_ZNK13QFreetypeFace16isScalableBitmapEv T -_ZNK13QFreetypeFace6fsTypeEv T -_ZNK16QGenodeClipboard10metaObjectEv T -_ZNK16QGenodeGLContext6formatEv T -_ZNK17QEglConfigChooser12filterConfigEPv T -_ZNK18QGenodeIntegration12fontDatabaseEv T -_ZNK18QGenodeIntegration12inputContextEv T -_ZNK18QGenodeIntegration13hasCapabilityEN20QPlatformIntegration10CapabilityE T -_ZNK18QGenodeIntegration20createPlatformWindowEP7QWindow T -_ZNK18QGenodeIntegration21createEventDispatcherEv T -_ZNK18QGenodeIntegration26createPlatformBackingStoreEP7QWindow T -_ZNK18QGenodeIntegration27createPlatformOpenGLContextEP14QOpenGLContext T -_ZNK18QGenodeIntegration9clipboardEv T -_ZNK20QGenodeWindowSurface10metaObjectEv T -_ZNK21QGenodePlatformWindow10isEmbeddedEv T -_ZNK21QGenodePlatformWindow10metaObjectEv T -_ZNK21QGenodePlatformWindow11egl_surfaceEv T -_ZNK21QGenodePlatformWindow11mapToGlobalERK6QPoint T -_ZNK21QGenodePlatformWindow12frameMarginsEv T -_ZNK21QGenodePlatformWindow13mapFromGlobalERK6QPoint T -_ZNK21QGenodePlatformWindow16devicePixelRatioEv T -_ZNK21QGenodePlatformWindow23frameStrutEventsEnabledEv T -_ZNK21QGenodePlatformWindow5winIdEv T -_ZNK21QGenodePlatformWindow6formatEv T -_ZNK21QGenodePlatformWindow8geometryEv T -_ZNK21QGenodePlatformWindow8isActiveEv T -_ZNK21QGenodePlatformWindow8view_capEv T -_ZNK21QGenodePlatformWindow9isExposedEv T -_ZNK23QUnixEventDispatcherQPA10metaObjectEv T -_ZNK24QGenodeIntegrationPlugin10metaObjectEv T -_ZNK24QGenodeIntegrationPlugin4keysEv T -_ZThn16_N16QGenodeClipboard11setMimeDataEP9QMimeDataN10QClipboard4ModeE T -_ZThn16_N16QGenodeClipboard8mimeDataEN10QClipboard4ModeE T -_ZThn16_N16QGenodeClipboardD0Ev T -_ZThn16_N16QGenodeClipboardD1Ev T -_ZThn16_N20QGenodeWindowSurface11paintDeviceEv T -_ZThn16_N20QGenodeWindowSurface5flushEP7QWindowRK7QRegionRK6QPoint T -_ZThn16_N20QGenodeWindowSurface6resizeERK5QSizeRK7QRegion T -_ZThn16_N20QGenodeWindowSurfaceD0Ev T -_ZThn16_N20QGenodeWindowSurfaceD1Ev T -_ZThn16_N21QGenodePlatformWindow10setOpacityEd T -_ZThn16_N21QGenodePlatformWindow10setVisibleEb T -_ZThn16_N21QGenodePlatformWindow11setGeometryERK5QRect T -_ZThn16_N21QGenodePlatformWindow11windowEventEP6QEvent T -_ZThn16_N21QGenodePlatformWindow13setWindowIconERK5QIcon T -_ZThn16_N21QGenodePlatformWindow14setWindowFlagsE6QFlagsIN2Qt10WindowTypeEE T -_ZThn16_N21QGenodePlatformWindow14setWindowStateE6QFlagsIN2Qt11WindowStateEE T -_ZThn16_N21QGenodePlatformWindow14setWindowTitleERK7QString T -_ZThn16_N21QGenodePlatformWindow17setWindowFilePathERK7QString T -_ZThn16_N21QGenodePlatformWindow17setWindowModifiedEb T -_ZThn16_N21QGenodePlatformWindow17startSystemResizeERK6QPointN2Qt6CornerE T -_ZThn16_N21QGenodePlatformWindow18propagateSizeHintsEv T -_ZThn16_N21QGenodePlatformWindow19setMouseGrabEnabledEb T -_ZThn16_N21QGenodePlatformWindow21requestActivateWindowEv T -_ZThn16_N21QGenodePlatformWindow22setKeyboardGrabEnabledEb T -_ZThn16_N21QGenodePlatformWindow26setFrameStrutEventsEnabledEb T -_ZThn16_N21QGenodePlatformWindow30handleContentOrientationChangeEN2Qt17ScreenOrientationE T -_ZThn16_N21QGenodePlatformWindow5lowerEv T -_ZThn16_N21QGenodePlatformWindow5raiseEv T -_ZThn16_N21QGenodePlatformWindow7setMaskERK7QRegion T -_ZThn16_N21QGenodePlatformWindow9setParentEPK15QPlatformWindow T -_ZThn16_N21QGenodePlatformWindowD0Ev T -_ZThn16_N21QGenodePlatformWindowD1Ev T -_ZThn16_NK21QGenodePlatformWindow10isEmbeddedEv T -_ZThn16_NK21QGenodePlatformWindow11mapToGlobalERK6QPoint T -_ZThn16_NK21QGenodePlatformWindow12frameMarginsEv T -_ZThn16_NK21QGenodePlatformWindow13mapFromGlobalERK6QPoint T -_ZThn16_NK21QGenodePlatformWindow16devicePixelRatioEv T -_ZThn16_NK21QGenodePlatformWindow23frameStrutEventsEnabledEv T -_ZThn16_NK21QGenodePlatformWindow5winIdEv T -_ZThn16_NK21QGenodePlatformWindow6formatEv T -_ZThn16_NK21QGenodePlatformWindow8geometryEv T -_ZThn16_NK21QGenodePlatformWindow8isActiveEv T -_ZThn16_NK21QGenodePlatformWindow9isExposedEv T - -# manually added typeinfo and vtable symbols -_ZTI21QGenodePlatformWindow V diff --git a/repos/libports/lib/symbols/qt5_qpluginwidget b/repos/libports/lib/symbols/qt5_qpluginwidget deleted file mode 100644 index 8e57299d3e..0000000000 --- a/repos/libports/lib/symbols/qt5_qpluginwidget +++ /dev/null @@ -1,35 +0,0 @@ -_ZN13PluginStarter11qt_metacallEN11QMetaObject4CallEiPPv T -_ZN13PluginStarter11qt_metacastEPKc T -_ZN13PluginStarter13_start_pluginER7QStringRK10QByteArray T -_ZN13PluginStarter13view_geometryEN6Genode4RectIijEENS0_5PointIiEE T -_ZN13PluginStarter16staticMetaObjectE D 48 -_ZN13PluginStarter20networkReplyFinishedEv T -_ZN13PluginStarter3runEv T -_ZN13PluginStarter8finishedEv T -_ZN13PluginStarter9view_sizeEv T -_ZN13PluginStarterC1EPN4Libc3EnvE4QUrlR7QStringiiN6Genode10CapabilityIN3Gui4ViewEEE T -_ZN13PluginStarterC2EPN4Libc3EnvE4QUrlR7QStringiiN6Genode10CapabilityIN3Gui4ViewEEE T -_ZN13QPluginWidget10paintEventEP11QPaintEvent T -_ZN13QPluginWidget11qt_metacallEN11QMetaObject4CallEiPPv T -_ZN13QPluginWidget11qt_metacastEPKc T -_ZN13QPluginWidget16staticMetaObjectE D 48 -_ZN13QPluginWidget19pluginStartFinishedEv T -_ZN13QPluginWidget4_envE B 8 -_ZN13QPluginWidget5_lastE B 8 -_ZN13QPluginWidget7cleanupEv T -_ZN13QPluginWidget9hideEventEP10QHideEvent T -_ZN13QPluginWidget9showEventEP10QShowEvent T -_ZN13QPluginWidgetC1EP7QWidget4QUrlR7QStringii T -_ZN13QPluginWidgetC2EP7QWidget4QUrlR7QStringii T -_ZN13QPluginWidgetD0Ev T -_ZN13QPluginWidgetD1Ev T -_ZN13QPluginWidgetD2Ev T -_ZNK13PluginStarter10metaObjectEv T -_ZNK13QPluginWidget10metaObjectEv T -_ZThn16_N13QPluginWidgetD0Ev T -_ZThn16_N13QPluginWidgetD1Ev T -config D 8 - -# manually added typeinfo and vtable symbols - -_ZTI13QPluginWidget V diff --git a/repos/libports/ports/qt5-host.hash b/repos/libports/ports/qt5-host.hash index 2c567ad635..a0c4084adf 100644 --- a/repos/libports/ports/qt5-host.hash +++ b/repos/libports/ports/qt5-host.hash @@ -1 +1 @@ -ad5edc78a8ac2c70e5ac3640a607a6bfb7ab83c2 +21e078acd47b0d6888fe0f289eafbc8682da7a05 diff --git a/repos/libports/ports/qt5-host.port b/repos/libports/ports/qt5-host.port index 1ccdc05ccf..507185778b 100644 --- a/repos/libports/ports/qt5-host.port +++ b/repos/libports/ports/qt5-host.port @@ -1,5 +1,5 @@ LICENSE := GPL -VERSION := 5.13.0 +VERSION := 5.13.2 QTBASE := qtbase-everywhere-src-${VERSION} QTTOOLS := qttools-everywhere-src-${VERSION} @@ -7,9 +7,9 @@ QTTOOLS := qttools-everywhere-src-${VERSION} DOWNLOADS := ${QTBASE}.archive $(QTTOOLS).archive URL(${QTBASE}) := https://download.qt.io/archive/qt/5.13/$(VERSION)/submodules/$(QTBASE).tar.xz -SHA(${QTBASE}) := ff6964b3b528cd3b1d21bcf3470006e8e5cbe69591923f982871d886ea0488fe +SHA(${QTBASE}) := 26b6b686d66a7ad28eaca349e55e2894e5a735f3831e45f2049e93b1daa92121 DIR(${QTBASE}) := src/lib/qtbase URL(${QTTOOLS}) := https://download.qt.io/archive/qt/5.13/$(VERSION)/submodules/$(QTTOOLS).tar.xz -SHA(${QTTOOLS}) := a7887a618dc6434c2567521990c2a7ca72ca6a8379c1d93c5aa6c1798d7a0819 +SHA(${QTTOOLS}) := 919a2713b6d2d7873a09ad85bd93cf4282606e5bf84d5884250f665a253ec06e DIR(${QTTOOLS}) := src/lib/qttools diff --git a/repos/libports/ports/qt5.hash b/repos/libports/ports/qt5.hash index 09a96e6c8b..86bd4450e1 100644 --- a/repos/libports/ports/qt5.hash +++ b/repos/libports/ports/qt5.hash @@ -1 +1 @@ -4a78b61b0e73803e65095f65b4c054861a308411 +0a2454ea1e8ee6c7a6b39a91a29cf5c144f9f50c diff --git a/repos/libports/ports/qt5.port b/repos/libports/ports/qt5.port index 02c9e55450..69a6a1cbb8 100644 --- a/repos/libports/ports/qt5.port +++ b/repos/libports/ports/qt5.port @@ -1,623 +1,8 @@ LICENSE := GPL -VERSION := 5.13.0 -QTWEBKIT_VERSION = 5.9.1 +VERSION := 5.13.2 -QT5 := qt-everywhere-src-${VERSION} -QT5_WEBKIT := qtwebkit-opensource-src-$(QTWEBKIT_VERSION) -QTSCRIPTCLASSIC := qtscriptclassic-1.0_1-opensource +DOWNLOADS := qt5.git -DOWNLOADS := ${QT5}.archive ${QT5_WEBKIT}.archive ${QTSCRIPTCLASSIC}.archive symbols.git - -URL(${QT5}) := https://download.qt.io/archive/qt/5.13/$(VERSION)/single/$(QT5).tar.xz -SHA(${QT5}) := 2cba31e410e169bd5cdae159f839640e672532a4687ea0f265f686421e0e86d6 -DIR(${QT5}) := src/lib/qt5/qt5 - -URL(${QT5_WEBKIT}) := https://download.qt.io/archive/qt/5.9/$(QTWEBKIT_VERSION)/submodules/${QT5_WEBKIT}.tar.xz -SHA(${QT5_WEBKIT}) := 28a560becd800a4229bfac317c2e5407cd3cc95308bc4c3ca90dba2577b052cf -DIR(${QT5_WEBKIT}) := src/lib/qt5/qt5/qtwebkit - -URL(${QTSCRIPTCLASSIC}) := https://genode.org/files/ports/${QTSCRIPTCLASSIC}.tar.gz -SHA(${QTSCRIPTCLASSIC}) := 6a4c4ada6f0064f6c5d7663602a37c99250ed6c7398b1775f95de1c41357b19d -DIR(${QTSCRIPTCLASSIC}) := src/lib/qt5/${QTSCRIPTCLASSIC} - -URL(symbols) := https://github.com/cproc/genode-symbols.git -REV(symbols) := 4bd6a7cf73b9e654f81fe82983f98ea6778ba53a -DIR(symbols) := lib/symbols - - -PATCHES_DIR := $(REP_DIR)/src/lib/qt5/patches -QT5_PATCHES := $(shell cat $(PATCHES_DIR)/series) -QTSCRIPTCLASSIC_PATCHES := $(shell cat $(PATCHES_DIR)/series.qtscriptclassic) - -PATCHES := $(addprefix src/lib/qt5/patches/, ${QT5_PATCHES} ${QTSCRIPTCLASSIC_PATCHES}) - -PATCH_OPT := -p1 -d ${DIR(${QT5})} -PATCH_OPT(src/lib/qt5/patches/qtscriptclassic_qt5.patch) := -p1 -d ${DIR(${QTSCRIPTCLASSIC})} -PATCH_OPT(src/lib/qt5/patches/qtscriptclassic_qt5_7.patch) := -p1 -d ${DIR(${QTSCRIPTCLASSIC})} - -QT5_HOST_TOOL_INSTALL_LOCATION ?= /usr/local/genode/qt5/19.08 - -MOC = $(QT5_HOST_TOOL_INSTALL_LOCATION)/bin/moc -QFLOAT16TABLES = $(QT5_HOST_TOOL_INSTALL_LOCATION)/bin/qfloat16-tables -QLALR = $(QT5_HOST_TOOL_INSTALL_LOCATION)/bin/qlalr - -$(call check_tool,bison) -$(call check_tool,flex) -$(call check_tool,gperf) -$(call check_tool,perl) -$(call check_tool,python) -$(call check_tool,sed) -$(call check_tool,$(MOC)) - -# generate Qt headers suitable for API package creation (no forwarding headers) - -ifneq ($(VERBOSE),) -OUTPUT_FILTER = >/dev/null 2>&1 -endif - -QT5_CONTRIB_DIR = $(CURDIR)/${DIR(${QT5})} -BUILD_DIR = $(CURDIR)/build - -QMAKE = $(BUILD_DIR)/qtbase/bin/qmake - -$(QMAKE): _patch - $(VERBOSE)$(MSG_GENERATE)files... - $(VERBOSE)mkdir -p $(BUILD_DIR) - $(VERBOSE)cd $(BUILD_DIR) && $(QT5_CONTRIB_DIR)/configure \ - -opensource \ - -confirm-license \ - -prefix / \ - -no-iconv \ - -no-opengl \ - $(OUTPUT_FILTER) - -# -# generate Makefile from 'qtbase.pro' file -# -# $(1): path of 'qtbase.pro' file -# -define generate_qtbase_makefile - $(VERBOSE)mkdir -p $(dir $@) && \ - cd $(dir $@) && \ - $(QMAKE) -o $@ $(1) -qtconf $(BUILD_DIR)/qtbase/bin/qt.conf -- -opensource -confirm-license -prefix / $(OUTPUT_FILTER) && \ - sed -i 's/first: all/first:/g' $@ -endef - - -# -# generate Makefile from Qmake project file -# -# $(1): path of Qmake project file -# -define generate_makefile - $(VERBOSE)mkdir -p $(dir $@) && \ - cd $(dir $@) && \ - $(QMAKE) -o $@ $(1) -qtconf $(BUILD_DIR)/qtbase/bin/qt.conf $(OUTPUT_FILTER) && \ - sed -i 's/first: all/first:/g' $@ -endef - -# qtbase - -$(BUILD_DIR)/qtbase/Makefile: $(QMAKE) - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtbase/qtbase.pro) - -$(BUILD_DIR)/qtbase/src/Makefile: $(BUILD_DIR)/qtbase/Makefile - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtbase/src/src.pro) - -$(BUILD_DIR)/qtbase/src/corelib/Makefile: $(BUILD_DIR)/qtbase/src/Makefile - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtbase/src/corelib/corelib.pro) - -$(BUILD_DIR)/qtbase/src/gui/Makefile: $(BUILD_DIR)/qtbase/src/Makefile - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtbase/src/gui/gui.pro) - -$(BUILD_DIR)/qtbase/src/network/Makefile: $(BUILD_DIR)/qtbase/src/Makefile - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtbase/src/network/network.pro) - -# the 'include/QtWidgets' dependency is needed for a correct 'QtOpenGLDepends' header -$(BUILD_DIR)/qtbase/src/opengl/Makefile: $(BUILD_DIR)/qtbase/src/Makefile include/QtWidgets - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtbase/src/opengl/opengl.pro) - -$(BUILD_DIR)/qtbase/src/platformheaders/Makefile: $(BUILD_DIR)/qtbase/src/Makefile - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtbase/src/platformheaders/platformheaders.pro) - -$(BUILD_DIR)/qtbase/src/platformsupport/Makefile: $(BUILD_DIR)/qtbase/src/Makefile - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtbase/src/platformsupport/platformsupport.pro) - -$(BUILD_DIR)/qtbase/src/platformsupport/eglconvenience/Makefile: $(BUILD_DIR)/qtbase/src/platformsupport/Makefile - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtbase/src/platformsupport/eglconvenience/eglconvenience.pro) - -$(BUILD_DIR)/qtbase/src/platformsupport/eventdispatchers/Makefile: $(BUILD_DIR)/qtbase/src/platformsupport/Makefile - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtbase/src/platformsupport/eventdispatchers/eventdispatchers.pro) - -$(BUILD_DIR)/qtbase/src/platformsupport/fontdatabases/Makefile: $(BUILD_DIR)/qtbase/src/platformsupport/Makefile - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtbase/src/platformsupport/fontdatabases/fontdatabases.pro) - -$(BUILD_DIR)/qtbase/src/platformsupport/input/Makefile.input-support: $(BUILD_DIR)/qtbase/src/platformsupport/Makefile - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtbase/src/platformsupport/input/input-support.pro) - -# the 'include/QtWidgets' dependency is needed for a correct 'QtPrintSupportDepends' header -$(BUILD_DIR)/qtbase/src/printsupport/Makefile: $(BUILD_DIR)/qtbase/src/Makefile include/QtWidgets - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtbase/src/printsupport/printsupport.pro) - -$(BUILD_DIR)/qtbase/src/sql/Makefile: $(BUILD_DIR)/qtbase/src/Makefile - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtbase/src/sql/sql.pro) - -$(BUILD_DIR)/qtbase/src/testlib/Makefile: $(BUILD_DIR)/qtbase/src/Makefile - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtbase/src/testlib/testlib.pro) - -$(BUILD_DIR)/qtbase/src/widgets/Makefile: $(BUILD_DIR)/qtbase/src/Makefile - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtbase/src/widgets/widgets.pro) - -$(BUILD_DIR)/qtbase/src/xml/Makefile: $(BUILD_DIR)/qtbase/src/Makefile - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtbase/src/xml/xml.pro) - -# qtdeclarative - -$(BUILD_DIR)/qtdeclarative/Makefile: $(QMAKE) - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtdeclarative/qtdeclarative.pro) - -$(BUILD_DIR)/qtdeclarative/src/Makefile: $(BUILD_DIR)/qtdeclarative/Makefile - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtdeclarative/src/src.pro) - -$(BUILD_DIR)/qtdeclarative/src/qml/Makefile: $(BUILD_DIR)/qtdeclarative/src/Makefile - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtdeclarative/src/qml/qml.pro) - -$(BUILD_DIR)/qtdeclarative/src/quick/Makefile: $(BUILD_DIR)/qtdeclarative/src/Makefile - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtdeclarative/src/quick/quick.pro) - -# qtquickcontrols2 - -$(BUILD_DIR)/qtquickcontrols2/Makefile: $(QMAKE) - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtquickcontrols2/qtquickcontrols2.pro) - -$(BUILD_DIR)/qtquickcontrols2/src/Makefile: $(BUILD_DIR)/qtquickcontrols2/Makefile - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtquickcontrols2/src/src.pro) - -$(BUILD_DIR)/qtquickcontrols2/src/quickcontrols2/Makefile: $(BUILD_DIR)/qtquickcontrols2/src/Makefile - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtquickcontrols2/src/quickcontrols2/quickcontrols2.pro) - -$(BUILD_DIR)/qtquickcontrols2/src/quicktemplates2/Makefile: $(BUILD_DIR)/qtquickcontrols2/src/Makefile - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtquickcontrols2/src/quicktemplates2/quicktemplates2.pro) - -# qtsvg - -$(BUILD_DIR)/qtsvg/Makefile: $(QMAKE) - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtsvg/qtsvg.pro) - -$(BUILD_DIR)/qtsvg/src/Makefile: $(BUILD_DIR)/qtsvg/Makefile - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtsvg/src/src.pro) - -$(BUILD_DIR)/qtsvg/src/svg/Makefile: $(BUILD_DIR)/qtsvg/src/Makefile - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtsvg/src/svg/svg.pro) - -# qttools - -$(BUILD_DIR)/qttools/Makefile: $(QMAKE) - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qttools/qttools.pro) - -$(BUILD_DIR)/qttools/src/Makefile: $(BUILD_DIR)/qttools/Makefile - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qttools/src/src.pro) - -$(BUILD_DIR)/qttools/src/designer/Makefile: $(BUILD_DIR)/qttools/src/Makefile - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qttools/src/designer/designer.pro) - -$(BUILD_DIR)/qttools/src/designer/src/Makefile: $(BUILD_DIR)/qttools/src/designer/Makefile - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qttools/src/designer/src/src.pro) - -$(BUILD_DIR)/qttools/src/designer/src/lib/Makefile: $(BUILD_DIR)/qttools/src/designer/src/Makefile - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qttools/src/designer/src/lib/lib.pro) - -$(BUILD_DIR)/qttools/src/designer/src/uiplugin/Makefile: $(BUILD_DIR)/qttools/src/designer/src/Makefile - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qttools/src/designer/src/uiplugin/uiplugin.pro) - -$(BUILD_DIR)/qttools/src/designer/src/uitools/Makefile: $(BUILD_DIR)/qttools/src/designer/src/Makefile - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qttools/src/designer/src/uitools/uitools.pro) - -# qtvirtualkeyboard - -$(BUILD_DIR)/qtvirtualkeyboard/Makefile: $(QMAKE) - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtvirtualkeyboard/qtvirtualkeyboard.pro) - -$(BUILD_DIR)/qtvirtualkeyboard/src/Makefile: $(BUILD_DIR)/qtvirtualkeyboard/Makefile - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtvirtualkeyboard/src/src.pro) - -$(BUILD_DIR)/qtvirtualkeyboard/src/virtualkeyboard/Makefile: $(BUILD_DIR)/qtvirtualkeyboard/src/Makefile - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtvirtualkeyboard/src/virtualkeyboard/virtualkeyboard.pro) - -# qtwebkit - -$(BUILD_DIR)/qtwebkit/Makefile: $(QMAKE) - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtwebkit/WebKit.pro) - -$(BUILD_DIR)/qtwebkit/Source/Makefile.api: $(BUILD_DIR)/qtwebkit/Makefile - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtwebkit/Source/api.pri) - -$(BUILD_DIR)/qtwebkit/Source/Makefile.widgetsapi: $(BUILD_DIR)/qtwebkit/Makefile - $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtwebkit/Source/widgetsapi.pri) - -# -# include directories -# - -# qtbase - -include/QtCore: $(BUILD_DIR)/qtbase/src/corelib/Makefile - $(VERBOSE)$(MSG_GENERATE)$@ - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER) - $(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtbase/src/corelib/global/qconfig.h $@/ - $(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtbase/src/corelib/global/qconfig_p.h $@/$(VERSION)/QtCore/private/ - $(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtbase/src/corelib/qtcore-config.h $@/ - $(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtbase/src/corelib/qtcore-config_p.h $@/$(VERSION)/QtCore/private/ - -include/QtEglSupport: $(BUILD_DIR)/qtbase/src/platformsupport/eglconvenience/Makefile - $(VERBOSE)$(MSG_GENERATE)$@ - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER) - -include/QtEventDispatcherSupport: $(BUILD_DIR)/qtbase/src/platformsupport/eventdispatchers/Makefile - $(VERBOSE)$(MSG_GENERATE)$@ - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER) - -include/QtFontDatabaseSupport: $(BUILD_DIR)/qtbase/src/platformsupport/fontdatabases/Makefile - $(VERBOSE)$(MSG_GENERATE)$@ - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER) - -include/QtGui: $(BUILD_DIR)/qtbase/src/gui/Makefile - $(VERBOSE)$(MSG_GENERATE)$@ - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_qpa_headers $(OUTPUT_FILTER) - $(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtbase/src/gui/qtgui-config.h $@/ - $(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtbase/src/gui/qtgui-config_p.h $@/$(VERSION)/QtGui/private/ - -include/QtInputSupport: $(BUILD_DIR)/qtbase/src/platformsupport/input/Makefile.input-support - $(VERBOSE)$(MSG_GENERATE)$@ - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER) - -include/QtNetwork: $(BUILD_DIR)/qtbase/src/network/Makefile - $(VERBOSE)$(MSG_GENERATE)$@ - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER) - $(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtbase/src/network/qtnetwork-config.h $@/ - $(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtbase/src/network/qtnetwork-config_p.h $@/$(VERSION)/QtNetwork/private/ - -include/QtOpenGL: $(BUILD_DIR)/qtbase/src/opengl/Makefile - $(VERBOSE)$(MSG_GENERATE)$@ - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER) - -include/QtPlatformHeaders: $(BUILD_DIR)/qtbase/src/platformheaders/Makefile - $(VERBOSE)$(MSG_GENERATE)$@ - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER) - -include/QtPrintSupport: $(BUILD_DIR)/qtbase/src/printsupport/Makefile - $(VERBOSE)$(MSG_GENERATE)$@ - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_qpa_headers $(OUTPUT_FILTER) - $(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtbase/src/printsupport/qtprintsupport-config.h $@/ - $(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtbase/src/printsupport/qtprintsupport-config_p.h $@/$(VERSION)/QtPrintSupport/private/ - -include/QtSql: $(BUILD_DIR)/qtbase/src/sql/Makefile - $(VERBOSE)$(MSG_GENERATE)$@ - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER) - -include/QtTest: $(BUILD_DIR)/qtbase/src/testlib/Makefile - $(VERBOSE)$(MSG_GENERATE)$@ - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER) - -include/QtWidgets: $(BUILD_DIR)/qtbase/src/widgets/Makefile - $(VERBOSE)$(MSG_GENERATE)$@ - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER) - $(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtbase/src/widgets/qtwidgets-config.h $@/ - $(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtbase/src/widgets/qtwidgets-config_p.h $@/$(VERSION)/QtWidgets/private/ - -include/QtXml: $(BUILD_DIR)/qtbase/src/xml/Makefile - $(VERBOSE)$(MSG_GENERATE)$@ - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER) - $(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtbase/src/xml/qtxml-config.h $@/ - $(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtbase/src/xml/qtxml-config_p.h $@/$(VERSION)/QtXml/private/ - -# qtdeclarative - -include/QtQml: $(BUILD_DIR)/qtdeclarative/src/qml/Makefile qtdeclarative_generated - $(VERBOSE)$(MSG_GENERATE)$@ - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER) - $(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtdeclarative/src/qml/qtqml-config.h $@/ - $(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtdeclarative/src/qml/qtqml-config_p.h $@/$(VERSION)/QtQml/private/ - $(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtdeclarative/src/qml/qqmljsgrammar_p.h $@/$(VERSION)/QtQml/private/ - $(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtdeclarative/src/qml/qqmljsparser_p.h $@/$(VERSION)/QtQml/private/ - -include/QtQuick: $(BUILD_DIR)/qtdeclarative/src/quick/Makefile - $(VERBOSE)$(MSG_GENERATE)$@ - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER) - $(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtdeclarative/src/quick/qtquick-config.h $@/ - $(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtdeclarative/src/quick/qtquick-config_p.h $@/$(VERSION)/QtQuick/private/ - -# qtquickcontrols2 - -include/QtQuickControls2: $(BUILD_DIR)/qtquickcontrols2/src/quickcontrols2/Makefile - $(VERBOSE)$(MSG_GENERATE)$@ - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER) - -include/QtQuickTemplates2: $(BUILD_DIR)/qtquickcontrols2/src/quicktemplates2/Makefile - $(VERBOSE)$(MSG_GENERATE)$@ - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER) - -# qtscriptclassic - -include/QtScript: - $(VERBOSE)$(MSG_GENERATE)$@ - $(VERBOSE)cp -a $(CURDIR)/${DIR(${QTSCRIPTCLASSIC})}/include/QtScript $@ - $(VERBOSE)cp -a $(CURDIR)/${DIR(${QTSCRIPTCLASSIC})}/src/*[^_p].h $@/ - -# qtsvg - -include/QtSvg: $(BUILD_DIR)/qtsvg/src/svg/Makefile - $(VERBOSE)$(MSG_GENERATE)$@ - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER) - -# qttools - -include/QtDesigner: $(BUILD_DIR)/qttools/src/designer/src/lib/Makefile - $(VERBOSE)$(MSG_GENERATE)$@ - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER) - -include/QtUiPlugin: $(BUILD_DIR)/qttools/src/designer/src/uiplugin/Makefile - $(VERBOSE)$(MSG_GENERATE)$@ - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER) - -include/QtUiTools: $(BUILD_DIR)/qttools/src/designer/src/uitools/Makefile - $(VERBOSE)$(MSG_GENERATE)$@ - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER) - -# qtvirtualkeyboard - -include/QtVirtualKeyboard: $(BUILD_DIR)/qtvirtualkeyboard/src/virtualkeyboard/Makefile - $(VERBOSE)$(MSG_GENERATE)$@ - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER) - -# qtwebkit - -include/QtWebKit: $(BUILD_DIR)/qtwebkit/Source/Makefile.api - $(VERBOSE)$(MSG_GENERATE)$@ - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER) - -include/QtWebKitWidgets: $(BUILD_DIR)/qtwebkit/Source/Makefile.widgetsapi - $(VERBOSE)$(MSG_GENERATE)$@ - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER) - $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER) - -# -# additional generated files -# - -# qtbase - -$(CURDIR)/src/lib/qt5/qt5/qtbase/src/corelib/global/qfloat16tables.cpp : _patch - $(VERBOSE) $(QFLOAT16TABLES) $@ - -# qtdeclarative - -$(CURDIR)/src/lib/qt5/qtdeclarative/src/3rdparty/masm/generated.tag: _patch - $(VERBOSE)mkdir -p $(dir $@) - $(VERBOSE)python $(QT5_CONTRIB_DIR)/qtdeclarative/src/3rdparty/masm/yarr/create_regex_tables > $(dir $@)/RegExpJitTables.h - $(VERBOSE)touch $@ - -$(CURDIR)/src/lib/qt5/qt5/qtdeclarative/src/qml/generated.tag: _patch - $(VERBOSE)mkdir -p $(dir $@) - $(VERBOSE)cd $(dir $@); $(QLALR) --no-debug --qt $(QT5_CONTRIB_DIR)/qtdeclarative/src/qml/parser/qqmljs.g - $(VERBOSE)touch $@ - -# qtwebkit - -ANGLE_DIR := $(QT5_CONTRIB_DIR)/qtwebkit/Source/ThirdParty/ANGLE - -$(CURDIR)/src/lib/qt5/qtwebkit/Source/ThirdParty/ANGLE/generated/generated.tag: _patch - - $(VERBOSE)mkdir -p $(dir $@) - - $(VERBOSE)flex --noline --nounistd --outfile=$(dir $@)/glslang_lex.cpp $(ANGLE_DIR)/src/compiler/glslang.l - $(VERBOSE)flex --noline --nounistd --outfile=$(dir $@)/Tokenizer_lex.cpp $(ANGLE_DIR)/src/compiler/preprocessor/Tokenizer.l - $(VERBOSE)bison --no-lines --skeleton=yacc.c --defines=$(dir $@)/glslang_tab.h --output=$(dir $@)/glslang_tab.cpp $(ANGLE_DIR)/src/compiler/glslang.y - $(VERBOSE)bison --no-lines --skeleton=yacc.c --defines=$(dir $@)/ExpressionParser_tab.h --output=$(dir $@)/ExpressionParser_tab.cpp $(ANGLE_DIR)/src/compiler/preprocessor/ExpressionParser.y - - $(VERBOSE)touch $@ - -JAVASCRIPTCORE_DIR = $(QT5_CONTRIB_DIR)/qtwebkit/Source/JavaScriptCore - -$(CURDIR)/src/lib/qt5/qtwebkit/Source/JavaScriptCore/generated/generated.tag: _patch - - $(VERBOSE)mkdir -p $(dir $@) - - @# create_hash_table - $(VERBOSE)perl $(JAVASCRIPTCORE_DIR)/create_hash_table $(JAVASCRIPTCORE_DIR)/runtime/ArrayConstructor.cpp -i > $(dir $@)/ArrayConstructor.lut.h - $(VERBOSE)perl $(JAVASCRIPTCORE_DIR)/create_hash_table $(JAVASCRIPTCORE_DIR)/runtime/ArrayPrototype.cpp -i > $(dir $@)/ArrayPrototype.lut.h - $(VERBOSE)perl $(JAVASCRIPTCORE_DIR)/create_hash_table $(JAVASCRIPTCORE_DIR)/runtime/BooleanPrototype.cpp -i > $(dir $@)/BooleanPrototype.lut.h - $(VERBOSE)perl $(JAVASCRIPTCORE_DIR)/create_hash_table $(JAVASCRIPTCORE_DIR)/runtime/DateConstructor.cpp -i > $(dir $@)/DateConstructor.lut.h - $(VERBOSE)perl $(JAVASCRIPTCORE_DIR)/create_hash_table $(JAVASCRIPTCORE_DIR)/runtime/DatePrototype.cpp -i > $(dir $@)/DatePrototype.lut.h - $(VERBOSE)perl $(JAVASCRIPTCORE_DIR)/create_hash_table $(JAVASCRIPTCORE_DIR)/runtime/ErrorPrototype.cpp -i > $(dir $@)/ErrorPrototype.lut.h - $(VERBOSE)perl $(JAVASCRIPTCORE_DIR)/create_hash_table $(JAVASCRIPTCORE_DIR)/runtime/JSGlobalObject.cpp -i > $(dir $@)/JSGlobalObject.lut.h - $(VERBOSE)perl $(JAVASCRIPTCORE_DIR)/create_hash_table $(JAVASCRIPTCORE_DIR)/runtime/JSONObject.cpp -i > $(dir $@)/JSONObject.lut.h - $(VERBOSE)perl $(JAVASCRIPTCORE_DIR)/create_hash_table $(JAVASCRIPTCORE_DIR)/runtime/MathObject.cpp -i > $(dir $@)/MathObject.lut.h - $(VERBOSE)perl $(JAVASCRIPTCORE_DIR)/create_hash_table $(JAVASCRIPTCORE_DIR)/runtime/NamePrototype.cpp -i > $(dir $@)/NamePrototype.lut.h - $(VERBOSE)perl $(JAVASCRIPTCORE_DIR)/create_hash_table $(JAVASCRIPTCORE_DIR)/runtime/NumberConstructor.cpp -i > $(dir $@)/NumberConstructor.lut.h - $(VERBOSE)perl $(JAVASCRIPTCORE_DIR)/create_hash_table $(JAVASCRIPTCORE_DIR)/runtime/NumberPrototype.cpp -i > $(dir $@)/NumberPrototype.lut.h - $(VERBOSE)perl $(JAVASCRIPTCORE_DIR)/create_hash_table $(JAVASCRIPTCORE_DIR)/runtime/ObjectConstructor.cpp -i > $(dir $@)/ObjectConstructor.lut.h - $(VERBOSE)perl $(JAVASCRIPTCORE_DIR)/create_hash_table $(JAVASCRIPTCORE_DIR)/runtime/RegExpConstructor.cpp -i > $(dir $@)/RegExpConstructor.lut.h - $(VERBOSE)perl $(JAVASCRIPTCORE_DIR)/create_hash_table $(JAVASCRIPTCORE_DIR)/runtime/RegExpObject.cpp -i > $(dir $@)/RegExpObject.lut.h - $(VERBOSE)perl $(JAVASCRIPTCORE_DIR)/create_hash_table $(JAVASCRIPTCORE_DIR)/runtime/RegExpPrototype.cpp -i > $(dir $@)/RegExpPrototype.lut.h - $(VERBOSE)perl $(JAVASCRIPTCORE_DIR)/create_hash_table $(JAVASCRIPTCORE_DIR)/runtime/StringConstructor.cpp -i > $(dir $@)/StringConstructor.lut.h - $(VERBOSE)perl $(JAVASCRIPTCORE_DIR)/create_hash_table $(JAVASCRIPTCORE_DIR)/parser/Keywords.table -i > $(dir $@)/Lexer.lut.h - - @# create_regex_tables - $(VERBOSE)python $(JAVASCRIPTCORE_DIR)/create_regex_tables > $(dir $@)/RegExpJitTables.h - - @# KeywordLookupGenerator.py - $(VERBOSE)python $(JAVASCRIPTCORE_DIR)/KeywordLookupGenerator.py $(JAVASCRIPTCORE_DIR)/parser/Keywords.table > $(dir $@)/KeywordLookup.h - - $(VERBOSE)touch $@ - - -# command names used by some of the extracted generator commands -DEL_FILE := rm -MOVE := mv - -WEBCORE_DIR = $(QT5_CONTRIB_DIR)/qtwebkit/Source/WebCore - -DEFINES = "LANGUAGE_JAVASCRIPT=1 ENABLE_3D_RENDERING=1 ENABLE_ACCELERATED_2D_CANVAS=1 ENABLE_BLOB=1 ENABLE_CANVAS_PATH=1 ENABLE_CHANNEL_MESSAGING=1 ENABLE_CSS_BOX_DECORATION_BREAK=1 ENABLE_CSS_COMPOSITING=1 ENABLE_CSS_EXCLUSIONS=1 ENABLE_CSS_FILTERS=1 ENABLE_CSS_IMAGE_SET=1 ENABLE_CSS_REGIONS=1 ENABLE_CSS_SHAPES=1 ENABLE_CSS_STICKY_POSITION=1 ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=1 ENABLE_DATALIST_ELEMENT=1 ENABLE_DETAILS_ELEMENT=1 ENABLE_DOWNLOAD_ATTRIBUTE=1 ENABLE_FAST_MOBILE_SCROLLING=1 ENABLE_FILTERS=1 ENABLE_FTPDIR=1 ENABLE_FULLSCREEN_API=1 ENABLE_GESTURE_EVENTS=1 ENABLE_ICONDATABASE=1 ENABLE_IFRAME_SEAMLESS=1 ENABLE_INPUT_TYPE_COLOR=1 ENABLE_INSPECTOR=1 ENABLE_INSPECTOR_SERVER=1 ENABLE_JAVASCRIPT_DEBUGGER=1 ENABLE_LEGACY_NOTIFICATIONS=1 ENABLE_LEGACY_VIEWPORT_ADAPTION=1 ENABLE_LEGACY_VENDOR_PREFIXES=1 ENABLE_LEGACY_WEB_AUDIO=1 ENABLE_LINK_PREFETCH=1 ENABLE_METER_ELEMENT=1 ENABLE_MHTML=1 ENABLE_NOTIFICATIONS=1 ENABLE_PAGE_VISIBILITY_API=1 ENABLE_PROGRESS_ELEMENT=1 ENABLE_RESOLUTION_MEDIA_QUERY=1 ENABLE_REQUEST_ANIMATION_FRAME=1 ENABLE_SHARED_WORKERS=1 ENABLE_SMOOTH_SCROLLING=1 ENABLE_SQL_DATABASE=1 ENABLE_SUBPIXEL_LAYOUT=1 ENABLE_SVG=1 ENABLE_SVG_FONTS=1 ENABLE_TOUCH_ADJUSTMENT=1 ENABLE_TOUCH_EVENTS=1 ENABLE_TOUCH_SLIDER=1 ENABLE_VIEW_MODE_CSS_MEDIA=1 ENABLE_WEB_SOCKETS=1 ENABLE_WEB_TIMING=1 ENABLE_WORKERS=1 ENABLE_XHR_TIMEOUT=1 ENABLE_WEBGL=1" -EXTRA_DEFINES = "QT_NO_MTDEV QT_NO_LIBUDEV QT_NO_TSLIB QT_NO_LIBINPUT ENABLE_3D_RENDERING=1 ENABLE_ACCELERATED_2D_CANVAS=1 ENABLE_BLOB=1 ENABLE_CANVAS_PATH=1 ENABLE_CHANNEL_MESSAGING=1 ENABLE_CSS_BOX_DECORATION_BREAK=1 ENABLE_CSS_COMPOSITING=1 ENABLE_CSS_EXCLUSIONS=1 ENABLE_CSS_FILTERS=1 ENABLE_CSS_IMAGE_SET=1 ENABLE_CSS_REGIONS=1 ENABLE_CSS_SHAPES=1 ENABLE_CSS_STICKY_POSITION=1 ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=1 ENABLE_DATALIST_ELEMENT=1 ENABLE_DETAILS_ELEMENT=1 ENABLE_DOWNLOAD_ATTRIBUTE=1 ENABLE_FAST_MOBILE_SCROLLING=1 ENABLE_FILTERS=1 ENABLE_FTPDIR=1 ENABLE_FULLSCREEN_API=1 ENABLE_GESTURE_EVENTS=1 ENABLE_ICONDATABASE=1 ENABLE_IFRAME_SEAMLESS=1 ENABLE_INPUT_TYPE_COLOR=1 ENABLE_INSPECTOR=1 ENABLE_INSPECTOR_SERVER=1 ENABLE_JAVASCRIPT_DEBUGGER=1 ENABLE_LEGACY_NOTIFICATIONS=1 ENABLE_LEGACY_VIEWPORT_ADAPTION=1 ENABLE_LEGACY_VENDOR_PREFIXES=1 ENABLE_LEGACY_WEB_AUDIO=1 ENABLE_LINK_PREFETCH=1 ENABLE_METER_ELEMENT=1 ENABLE_MHTML=1 ENABLE_NOTIFICATIONS=1 ENABLE_PAGE_VISIBILITY_API=1 ENABLE_PROGRESS_ELEMENT=1 ENABLE_RESOLUTION_MEDIA_QUERY=1 ENABLE_REQUEST_ANIMATION_FRAME=1 ENABLE_SHARED_WORKERS=1 ENABLE_SMOOTH_SCROLLING=1 ENABLE_SQL_DATABASE=1 ENABLE_SUBPIXEL_LAYOUT=1 ENABLE_SVG=1 ENABLE_SVG_FONTS=1 ENABLE_TOUCH_ADJUSTMENT=1 ENABLE_TOUCH_EVENTS=1 ENABLE_TOUCH_SLIDER=1 ENABLE_VIEW_MODE_CSS_MEDIA=1 ENABLE_WEB_SOCKETS=1 ENABLE_WEB_TIMING=1 ENABLE_WORKERS=1 ENABLE_XHR_TIMEOUT=1 WTF_USE_TILED_BACKING_STORE=1 WTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=1 HAVE_QTQUICK=1 HAVE_QTPRINTSUPPORT=1 HAVE_QSTYLE=1 HAVE_QTTESTLIB=1 WTF_USE_LIBJPEG=1 WTF_USE_LIBPNG=1 PLUGIN_ARCHITECTURE_UNSUPPORTED=1 WTF_USE_3D_GRAPHICS=1 ENABLE_WEBGL=1 ENABLE_BATTERY_STATUS=0 ENABLE_CANVAS_PROXY=0 ENABLE_CSP_NEXT=0 ENABLE_CSS_GRID_LAYOUT=0 ENABLE_CSS_HIERARCHIES=0 ENABLE_CSS_IMAGE_ORIENTATION=0 ENABLE_CSS_IMAGE_RESOLUTION=0 ENABLE_CSS_SHADERS=0 ENABLE_CSS_VARIABLES=0 ENABLE_CSS3_CONDITIONAL_RULES=0 ENABLE_CSS3_TEXT=0 ENABLE_CSS3_TEXT_LINE_BREAK=0 ENABLE_DASHBOARD_SUPPORT=0 ENABLE_DATAGRID=0 ENABLE_DATA_TRANSFER_ITEMS=0 ENABLE_DEVICE_ORIENTATION=0 ENABLE_DIRECTORY_UPLOAD=0 ENABLE_FILE_SYSTEM=0 ENABLE_FONT_LOAD_EVENTS=0 ENABLE_GAMEPAD=0 ENABLE_GEOLOCATION=0 ENABLE_HIGH_DPI_CANVAS=0 ENABLE_INDEXED_DATABASE=0 ENABLE_INPUT_SPEECH=0 ENABLE_INPUT_TYPE_DATE=0 ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE=0 ENABLE_INPUT_TYPE_DATETIMELOCAL=0 ENABLE_INPUT_TYPE_MONTH=0 ENABLE_INPUT_TYPE_TIME=0 ENABLE_INPUT_TYPE_WEEK=0 ENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 ENABLE_MATHML=0 ENABLE_MEDIA_SOURCE=0 ENABLE_MEDIA_STATISTICS=0 ENABLE_MEDIA_STREAM=0 ENABLE_MICRODATA=0 ENABLE_MOUSE_CURSOR_SCALE=0 ENABLE_NAVIGATOR_CONTENT_UTILS=0 ENABLE_NETSCAPE_PLUGIN_API=0 ENABLE_NETWORK_INFO=0 ENABLE_NOSNIFF=0 ENABLE_ORIENTATION_EVENTS=0 ENABLE_PROXIMITY_EVENTS=0 ENABLE_QUOTA=0 ENABLE_RESOURCE_TIMING=0 ENABLE_SCRIPTED_SPEECH=0 ENABLE_SECCOMP_FILTERS=0 ENABLE_SHADOW_DOM=0 ENABLE_STYLE_SCOPED=0 ENABLE_TEMPLATE_ELEMENT=0 ENABLE_TEXT_AUTOSIZING=0 ENABLE_THREADED_HTML_PARSER=0 ENABLE_TOUCH_ICON_LOADING=0 ENABLE_USER_TIMING=0 ENABLE_VIBRATION=0 ENABLE_VIDEO=0 ENABLE_VIDEO_TRACK=0 ENABLE_WEB_AUDIO=0 ENABLE_XSLT=0" -GENERATE_BINDINGS_PL = export "SOURCE_ROOT=$(WEBCORE_DIR)" && perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/bindings/scripts/generate-bindings.pl --defines $(DEFINES) --generator JS --include Modules/filesystem --include Modules/geolocation --include Modules/indexeddb --include Modules/mediasource --include Modules/notifications --include Modules/quota --include Modules/webaudio --include Modules/webdatabase --include Modules/websockets --include css --include dom --include editing --include fileapi --include html --include html/canvas --include html/shadow --include html/track --include inspector --include loader/appcache --include page --include plugins --include storage --include svg --include testing --include workers --include xml --outputDir $(dir $@) --supplementalDependencyFile $(dir $@)/supplemental_dependency.tmp --idlAttributesFile $(WEBCORE_DIR)/bindings/scripts/IDLAttributes.txt --preprocessor "$(MOC) -E" -# The directory with the generated files must be added for the Genode build -# system, because it is not a subdirectory of the current directory. -GENERATE_BINDINGS_PL += --include $(dir $@) - -$(CURDIR)/src/lib/qt5/qtwebkit/Source/WebCore/generated/generated.tag: _patch - - $(VERBOSE)mkdir -p $(dir $@) - - @# make_names.pl - $(VERBOSE)perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/dom/make_names.pl --tags $(WEBCORE_DIR)/mathml/mathtags.in --attrs $(WEBCORE_DIR)/mathml/mathattrs.in --extraDefines $(EXTRA_DEFINES) --preprocessor "$(MOC) -E" --factory --wrapperFactory --outputDir $(dir $@) - $(VERBOSE)perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/dom/make_names.pl --tags $(WEBCORE_DIR)/svg/svgtags.in --attrs $(WEBCORE_DIR)/svg/svgattrs.in --extraDefines $(EXTRA_DEFINES) --preprocessor "$(MOC) -E" --factory --wrapperFactory --outputDir $(dir $@) - $(VERBOSE)perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/dom/make_names.pl --attrs $(WEBCORE_DIR)/svg/xlinkattrs.in --preprocessor "$(MOC) -E" --outputDir $(dir $@) - - @# makeprop.pl - $(VERBOSE)perl -ne "print $1" $(WEBCORE_DIR)/css/CSSPropertyNames.in $(WEBCORE_DIR)/css/SVGCSSPropertyNames.in > $(dir $@)/CSSPropertyNames.in && cd $(dir $@) && perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/css/makeprop.pl --defines $(DEFINES) --preprocessor "$(MOC) -E" $(WEBCORE_DIR)/css/CSSPropertyNames.in && $(DEL_FILE) CSSPropertyNames.in CSSPropertyNames.gperf - - @# make_settings.pl - $(VERBOSE)perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/page/make_settings.pl --input $(WEBCORE_DIR)/page/Settings.in --outputDir $(dir $@) - - @# makevalues.pl - $(VERBOSE)perl -ne "print $1" $(WEBCORE_DIR)/css/CSSValueKeywords.in $(WEBCORE_DIR)/css/SVGCSSValueKeywords.in > $(dir $@)/CSSValueKeywords.in && cd $(dir $@) && perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/css/makevalues.pl --defines $(DEFINES) --preprocessor "$(MOC) -E" $(WEBCORE_DIR)/css/CSSValueKeywords.in && $(DEL_FILE) CSSValueKeywords.in CSSValueKeywords.gperf - - @# preprocess-idls.pl - $(VERBOSE)sed -e "s,^qtwebkit,$(QT5_CONTRIB_DIR)/qtwebkit,g" -e "s,^generated/,$(dir $@),g" $(REP_DIR)/src/lib/qt5/qtwebkit/Source/WebCore/idl_files > $(dir $@)/idl_files.tmp - $(VERBOSE)export "QT5_CONTRIB_DIR=$(QT5_CONTRIB_DIR)" && perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/bindings/scripts/preprocess-idls.pl --defines $(DEFINES) --idlFilesList $(dir $@)/idl_files.tmp --supplementalDependencyFile $(dir $@)/supplemental_dependency.tmp --windowConstructorsFile $(dir $@)/DOMWindowConstructors.idl --workerGlobalScopeConstructorsFile $(dir $@)/WorkerGlobalScopeConstructors.idl --sharedWorkerGlobalScopeConstructorsFile $(dir $@)/SharedWorkerGlobalScopeConstructors.idl --dedicatedWorkerGlobalScopeConstructorsFile $(dir $@)/DedicatedWorkerGlobalScopeConstructors.idl - - @# generate-bindings.pl - $(VERBOSE)cd $(dir $@) && while read -r idl_file; do $(GENERATE_BINDINGS_PL) $$idl_file; done < $(dir $@)/idl_files.tmp - #$(VERBOSE)while read -r idl_file; do echo "$(GENERATE_BINDINGS_PL) $$idl_file"; $(GENERATE_BINDINGS_PL) $$idl_file; done < $(dir $@)/idl_files.tmp - - @# CodeGeneratorInspector.py - $(VERBOSE)python $(WEBCORE_DIR)/inspector/CodeGeneratorInspector.py $(WEBCORE_DIR)/inspector/Inspector.json --output_h_dir $(dir $@) --output_cpp_dir $(dir $@) - - @# xxd.pl - $(VERBOSE)perl $(WEBCORE_DIR)/inspector/xxd.pl InspectorOverlayPage_html $(WEBCORE_DIR)/inspector/InspectorOverlayPage.html $(dir $@)/InspectorOverlayPage.h - $(VERBOSE)perl $(WEBCORE_DIR)/inspector/xxd.pl InjectedScriptSource_js $(WEBCORE_DIR)/inspector/InjectedScriptSource.js $(dir $@)/InjectedScriptSource.h - $(VERBOSE)perl $(WEBCORE_DIR)/inspector/xxd.pl InjectedScriptCanvasModuleSource_js $(WEBCORE_DIR)/inspector/InjectedScriptCanvasModuleSource.js $(dir $@)/InjectedScriptCanvasModuleSource.h - - @# makegrammar.pl - $(VERBOSE)perl -I $(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/css/makegrammar.pl --outputDir $(dir $@) --extraDefines $(EXTRA_DEFINES) --preprocessor "$(MOC) -E" --symbolsPrefix cssyy $(WEBCORE_DIR)/css/CSSGrammar.y.in - - @# make_names.pl - $(VERBOSE)perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/dom/make_names.pl --tags $(WEBCORE_DIR)/html/HTMLTagNames.in --attrs $(WEBCORE_DIR)/html/HTMLAttributeNames.in --extraDefines $(EXTRA_DEFINES) --preprocessor "$(MOC) -E" --factory --wrapperFactory --outputDir $(dir $@) - $(VERBOSE)perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/dom/make_names.pl --attrs $(WEBCORE_DIR)/xml/xmlnsattrs.in --preprocessor "$(MOC) -E" --outputDir $(dir $@) - $(VERBOSE)perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/dom/make_names.pl --attrs $(WEBCORE_DIR)/xml/xmlattrs.in --preprocessor "$(MOC) -E" --outputDir $(dir $@) - $(VERBOSE)perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/dom/make_names.pl --fonts $(WEBCORE_DIR)/css/WebKitFontFamilyNames.in --outputDir $(dir $@) - - @# make_event_factory.pl - $(VERBOSE)perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/dom/make_event_factory.pl --input $(WEBCORE_DIR)/dom/EventNames.in --outputDir $(dir $@) - $(VERBOSE)perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/dom/make_event_factory.pl --input $(WEBCORE_DIR)/dom/EventTargetFactory.in --outputDir $(dir $@) - - @# make-dom-exceptions.pl - $(VERBOSE)perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/dom/make_dom_exceptions.pl --input $(WEBCORE_DIR)/dom/DOMExceptions.in --outputDir $(dir $@) - - @# create-html-entity-table - $(VERBOSE)python $(WEBCORE_DIR)/html/parser/create-html-entity-table -o $(dir $@)/HTMLEntityTable.cpp $(WEBCORE_DIR)/html/parser/HTMLEntityNames.in - - @# make-hash-tools.pl - $(VERBOSE)perl $(WEBCORE_DIR)/make-hash-tools.pl $(dir $@) $(WEBCORE_DIR)/platform/ColorData.gperf - - @# make-css-file-arrays.pl - $(VERBOSE)perl $(WEBCORE_DIR)/css/make-css-file-arrays.pl $(dir $@)/UserAgentStyleSheets.h $(dir $@)/UserAgentStyleSheetsData.cpp $(WEBCORE_DIR)/css/html.css $(WEBCORE_DIR)/css/quirks.css $(WEBCORE_DIR)/css/mathml.css $(WEBCORE_DIR)/css/svg.css $(WEBCORE_DIR)/css/view-source.css $(WEBCORE_DIR)/css/fullscreen.css $(WEBCORE_DIR)/css/mediaControls.css $(WEBCORE_DIR)/css/mediaControlsQt.css $(WEBCORE_DIR)/css/mediaControlsQtFullscreen.css $(WEBCORE_DIR)/css/plugIns.css $(WEBCORE_DIR)/css/themeQtNoListboxes.css $(WEBCORE_DIR)/css/mobileThemeQt.css - $(VERBOSE)perl $(WEBCORE_DIR)/css/make-css-file-arrays.pl $(dir $@)/PlugInsResources.h $(dir $@)/PlugInsResourcesData.cpp $(WEBCORE_DIR)/Resources/plugIns.js - - @# XPathGrammar - $(VERBOSE)bison -d -p xpathyy $(WEBCORE_DIR)/xml/XPathGrammar.y -o $(dir $@)/XPathGrammar.tab.c && $(MOVE) $(dir $@)/XPathGrammar.tab.c $(dir $@)/XPathGrammar.cpp && $(MOVE) $(dir $@)/XPathGrammar.tab.h $(dir $@)/XPathGrammar.h - - @# generate-webkit-version.pl - $(VERBOSE)perl $(WEBCORE_DIR)/../WebKit/scripts/generate-webkitversion.pl --config $(WEBCORE_DIR)/../WebKit/mac/Configurations/Version.xcconfig --outputDir $(dir $@)/ - - $(VERBOSE)touch $@ - - -qt5_headers: include/QtCore \ - include/QtEglSupport \ - include/QtEventDispatcherSupport \ - include/QtFontDatabaseSupport \ - include/QtGui \ - include/QtInputSupport \ - include/QtNetwork \ - include/QtOpenGL \ - include/QtPlatformHeaders \ - include/QtPrintSupport \ - include/QtSql \ - include/QtTest \ - include/QtWidgets \ - include/QtXml \ - include/QtScript \ - include/QtQml \ - include/QtQuick \ - include/QtQuickControls2 \ - include/QtQuickTemplates2 \ - include/QtSvg \ - include/QtDesigner \ - include/QtUiPlugin \ - include/QtUiTools \ - include/QtVirtualKeyboard \ - include/QtWebKit \ - include/QtWebKitWidgets - $(VERBOSE)rm -rf $(BUILD_DIR) - -qtbase_generated: $(CURDIR)/src/lib/qt5/qt5/qtbase/src/corelib/global/qfloat16tables.cpp - -qtdeclarative_generated: $(CURDIR)/src/lib/qt5/qtdeclarative/src/3rdparty/masm/generated.tag \ - $(CURDIR)/src/lib/qt5/qt5/qtdeclarative/src/qml/generated.tag - -qtwebkit_generated: $(CURDIR)/src/lib/qt5/qtwebkit/Source/ThirdParty/ANGLE/generated/generated.tag \ - $(CURDIR)/src/lib/qt5/qtwebkit/Source/JavaScriptCore/generated/generated.tag \ - $(CURDIR)/src/lib/qt5/qtwebkit/Source/WebCore/generated/generated.tag - -default: qt5_headers qtbase_generated qtdeclarative_generated qtwebkit_generated +URL(qt5) := https://github.com/cproc/qt5.git +REV(qt5) := 6e2e8fa1eb37b5fbee8614136868f03dfacd7ca2 +DIR(qt5) := src/lib/qt5 diff --git a/repos/libports/recipes/api/libqgenodeviewwidget/content.mk b/repos/libports/recipes/api/libqgenodeviewwidget/content.mk new file mode 100644 index 0000000000..ee0926be02 --- /dev/null +++ b/repos/libports/recipes/api/libqgenodeviewwidget/content.mk @@ -0,0 +1,10 @@ +MIRROR_FROM_REP_DIR := include/qgenodeviewwidget \ + lib/symbols/libqgenodeviewwidget + +content: $(MIRROR_FROM_REP_DIR) LICENSE + +$(MIRROR_FROM_REP_DIR): + $(mirror_from_rep_dir) + +LICENSE: + cp $(GENODE_DIR)/LICENSE $@ diff --git a/repos/libports/recipes/api/libqgenodeviewwidget/hash b/repos/libports/recipes/api/libqgenodeviewwidget/hash new file mode 100644 index 0000000000..3a2afbbb77 --- /dev/null +++ b/repos/libports/recipes/api/libqgenodeviewwidget/hash @@ -0,0 +1 @@ +2020-06-09 d668eb3d7e772095dd8c47765aa97fdcc6bbb5c9 diff --git a/repos/libports/recipes/api/libqpluginwidget/content.mk b/repos/libports/recipes/api/libqpluginwidget/content.mk new file mode 100644 index 0000000000..4d747580f7 --- /dev/null +++ b/repos/libports/recipes/api/libqpluginwidget/content.mk @@ -0,0 +1,10 @@ +MIRROR_FROM_REP_DIR := include/qpluginwidget \ + lib/symbols/libqpluginwidget + +content: $(MIRROR_FROM_REP_DIR) LICENSE + +$(MIRROR_FROM_REP_DIR): + $(mirror_from_rep_dir) + +LICENSE: + cp $(GENODE_DIR)/LICENSE $@ diff --git a/repos/libports/recipes/api/libqpluginwidget/hash b/repos/libports/recipes/api/libqpluginwidget/hash new file mode 100644 index 0000000000..982706193a --- /dev/null +++ b/repos/libports/recipes/api/libqpluginwidget/hash @@ -0,0 +1 @@ +2020-06-09-a e1a2df9678bc21b94818ba3f39cd3b9b5fd00cfc diff --git a/repos/libports/recipes/api/qt5/content.mk b/repos/libports/recipes/api/qt5/content.mk new file mode 100644 index 0000000000..0320150e96 --- /dev/null +++ b/repos/libports/recipes/api/qt5/content.mk @@ -0,0 +1,20 @@ +MIRROR_FROM_REP_DIR := lib/import/import-qt5_qmake.mk + +content: $(MIRROR_FROM_REP_DIR) + +$(MIRROR_FROM_REP_DIR): + $(mirror_from_rep_dir) + +PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) + +MIRROR_FROM_PORT_DIR := src/lib/qt5/genode/api/* + +content: $(MIRROR_FROM_PORT_DIR) + +$(MIRROR_FROM_PORT_DIR): + cp -r $(PORT_DIR)/$@ . + +content: LICENSE + +LICENSE: + cp $(PORT_DIR)/src/lib/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/api/qt5/hash b/repos/libports/recipes/api/qt5/hash new file mode 100644 index 0000000000..9476d12d47 --- /dev/null +++ b/repos/libports/recipes/api/qt5/hash @@ -0,0 +1 @@ +2020-05-24-i fecc4af66fac648337136b2e7d0f64f9cc1d121e diff --git a/repos/libports/recipes/api/qt5_component/content.mk b/repos/libports/recipes/api/qt5_component/content.mk index fbe7e6519f..faa7d9f4eb 100644 --- a/repos/libports/recipes/api/qt5_component/content.mk +++ b/repos/libports/recipes/api/qt5_component/content.mk @@ -1,4 +1,5 @@ -MIRROR_FROM_REP_DIR := lib/symbols/qt5_component +MIRROR_FROM_REP_DIR := include/qt5_component \ + lib/symbols/qt5_component content: $(MIRROR_FROM_REP_DIR) LICENSE diff --git a/repos/libports/recipes/api/qt5_core/content.mk b/repos/libports/recipes/api/qt5_core/content.mk deleted file mode 100644 index 5b69308cfd..0000000000 --- a/repos/libports/recipes/api/qt5_core/content.mk +++ /dev/null @@ -1,27 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/import/import-qt5_core.mk \ - lib/import/import-qt5_pcre2.mk \ - lib/import/import-qt5.inc - -content: $(MIRROR_FROM_REP_DIR) - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := include/QtCore \ - lib/symbols/qt5_core \ - src/lib/qt5/qt5/qtbase/mkspecs/common/c89 \ - src/lib/qt5/qt5/qtbase/mkspecs/common/posix \ - src/lib/qt5/qt5/qtbase/mkspecs/genode-g++ - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/api/qt5_core/hash b/repos/libports/recipes/api/qt5_core/hash deleted file mode 100644 index a68d0c5e06..0000000000 --- a/repos/libports/recipes/api/qt5_core/hash +++ /dev/null @@ -1 +0,0 @@ -2020-02-19 0eaff4e6023306560043bfbc95e8524ab99fdfa6 diff --git a/repos/libports/recipes/api/qt5_gui/content.mk b/repos/libports/recipes/api/qt5_gui/content.mk deleted file mode 100644 index b09afdf2b8..0000000000 --- a/repos/libports/recipes/api/qt5_gui/content.mk +++ /dev/null @@ -1,23 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/import/import-qt5_gui.mk \ - lib/import/import-qt5.inc - -content: $(MIRROR_FROM_REP_DIR) - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := include/QtGui \ - lib/symbols/qt5_gui - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/api/qt5_gui/hash b/repos/libports/recipes/api/qt5_gui/hash deleted file mode 100644 index c4fbca7d03..0000000000 --- a/repos/libports/recipes/api/qt5_gui/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-17 966a17f191101426c8f56ec435c7ffa908482fa5 diff --git a/repos/libports/recipes/api/qt5_network/content.mk b/repos/libports/recipes/api/qt5_network/content.mk deleted file mode 100644 index ba3db9884e..0000000000 --- a/repos/libports/recipes/api/qt5_network/content.mk +++ /dev/null @@ -1,23 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/import/import-qt5_network.mk \ - lib/import/import-qt5.inc - -content: $(MIRROR_FROM_REP_DIR) - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := include/QtNetwork \ - lib/symbols/qt5_network - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/api/qt5_network/hash b/repos/libports/recipes/api/qt5_network/hash deleted file mode 100644 index 2bd14bdcc9..0000000000 --- a/repos/libports/recipes/api/qt5_network/hash +++ /dev/null @@ -1 +0,0 @@ -2019-08-28 317d2186dd0110967d7cace5ba5a249b8f3b9ce6 diff --git a/repos/libports/recipes/api/qt5_opengl/content.mk b/repos/libports/recipes/api/qt5_opengl/content.mk deleted file mode 100644 index 90436f9f58..0000000000 --- a/repos/libports/recipes/api/qt5_opengl/content.mk +++ /dev/null @@ -1,23 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/import/import-qt5_opengl.mk \ - lib/import/import-qt5.inc - -content: $(MIRROR_FROM_REP_DIR) - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := include/QtOpenGL \ - lib/symbols/qt5_opengl - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/api/qt5_opengl/hash b/repos/libports/recipes/api/qt5_opengl/hash deleted file mode 100644 index e6eda6dc0a..0000000000 --- a/repos/libports/recipes/api/qt5_opengl/hash +++ /dev/null @@ -1 +0,0 @@ -2019-08-28 21b3a988b4bc3490558c990df9c64fe02c559278 diff --git a/repos/libports/recipes/api/qt5_printsupport/content.mk b/repos/libports/recipes/api/qt5_printsupport/content.mk deleted file mode 100644 index 76e5ab30c8..0000000000 --- a/repos/libports/recipes/api/qt5_printsupport/content.mk +++ /dev/null @@ -1,23 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/import/import-qt5_printsupport.mk \ - lib/import/import-qt5.inc - -content: $(MIRROR_FROM_REP_DIR) - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := include/QtPrintSupport \ - lib/symbols/qt5_printsupport - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/api/qt5_printsupport/hash b/repos/libports/recipes/api/qt5_printsupport/hash deleted file mode 100644 index 26e4a55e7a..0000000000 --- a/repos/libports/recipes/api/qt5_printsupport/hash +++ /dev/null @@ -1 +0,0 @@ -2019-08-28 f99943fa64996e17569b7099743118aa79b3d73e diff --git a/repos/libports/recipes/api/qt5_qgenodeviewwidget/content.mk b/repos/libports/recipes/api/qt5_qgenodeviewwidget/content.mk deleted file mode 100644 index f91502f8b0..0000000000 --- a/repos/libports/recipes/api/qt5_qgenodeviewwidget/content.mk +++ /dev/null @@ -1,11 +0,0 @@ -MIRROR_FROM_REP_DIR := include/qt5/qgenodeviewwidget \ - lib/import/import-qt5_qgenodeviewwidget.mk \ - lib/symbols/qt5_qgenodeviewwidget - -content: $(MIRROR_FROM_REP_DIR) LICENSE - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -LICENSE: - cp $(GENODE_DIR)/LICENSE $@ diff --git a/repos/libports/recipes/api/qt5_qgenodeviewwidget/hash b/repos/libports/recipes/api/qt5_qgenodeviewwidget/hash deleted file mode 100644 index 20ff14f94a..0000000000 --- a/repos/libports/recipes/api/qt5_qgenodeviewwidget/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-21 f5ba29a2f9ba04e0e4c536c0c2ca3e13e7704b10 diff --git a/repos/libports/recipes/api/qt5_qjpeg/content.mk b/repos/libports/recipes/api/qt5_qjpeg/content.mk deleted file mode 100644 index c4c6fe6c9f..0000000000 --- a/repos/libports/recipes/api/qt5_qjpeg/content.mk +++ /dev/null @@ -1,22 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/import/import-qt5_qjpeg.mk \ - lib/import/import-qt5.inc - -content: $(MIRROR_FROM_REP_DIR) - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := lib/symbols/qt5_qjpeg - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/api/qt5_qjpeg/hash b/repos/libports/recipes/api/qt5_qjpeg/hash deleted file mode 100644 index cfa01815a7..0000000000 --- a/repos/libports/recipes/api/qt5_qjpeg/hash +++ /dev/null @@ -1 +0,0 @@ -2019-08-28 46439f28b9e1d3e2111873aeabdb1a618db8f7e8 diff --git a/repos/libports/recipes/api/qt5_qml/content.mk b/repos/libports/recipes/api/qt5_qml/content.mk deleted file mode 100644 index 884847b85d..0000000000 --- a/repos/libports/recipes/api/qt5_qml/content.mk +++ /dev/null @@ -1,23 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/import/import-qt5_qml.mk \ - lib/import/import-qt5.inc - -content: $(MIRROR_FROM_REP_DIR) - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := include/QtQml \ - lib/symbols/qt5_qml - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/api/qt5_qml/hash b/repos/libports/recipes/api/qt5_qml/hash deleted file mode 100644 index 24c17d1c2d..0000000000 --- a/repos/libports/recipes/api/qt5_qml/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-21 a6b5607b45f9bd6a5645c98b8b8b72156330c8a5 diff --git a/repos/libports/recipes/api/qt5_qpa_genode/content.mk b/repos/libports/recipes/api/qt5_qpa_genode/content.mk deleted file mode 100644 index 1c082100b3..0000000000 --- a/repos/libports/recipes/api/qt5_qpa_genode/content.mk +++ /dev/null @@ -1,27 +0,0 @@ -MIRROR_FROM_REP_DIR := include/qt5/qpa_genode \ - lib/import/import-qt5_qpa_genode.mk \ - lib/import/import-qt5.inc \ - lib/symbols/qt5_qpa_genode - -content: $(MIRROR_FROM_REP_DIR) - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := include/QtEglSupport \ - include/QtEventDispatcherSupport \ - include/QtFontDatabaseSupport \ - include/QtInputSupport - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $@ - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(GENODE_DIR)/LICENSE $@ diff --git a/repos/libports/recipes/api/qt5_qpa_genode/hash b/repos/libports/recipes/api/qt5_qpa_genode/hash deleted file mode 100644 index 8a5e461bd5..0000000000 --- a/repos/libports/recipes/api/qt5_qpa_genode/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-21 e122e1cdd3b060f11aeb90af64e303019873bb03 diff --git a/repos/libports/recipes/api/qt5_qpluginwidget/content.mk b/repos/libports/recipes/api/qt5_qpluginwidget/content.mk deleted file mode 100644 index 2cd9e2dd42..0000000000 --- a/repos/libports/recipes/api/qt5_qpluginwidget/content.mk +++ /dev/null @@ -1,11 +0,0 @@ -MIRROR_FROM_REP_DIR := include/qt5/qpluginwidget \ - lib/import/import-qt5_qpluginwidget.mk \ - lib/symbols/qt5_qpluginwidget - -content: $(MIRROR_FROM_REP_DIR) LICENSE - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -LICENSE: - cp $(GENODE_DIR)/LICENSE $@ diff --git a/repos/libports/recipes/api/qt5_qpluginwidget/hash b/repos/libports/recipes/api/qt5_qpluginwidget/hash deleted file mode 100644 index 0578f49b69..0000000000 --- a/repos/libports/recipes/api/qt5_qpluginwidget/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-21 caf836089cd0ab4f17b0687909a4a86eeb4ea097 diff --git a/repos/libports/recipes/api/qt5_quick/content.mk b/repos/libports/recipes/api/qt5_quick/content.mk deleted file mode 100644 index 62b046b9fd..0000000000 --- a/repos/libports/recipes/api/qt5_quick/content.mk +++ /dev/null @@ -1,23 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/import/import-qt5_quick.mk \ - lib/import/import-qt5.inc - -content: $(MIRROR_FROM_REP_DIR) - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := include/QtQuick \ - lib/symbols/qt5_quick - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/api/qt5_quick/hash b/repos/libports/recipes/api/qt5_quick/hash deleted file mode 100644 index 88fc5f3e7a..0000000000 --- a/repos/libports/recipes/api/qt5_quick/hash +++ /dev/null @@ -1 +0,0 @@ -2019-08-28 e1b1d823bcccb4750ed659303c16638c27dfddb4 diff --git a/repos/libports/recipes/api/qt5_quickcontrols2/content.mk b/repos/libports/recipes/api/qt5_quickcontrols2/content.mk deleted file mode 100644 index 73e6a45d11..0000000000 --- a/repos/libports/recipes/api/qt5_quickcontrols2/content.mk +++ /dev/null @@ -1,23 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/import/import-qt5_quickcontrols2.mk \ - lib/import/import-qt5.inc - -content: $(MIRROR_FROM_REP_DIR) - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := include/QtQuickControls2 \ - lib/symbols/qt5_quickcontrols2 - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/api/qt5_quickcontrols2/hash b/repos/libports/recipes/api/qt5_quickcontrols2/hash deleted file mode 100644 index 988377d457..0000000000 --- a/repos/libports/recipes/api/qt5_quickcontrols2/hash +++ /dev/null @@ -1 +0,0 @@ -2019-09-19 0f770ca8aa55bfcc1f09e733dc80094322ad5b7f diff --git a/repos/libports/recipes/api/qt5_quicktemplates2/content.mk b/repos/libports/recipes/api/qt5_quicktemplates2/content.mk deleted file mode 100644 index 32f3da598c..0000000000 --- a/repos/libports/recipes/api/qt5_quicktemplates2/content.mk +++ /dev/null @@ -1,23 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/import/import-qt5_quicktemplates2.mk \ - lib/import/import-qt5.inc - -content: $(MIRROR_FROM_REP_DIR) - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := include/QtQuickTemplates2 \ - lib/symbols/qt5_quicktemplates2 - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/api/qt5_quicktemplates2/hash b/repos/libports/recipes/api/qt5_quicktemplates2/hash deleted file mode 100644 index adc48cfca6..0000000000 --- a/repos/libports/recipes/api/qt5_quicktemplates2/hash +++ /dev/null @@ -1 +0,0 @@ -2019-09-19 5db2104df53abcb0322e1d3fd189ad62a17ed100 diff --git a/repos/libports/recipes/api/qt5_scriptclassic/content.mk b/repos/libports/recipes/api/qt5_scriptclassic/content.mk deleted file mode 100644 index 573dbbedee..0000000000 --- a/repos/libports/recipes/api/qt5_scriptclassic/content.mk +++ /dev/null @@ -1,23 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/import/import-qt5_scriptclassic.mk \ - lib/import/import-qt5.inc - -content: $(MIRROR_FROM_REP_DIR) - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := include/QtScript \ - lib/symbols/qt5_scriptclassic - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/api/qt5_scriptclassic/hash b/repos/libports/recipes/api/qt5_scriptclassic/hash deleted file mode 100644 index 675f193d8a..0000000000 --- a/repos/libports/recipes/api/qt5_scriptclassic/hash +++ /dev/null @@ -1 +0,0 @@ -2019-08-28 18392e84e5e18acdc6df7490d23c9c52e3120d74 diff --git a/repos/libports/recipes/api/qt5_sql/content.mk b/repos/libports/recipes/api/qt5_sql/content.mk deleted file mode 100644 index d5ee5fae58..0000000000 --- a/repos/libports/recipes/api/qt5_sql/content.mk +++ /dev/null @@ -1,23 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/import/import-qt5_sql.mk \ - lib/import/import-qt5.inc - -content: $(MIRROR_FROM_REP_DIR) - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := include/QtSql \ - lib/symbols/qt5_sql - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/api/qt5_sql/hash b/repos/libports/recipes/api/qt5_sql/hash deleted file mode 100644 index 638df30c01..0000000000 --- a/repos/libports/recipes/api/qt5_sql/hash +++ /dev/null @@ -1 +0,0 @@ -2019-08-28 ea2025014c1d3226132818db47f6f1575bc6f47a diff --git a/repos/libports/recipes/api/qt5_svg/content.mk b/repos/libports/recipes/api/qt5_svg/content.mk deleted file mode 100644 index 1e51959348..0000000000 --- a/repos/libports/recipes/api/qt5_svg/content.mk +++ /dev/null @@ -1,23 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/import/import-qt5_svg.mk \ - lib/import/import-qt5.inc - -content: $(MIRROR_FROM_REP_DIR) - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := include/QtSvg \ - lib/symbols/qt5_svg - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/api/qt5_svg/hash b/repos/libports/recipes/api/qt5_svg/hash deleted file mode 100644 index caa156d690..0000000000 --- a/repos/libports/recipes/api/qt5_svg/hash +++ /dev/null @@ -1 +0,0 @@ -2019-08-28 effb88182edc78c7799ac968aeef32a6f03f8d61 diff --git a/repos/libports/recipes/api/qt5_test/content.mk b/repos/libports/recipes/api/qt5_test/content.mk deleted file mode 100644 index 2eb53b7a43..0000000000 --- a/repos/libports/recipes/api/qt5_test/content.mk +++ /dev/null @@ -1,23 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/import/import-qt5_test.mk \ - lib/import/import-qt5.inc - -content: $(MIRROR_FROM_REP_DIR) - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := include/QtTest \ - lib/symbols/qt5_test - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/api/qt5_test/hash b/repos/libports/recipes/api/qt5_test/hash deleted file mode 100644 index ee9fcb7f87..0000000000 --- a/repos/libports/recipes/api/qt5_test/hash +++ /dev/null @@ -1 +0,0 @@ -2019-08-28 e5aa0301797c14922b565e32575ee6163d0b2574 diff --git a/repos/libports/recipes/api/qt5_ui_tools/content.mk b/repos/libports/recipes/api/qt5_ui_tools/content.mk deleted file mode 100644 index f41a5f2ded..0000000000 --- a/repos/libports/recipes/api/qt5_ui_tools/content.mk +++ /dev/null @@ -1,25 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/import/import-qt5_ui_tools.mk \ - lib/import/import-qt5.inc - -content: $(MIRROR_FROM_REP_DIR) - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := include/QtDesigner \ - include/QtUiPlugin \ - include/QtUiTools \ - lib/symbols/qt5_ui_tools - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/api/qt5_ui_tools/hash b/repos/libports/recipes/api/qt5_ui_tools/hash deleted file mode 100644 index 72061dd22d..0000000000 --- a/repos/libports/recipes/api/qt5_ui_tools/hash +++ /dev/null @@ -1 +0,0 @@ -2019-08-28 f887f71497a5fc453d6c13cc5d056f5a42b74402 diff --git a/repos/libports/recipes/api/qt5_virtualkeyboard/content.mk b/repos/libports/recipes/api/qt5_virtualkeyboard/content.mk deleted file mode 100644 index 675cec0912..0000000000 --- a/repos/libports/recipes/api/qt5_virtualkeyboard/content.mk +++ /dev/null @@ -1,23 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/import/import-qt5_virtualkeyboard.mk \ - lib/import/import-qt5.inc - -content: $(MIRROR_FROM_REP_DIR) - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := include/QtVirtualKeyboard \ - lib/symbols/qt5_virtualkeyboard - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/api/qt5_virtualkeyboard/hash b/repos/libports/recipes/api/qt5_virtualkeyboard/hash deleted file mode 100644 index 11b9a61021..0000000000 --- a/repos/libports/recipes/api/qt5_virtualkeyboard/hash +++ /dev/null @@ -1 +0,0 @@ -2019-08-28 6aa22aaa872e7b12d9ec6cd2b2ea7f0a9680ef0c diff --git a/repos/libports/recipes/api/qt5_webkit/content.mk b/repos/libports/recipes/api/qt5_webkit/content.mk deleted file mode 100644 index f8944dcb33..0000000000 --- a/repos/libports/recipes/api/qt5_webkit/content.mk +++ /dev/null @@ -1,34 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/import/import-qt5_angle.mk \ - lib/import/import-qt5_jscore.mk \ - lib/import/import-qt5_webcore.mk \ - lib/import/import-qt5_webkit.mk \ - lib/import/import-qt5_webkitwidgets.mk \ - lib/import/import-qt5_wtf.mk \ - lib/import/import-qt5.inc - -content: $(MIRROR_FROM_REP_DIR) - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := include/QtWebKit \ - include/QtWebKitWidgets \ - lib/symbols/qt5_angle \ - lib/symbols/qt5_jscore \ - lib/symbols/qt5_webcore \ - lib/symbols/qt5_webkit \ - lib/symbols/qt5_webkitwidgets \ - lib/symbols/qt5_wtf - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/api/qt5_webkit/hash b/repos/libports/recipes/api/qt5_webkit/hash deleted file mode 100644 index 75a6947edb..0000000000 --- a/repos/libports/recipes/api/qt5_webkit/hash +++ /dev/null @@ -1 +0,0 @@ -2019-08-28 53a9b038a4aef840828c0450e0afc5c28fc89fd2 diff --git a/repos/libports/recipes/api/qt5_widgets/content.mk b/repos/libports/recipes/api/qt5_widgets/content.mk deleted file mode 100644 index 760ec6f097..0000000000 --- a/repos/libports/recipes/api/qt5_widgets/content.mk +++ /dev/null @@ -1,24 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/import/import-qt5_widgets.mk \ - lib/import/import-qt5.inc - -content: $(MIRROR_FROM_REP_DIR) - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := include/QtPlatformHeaders \ - include/QtWidgets \ - lib/symbols/qt5_widgets - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/api/qt5_widgets/hash b/repos/libports/recipes/api/qt5_widgets/hash deleted file mode 100644 index 515e21e8f8..0000000000 --- a/repos/libports/recipes/api/qt5_widgets/hash +++ /dev/null @@ -1 +0,0 @@ -2019-08-28 7fb65a11a303f17d3b17cf36ef52250d3a51fba2 diff --git a/repos/libports/recipes/api/qt5_xml/content.mk b/repos/libports/recipes/api/qt5_xml/content.mk deleted file mode 100644 index 2c3d12be47..0000000000 --- a/repos/libports/recipes/api/qt5_xml/content.mk +++ /dev/null @@ -1,23 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/import/import-qt5_xml.mk \ - lib/import/import-qt5.inc - -content: $(MIRROR_FROM_REP_DIR) - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := include/QtXml \ - lib/symbols/qt5_xml - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/api/qt5_xml/hash b/repos/libports/recipes/api/qt5_xml/hash deleted file mode 100644 index 667170c9dc..0000000000 --- a/repos/libports/recipes/api/qt5_xml/hash +++ /dev/null @@ -1 +0,0 @@ -2019-08-28 07a8c1f74f210b9d35f4ae1db686d3081559aaec diff --git a/repos/libports/recipes/pkg/qt5_textedit/archives b/repos/libports/recipes/pkg/qt5_textedit/archives index c1ba9d7590..aa9b33547a 100644 --- a/repos/libports/recipes/pkg/qt5_textedit/archives +++ b/repos/libports/recipes/pkg/qt5_textedit/archives @@ -5,16 +5,11 @@ _/src/jpeg _/src/libc _/src/libpng _/src/mesa -_/src/qt5_core -_/src/qt5_gui -_/src/qt5_qjpeg -_/src/qt5_qpa_genode +_/src/qt5_base _/src/stdcxx _/src/vfs _/src/vfs_pipe _/src/zlib _/raw/qt5_textedit _/src/qt5_component -_/src/qt5_printsupport _/src/qt5_textedit -_/src/qt5_widgets diff --git a/repos/libports/recipes/pkg/qt5_textedit/runtime b/repos/libports/recipes/pkg/qt5_textedit/runtime index aeec7ff5a1..336c17d8d9 100644 --- a/repos/libports/recipes/pkg/qt5_textedit/runtime +++ b/repos/libports/recipes/pkg/qt5_textedit/runtime @@ -18,15 +18,15 @@ + + + - - - - + @@ -35,8 +35,8 @@ - - + + diff --git a/repos/libports/recipes/raw/qt5_dejavusans/content.mk b/repos/libports/recipes/raw/qt5_dejavusans/content.mk index 6ad12b2569..4c57aa84f9 100644 --- a/repos/libports/recipes/raw/qt5_dejavusans/content.mk +++ b/repos/libports/recipes/raw/qt5_dejavusans/content.mk @@ -4,7 +4,7 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) qt/lib/fonts/DejaVuSans.ttf: mkdir -p $(dir $@) - cp $(PORT_DIR)/src/lib/qt5/qt5/qtquickcontrols/examples/quickcontrols/extras/dashboard/fonts/$(notdir $@) $@ + cp $(PORT_DIR)/src/lib/qt5/qtquickcontrols/examples/quickcontrols/extras/dashboard/fonts/$(notdir $@) $@ qt5_dejavusans.tar: qt/lib/fonts/DejaVuSans.ttf tar --owner=0 --group=0 --numeric-owner --mode='go=' --mtime='1970-01-01 00:00+00' -cf $@ qt diff --git a/repos/libports/recipes/raw/qt5_qt_labs_folderlistmodel/content.mk b/repos/libports/recipes/raw/qt5_qt_labs_folderlistmodel/content.mk deleted file mode 100644 index 12191ad540..0000000000 --- a/repos/libports/recipes/raw/qt5_qt_labs_folderlistmodel/content.mk +++ /dev/null @@ -1,16 +0,0 @@ -content: qt5_qt_labs_folderlistmodel.tar - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -INSTALL_DIR := qt/qml/Qt/labs/folderlistmodel -QMLDIR := $(INSTALL_DIR)/qmldir - -$(INSTALL_DIR): - mkdir -p $@ - -$(QMLDIR): $(INSTALL_DIR) - cp $(PORT_DIR)/src/lib/qt5/qt5/qtdeclarative/src/imports/folderlistmodel/qmldir $@ - -qt5_qt_labs_folderlistmodel.tar: $(QMLDIR) - tar --owner=0 --group=0 --numeric-owner --mode='go=' --mtime='1970-01-01 00:00+00' -cf $@ qt - rm -rf qt diff --git a/repos/libports/recipes/raw/qt5_qt_labs_folderlistmodel/hash b/repos/libports/recipes/raw/qt5_qt_labs_folderlistmodel/hash deleted file mode 100644 index 1375a3c5ee..0000000000 --- a/repos/libports/recipes/raw/qt5_qt_labs_folderlistmodel/hash +++ /dev/null @@ -1 +0,0 @@ -2019-02-25 a53217fddae63fe08bfaad7d2a40564190bf4a6e diff --git a/repos/libports/recipes/raw/qt5_qtquick2/content.mk b/repos/libports/recipes/raw/qt5_qtquick2/content.mk deleted file mode 100644 index e82c3b27f1..0000000000 --- a/repos/libports/recipes/raw/qt5_qtquick2/content.mk +++ /dev/null @@ -1,16 +0,0 @@ -content: qt5_qtquick2.tar - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -INSTALL_DIR := qt/qml/QtQuick.2 -QMLDIR := $(INSTALL_DIR)/qmldir - -$(INSTALL_DIR): - mkdir -p $@ - -$(QMLDIR): $(INSTALL_DIR) - cp $(PORT_DIR)/src/lib/qt5/qt5/qtdeclarative/src/imports/qtquick2/qmldir $@ - -qt5_qtquick2.tar: $(QMLDIR) - tar --owner=0 --group=0 --numeric-owner --mode='go=' --mtime='1970-01-01 00:00+00' -cf $@ qt - rm -rf qt diff --git a/repos/libports/recipes/raw/qt5_qtquick2/hash b/repos/libports/recipes/raw/qt5_qtquick2/hash deleted file mode 100644 index 04911503fe..0000000000 --- a/repos/libports/recipes/raw/qt5_qtquick2/hash +++ /dev/null @@ -1 +0,0 @@ -2019-02-25 7b9b104117652e1316d10901f155e43b95e38018 diff --git a/repos/libports/recipes/raw/qt5_qtquick_controls2/content.mk b/repos/libports/recipes/raw/qt5_qtquick_controls2/content.mk deleted file mode 100644 index 8a53c67418..0000000000 --- a/repos/libports/recipes/raw/qt5_qtquick_controls2/content.mk +++ /dev/null @@ -1,16 +0,0 @@ -content: qt5_qtquick_controls2.tar - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -INSTALL_DIR := qt/qml/QtQuick/Controls.2 -QMLDIR := $(INSTALL_DIR)/qmldir - -$(INSTALL_DIR): - mkdir -p $@ - -$(QMLDIR): $(INSTALL_DIR) - cp $(PORT_DIR)/src/lib/qt5/qt5/qtquickcontrols2/src/imports/controls/qmldir $@ - -qt5_qtquick_controls2.tar: $(QMLDIR) - tar --owner=0 --group=0 --numeric-owner --mode='go=' --mtime='1970-01-01 00:00+00' -cf $@ qt - rm -rf qt diff --git a/repos/libports/recipes/raw/qt5_qtquick_controls2/hash b/repos/libports/recipes/raw/qt5_qtquick_controls2/hash deleted file mode 100644 index cf026c9279..0000000000 --- a/repos/libports/recipes/raw/qt5_qtquick_controls2/hash +++ /dev/null @@ -1 +0,0 @@ -2019-09-05 bdba54a331f9dcb8ef7967bf78e936d8f5a3a707 diff --git a/repos/libports/recipes/raw/qt5_qtquick_layouts/content.mk b/repos/libports/recipes/raw/qt5_qtquick_layouts/content.mk deleted file mode 100644 index 02d9f9ca2c..0000000000 --- a/repos/libports/recipes/raw/qt5_qtquick_layouts/content.mk +++ /dev/null @@ -1,16 +0,0 @@ -content: qt5_qtquick_layouts.tar - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -INSTALL_DIR := qt/qml/QtQuick/Layouts -QMLDIR := $(INSTALL_DIR)/qmldir - -$(INSTALL_DIR): - mkdir -p $@ - -$(QMLDIR): $(INSTALL_DIR) - cp $(PORT_DIR)/src/lib/qt5/qt5/qtdeclarative/src/imports/layouts/qmldir $@ - -qt5_qtquick_layouts.tar: $(QMLDIR) - tar --owner=0 --group=0 --numeric-owner --mode='go=' --mtime='1970-01-01 00:00+00' -cf $@ qt - rm -rf qt diff --git a/repos/libports/recipes/raw/qt5_qtquick_layouts/hash b/repos/libports/recipes/raw/qt5_qtquick_layouts/hash deleted file mode 100644 index bafe4e21be..0000000000 --- a/repos/libports/recipes/raw/qt5_qtquick_layouts/hash +++ /dev/null @@ -1 +0,0 @@ -2019-02-25 b754346860940c73234a7740d06e6b5c61113863 diff --git a/repos/libports/recipes/raw/qt5_qtquick_templates2/content.mk b/repos/libports/recipes/raw/qt5_qtquick_templates2/content.mk deleted file mode 100644 index f51543896e..0000000000 --- a/repos/libports/recipes/raw/qt5_qtquick_templates2/content.mk +++ /dev/null @@ -1,16 +0,0 @@ -content: qt5_qtquick_templates2.tar - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -INSTALL_DIR := qt/qml/QtQuick/Templates.2 -QMLDIR := $(INSTALL_DIR)/qmldir - -$(INSTALL_DIR): - mkdir -p $@ - -$(QMLDIR): $(INSTALL_DIR) - cp $(PORT_DIR)/src/lib/qt5/qt5/qtquickcontrols2/src/imports/templates/qmldir $@ - -qt5_qtquick_templates2.tar: $(QMLDIR) - tar --owner=0 --group=0 --numeric-owner --mode='go=' --mtime='1970-01-01 00:00+00' -cf $@ qt - rm -rf qt diff --git a/repos/libports/recipes/raw/qt5_qtquick_templates2/hash b/repos/libports/recipes/raw/qt5_qtquick_templates2/hash deleted file mode 100644 index 716084016e..0000000000 --- a/repos/libports/recipes/raw/qt5_qtquick_templates2/hash +++ /dev/null @@ -1 +0,0 @@ -2019-09-05-a 2fb3f15668a99e40948b485e31381a4489f99774 diff --git a/repos/libports/recipes/raw/qt5_qtquick_virtualkeyboard/content.mk b/repos/libports/recipes/raw/qt5_qtquick_virtualkeyboard/content.mk deleted file mode 100644 index 906269d441..0000000000 --- a/repos/libports/recipes/raw/qt5_qtquick_virtualkeyboard/content.mk +++ /dev/null @@ -1,30 +0,0 @@ -content: qt5_qtquick_virtualkeyboard.tar - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -INSTALL_DIR := qt/qml/QtQuick/VirtualKeyboard -QMLDIR := $(INSTALL_DIR)/qmldir -SETTINGS_QMLDIR := $(INSTALL_DIR)/Settings/qmldir -STYLES_QMLDIR := $(INSTALL_DIR)/Styles/qmldir - -$(INSTALL_DIR): - mkdir -p $@ - -$(INSTALL_DIR)/Settings: - mkdir -p $@ - -$(INSTALL_DIR)/Styles: - mkdir -p $@ - -$(QMLDIR): $(INSTALL_DIR) - cp $(PORT_DIR)/src/lib/qt5/qt5/qtvirtualkeyboard/src/import/qmldir $@ - -$(SETTINGS_QMLDIR): $(INSTALL_DIR)/Settings - cp $(PORT_DIR)/src/lib/qt5/qt5/qtvirtualkeyboard/src/settings/qmldir $@ - -$(STYLES_QMLDIR): $(INSTALL_DIR)/Styles - cp $(PORT_DIR)/src/lib/qt5/qt5/qtvirtualkeyboard/src/styles/qmldir $@ - -qt5_qtquick_virtualkeyboard.tar: $(QMLDIR) $(SETTINGS_QMLDIR) $(STYLES_QMLDIR) - tar --owner=0 --group=0 --numeric-owner --mode='go=' --mtime='1970-01-01 00:00+00' -cf $@ qt - rm -rf qt diff --git a/repos/libports/recipes/raw/qt5_qtquick_virtualkeyboard/hash b/repos/libports/recipes/raw/qt5_qtquick_virtualkeyboard/hash deleted file mode 100644 index b9b9113ffb..0000000000 --- a/repos/libports/recipes/raw/qt5_qtquick_virtualkeyboard/hash +++ /dev/null @@ -1 +0,0 @@ -2019-09-19 5e86dd58cc1c9c020a5be75fa03feaef60bff717 diff --git a/repos/libports/recipes/raw/qt5_qtquick_window/content.mk b/repos/libports/recipes/raw/qt5_qtquick_window/content.mk deleted file mode 100644 index 9acb2ac1aa..0000000000 --- a/repos/libports/recipes/raw/qt5_qtquick_window/content.mk +++ /dev/null @@ -1,16 +0,0 @@ -content: qt5_qtquick_window.tar - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -INSTALL_DIR := qt/qml/QtQuick/Window.2 -QMLDIR := $(INSTALL_DIR)/qmldir - -$(INSTALL_DIR): - mkdir -p $@ - -$(QMLDIR): $(INSTALL_DIR) - cp $(PORT_DIR)/src/lib/qt5/qt5/qtdeclarative/src/imports/window/qmldir $@ - -qt5_qtquick_window.tar: $(QMLDIR) - tar --owner=0 --group=0 --numeric-owner --mode='go=' --mtime='1970-01-01 00:00+00' -cf $@ qt - rm -rf qt diff --git a/repos/libports/recipes/raw/qt5_qtquick_window/hash b/repos/libports/recipes/raw/qt5_qtquick_window/hash deleted file mode 100644 index 7dc034ae7d..0000000000 --- a/repos/libports/recipes/raw/qt5_qtquick_window/hash +++ /dev/null @@ -1 +0,0 @@ -2019-02-25 6ffafd269b1cd084a794fb19cd931cb2a12d61bc diff --git a/repos/libports/recipes/raw/qt5_samegame/content.mk b/repos/libports/recipes/raw/qt5_samegame/content.mk index 7aee6bde29..47c502e94f 100644 --- a/repos/libports/recipes/raw/qt5_samegame/content.mk +++ b/repos/libports/recipes/raw/qt5_samegame/content.mk @@ -21,10 +21,10 @@ samegame/shared/pics: mkdir -p $@ $(addprefix samegame/, $(SAMEGAME3_RESOURCES)): samegame - cp $(PORT_DIR)/src/lib/qt5/qt5/qtdeclarative/examples/quick/tutorials/samegame/samegame3/$(notdir $@) $@ + cp $(PORT_DIR)/src/lib/qt5/qtdeclarative/examples/quick/tutorials/samegame/samegame3/$(notdir $@) $@ $(addprefix samegame/shared/pics/, $(SAMEGAME_RESOURCES)): samegame/shared/pics - cp $(PORT_DIR)/src/lib/qt5/qt5/qtdeclarative/examples/quick/tutorials/samegame/shared/pics/$(notdir $@) $@ + cp $(PORT_DIR)/src/lib/qt5/qtdeclarative/examples/quick/tutorials/samegame/shared/pics/$(notdir $@) $@ qt5_samegame.tar: $(addprefix samegame/, $(SAMEGAME3_RESOURCES)) \ diff --git a/repos/libports/recipes/raw/qt5_textedit/textedit.config b/repos/libports/recipes/raw/qt5_textedit/textedit.config index 07c8c7e693..8a6b82924a 100644 --- a/repos/libports/recipes/raw/qt5_textedit/textedit.config +++ b/repos/libports/recipes/raw/qt5_textedit/textedit.config @@ -7,6 +7,7 @@ + diff --git a/repos/libports/recipes/src/libqgenodeviewwidget/api b/repos/libports/recipes/src/libqgenodeviewwidget/api new file mode 100644 index 0000000000..f0a866e761 --- /dev/null +++ b/repos/libports/recipes/src/libqgenodeviewwidget/api @@ -0,0 +1 @@ +libqgenodeviewwidget diff --git a/repos/libports/recipes/src/libqgenodeviewwidget/content.mk b/repos/libports/recipes/src/libqgenodeviewwidget/content.mk new file mode 100644 index 0000000000..01dd2e58ce --- /dev/null +++ b/repos/libports/recipes/src/libqgenodeviewwidget/content.mk @@ -0,0 +1,14 @@ +MIRROR_FROM_REP_DIR := lib/mk/libqgenodeviewwidget.mk \ + src/lib/qgenodeviewwidget + +content: $(MIRROR_FROM_REP_DIR) LICENSE src/lib/qgenodeviewwidget/target.mk + +$(MIRROR_FROM_REP_DIR): + $(mirror_from_rep_dir) + +src/lib/qgenodeviewwidget/target.mk: + mkdir -p $(dir $@) + echo "LIBS = libqgenodeviewwidget" > $@ + +LICENSE: + cp $(GENODE_DIR)/LICENSE $@ diff --git a/repos/libports/recipes/src/libqgenodeviewwidget/hash b/repos/libports/recipes/src/libqgenodeviewwidget/hash new file mode 100644 index 0000000000..2c4cc98280 --- /dev/null +++ b/repos/libports/recipes/src/libqgenodeviewwidget/hash @@ -0,0 +1 @@ +2020-06-09 7e1656aa8305487a6b621558a4486783ce831221 diff --git a/repos/libports/recipes/src/qt5_qgenodeviewwidget/used_apis b/repos/libports/recipes/src/libqgenodeviewwidget/used_apis similarity index 63% rename from repos/libports/recipes/src/qt5_qgenodeviewwidget/used_apis rename to repos/libports/recipes/src/libqgenodeviewwidget/used_apis index 037b3567a6..a5bf8105f0 100644 --- a/repos/libports/recipes/src/qt5_qgenodeviewwidget/used_apis +++ b/repos/libports/recipes/src/libqgenodeviewwidget/used_apis @@ -1,13 +1,10 @@ base framebuffer_session +gui_session input_session libc mesa -gui_session os qoost -qt5_core -qt5_gui -qt5_qpa_genode -qt5_widgets +qt5 stdcxx diff --git a/repos/libports/recipes/src/libqpluginwidget/api b/repos/libports/recipes/src/libqpluginwidget/api new file mode 100644 index 0000000000..0d91f1fde4 --- /dev/null +++ b/repos/libports/recipes/src/libqpluginwidget/api @@ -0,0 +1 @@ +libqpluginwidget diff --git a/repos/libports/recipes/src/libqpluginwidget/content.mk b/repos/libports/recipes/src/libqpluginwidget/content.mk new file mode 100644 index 0000000000..181990123f --- /dev/null +++ b/repos/libports/recipes/src/libqpluginwidget/content.mk @@ -0,0 +1,14 @@ +MIRROR_FROM_REP_DIR := lib/mk/libqpluginwidget.mk \ + src/lib/qpluginwidget + +content: $(MIRROR_FROM_REP_DIR) LICENSE src/lib/qpluginwidget/target.mk + +$(MIRROR_FROM_REP_DIR): + $(mirror_from_rep_dir) + +src/lib/qpluginwidget/target.mk: + mkdir -p $(dir $@) + echo "LIBS = libqpluginwidget" > $@ + +LICENSE: + cp $(GENODE_DIR)/LICENSE $@ diff --git a/repos/libports/recipes/src/libqpluginwidget/hash b/repos/libports/recipes/src/libqpluginwidget/hash new file mode 100644 index 0000000000..279b2a2df9 --- /dev/null +++ b/repos/libports/recipes/src/libqpluginwidget/hash @@ -0,0 +1 @@ +2020-06-09-a 255dd0d84b4c7128f7e0b9f126b994e295c31d7a diff --git a/repos/libports/recipes/src/qt5_qpluginwidget/used_apis b/repos/libports/recipes/src/libqpluginwidget/used_apis similarity index 56% rename from repos/libports/recipes/src/qt5_qpluginwidget/used_apis rename to repos/libports/recipes/src/libqpluginwidget/used_apis index 798c0c4289..530ba0bf05 100644 --- a/repos/libports/recipes/src/qt5_qpluginwidget/used_apis +++ b/repos/libports/recipes/src/libqpluginwidget/used_apis @@ -1,18 +1,14 @@ base framebuffer_session +gui_session input_session libc +libqgenodeviewwidget loader_session mesa -gui_session os qoost -qt5_core -qt5_gui -qt5_network -qt5_qgenodeviewwidget -qt5_qpa_genode -qt5_widgets +qt5 stdcxx vfs zlib diff --git a/repos/libports/recipes/src/qt5_base/api b/repos/libports/recipes/src/qt5_base/api new file mode 100644 index 0000000000..7d275211d0 --- /dev/null +++ b/repos/libports/recipes/src/qt5_base/api @@ -0,0 +1 @@ +qt5 diff --git a/repos/libports/recipes/src/qt5_base/content.mk b/repos/libports/recipes/src/qt5_base/content.mk new file mode 100644 index 0000000000..d6378a1e31 --- /dev/null +++ b/repos/libports/recipes/src/qt5_base/content.mk @@ -0,0 +1,33 @@ +MIRROR_FROM_REP_DIR := lib/mk/qt5_base.mk + +content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_base/target.mk + +$(MIRROR_FROM_REP_DIR): + $(mirror_from_rep_dir) + +src/lib/qt5_base/target.mk: + mkdir -p $(dir $@) + echo "LIBS = qt5_base" > $@ + +PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) + +MIRROR_FROM_PORT_DIR := src/lib/qt5/qtbase + +content: $(MIRROR_FROM_PORT_DIR) + +$(MIRROR_FROM_PORT_DIR): + mkdir -p $(dir $@) + cp -r $(PORT_DIR)/$@ $(dir $@) + +MIRROR_FROM_OS := include/pointer/shape_report.h + +content: $(MIRROR_FROM_OS) + +$(MIRROR_FROM_OS): + mkdir -p $(dir $@) + cp -r $(GENODE_DIR)/repos/os/$@ $(dir $@) + +content: LICENSE + +LICENSE: + cp $(PORT_DIR)/src/lib/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_base/hash b/repos/libports/recipes/src/qt5_base/hash new file mode 100644 index 0000000000..1f242ff271 --- /dev/null +++ b/repos/libports/recipes/src/qt5_base/hash @@ -0,0 +1 @@ +2020-05-24-o 2bc89b879c3ee88b317ac1f2064114f3dee133a8 diff --git a/repos/libports/recipes/src/qt5_qpa_genode/used_apis b/repos/libports/recipes/src/qt5_base/used_apis similarity index 72% rename from repos/libports/recipes/src/qt5_qpa_genode/used_apis rename to repos/libports/recipes/src/qt5_base/used_apis index e547a356d9..17b1124051 100644 --- a/repos/libports/recipes/src/qt5_qpa_genode/used_apis +++ b/repos/libports/recipes/src/qt5_base/used_apis @@ -1,14 +1,15 @@ base blit +expat framebuffer_session -freetype +gui_session input_session libc mesa -gui_session os qoost -qt5_core -qt5_gui +qt5_component report_session +so stdcxx +timer_session diff --git a/repos/libports/recipes/src/qt5_calculatorform/content.mk b/repos/libports/recipes/src/qt5_calculatorform/content.mk index ed3a196b29..1090b91bfc 100644 --- a/repos/libports/recipes/src/qt5_calculatorform/content.mk +++ b/repos/libports/recipes/src/qt5_calculatorform/content.mk @@ -1,6 +1,4 @@ -MIRROR_FROM_REP_DIR := src/app/qt5/examples/calculatorform \ - src/app/qt5/tmpl/target_defaults.inc \ - src/app/qt5/tmpl/target_final.inc +MIRROR_FROM_REP_DIR := src/app/qt5/examples/calculatorform content: $(MIRROR_FROM_REP_DIR) LICENSE @@ -9,7 +7,7 @@ $(MIRROR_FROM_REP_DIR): PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qttools/examples/designer/calculatorform +MIRROR_FROM_PORT_DIR := src/lib/qt5/qttools/examples/designer/calculatorform content: $(MIRROR_FROM_PORT_DIR) @@ -18,5 +16,5 @@ $(MIRROR_FROM_PORT_DIR): cp -r $(PORT_DIR)/$@ $(dir $@) LICENSE: - cp $(GENODE_DIR)/LICENSE $@ + cp $(PORT_DIR)/src/lib/qt5/LICENSE.GPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_calculatorform/used_apis b/repos/libports/recipes/src/qt5_calculatorform/used_apis index 7e89378d6a..3e0a7a5204 100644 --- a/repos/libports/recipes/src/qt5_calculatorform/used_apis +++ b/repos/libports/recipes/src/qt5_calculatorform/used_apis @@ -1,9 +1,6 @@ libc mesa +qt5 qt5_component -qt5_core -qt5_gui -qt5_qjpeg -qt5_qpa_genode -qt5_widgets +so stdcxx diff --git a/repos/libports/recipes/src/qt5_component/content.mk b/repos/libports/recipes/src/qt5_component/content.mk index 9861adc9f0..b41763cbc8 100644 --- a/repos/libports/recipes/src/qt5_component/content.mk +++ b/repos/libports/recipes/src/qt5_component/content.mk @@ -1,5 +1,5 @@ MIRROR_FROM_REP_DIR := lib/mk/qt5_component.mk \ - src/lib/qt5/qt_component.cc + src/lib/qt5_component/qt_component.cc content: $(MIRROR_FROM_REP_DIR) LICENSE src/lib/qt5_component/target.mk diff --git a/repos/libports/recipes/src/qt5_core/api b/repos/libports/recipes/src/qt5_core/api deleted file mode 100644 index 9e826c37fa..0000000000 --- a/repos/libports/recipes/src/qt5_core/api +++ /dev/null @@ -1 +0,0 @@ -qt5_core diff --git a/repos/libports/recipes/src/qt5_core/content.mk b/repos/libports/recipes/src/qt5_core/content.mk deleted file mode 100644 index 2bceea2863..0000000000 --- a/repos/libports/recipes/src/qt5_core/content.mk +++ /dev/null @@ -1,41 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_core.mk \ - lib/mk/qt5_core_generated.inc \ - lib/mk/qt5_pcre2.mk \ - lib/mk/qt5_pcre2_generated.inc \ - lib/mk/qt5.inc \ - src/lib/qt5/libc_dummies.cc - -content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_core/target.mk - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -src/lib/qt5_core/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_core" > $@ - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtbase/src/3rdparty/double-conversion \ - src/lib/qt5/qt5/qtbase/src/3rdparty/easing \ - src/lib/qt5/qt5/qtbase/src/3rdparty/freebsd \ - src/lib/qt5/qt5/qtbase/src/3rdparty/harfbuzz \ - src/lib/qt5/qt5/qtbase/src/3rdparty/md4 \ - src/lib/qt5/qt5/qtbase/src/3rdparty/md5 \ - src/lib/qt5/qt5/qtbase/src/3rdparty/pcre2 \ - src/lib/qt5/qt5/qtbase/src/3rdparty/rfc6234 \ - src/lib/qt5/qt5/qtbase/src/3rdparty/sha1 \ - src/lib/qt5/qt5/qtbase/src/3rdparty/sha3 \ - src/lib/qt5/qt5/qtbase/src/3rdparty/tinycbor \ - src/lib/qt5/qt5/qtbase/src/corelib - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_core/hash b/repos/libports/recipes/src/qt5_core/hash deleted file mode 100644 index 556f1332c8..0000000000 --- a/repos/libports/recipes/src/qt5_core/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-28 39524a3ba6dc81016d6e0834d3600136d6c89939 diff --git a/repos/libports/recipes/src/qt5_declarative/api b/repos/libports/recipes/src/qt5_declarative/api new file mode 100644 index 0000000000..7d275211d0 --- /dev/null +++ b/repos/libports/recipes/src/qt5_declarative/api @@ -0,0 +1 @@ +qt5 diff --git a/repos/libports/recipes/src/qt5_declarative/content.mk b/repos/libports/recipes/src/qt5_declarative/content.mk new file mode 100644 index 0000000000..53a9af087f --- /dev/null +++ b/repos/libports/recipes/src/qt5_declarative/content.mk @@ -0,0 +1,25 @@ +MIRROR_FROM_REP_DIR := lib/mk/qt5_declarative.mk + +content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_declarative/target.mk + +$(MIRROR_FROM_REP_DIR): + $(mirror_from_rep_dir) + +src/lib/qt5_declarative/target.mk: + mkdir -p $(dir $@) + echo "LIBS = qt5_declarative" > $@ + +PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) + +MIRROR_FROM_PORT_DIR := src/lib/qt5/qtdeclarative + +content: $(MIRROR_FROM_PORT_DIR) + +$(MIRROR_FROM_PORT_DIR): + mkdir -p $(dir $@) + cp -r $(PORT_DIR)/$@ $(dir $@) + +content: LICENSE + +LICENSE: + cp $(PORT_DIR)/src/lib/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_declarative/hash b/repos/libports/recipes/src/qt5_declarative/hash new file mode 100644 index 0000000000..c696208c09 --- /dev/null +++ b/repos/libports/recipes/src/qt5_declarative/hash @@ -0,0 +1 @@ +2020-05-24-b a472a6782cebb49bc525cf5476e5072ad41c5ab1 diff --git a/repos/libports/recipes/src/qt5_core/used_apis b/repos/libports/recipes/src/qt5_declarative/used_apis similarity index 53% rename from repos/libports/recipes/src/qt5_core/used_apis rename to repos/libports/recipes/src/qt5_declarative/used_apis index ed9ae0b620..38a7553adb 100644 --- a/repos/libports/recipes/src/qt5_core/used_apis +++ b/repos/libports/recipes/src/qt5_declarative/used_apis @@ -1,6 +1,4 @@ -base libc -os +mesa so stdcxx -zlib diff --git a/repos/libports/recipes/src/qt5_gui/api b/repos/libports/recipes/src/qt5_gui/api deleted file mode 100644 index 9f3a1b159a..0000000000 --- a/repos/libports/recipes/src/qt5_gui/api +++ /dev/null @@ -1 +0,0 @@ -qt5_gui diff --git a/repos/libports/recipes/src/qt5_gui/content.mk b/repos/libports/recipes/src/qt5_gui/content.mk deleted file mode 100644 index 7215bdb7ef..0000000000 --- a/repos/libports/recipes/src/qt5_gui/content.mk +++ /dev/null @@ -1,28 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_gui.mk \ - lib/mk/qt5_gui_generated.inc \ - lib/mk/qt5.inc \ - -content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_gui/target.mk - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -src/lib/qt5_gui/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_gui" > $@ - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtbase/src/3rdparty/icc \ - src/lib/qt5/qt5/qtbase/src/gui - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_gui/hash b/repos/libports/recipes/src/qt5_gui/hash deleted file mode 100644 index 15a62656b0..0000000000 --- a/repos/libports/recipes/src/qt5_gui/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-21 98304430cd924b29c7f140f542955ed71664b82f diff --git a/repos/libports/recipes/src/qt5_gui/used_apis b/repos/libports/recipes/src/qt5_gui/used_apis deleted file mode 100644 index e414f9aeb3..0000000000 --- a/repos/libports/recipes/src/qt5_gui/used_apis +++ /dev/null @@ -1,7 +0,0 @@ -base -libc -libpng -mesa -qt5_core -stdcxx -zlib diff --git a/repos/libports/recipes/src/qt5_launchpad/content.mk b/repos/libports/recipes/src/qt5_launchpad/content.mk index f7d8b63dc2..2dd30ea21b 100644 --- a/repos/libports/recipes/src/qt5_launchpad/content.mk +++ b/repos/libports/recipes/src/qt5_launchpad/content.mk @@ -1,6 +1,4 @@ -MIRROR_FROM_REP_DIR := src/app/qt5/qt_launchpad \ - src/app/qt5/tmpl/target_defaults.inc \ - src/app/qt5/tmpl/target_final.inc +MIRROR_FROM_REP_DIR := src/app/qt5/qt_launchpad content: $(MIRROR_FROM_REP_DIR) LICENSE diff --git a/repos/libports/recipes/src/qt5_launchpad/used_apis b/repos/libports/recipes/src/qt5_launchpad/used_apis index 33f27b1165..a16813e3aa 100644 --- a/repos/libports/recipes/src/qt5_launchpad/used_apis +++ b/repos/libports/recipes/src/qt5_launchpad/used_apis @@ -2,11 +2,8 @@ base libc mesa os -qt5_core -qt5_gui -qt5_qjpeg -qt5_qpa_genode -qt5_widgets +qt5 +qt5_component stdcxx timer_session vfs diff --git a/repos/libports/recipes/src/qt5_network/api b/repos/libports/recipes/src/qt5_network/api deleted file mode 100644 index 11223a0929..0000000000 --- a/repos/libports/recipes/src/qt5_network/api +++ /dev/null @@ -1 +0,0 @@ -qt5_network diff --git a/repos/libports/recipes/src/qt5_network/content.mk b/repos/libports/recipes/src/qt5_network/content.mk deleted file mode 100644 index 95914941e1..0000000000 --- a/repos/libports/recipes/src/qt5_network/content.mk +++ /dev/null @@ -1,27 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_network.mk \ - lib/mk/qt5_network_generated.inc \ - lib/mk/qt5.inc \ - -content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_network/target.mk - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -src/lib/qt5_network/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_network" > $@ - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtbase/src/network - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_network/hash b/repos/libports/recipes/src/qt5_network/hash deleted file mode 100644 index fb884a51d4..0000000000 --- a/repos/libports/recipes/src/qt5_network/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-21 3891e36a6950df6291a4b981d16123b73a84fd5d diff --git a/repos/libports/recipes/src/qt5_network/used_apis b/repos/libports/recipes/src/qt5_network/used_apis deleted file mode 100644 index 5c4ad3b059..0000000000 --- a/repos/libports/recipes/src/qt5_network/used_apis +++ /dev/null @@ -1,6 +0,0 @@ -base -libc -libssl -qt5_core -stdcxx -zlib diff --git a/repos/libports/recipes/src/qt5_opengl/api b/repos/libports/recipes/src/qt5_opengl/api deleted file mode 100644 index 2602c08eaa..0000000000 --- a/repos/libports/recipes/src/qt5_opengl/api +++ /dev/null @@ -1 +0,0 @@ -qt5_opengl diff --git a/repos/libports/recipes/src/qt5_opengl/content.mk b/repos/libports/recipes/src/qt5_opengl/content.mk deleted file mode 100644 index ff2fab4bb4..0000000000 --- a/repos/libports/recipes/src/qt5_opengl/content.mk +++ /dev/null @@ -1,27 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_opengl.mk \ - lib/mk/qt5_opengl_generated.inc \ - lib/mk/qt5.inc \ - -content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_opengl/target.mk - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -src/lib/qt5_opengl/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_opengl" > $@ - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtbase/src/opengl - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_opengl/hash b/repos/libports/recipes/src/qt5_opengl/hash deleted file mode 100644 index 74bdfd5148..0000000000 --- a/repos/libports/recipes/src/qt5_opengl/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-21 f447e85f41856833b41431aed4ef63e45a70c99e diff --git a/repos/libports/recipes/src/qt5_opengl/used_apis b/repos/libports/recipes/src/qt5_opengl/used_apis deleted file mode 100644 index 17475348d8..0000000000 --- a/repos/libports/recipes/src/qt5_opengl/used_apis +++ /dev/null @@ -1,7 +0,0 @@ -base -libc -mesa -qt5_core -qt5_gui -qt5_widgets -stdcxx diff --git a/repos/libports/recipes/src/qt5_openglwindow/content.mk b/repos/libports/recipes/src/qt5_openglwindow/content.mk index af27dff920..85d3e52d87 100644 --- a/repos/libports/recipes/src/qt5_openglwindow/content.mk +++ b/repos/libports/recipes/src/qt5_openglwindow/content.mk @@ -1,6 +1,4 @@ -MIRROR_FROM_REP_DIR := src/app/qt5/examples/openglwindow \ - src/app/qt5/tmpl/target_defaults.inc \ - src/app/qt5/tmpl/target_final.inc +MIRROR_FROM_REP_DIR := src/app/qt5/examples/openglwindow content: $(MIRROR_FROM_REP_DIR) LICENSE @@ -9,7 +7,7 @@ $(MIRROR_FROM_REP_DIR): PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtbase/examples/gui/openglwindow +MIRROR_FROM_PORT_DIR := src/lib/qt5/qtbase/examples/gui/openglwindow content: $(MIRROR_FROM_PORT_DIR) @@ -18,5 +16,5 @@ $(MIRROR_FROM_PORT_DIR): cp -r $(PORT_DIR)/$@ $(dir $@) LICENSE: - cp $(GENODE_DIR)/LICENSE $@ + cp $(PORT_DIR)/src/lib/qt5/LICENSE.GPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_openglwindow/used_apis b/repos/libports/recipes/src/qt5_openglwindow/used_apis index 778b16b8ab..bf0dd3e6b2 100644 --- a/repos/libports/recipes/src/qt5_openglwindow/used_apis +++ b/repos/libports/recipes/src/qt5_openglwindow/used_apis @@ -1,9 +1,5 @@ -base libc mesa +qt5 qt5_component -qt5_core -qt5_gui -qt5_qjpeg -qt5_qpa_genode stdcxx diff --git a/repos/libports/recipes/src/qt5_printsupport/api b/repos/libports/recipes/src/qt5_printsupport/api deleted file mode 100644 index eebc78a043..0000000000 --- a/repos/libports/recipes/src/qt5_printsupport/api +++ /dev/null @@ -1 +0,0 @@ -qt5_printsupport diff --git a/repos/libports/recipes/src/qt5_printsupport/content.mk b/repos/libports/recipes/src/qt5_printsupport/content.mk deleted file mode 100644 index 0d80677a13..0000000000 --- a/repos/libports/recipes/src/qt5_printsupport/content.mk +++ /dev/null @@ -1,27 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_printsupport.mk \ - lib/mk/qt5_printsupport_generated.inc \ - lib/mk/qt5.inc \ - -content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_printsupport/target.mk - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -src/lib/qt5_printsupport/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_printsupport" > $@ - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtbase/src/printsupport - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_printsupport/hash b/repos/libports/recipes/src/qt5_printsupport/hash deleted file mode 100644 index 9d3a68e3b6..0000000000 --- a/repos/libports/recipes/src/qt5_printsupport/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-21 6329ff1f321f5c1eca7a429335f77ef50cefad12 diff --git a/repos/libports/recipes/src/qt5_printsupport/used_apis b/repos/libports/recipes/src/qt5_printsupport/used_apis deleted file mode 100644 index 17475348d8..0000000000 --- a/repos/libports/recipes/src/qt5_printsupport/used_apis +++ /dev/null @@ -1,7 +0,0 @@ -base -libc -mesa -qt5_core -qt5_gui -qt5_widgets -stdcxx diff --git a/repos/libports/recipes/src/qt5_qgenodeviewwidget/api b/repos/libports/recipes/src/qt5_qgenodeviewwidget/api deleted file mode 100644 index ff60ba5265..0000000000 --- a/repos/libports/recipes/src/qt5_qgenodeviewwidget/api +++ /dev/null @@ -1 +0,0 @@ -qt5_qgenodeviewwidget diff --git a/repos/libports/recipes/src/qt5_qgenodeviewwidget/content.mk b/repos/libports/recipes/src/qt5_qgenodeviewwidget/content.mk deleted file mode 100644 index 70027011ed..0000000000 --- a/repos/libports/recipes/src/qt5_qgenodeviewwidget/content.mk +++ /dev/null @@ -1,14 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_qgenodeviewwidget.mk \ - src/lib/qt5/qgenodeviewwidget - -content: $(MIRROR_FROM_REP_DIR) LICENSE src/lib/qt5_qgenodeviewwidget/target.mk - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -src/lib/qt5_qgenodeviewwidget/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_qgenodeviewwidget" > $@ - -LICENSE: - cp $(GENODE_DIR)/LICENSE $@ diff --git a/repos/libports/recipes/src/qt5_qgenodeviewwidget/hash b/repos/libports/recipes/src/qt5_qgenodeviewwidget/hash deleted file mode 100644 index bc169da239..0000000000 --- a/repos/libports/recipes/src/qt5_qgenodeviewwidget/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-28 7b420c777287af510e1d0557c27b7190ac6fbb13 diff --git a/repos/libports/recipes/src/qt5_qjpeg/api b/repos/libports/recipes/src/qt5_qjpeg/api deleted file mode 100644 index 23bfda8873..0000000000 --- a/repos/libports/recipes/src/qt5_qjpeg/api +++ /dev/null @@ -1 +0,0 @@ -qt5_qjpeg diff --git a/repos/libports/recipes/src/qt5_qjpeg/content.mk b/repos/libports/recipes/src/qt5_qjpeg/content.mk deleted file mode 100644 index 891e8e21c6..0000000000 --- a/repos/libports/recipes/src/qt5_qjpeg/content.mk +++ /dev/null @@ -1,26 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_qjpeg.mk \ - src/lib/qt5/qtbase/src/plugins/imageformats/jpeg - -content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_qjpeg/target.mk - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -src/lib/qt5_qjpeg/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_qjpeg" > $@ - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtbase/src/plugins/imageformats/jpeg - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $@ - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_qjpeg/hash b/repos/libports/recipes/src/qt5_qjpeg/hash deleted file mode 100644 index 89d6359cc0..0000000000 --- a/repos/libports/recipes/src/qt5_qjpeg/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-21 0bfa8f22cb3748b1b4736f8c579dfb3f9f559523 diff --git a/repos/libports/recipes/src/qt5_qjpeg/used_apis b/repos/libports/recipes/src/qt5_qjpeg/used_apis deleted file mode 100644 index 91c423ec52..0000000000 --- a/repos/libports/recipes/src/qt5_qjpeg/used_apis +++ /dev/null @@ -1,6 +0,0 @@ -base -jpeg -libc -qt5_core -qt5_gui -stdcxx diff --git a/repos/libports/recipes/src/qt5_qml/api b/repos/libports/recipes/src/qt5_qml/api deleted file mode 100644 index 9be0b730c9..0000000000 --- a/repos/libports/recipes/src/qt5_qml/api +++ /dev/null @@ -1 +0,0 @@ -qt5_qml diff --git a/repos/libports/recipes/src/qt5_qml/content.mk b/repos/libports/recipes/src/qt5_qml/content.mk deleted file mode 100644 index 0d8f041b7c..0000000000 --- a/repos/libports/recipes/src/qt5_qml/content.mk +++ /dev/null @@ -1,29 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_qml.mk \ - lib/mk/qt5_qml_generated.inc \ - lib/mk/qt5.inc \ - -content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_qml/target.mk - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -src/lib/qt5_qml/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_qml" > $@ - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtdeclarative/src/3rdparty/masm \ - src/lib/qt5/qt5/qtdeclarative/src/qml \ - src/lib/qt5/qtdeclarative - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_qml/hash b/repos/libports/recipes/src/qt5_qml/hash deleted file mode 100644 index a097600bab..0000000000 --- a/repos/libports/recipes/src/qt5_qml/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-21 30040eea749ceecd0ad53122c17054ea60b51103 diff --git a/repos/libports/recipes/src/qt5_qml/used_apis b/repos/libports/recipes/src/qt5_qml/used_apis deleted file mode 100644 index 430a6f4b43..0000000000 --- a/repos/libports/recipes/src/qt5_qml/used_apis +++ /dev/null @@ -1,5 +0,0 @@ -base -libc -qt5_core -qt5_network -stdcxx diff --git a/repos/libports/recipes/src/qt5_qpa_genode/api b/repos/libports/recipes/src/qt5_qpa_genode/api deleted file mode 100644 index 708ec04463..0000000000 --- a/repos/libports/recipes/src/qt5_qpa_genode/api +++ /dev/null @@ -1 +0,0 @@ -qt5_qpa_genode diff --git a/repos/libports/recipes/src/qt5_qpa_genode/content.mk b/repos/libports/recipes/src/qt5_qpa_genode/content.mk deleted file mode 100644 index 700559b7a9..0000000000 --- a/repos/libports/recipes/src/qt5_qpa_genode/content.mk +++ /dev/null @@ -1,41 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_qpa_genode.mk \ - lib/mk/qt5.inc \ - src/lib/qt5/qtbase/src/plugins/platforms/genode - -content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_qpa_genode/target.mk - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -src/lib/qt5_qpa_genode/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_qpa_genode" > $@ - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtbase/src/platformsupport/eglconvenience/qeglconvenience.cpp \ - src/lib/qt5/qt5/qtbase/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher.cpp \ - src/lib/qt5/qt5/qtbase/src/platformsupport/eventdispatchers/qunixeventdispatcher.cpp \ - src/lib/qt5/qt5/qtbase/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp \ - src/lib/qt5/qt5/qtbase/src/platformsupport/fontdatabases/freetype/qfreetypefontdatabase.cpp - - - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -MIRROR_FROM_OS := include/pointer/shape_report.h - -content: $(MIRROR_FROM_OS) - -$(MIRROR_FROM_OS): - mkdir -p $(dir $@) - cp -r $(GENODE_DIR)/repos/os/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(GENODE_DIR)/LICENSE $@ diff --git a/repos/libports/recipes/src/qt5_qpa_genode/hash b/repos/libports/recipes/src/qt5_qpa_genode/hash deleted file mode 100644 index 64a11bbd93..0000000000 --- a/repos/libports/recipes/src/qt5_qpa_genode/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-28 48ac9052e3d1a0315538e79869899d499c6602ea diff --git a/repos/libports/recipes/src/qt5_qpluginwidget/api b/repos/libports/recipes/src/qt5_qpluginwidget/api deleted file mode 100644 index 6788e7d2d0..0000000000 --- a/repos/libports/recipes/src/qt5_qpluginwidget/api +++ /dev/null @@ -1 +0,0 @@ -qt5_qpluginwidget diff --git a/repos/libports/recipes/src/qt5_qpluginwidget/content.mk b/repos/libports/recipes/src/qt5_qpluginwidget/content.mk deleted file mode 100644 index 8afc03ed5c..0000000000 --- a/repos/libports/recipes/src/qt5_qpluginwidget/content.mk +++ /dev/null @@ -1,14 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_qpluginwidget.mk \ - src/lib/qt5/qpluginwidget - -content: $(MIRROR_FROM_REP_DIR) LICENSE src/lib/qt5_qpluginwidget/target.mk - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -src/lib/qt5_qpluginwidget/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_qpluginwidget" > $@ - -LICENSE: - cp $(GENODE_DIR)/LICENSE $@ diff --git a/repos/libports/recipes/src/qt5_qpluginwidget/hash b/repos/libports/recipes/src/qt5_qpluginwidget/hash deleted file mode 100644 index 59b2e15f7f..0000000000 --- a/repos/libports/recipes/src/qt5_qpluginwidget/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-28 47748212168c261ce7616914feefc655e1a98b3e diff --git a/repos/libports/recipes/src/qt5_qt_labs_folderlistmodel/content.mk b/repos/libports/recipes/src/qt5_qt_labs_folderlistmodel/content.mk deleted file mode 100644 index 01e4d19c6f..0000000000 --- a/repos/libports/recipes/src/qt5_qt_labs_folderlistmodel/content.mk +++ /dev/null @@ -1,27 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_qmlfolderlistmodelplugin.mk \ - lib/mk/qt5_qmlfolderlistmodelplugin_generated.inc \ - lib/mk/qt5.inc \ - -content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_qmlfolderlistmodelplugin/target.mk - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -src/lib/qt5_qmlfolderlistmodelplugin/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_qmlfolderlistmodelplugin" > $@ - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtdeclarative/src/imports/folderlistmodel - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_qt_labs_folderlistmodel/hash b/repos/libports/recipes/src/qt5_qt_labs_folderlistmodel/hash deleted file mode 100644 index 5e5939d158..0000000000 --- a/repos/libports/recipes/src/qt5_qt_labs_folderlistmodel/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-21 cd83327fb1392e471c1efe40d22480438f83e7fb diff --git a/repos/libports/recipes/src/qt5_qt_labs_folderlistmodel/used_apis b/repos/libports/recipes/src/qt5_qt_labs_folderlistmodel/used_apis deleted file mode 100644 index 820fed9384..0000000000 --- a/repos/libports/recipes/src/qt5_qt_labs_folderlistmodel/used_apis +++ /dev/null @@ -1,9 +0,0 @@ -base -libc -mesa -qt5_core -qt5_gui -qt5_network -qt5_qml -qt5_quick -stdcxx diff --git a/repos/libports/recipes/src/qt5_qtquick2/content.mk b/repos/libports/recipes/src/qt5_qtquick2/content.mk deleted file mode 100644 index 4b0ff76a2f..0000000000 --- a/repos/libports/recipes/src/qt5_qtquick2/content.mk +++ /dev/null @@ -1,27 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_qtquick2plugin.mk \ - lib/mk/qt5_qtquick2plugin_generated.inc \ - lib/mk/qt5.inc \ - -content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_qtquick2plugin/target.mk - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -src/lib/qt5_qtquick2plugin/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_qtquick2plugin" > $@ - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtdeclarative/src/imports/qtquick2 - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_qtquick2/hash b/repos/libports/recipes/src/qt5_qtquick2/hash deleted file mode 100644 index a21531ad17..0000000000 --- a/repos/libports/recipes/src/qt5_qtquick2/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-21 4d748e7808700b2ac060bf56f564bcb85b82253b diff --git a/repos/libports/recipes/src/qt5_qtquick2/used_apis b/repos/libports/recipes/src/qt5_qtquick2/used_apis deleted file mode 100644 index b52fa5e49d..0000000000 --- a/repos/libports/recipes/src/qt5_qtquick2/used_apis +++ /dev/null @@ -1,8 +0,0 @@ -base -libc -qt5_core -qt5_gui -qt5_network -qt5_qml -qt5_quick -stdcxx diff --git a/repos/libports/recipes/src/qt5_qtquick_controls2/content.mk b/repos/libports/recipes/src/qt5_qtquick_controls2/content.mk deleted file mode 100644 index c1ac6b70c7..0000000000 --- a/repos/libports/recipes/src/qt5_qtquick_controls2/content.mk +++ /dev/null @@ -1,27 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_qtquickcontrols2plugin.mk \ - lib/mk/qt5_qtquickcontrols2plugin_generated.inc \ - lib/mk/qt5.inc \ - -content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_qtquickcontrols2plugin/target.mk - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -src/lib/qt5_qtquickcontrols2plugin/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_qtquickcontrols2plugin" > $@ - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtquickcontrols2/src/imports/controls - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_qtquick_controls2/hash b/repos/libports/recipes/src/qt5_qtquick_controls2/hash deleted file mode 100644 index 04720e3b49..0000000000 --- a/repos/libports/recipes/src/qt5_qtquick_controls2/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-21 c0685cd2a32f2e62a15b1490c5fb32dca4bc6f7e diff --git a/repos/libports/recipes/src/qt5_qtquick_controls2/used_apis b/repos/libports/recipes/src/qt5_qtquick_controls2/used_apis deleted file mode 100644 index 35be5639a6..0000000000 --- a/repos/libports/recipes/src/qt5_qtquick_controls2/used_apis +++ /dev/null @@ -1,11 +0,0 @@ -base -libc -mesa -qt5_core -qt5_gui -qt5_network -qt5_qml -qt5_quick -qt5_quickcontrols2 -qt5_quicktemplates2 -stdcxx diff --git a/repos/libports/recipes/src/qt5_qtquick_layouts/content.mk b/repos/libports/recipes/src/qt5_qtquick_layouts/content.mk deleted file mode 100644 index dea0658f30..0000000000 --- a/repos/libports/recipes/src/qt5_qtquick_layouts/content.mk +++ /dev/null @@ -1,27 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_qquicklayoutsplugin.mk \ - lib/mk/qt5_qquicklayoutsplugin_generated.inc \ - lib/mk/qt5.inc \ - -content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_qquicklayoutsplugin/target.mk - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -src/lib/qt5_qquicklayoutsplugin/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_qquicklayoutsplugin" > $@ - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtdeclarative/src/imports/layouts - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_qtquick_layouts/hash b/repos/libports/recipes/src/qt5_qtquick_layouts/hash deleted file mode 100644 index df6c1f2877..0000000000 --- a/repos/libports/recipes/src/qt5_qtquick_layouts/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-21 db3f36d81a8f0c094657ce065486efead3982b4c diff --git a/repos/libports/recipes/src/qt5_qtquick_layouts/used_apis b/repos/libports/recipes/src/qt5_qtquick_layouts/used_apis deleted file mode 100644 index 820fed9384..0000000000 --- a/repos/libports/recipes/src/qt5_qtquick_layouts/used_apis +++ /dev/null @@ -1,9 +0,0 @@ -base -libc -mesa -qt5_core -qt5_gui -qt5_network -qt5_qml -qt5_quick -stdcxx diff --git a/repos/libports/recipes/src/qt5_qtquick_templates2/content.mk b/repos/libports/recipes/src/qt5_qtquick_templates2/content.mk deleted file mode 100644 index c4389d0df0..0000000000 --- a/repos/libports/recipes/src/qt5_qtquick_templates2/content.mk +++ /dev/null @@ -1,27 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_qtquicktemplates2plugin.mk \ - lib/mk/qt5_qtquicktemplates2plugin_generated.inc \ - lib/mk/qt5.inc \ - -content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_qtquicktemplates2plugin/target.mk - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -src/lib/qt5_qtquicktemplates2plugin/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_qtquicktemplates2plugin" > $@ - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtquickcontrols2/src/imports/templates - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_qtquick_templates2/hash b/repos/libports/recipes/src/qt5_qtquick_templates2/hash deleted file mode 100644 index c88ef0df6a..0000000000 --- a/repos/libports/recipes/src/qt5_qtquick_templates2/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-21 af577e3415bbd4d2b45868462a0a1522e7fc6e88 diff --git a/repos/libports/recipes/src/qt5_qtquick_templates2/used_apis b/repos/libports/recipes/src/qt5_qtquick_templates2/used_apis deleted file mode 100644 index 591d08cddb..0000000000 --- a/repos/libports/recipes/src/qt5_qtquick_templates2/used_apis +++ /dev/null @@ -1,10 +0,0 @@ -base -libc -mesa -qt5_core -qt5_gui -qt5_network -qt5_qml -qt5_quick -qt5_quicktemplates2 -stdcxx diff --git a/repos/libports/recipes/src/qt5_qtquick_virtualkeyboard/content.mk b/repos/libports/recipes/src/qt5_qtquick_virtualkeyboard/content.mk deleted file mode 100644 index 961d10d49b..0000000000 --- a/repos/libports/recipes/src/qt5_qtquick_virtualkeyboard/content.mk +++ /dev/null @@ -1,51 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_qtvirtualkeyboardplugin.mk \ - lib/mk/qt5_qtvirtualkeyboardplugin_generated.inc \ - lib/mk/qt5_qtquickvirtualkeyboardplugin.mk \ - lib/mk/qt5_qtquickvirtualkeyboardplugin_generated.inc \ - lib/mk/qt5_qtquickvirtualkeyboardsettingsplugin.mk \ - lib/mk/qt5_qtquickvirtualkeyboardsettingsplugin_generated.inc \ - lib/mk/qt5_qtquickvirtualkeyboardstylesplugin.mk \ - lib/mk/qt5_qtquickvirtualkeyboardstylesplugin_generated.inc \ - lib/mk/qt5.inc \ - -content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_qtvirtualkeyboardplugin/target.mk \ - src/lib/qt5_qtquickvirtualkeyboardplugin/target.mk \ - src/lib/qt5_qtquickvirtualkeyboardsettingsplugin/target.mk \ - src/lib/qt5_qtquickvirtualkeyboardstylesplugin/target.mk - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -src/lib/qt5_qtvirtualkeyboardplugin/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_qtvirtualkeyboardplugin" > $@ - -src/lib/qt5_qtquickvirtualkeyboardplugin/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_qtquickvirtualkeyboardplugin" > $@ - -src/lib/qt5_qtquickvirtualkeyboardsettingsplugin/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_qtquickvirtualkeyboardsettingsplugin" > $@ - -src/lib/qt5_qtquickvirtualkeyboardstylesplugin/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_qtquickvirtualkeyboardstylesplugin" > $@ - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtvirtualkeyboard/src/import \ - src/lib/qt5/qt5/qtvirtualkeyboard/src/plugin \ - src/lib/qt5/qt5/qtvirtualkeyboard/src/settings \ - src/lib/qt5/qt5/qtvirtualkeyboard/src/styles - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_qtquick_virtualkeyboard/hash b/repos/libports/recipes/src/qt5_qtquick_virtualkeyboard/hash deleted file mode 100644 index 186e8f558d..0000000000 --- a/repos/libports/recipes/src/qt5_qtquick_virtualkeyboard/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-21 c723d2227060360ce22e0e22e03882f6d3b3bdc3 diff --git a/repos/libports/recipes/src/qt5_qtquick_virtualkeyboard/used_apis b/repos/libports/recipes/src/qt5_qtquick_virtualkeyboard/used_apis deleted file mode 100644 index 6198660845..0000000000 --- a/repos/libports/recipes/src/qt5_qtquick_virtualkeyboard/used_apis +++ /dev/null @@ -1,11 +0,0 @@ -base -libc -mesa -qt5_core -qt5_gui -qt5_network -qt5_qml -qt5_quick -qt5_svg -qt5_virtualkeyboard -stdcxx diff --git a/repos/libports/recipes/src/qt5_qtquick_window/content.mk b/repos/libports/recipes/src/qt5_qtquick_window/content.mk deleted file mode 100644 index cabfd6f05b..0000000000 --- a/repos/libports/recipes/src/qt5_qtquick_window/content.mk +++ /dev/null @@ -1,27 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_windowplugin.mk \ - lib/mk/qt5_windowplugin_generated.inc \ - lib/mk/qt5.inc \ - -content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_windowplugin/target.mk - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -src/lib/qt5_windowplugin/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_windowplugin" > $@ - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtdeclarative/src/imports/window - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_qtquick_window/hash b/repos/libports/recipes/src/qt5_qtquick_window/hash deleted file mode 100644 index f51b531de1..0000000000 --- a/repos/libports/recipes/src/qt5_qtquick_window/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-21 53d4e1956f31d106144fa6c9cd24ba00205540e0 diff --git a/repos/libports/recipes/src/qt5_qtquick_window/used_apis b/repos/libports/recipes/src/qt5_qtquick_window/used_apis deleted file mode 100644 index 820fed9384..0000000000 --- a/repos/libports/recipes/src/qt5_qtquick_window/used_apis +++ /dev/null @@ -1,9 +0,0 @@ -base -libc -mesa -qt5_core -qt5_gui -qt5_network -qt5_qml -qt5_quick -stdcxx diff --git a/repos/libports/recipes/src/qt5_quick/api b/repos/libports/recipes/src/qt5_quick/api deleted file mode 100644 index 0b0c9ce368..0000000000 --- a/repos/libports/recipes/src/qt5_quick/api +++ /dev/null @@ -1 +0,0 @@ -qt5_quick diff --git a/repos/libports/recipes/src/qt5_quick/content.mk b/repos/libports/recipes/src/qt5_quick/content.mk deleted file mode 100644 index 954f01eacd..0000000000 --- a/repos/libports/recipes/src/qt5_quick/content.mk +++ /dev/null @@ -1,27 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_quick.mk \ - lib/mk/qt5_quick_generated.inc \ - lib/mk/qt5.inc \ - -content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_quick/target.mk - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -src/lib/qt5_quick/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_quick" > $@ - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtdeclarative/src/quick - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_quick/hash b/repos/libports/recipes/src/qt5_quick/hash deleted file mode 100644 index 7c01f2f8f4..0000000000 --- a/repos/libports/recipes/src/qt5_quick/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-21 3fd804ff1bd4759ccba3595c0114f350c3052362 diff --git a/repos/libports/recipes/src/qt5_quick/used_apis b/repos/libports/recipes/src/qt5_quick/used_apis deleted file mode 100644 index 5153ef4594..0000000000 --- a/repos/libports/recipes/src/qt5_quick/used_apis +++ /dev/null @@ -1,8 +0,0 @@ -base -libc -mesa -qt5_core -qt5_gui -qt5_network -qt5_qml -stdcxx diff --git a/repos/libports/recipes/src/qt5_quickcontrols2/api b/repos/libports/recipes/src/qt5_quickcontrols2/api index 7cc64413a5..7d275211d0 100644 --- a/repos/libports/recipes/src/qt5_quickcontrols2/api +++ b/repos/libports/recipes/src/qt5_quickcontrols2/api @@ -1 +1 @@ -qt5_quickcontrols2 +qt5 diff --git a/repos/libports/recipes/src/qt5_quickcontrols2/content.mk b/repos/libports/recipes/src/qt5_quickcontrols2/content.mk index a0fb76739f..42f4ef72cf 100644 --- a/repos/libports/recipes/src/qt5_quickcontrols2/content.mk +++ b/repos/libports/recipes/src/qt5_quickcontrols2/content.mk @@ -1,6 +1,4 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_quickcontrols2.mk \ - lib/mk/qt5_quickcontrols2_generated.inc \ - lib/mk/qt5.inc \ +MIRROR_FROM_REP_DIR := lib/mk/qt5_quickcontrols2.mk content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_quickcontrols2/target.mk @@ -13,7 +11,7 @@ src/lib/qt5_quickcontrols2/target.mk: PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtquickcontrols2/src/quickcontrols2 +MIRROR_FROM_PORT_DIR := src/lib/qt5/qtquickcontrols2 content: $(MIRROR_FROM_PORT_DIR) @@ -24,4 +22,4 @@ $(MIRROR_FROM_PORT_DIR): content: LICENSE LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ + cp $(PORT_DIR)/src/lib/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_quickcontrols2/used_apis b/repos/libports/recipes/src/qt5_quickcontrols2/used_apis index 09cf10a1bf..0e16c9b545 100644 --- a/repos/libports/recipes/src/qt5_quickcontrols2/used_apis +++ b/repos/libports/recipes/src/qt5_quickcontrols2/used_apis @@ -1,11 +1,4 @@ base libc mesa -qt5_core -qt5_gui -qt5_network -qt5_qml -qt5_quick -qt5_quicktemplates2 stdcxx -zlib diff --git a/repos/libports/recipes/src/qt5_quicktemplates2/api b/repos/libports/recipes/src/qt5_quicktemplates2/api deleted file mode 100644 index 4af6a2b7a7..0000000000 --- a/repos/libports/recipes/src/qt5_quicktemplates2/api +++ /dev/null @@ -1 +0,0 @@ -qt5_quicktemplates2 diff --git a/repos/libports/recipes/src/qt5_quicktemplates2/content.mk b/repos/libports/recipes/src/qt5_quicktemplates2/content.mk deleted file mode 100644 index a57f58bc51..0000000000 --- a/repos/libports/recipes/src/qt5_quicktemplates2/content.mk +++ /dev/null @@ -1,27 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_quicktemplates2.mk \ - lib/mk/qt5_quicktemplates2_generated.inc \ - lib/mk/qt5.inc \ - -content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_quicktemplates2/target.mk - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -src/lib/qt5_quicktemplates2/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_quicktemplates2" > $@ - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtquickcontrols2/src/quicktemplates2 - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_quicktemplates2/hash b/repos/libports/recipes/src/qt5_quicktemplates2/hash deleted file mode 100644 index 7184bce360..0000000000 --- a/repos/libports/recipes/src/qt5_quicktemplates2/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-21 58b5b257615b7bc73bde0fc4480945c04af30e71 diff --git a/repos/libports/recipes/src/qt5_quicktemplates2/used_apis b/repos/libports/recipes/src/qt5_quicktemplates2/used_apis deleted file mode 100644 index 6ad27e7924..0000000000 --- a/repos/libports/recipes/src/qt5_quicktemplates2/used_apis +++ /dev/null @@ -1,10 +0,0 @@ -base -libc -mesa -qt5_core -qt5_network -qt5_gui -qt5_qml -qt5_quick -stdcxx -zlib diff --git a/repos/libports/recipes/src/qt5_samegame/content.mk b/repos/libports/recipes/src/qt5_samegame/content.mk index 5ed0adf66b..2a055bad15 100644 --- a/repos/libports/recipes/src/qt5_samegame/content.mk +++ b/repos/libports/recipes/src/qt5_samegame/content.mk @@ -1,6 +1,4 @@ -MIRROR_FROM_REP_DIR := src/app/qt5/examples/samegame \ - src/app/qt5/tmpl/target_defaults.inc \ - src/app/qt5/tmpl/target_final.inc +MIRROR_FROM_REP_DIR := src/app/qt5/examples/samegame content: $(MIRROR_FROM_REP_DIR) LICENSE diff --git a/repos/libports/recipes/src/qt5_samegame/used_apis b/repos/libports/recipes/src/qt5_samegame/used_apis index 0bfc794ec6..bf0dd3e6b2 100644 --- a/repos/libports/recipes/src/qt5_samegame/used_apis +++ b/repos/libports/recipes/src/qt5_samegame/used_apis @@ -1,12 +1,5 @@ -base libc mesa +qt5 qt5_component -qt5_core -qt5_network -qt5_gui -qt5_qjpeg -qt5_qml -qt5_qpa_genode -qt5_quick stdcxx diff --git a/repos/libports/recipes/src/qt5_scriptclassic/api b/repos/libports/recipes/src/qt5_scriptclassic/api deleted file mode 100644 index abbed17370..0000000000 --- a/repos/libports/recipes/src/qt5_scriptclassic/api +++ /dev/null @@ -1 +0,0 @@ -qt5_scriptclassic diff --git a/repos/libports/recipes/src/qt5_scriptclassic/content.mk b/repos/libports/recipes/src/qt5_scriptclassic/content.mk deleted file mode 100644 index 5bcecadf48..0000000000 --- a/repos/libports/recipes/src/qt5_scriptclassic/content.mk +++ /dev/null @@ -1,27 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_scriptclassic.mk \ - lib/mk/qt5_scriptclassic_generated.inc \ - lib/mk/qt5.inc \ - -content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_scriptclassic/target.mk - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -src/lib/qt5_scriptclassic/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_scriptclassic" > $@ - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := src/lib/qt5/qtscriptclassic-1.0_1-opensource/src - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_scriptclassic/hash b/repos/libports/recipes/src/qt5_scriptclassic/hash deleted file mode 100644 index 293bb53442..0000000000 --- a/repos/libports/recipes/src/qt5_scriptclassic/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-21 b927413094532d8d75991eddefe3f1048c2c8b7f diff --git a/repos/libports/recipes/src/qt5_scriptclassic/used_apis b/repos/libports/recipes/src/qt5_scriptclassic/used_apis deleted file mode 100644 index 8f511a5f2d..0000000000 --- a/repos/libports/recipes/src/qt5_scriptclassic/used_apis +++ /dev/null @@ -1,6 +0,0 @@ -base -libc -qt5_core -qt5_gui -qt5_widgets -stdcxx diff --git a/repos/libports/recipes/src/qt5_sql/api b/repos/libports/recipes/src/qt5_sql/api deleted file mode 100644 index 97019ad331..0000000000 --- a/repos/libports/recipes/src/qt5_sql/api +++ /dev/null @@ -1 +0,0 @@ -qt5_sql diff --git a/repos/libports/recipes/src/qt5_sql/content.mk b/repos/libports/recipes/src/qt5_sql/content.mk deleted file mode 100644 index 0ad568033b..0000000000 --- a/repos/libports/recipes/src/qt5_sql/content.mk +++ /dev/null @@ -1,27 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_sql.mk \ - lib/mk/qt5_sql_generated.inc \ - lib/mk/qt5.inc \ - -content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_sql/target.mk - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -src/lib/qt5_sql/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_sql" > $@ - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtbase/src/sql - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_sql/hash b/repos/libports/recipes/src/qt5_sql/hash deleted file mode 100644 index b1efcad3c3..0000000000 --- a/repos/libports/recipes/src/qt5_sql/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-21 a670de09079e09d21bfcda1f69cdc86a2bf14b07 diff --git a/repos/libports/recipes/src/qt5_sql/used_apis b/repos/libports/recipes/src/qt5_sql/used_apis deleted file mode 100644 index 173fddbe0a..0000000000 --- a/repos/libports/recipes/src/qt5_sql/used_apis +++ /dev/null @@ -1,4 +0,0 @@ -base -libc -qt5_core -stdcxx diff --git a/repos/libports/recipes/src/qt5_svg/api b/repos/libports/recipes/src/qt5_svg/api index e68c170099..7d275211d0 100644 --- a/repos/libports/recipes/src/qt5_svg/api +++ b/repos/libports/recipes/src/qt5_svg/api @@ -1 +1 @@ -qt5_svg +qt5 diff --git a/repos/libports/recipes/src/qt5_svg/content.mk b/repos/libports/recipes/src/qt5_svg/content.mk index 612b2f91df..0b1c104e9e 100644 --- a/repos/libports/recipes/src/qt5_svg/content.mk +++ b/repos/libports/recipes/src/qt5_svg/content.mk @@ -1,6 +1,4 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_svg.mk \ - lib/mk/qt5_svg_generated.inc \ - lib/mk/qt5.inc \ +MIRROR_FROM_REP_DIR := lib/mk/qt5_svg.mk content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_svg/target.mk @@ -13,7 +11,7 @@ src/lib/qt5_svg/target.mk: PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtsvg/src/svg +MIRROR_FROM_PORT_DIR := src/lib/qt5/qtsvg content: $(MIRROR_FROM_PORT_DIR) @@ -24,4 +22,4 @@ $(MIRROR_FROM_PORT_DIR): content: LICENSE LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ + cp $(PORT_DIR)/src/lib/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_svg/used_apis b/repos/libports/recipes/src/qt5_svg/used_apis index c1f1d7dc34..0e16c9b545 100644 --- a/repos/libports/recipes/src/qt5_svg/used_apis +++ b/repos/libports/recipes/src/qt5_svg/used_apis @@ -1,8 +1,4 @@ base libc mesa -qt5_core -qt5_gui -qt5_widgets stdcxx -zlib diff --git a/repos/libports/recipes/src/qt5_test/api b/repos/libports/recipes/src/qt5_test/api deleted file mode 100644 index 10efd13e6e..0000000000 --- a/repos/libports/recipes/src/qt5_test/api +++ /dev/null @@ -1 +0,0 @@ -qt5_test diff --git a/repos/libports/recipes/src/qt5_test/content.mk b/repos/libports/recipes/src/qt5_test/content.mk deleted file mode 100644 index 08d49f0102..0000000000 --- a/repos/libports/recipes/src/qt5_test/content.mk +++ /dev/null @@ -1,27 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_test.mk \ - lib/mk/qt5_test_generated.inc \ - lib/mk/qt5.inc \ - -content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_test/target.mk - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -src/lib/qt5_test/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_test" > $@ - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtbase/src/testlib - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_test/hash b/repos/libports/recipes/src/qt5_test/hash deleted file mode 100644 index 5c2636b113..0000000000 --- a/repos/libports/recipes/src/qt5_test/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-21 f8dbb39277bf0db9fb1281929206dbe37071ec7e diff --git a/repos/libports/recipes/src/qt5_test/used_apis b/repos/libports/recipes/src/qt5_test/used_apis deleted file mode 100644 index 173fddbe0a..0000000000 --- a/repos/libports/recipes/src/qt5_test/used_apis +++ /dev/null @@ -1,4 +0,0 @@ -base -libc -qt5_core -stdcxx diff --git a/repos/libports/recipes/src/qt5_testqstring/content.mk b/repos/libports/recipes/src/qt5_testqstring/content.mk index d4fcccd53a..1883b2d44b 100644 --- a/repos/libports/recipes/src/qt5_testqstring/content.mk +++ b/repos/libports/recipes/src/qt5_testqstring/content.mk @@ -1,6 +1,4 @@ -MIRROR_FROM_REP_DIR := src/app/qt5/examples/testqstring \ - src/app/qt5/tmpl/target_defaults.inc \ - src/app/qt5/tmpl/target_final.inc +MIRROR_FROM_REP_DIR := src/app/qt5/examples/testqstring content: $(MIRROR_FROM_REP_DIR) LICENSE @@ -9,7 +7,7 @@ $(MIRROR_FROM_REP_DIR): PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtbase/examples/qtestlib/tutorial1 +MIRROR_FROM_PORT_DIR := src/lib/qt5/qtbase/examples/qtestlib/tutorial1 content: $(MIRROR_FROM_PORT_DIR) @@ -18,5 +16,5 @@ $(MIRROR_FROM_PORT_DIR): cp -r $(PORT_DIR)/$@ $(dir $@) LICENSE: - cp $(GENODE_DIR)/LICENSE $@ + cp $(PORT_DIR)/src/lib/qt5/LICENSE.GPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_testqstring/used_apis b/repos/libports/recipes/src/qt5_testqstring/used_apis index 4604c358f2..bf0dd3e6b2 100644 --- a/repos/libports/recipes/src/qt5_testqstring/used_apis +++ b/repos/libports/recipes/src/qt5_testqstring/used_apis @@ -1,11 +1,5 @@ -base libc mesa +qt5 qt5_component -qt5_core -qt5_gui -qt5_qjpeg -qt5_qpa_genode -qt5_test -qt5_widgets stdcxx diff --git a/repos/libports/recipes/src/qt5_tetrix/content.mk b/repos/libports/recipes/src/qt5_tetrix/content.mk index 8a21945133..80739e7fcb 100644 --- a/repos/libports/recipes/src/qt5_tetrix/content.mk +++ b/repos/libports/recipes/src/qt5_tetrix/content.mk @@ -1,6 +1,4 @@ -MIRROR_FROM_REP_DIR := src/app/qt5/examples/tetrix \ - src/app/qt5/tmpl/target_defaults.inc \ - src/app/qt5/tmpl/target_final.inc +MIRROR_FROM_REP_DIR := src/app/qt5/examples/tetrix content: $(MIRROR_FROM_REP_DIR) LICENSE @@ -9,7 +7,7 @@ $(MIRROR_FROM_REP_DIR): PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtscript/examples/script/qstetrix +MIRROR_FROM_PORT_DIR := src/lib/qt5/qtbase/examples/widgets/widgets/tetrix content: $(MIRROR_FROM_PORT_DIR) diff --git a/repos/libports/recipes/src/qt5_tetrix/used_apis b/repos/libports/recipes/src/qt5_tetrix/used_apis index 12a0230bc3..bf0dd3e6b2 100644 --- a/repos/libports/recipes/src/qt5_tetrix/used_apis +++ b/repos/libports/recipes/src/qt5_tetrix/used_apis @@ -1,12 +1,5 @@ -base libc mesa +qt5 qt5_component -qt5_core -qt5_gui -qt5_qjpeg -qt5_qpa_genode -qt5_scriptclassic -qt5_ui_tools -qt5_widgets stdcxx diff --git a/repos/libports/recipes/src/qt5_textedit/content.mk b/repos/libports/recipes/src/qt5_textedit/content.mk index 6c15b4783f..bc9cf89be8 100644 --- a/repos/libports/recipes/src/qt5_textedit/content.mk +++ b/repos/libports/recipes/src/qt5_textedit/content.mk @@ -1,6 +1,4 @@ -MIRROR_FROM_REP_DIR := src/app/qt5/examples/textedit \ - src/app/qt5/tmpl/target_defaults.inc \ - src/app/qt5/tmpl/target_final.inc +MIRROR_FROM_REP_DIR := src/app/qt5/examples/textedit content: $(MIRROR_FROM_REP_DIR) LICENSE @@ -9,7 +7,7 @@ $(MIRROR_FROM_REP_DIR): PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtbase/examples/widgets/richtext/textedit +MIRROR_FROM_PORT_DIR := src/lib/qt5/qtbase/examples/widgets/richtext/textedit content: $(MIRROR_FROM_PORT_DIR) @@ -18,5 +16,5 @@ $(MIRROR_FROM_PORT_DIR): cp -r $(PORT_DIR)/$@ $(dir $@) LICENSE: - cp $(GENODE_DIR)/LICENSE $@ + cp $(PORT_DIR)/src/lib/qt5/LICENSE.GPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_textedit/used_apis b/repos/libports/recipes/src/qt5_textedit/used_apis index bfbb2f50f7..bf0dd3e6b2 100644 --- a/repos/libports/recipes/src/qt5_textedit/used_apis +++ b/repos/libports/recipes/src/qt5_textedit/used_apis @@ -1,11 +1,5 @@ -base libc mesa +qt5 qt5_component -qt5_core -qt5_gui -qt5_printsupport -qt5_qjpeg -qt5_qpa_genode -qt5_widgets stdcxx diff --git a/repos/libports/recipes/src/qt5_ui_tools/api b/repos/libports/recipes/src/qt5_ui_tools/api deleted file mode 100644 index 75ce55fdf1..0000000000 --- a/repos/libports/recipes/src/qt5_ui_tools/api +++ /dev/null @@ -1 +0,0 @@ -qt5_ui_tools diff --git a/repos/libports/recipes/src/qt5_ui_tools/content.mk b/repos/libports/recipes/src/qt5_ui_tools/content.mk deleted file mode 100644 index 84545ca4b2..0000000000 --- a/repos/libports/recipes/src/qt5_ui_tools/content.mk +++ /dev/null @@ -1,28 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_ui_tools.mk \ - lib/mk/qt5_ui_tools_generated.inc \ - lib/mk/qt5.inc \ - -content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_ui_tools/target.mk - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -src/lib/qt5_ui_tools/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_ui_tools" > $@ - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qttools/src/designer/src/lib/uilib \ - src/lib/qt5/qt5/qttools/src/designer/src/uitools - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_ui_tools/hash b/repos/libports/recipes/src/qt5_ui_tools/hash deleted file mode 100644 index 69f916027a..0000000000 --- a/repos/libports/recipes/src/qt5_ui_tools/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-21 11baa13bd05ab7fa0fc7a4096c8e346e1fa2cfc0 diff --git a/repos/libports/recipes/src/qt5_ui_tools/used_apis b/repos/libports/recipes/src/qt5_ui_tools/used_apis deleted file mode 100644 index 17475348d8..0000000000 --- a/repos/libports/recipes/src/qt5_ui_tools/used_apis +++ /dev/null @@ -1,7 +0,0 @@ -base -libc -mesa -qt5_core -qt5_gui -qt5_widgets -stdcxx diff --git a/repos/libports/recipes/src/qt5_virtualkeyboard/api b/repos/libports/recipes/src/qt5_virtualkeyboard/api index 3c9b41400b..7d275211d0 100644 --- a/repos/libports/recipes/src/qt5_virtualkeyboard/api +++ b/repos/libports/recipes/src/qt5_virtualkeyboard/api @@ -1 +1 @@ -qt5_virtualkeyboard +qt5 diff --git a/repos/libports/recipes/src/qt5_virtualkeyboard/content.mk b/repos/libports/recipes/src/qt5_virtualkeyboard/content.mk index df7aac0fe5..329fceec80 100644 --- a/repos/libports/recipes/src/qt5_virtualkeyboard/content.mk +++ b/repos/libports/recipes/src/qt5_virtualkeyboard/content.mk @@ -1,6 +1,4 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_virtualkeyboard.mk \ - lib/mk/qt5_virtualkeyboard_generated.inc \ - lib/mk/qt5.inc \ +MIRROR_FROM_REP_DIR := lib/mk/qt5_virtualkeyboard.mk content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_virtualkeyboard/target.mk @@ -13,7 +11,7 @@ src/lib/qt5_virtualkeyboard/target.mk: PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtvirtualkeyboard/src/virtualkeyboard +MIRROR_FROM_PORT_DIR := src/lib/qt5/qtvirtualkeyboard content: $(MIRROR_FROM_PORT_DIR) @@ -24,4 +22,4 @@ $(MIRROR_FROM_PORT_DIR): content: LICENSE LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ + cp $(PORT_DIR)/src/lib/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_virtualkeyboard/used_apis b/repos/libports/recipes/src/qt5_virtualkeyboard/used_apis index 7972db51ca..38a7553adb 100644 --- a/repos/libports/recipes/src/qt5_virtualkeyboard/used_apis +++ b/repos/libports/recipes/src/qt5_virtualkeyboard/used_apis @@ -1,10 +1,4 @@ -base libc mesa -qt5_core -qt5_gui -qt5_network -qt5_qml -qt5_quick +so stdcxx -zlib diff --git a/repos/libports/recipes/src/qt5_virtualkeyboard_example/content.mk b/repos/libports/recipes/src/qt5_virtualkeyboard_example/content.mk index 52b625ae46..96ebc460a3 100644 --- a/repos/libports/recipes/src/qt5_virtualkeyboard_example/content.mk +++ b/repos/libports/recipes/src/qt5_virtualkeyboard_example/content.mk @@ -1,6 +1,4 @@ -MIRROR_FROM_REP_DIR := src/app/qt5/examples/virtualkeyboard \ - src/app/qt5/tmpl/target_defaults.inc \ - src/app/qt5/tmpl/target_final.inc +MIRROR_FROM_REP_DIR := src/app/qt5/examples/virtualkeyboard content: $(MIRROR_FROM_REP_DIR) LICENSE @@ -9,7 +7,7 @@ $(MIRROR_FROM_REP_DIR): PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtvirtualkeyboard/examples/virtualkeyboard/basic +MIRROR_FROM_PORT_DIR := src/lib/qt5/qtvirtualkeyboard/examples/virtualkeyboard/basic content: $(MIRROR_FROM_PORT_DIR) @@ -18,5 +16,5 @@ $(MIRROR_FROM_PORT_DIR): cp -r $(PORT_DIR)/$@ $(dir $@) LICENSE: - cp $(GENODE_DIR)/LICENSE $@ + cp $(PORT_DIR)/src/lib/qt5/LICENSE.GPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_virtualkeyboard_example/used_apis b/repos/libports/recipes/src/qt5_virtualkeyboard_example/used_apis index f7bc064c3d..c4ee1cc7a5 100644 --- a/repos/libports/recipes/src/qt5_virtualkeyboard_example/used_apis +++ b/repos/libports/recipes/src/qt5_virtualkeyboard_example/used_apis @@ -1,13 +1,5 @@ -base libc mesa qt5_component -qt5_core -qt5_network -qt5_gui -qt5_qjpeg -qt5_qml -qt5_qpa_genode -qt5_quick -qt5_virtualkeyboard +qt5 stdcxx diff --git a/repos/libports/recipes/src/qt5_webkit/api b/repos/libports/recipes/src/qt5_webkit/api deleted file mode 100644 index 5c8d647be9..0000000000 --- a/repos/libports/recipes/src/qt5_webkit/api +++ /dev/null @@ -1 +0,0 @@ -qt5_webkit diff --git a/repos/libports/recipes/src/qt5_webkit/content.mk b/repos/libports/recipes/src/qt5_webkit/content.mk deleted file mode 100644 index c58f79f60f..0000000000 --- a/repos/libports/recipes/src/qt5_webkit/content.mk +++ /dev/null @@ -1,83 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_angle.inc \ - lib/mk/qt5_angle_generated.inc \ - lib/mk/qt5_jscore.inc \ - lib/mk/qt5_jscore_generated.inc \ - lib/mk/qt5_webcore.inc \ - lib/mk/qt5_webcore_generated.inc \ - lib/mk/qt5_webkit.inc \ - lib/mk/qt5_webkit_generated.inc \ - lib/mk/qt5_webkitwidgets.inc \ - lib/mk/qt5_webkitwidgets_generated.inc \ - lib/mk/qt5_wtf.inc \ - lib/mk/qt5_wtf_generated.inc \ - lib/mk/qt5.inc \ - lib/mk/spec/32bit/qt5_angle.mk \ - lib/mk/spec/32bit/qt5_jscore.mk \ - lib/mk/spec/32bit/qt5_webcore.mk \ - lib/mk/spec/32bit/qt5_webkit.mk \ - lib/mk/spec/32bit/qt5_webkitwidgets.mk \ - lib/mk/spec/32bit/qt5_wtf.mk \ - lib/mk/spec/x86_64/qt5_angle.mk \ - lib/mk/spec/x86_64/qt5_jscore.mk \ - lib/mk/spec/x86_64/qt5_webcore.mk \ - lib/mk/spec/x86_64/qt5_webkit.mk \ - lib/mk/spec/x86_64/qt5_webkitwidgets.mk \ - lib/mk/spec/x86_64/qt5_wtf.mk - -content: $(MIRROR_FROM_REP_DIR) \ - src/lib/qt5_angle/target.mk \ - src/lib/qt5_jscore/target.mk \ - src/lib/qt5_webcore/target.mk \ - src/lib/qt5_webkit/target.mk \ - src/lib/qt5_webkitwidgets/target.mk \ - src/lib/qt5_wtf/target.mk - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -src/lib/qt5_angle/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_angle" > $@ - -src/lib/qt5_jscore/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_jscore" > $@ - -src/lib/qt5_webcore/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_webcore" > $@ - -src/lib/qt5_webkit/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_webkit" > $@ - -src/lib/qt5_webkitwidgets/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_webkitwidgets" > $@ - -src/lib/qt5_wtf/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_wtf" > $@ - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtbase/src/3rdparty/sqlite \ - src/lib/qt5/qt5/qtwebkit/Source/ThirdParty/ANGLE \ - src/lib/qt5/qt5/qtwebkit/Source/JavaScriptCore \ - src/lib/qt5/qt5/qtwebkit/Source/WebCore \ - src/lib/qt5/qt5/qtwebkit/Source/WebKit \ - src/lib/qt5/qt5/qtwebkit/Source/WTF \ - src/lib/qt5/qtwebkit/Source/ThirdParty/ANGLE/generated \ - src/lib/qt5/qtwebkit/Source/JavaScriptCore/generated \ - src/lib/qt5/qtwebkit/Source/WebCore/generated - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_webkit/hash b/repos/libports/recipes/src/qt5_webkit/hash deleted file mode 100644 index e656746e94..0000000000 --- a/repos/libports/recipes/src/qt5_webkit/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-28 2426655557be6ef98a1b2091d4d34a279b43feca diff --git a/repos/libports/recipes/src/qt5_webkit/used_apis b/repos/libports/recipes/src/qt5_webkit/used_apis deleted file mode 100644 index 81e93e8285..0000000000 --- a/repos/libports/recipes/src/qt5_webkit/used_apis +++ /dev/null @@ -1,17 +0,0 @@ -base -icu -libc -libpng -jpeg -mesa -os -qt5_core -qt5_gui -qt5_network -qt5_opengl -qt5_printsupport -qt5_sql -qt5_widgets -stdcxx -timer_session -zlib diff --git a/repos/libports/recipes/src/qt5_widgets/api b/repos/libports/recipes/src/qt5_widgets/api deleted file mode 100644 index ce86957231..0000000000 --- a/repos/libports/recipes/src/qt5_widgets/api +++ /dev/null @@ -1 +0,0 @@ -qt5_widgets diff --git a/repos/libports/recipes/src/qt5_widgets/content.mk b/repos/libports/recipes/src/qt5_widgets/content.mk deleted file mode 100644 index 222211918a..0000000000 --- a/repos/libports/recipes/src/qt5_widgets/content.mk +++ /dev/null @@ -1,27 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_widgets.mk \ - lib/mk/qt5_widgets_generated.inc \ - lib/mk/qt5.inc \ - -content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_widgets/target.mk - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -src/lib/qt5_widgets/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_widgets" > $@ - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtbase/src/widgets - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_widgets/hash b/repos/libports/recipes/src/qt5_widgets/hash deleted file mode 100644 index f21b8502b6..0000000000 --- a/repos/libports/recipes/src/qt5_widgets/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-21 d3488772ca8925b9d4bdd9b4a6adbfd406cd73ce diff --git a/repos/libports/recipes/src/qt5_widgets/used_apis b/repos/libports/recipes/src/qt5_widgets/used_apis deleted file mode 100644 index d068155164..0000000000 --- a/repos/libports/recipes/src/qt5_widgets/used_apis +++ /dev/null @@ -1,6 +0,0 @@ -base -libc -mesa -qt5_core -qt5_gui -stdcxx diff --git a/repos/libports/recipes/src/qt5_xml/api b/repos/libports/recipes/src/qt5_xml/api deleted file mode 100644 index 879db4edae..0000000000 --- a/repos/libports/recipes/src/qt5_xml/api +++ /dev/null @@ -1 +0,0 @@ -qt5_xml diff --git a/repos/libports/recipes/src/qt5_xml/content.mk b/repos/libports/recipes/src/qt5_xml/content.mk deleted file mode 100644 index f65e9e3b07..0000000000 --- a/repos/libports/recipes/src/qt5_xml/content.mk +++ /dev/null @@ -1,27 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_xml.mk \ - lib/mk/qt5_xml_generated.inc \ - lib/mk/qt5.inc \ - -content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_xml/target.mk - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -src/lib/qt5_xml/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_xml" > $@ - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) - -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtbase/src/xml - -content: $(MIRROR_FROM_PORT_DIR) - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - -content: LICENSE - -LICENSE: - cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_xml/hash b/repos/libports/recipes/src/qt5_xml/hash deleted file mode 100644 index 2b972f270b..0000000000 --- a/repos/libports/recipes/src/qt5_xml/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-21 df45e9ca3f6cff9509cbf455852a20f2d1854a38 diff --git a/repos/libports/recipes/src/qt5_xml/used_apis b/repos/libports/recipes/src/qt5_xml/used_apis deleted file mode 100644 index 173fddbe0a..0000000000 --- a/repos/libports/recipes/src/qt5_xml/used_apis +++ /dev/null @@ -1,4 +0,0 @@ -base -libc -qt5_core -stdcxx diff --git a/repos/libports/recipes/src/test-qpluginwidget/content.mk b/repos/libports/recipes/src/test-qpluginwidget/content.mk index f70f19a63a..b057169847 100644 --- a/repos/libports/recipes/src/test-qpluginwidget/content.mk +++ b/repos/libports/recipes/src/test-qpluginwidget/content.mk @@ -1,6 +1,4 @@ -MIRROR_FROM_REP_DIR := src/test/qt5/qpluginwidget \ - src/app/qt5/tmpl/target_defaults.inc \ - src/app/qt5/tmpl/target_final.inc +MIRROR_FROM_REP_DIR := src/test/qt5/qpluginwidget content: $(MIRROR_FROM_REP_DIR) LICENSE diff --git a/repos/libports/recipes/src/test-qpluginwidget/used_apis b/repos/libports/recipes/src/test-qpluginwidget/used_apis index ffa56311d5..b4778ab728 100644 --- a/repos/libports/recipes/src/test-qpluginwidget/used_apis +++ b/repos/libports/recipes/src/test-qpluginwidget/used_apis @@ -2,18 +2,14 @@ base framebuffer_session input_session libc +libqgenodeviewwidget +libqpluginwidget loader_session mesa gui_session os qoost -qt5_core -qt5_gui -qt5_network -qt5_qjpeg -qt5_qgenodeviewwidget -qt5_qpa_genode -qt5_qpluginwidget -qt5_widgets +qt5 +qt5_component stdcxx vfs diff --git a/repos/libports/recipes/src/test-qt_core/content.mk b/repos/libports/recipes/src/test-qt_core/content.mk index d2c8d39199..c072120dbd 100644 --- a/repos/libports/recipes/src/test-qt_core/content.mk +++ b/repos/libports/recipes/src/test-qt_core/content.mk @@ -1,6 +1,4 @@ -MIRROR_FROM_REP_DIR := src/test/qt5/qt_core \ - src/app/qt5/tmpl/target_defaults.inc \ - src/app/qt5/tmpl/target_final.inc +MIRROR_FROM_REP_DIR := src/test/qt5/qt_core content: $(MIRROR_FROM_REP_DIR) LICENSE diff --git a/repos/libports/recipes/src/test-qt_core/used_apis b/repos/libports/recipes/src/test-qt_core/used_apis index 309a63060a..7939ec008e 100644 --- a/repos/libports/recipes/src/test-qt_core/used_apis +++ b/repos/libports/recipes/src/test-qt_core/used_apis @@ -1,5 +1,5 @@ -base libc +qt5 qt5_component -qt5_core +so stdcxx diff --git a/repos/libports/recipes/src/test-qt_quick/content.mk b/repos/libports/recipes/src/test-qt_quick/content.mk index ab372134c3..7265bd3f06 100644 --- a/repos/libports/recipes/src/test-qt_quick/content.mk +++ b/repos/libports/recipes/src/test-qt_quick/content.mk @@ -1,6 +1,4 @@ -MIRROR_FROM_REP_DIR := src/test/qt5/qt_quick \ - src/app/qt5/tmpl/target_defaults.inc \ - src/app/qt5/tmpl/target_final.inc +MIRROR_FROM_REP_DIR := src/test/qt5/qt_quick content: $(MIRROR_FROM_REP_DIR) LICENSE diff --git a/repos/libports/recipes/src/test-qt_quick/used_apis b/repos/libports/recipes/src/test-qt_quick/used_apis index df4c718c16..bf0dd3e6b2 100644 --- a/repos/libports/recipes/src/test-qt_quick/used_apis +++ b/repos/libports/recipes/src/test-qt_quick/used_apis @@ -1,12 +1,5 @@ -base libc mesa +qt5 qt5_component -qt5_core -qt5_gui -qt5_network -qt5_qjpeg -qt5_qml -qt5_qpa_genode -qt5_quick stdcxx diff --git a/repos/libports/run/qt5.run b/repos/libports/run/qt5.run index cde18aadc5..e325ad31b4 100644 --- a/repos/libports/run/qt5.run +++ b/repos/libports/run/qt5.run @@ -3,18 +3,7 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc import_from_depot [depot_user]/src/qt5_component \ [depot_user]/src/qt5_calculatorform \ [depot_user]/src/qt5_launchpad \ - [depot_user]/src/qt5_scriptclassic \ - [depot_user]/src/qt5_tetrix \ - [depot_user]/src/qt5_ui_tools \ - [depot_user]/src/qt5_widgets - -# -# Build -# - -append build_components [qt5_build_components feature] - -build $build_components + [depot_user]/src/qt5_tetrix # # Generate config @@ -23,7 +12,7 @@ build $build_components append config { } -append config [qt5_parent_provides feature] +append config [qt5_parent_provides] append config { @@ -31,7 +20,7 @@ append config { } -append config [qt5_start_nodes feature] +append config [qt5_start_nodes] append config { @@ -45,6 +34,7 @@ append config { 2018-01-01 00:01 + @@ -56,6 +46,7 @@ append config { 2018-01-01 00:01 + @@ -69,6 +60,7 @@ append config { 2018-01-01 00:01 + @@ -97,7 +89,7 @@ install_config $config # Boot modules # -append boot_modules [qt5_boot_modules feature] +append boot_modules [qt5_boot_modules] build_boot_image $boot_modules diff --git a/repos/libports/run/qt5_calculatorform.run b/repos/libports/run/qt5_calculatorform.run index 378b9decdc..c6c1c386f7 100644 --- a/repos/libports/run/qt5_calculatorform.run +++ b/repos/libports/run/qt5_calculatorform.run @@ -1,17 +1,7 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc -import_from_depot [depot_user]/src/qt5_component \ - [depot_user]/src/qt5_widgets \ - [depot_user]/src/qt5_calculatorform - -# -# Build -# - -append build_components [qt5_build_components feature] - -build $build_components - +import_from_depot [depot_user]/src/qt5_calculatorform \ + [depot_user]/src/qt5_component # # Generate config @@ -20,7 +10,7 @@ build $build_components append config { } -append config [qt5_parent_provides feature] +append config [qt5_parent_provides] append config { @@ -28,7 +18,7 @@ append config { } -append config [qt5_start_nodes feature] +append config [qt5_start_nodes] append config { @@ -41,6 +31,7 @@ append config { 2018-01-01 00:01 + @@ -62,7 +53,7 @@ install_config $config # Boot modules # -append boot_modules [qt5_boot_modules feature] +append boot_modules [qt5_boot_modules] build_boot_image $boot_modules diff --git a/repos/libports/run/qt5_common.inc b/repos/libports/run/qt5_common.inc index 9636cd07de..d2b1533671 100644 --- a/repos/libports/run/qt5_common.inc +++ b/repos/libports/run/qt5_common.inc @@ -1,52 +1,21 @@ - -source ${genode_dir}/repos/libports/run/qt5_drivers.inc - -set feature(Input) 1 -set feature(Framebuffer) 1 -set feature(Timer) 1 - create_boot_directory -import_from_depot [depot_user]/src/[base_src] \ +import_from_depot [depot_user]/pkg/[drivers_interactive_pkg] \ + [depot_user]/pkg/themed_wm \ + [depot_user]/raw/qt5_dejavusans \ + [depot_user]/src/[base_src] \ [depot_user]/src/expat \ - [depot_user]/src/freetype \ + [depot_user]/src/global_keys_handler \ [depot_user]/src/init \ - [depot_user]/src/jpeg \ [depot_user]/src/libc \ - [depot_user]/src/libpng \ [depot_user]/src/mesa \ [depot_user]/src/nitpicker \ - [depot_user]/src/global_keys_handler \ - [depot_user]/src/rom_filter \ - [depot_user]/src/qt5_core \ - [depot_user]/src/qt5_gui \ - [depot_user]/src/qt5_qjpeg \ - [depot_user]/src/qt5_qpa_genode \ + [depot_user]/src/qt5_base \ [depot_user]/src/report_rom \ + [depot_user]/src/rom_filter \ [depot_user]/src/stdcxx \ [depot_user]/src/vfs \ [depot_user]/src/vfs_pipe \ - [depot_user]/src/zlib \ - [depot_user]/pkg/themed_wm \ - [depot_user]/raw/qt5_dejavusans - -# -# Build -# - -proc qt5_build_components { feature_arg } { - - upvar $feature_arg feature - - set build_components { } - - append build_components [drivers_build_components feature] - - append build_components { } - - return $build_components -} - # # Configuration @@ -78,34 +47,148 @@ proc qt5_decorator_config { } { } } -proc qt5_parent_provides { feature_arg } { +proc qt5_parent_provides { } { - upvar $feature_arg feature + set parent_provides { } - set parent_provides [drivers_parent_provides feature] + append parent_provides { + + + + + + + + + } return $parent_provides } -proc qt5_start_nodes { feature_arg } { +# +# Keyboard layout - this function can be overridden in a run script +# +proc language_chargen { } { return "en_us" } - upvar $feature_arg feature +exec cp -f [genode_dir]/repos/os/src/server/input_filter/[language_chargen].chargen bin/ +exec cp -f [genode_dir]/repos/os/src/server/input_filter/special.chargen bin/ - set start_nodes [drivers_start_nodes feature] +set qt5_input_filter_config { + } +append_if [have_spec ps2] qt5_input_filter_config { + } +append_if [have_spec usb] qt5_input_filter_config { + } +append_if [have_spec linux] qt5_input_filter_config { + } +append qt5_input_filter_config { + + + + + } +append_if [have_spec ps2] qt5_input_filter_config { + } +append_if [have_spec usb] qt5_input_filter_config { + } +append_if [have_spec linux] qt5_input_filter_config { + } +append qt5_input_filter_config { + + + + + + + + + + + + + + + } +append qt5_input_filter_config " + " +append qt5_input_filter_config { + + + + +} + +set fd [open bin/qt5_input_filter.config w] +puts $fd $qt5_input_filter_config +close $fd + + +proc qt5_start_nodes { } { + + set start_nodes { } append start_nodes { + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - } - append_if [use_fb_sdl feature] start_nodes { - - } - append_if [use_fb_drv feature] start_nodes { - - } - append start_nodes { - + + @@ -143,24 +226,24 @@ proc qt5_start_nodes { feature_arg } { - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -239,19 +322,12 @@ proc qt5_start_nodes { feature_arg } { return $start_nodes } -# -# Boot modules -# -proc qt5_boot_modules { feature_arg } { - - upvar $feature_arg feature +proc qt5_boot_modules { } { set boot_modules { } - append boot_modules [drivers_boot_modules feature] - - append boot_modules { } - - return $boot_modules + lappend boot_modules [language_chargen].chargen + lappend boot_modules special.chargen + lappend boot_modules qt5_input_filter.config } diff --git a/repos/libports/run/qt5_core.run b/repos/libports/run/qt5_core.run index d37a7cc6f0..8996fe1806 100644 --- a/repos/libports/run/qt5_core.run +++ b/repos/libports/run/qt5_core.run @@ -3,8 +3,8 @@ create_boot_directory import_from_depot [depot_user]/src/[base_src] \ [depot_user]/src/init \ [depot_user]/src/libc \ + [depot_user]/src/qt5_base \ [depot_user]/src/qt5_component \ - [depot_user]/src/qt5_core \ [depot_user]/src/stdcxx \ [depot_user]/src/vfs \ [depot_user]/src/zlib \ diff --git a/repos/libports/run/qt5_drivers.inc b/repos/libports/run/qt5_drivers.inc deleted file mode 100644 index f1edd85e75..0000000000 --- a/repos/libports/run/qt5_drivers.inc +++ /dev/null @@ -1,405 +0,0 @@ -# -# Global variables required by platform_drv-related functions -# - -set build_components { } -set config { } -set boot_modules { } - -source ${genode_dir}/repos/base/run/platform_drv.inc - -# -# Helper functions -# - -proc use_audio_drv { feature_arg } { - upvar $feature_arg feature - return [info exists feature(Audio_out)] -} - -proc use_fb_drv { feature_arg } { - upvar $feature_arg feature - return [have_spec framebuffer] -} - -proc fb_drv_binary { } { - if {[have_spec pbxa9]} { return pl11x_fb_drv } - if {[have_spec x86]} { return vesa_fb_drv } - if {[have_spec imx53]} { return imx53_fb_drv } - if {[have_spec rpi]} { return rpi_fb_drv } - return no_fb_drv_available -} - -proc use_fb_sdl { feature_arg } { - upvar $feature_arg feature - return [have_spec linux] -} - -proc use_gpio_drv { feature_arg } { - upvar $feature_arg feature - return [expr {[use_usb_drv feature] && - [have_spec gpio]}] -} - -proc use_input_filter { feature_arg } { - upvar $feature_arg feature - return [info exists feature(Input)] -} - -proc use_nic_drv { feature_arg } { - upvar $feature_arg feature - return [expr {[info exists feature(Nic)] && - ([have_spec zynq] || - [have_spec lan9118] || - [have_spec imx53] || - [have_spec imx6] || - [have_spec linux] || - [have_spec x86])}] -} - -proc nic_drv_binary { } { - if {[have_spec linux]} { return linux_nic_drv } - if {[have_spec zynq]} { return zynq_nic_drv } - if {[have_spec lan9118]} { return lan9118_nic_drv } - if {[have_spec x86]} { return ipxe_nic_drv } - if {[have_spec imx53]} { return fec_nic_drv } - if {[have_spec imx6]} { return fec_nic_drv } - return no_nic_drv_available -} - -proc use_ps2_drv { feature_arg } { - upvar $feature_arg feature - return [have_spec ps2] -} - -proc use_timer { feature_arg } { - upvar $feature_arg feature - return [info exists feature(Timer)] -} - -proc use_usb_input { feature_arg } { - upvar $feature_arg feature - return [expr {[info exists feature(Input)] && - ([need_usb_hid] || - ([have_spec x86] && ![have_spec linux]))}] -} - -proc use_usb_nic { feature_arg } { - upvar $feature_arg feature - return [expr {[info exists feature(Nic)] && - [have_spec rpi]}] -} - -proc use_usb_drv { feature_arg } { - upvar $feature_arg feature - return [expr {[use_usb_input feature] || [use_usb_nic feature]}] -} - -proc usb_drv_binary { } { - if {[have_spec x86]} { return usb_drv } - if {[have_spec rpi]} { return rpi_usb_drv } - return no_nic_drv_available -} - -# -# Keyboard layout - this function can be overridden in a run script -# -proc language_chargen { } { return "en_us" } - -# -# Build -# - -proc drivers_build_components { feature_arg } { - - upvar $feature_arg feature - - set build_components { } - - # This function appends to the global 'build_components' variable, not to - # the local version defined above. - append_platform_drv_build_components - - lappend_if [use_audio_drv feature] build_components drivers/audio - lappend_if [use_fb_drv feature] build_components drivers/framebuffer - lappend_if [use_fb_sdl feature] build_components drivers/framebuffer/spec/sdl - lappend_if [use_gpio_drv feature] build_components drivers/gpio - lappend_if [use_input_filter feature] build_components server/input_filter - lappend_if [use_nic_drv feature] build_components drivers/nic - lappend_if [use_ps2_drv feature] build_components drivers/input/spec/ps2 - lappend_if [use_usb_drv feature] build_components drivers/usb - - return $build_components -} - -# -# Configuration -# - -proc drivers_parent_provides { feature_arg } { - - upvar $feature_arg feature - - set parent_provides { } - - # TODO: make dependent on features - - append parent_provides { - - - - - - - - - } - - return $parent_provides -} - -proc drivers_start_nodes { feature_arg } { - - upvar $feature_arg feature - - set start_nodes { } - - append start_nodes [platform_drv_config] - - append_if [use_audio_drv feature] start_nodes { - - - - - - - } - - append_if [use_fb_drv feature] start_nodes { - - - - - - } - - append_if [use_fb_sdl feature] start_nodes { - - - - - - - - } - - append_if [use_gpio_drv feature] start_nodes " - - - - - " - - if { [use_input_filter feature] } { - - exec cp -f [genode_dir]/repos/os/src/server/input_filter/[language_chargen].chargen bin/ - exec cp -f [genode_dir]/repos/os/src/server/input_filter/special.chargen bin/ - - append start_nodes { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - } - - - append start_nodes { - - - - } - append_if [use_ps2_drv feature] start_nodes { - } - append_if [use_usb_drv feature] start_nodes { - } - append_if [use_fb_sdl feature] start_nodes { - } - append start_nodes { - - - - - } - append_if [use_ps2_drv feature] start_nodes { - } - append_if [use_usb_drv feature] start_nodes { - } - append_if [use_fb_sdl feature] start_nodes { - } - append start_nodes { - - - - - - - - - - - - - - - } - append start_nodes " - " - append start_nodes { - - - - - - - - - - - - } - append_if [use_ps2_drv feature] start_nodes { - } - append_if [use_usb_drv feature] start_nodes { - } - append_if [use_fb_sdl feature] start_nodes { - } - append start_nodes { - - - } - } - - # don't use the dynamic linker for loading the lx_hybrid nic_drv on Linux - proc nic_drv_ld_attr {} { - if {[have_spec linux]} { return {ld="no"} } - return "" - } - - append_if [use_nic_drv feature] start_nodes { - - - - - - } - - append_if [use_ps2_drv feature] start_nodes { - - - - - - - - - - - } - - append_if [use_timer feature] start_nodes { - - - - - } - - if { [use_usb_drv feature] } { - append start_nodes { - - - - } - append_if [use_usb_input feature] start_nodes { - } - append_if [use_usb_nic feature] start_nodes { - } - append start_nodes { - - } - append_if [use_usb_input feature] start_nodes { - } - append_if [use_usb_nic feature] start_nodes { - } - append start_nodes { - - - - - - - - } - } - - return $start_nodes -} - -# -# Boot modules -# - -proc drivers_boot_modules { feature_arg } { - - upvar $feature_arg feature - - set boot_modules { } - - # This function appends to the global 'boot_modules' variable, not to the - # local version defined above. - append_platform_drv_boot_modules - - lappend_if [use_audio_drv feature] boot_modules [audio_drv_binary] - lappend_if [use_fb_drv feature] boot_modules [fb_drv_binary] - lappend_if [use_fb_sdl feature] boot_modules fb_sdl - lappend_if [use_gpio_drv feature] boot_modules [gpio_drv] - lappend_if [use_input_filter feature] boot_modules input_filter - lappend_if [use_input_filter feature] boot_modules [language_chargen].chargen - lappend_if [use_input_filter feature] boot_modules special.chargen - lappend_if [use_nic_drv feature] boot_modules [nic_drv_binary] - lappend_if [use_ps2_drv feature] boot_modules ps2_drv - lappend_if [use_usb_drv feature] boot_modules [usb_drv_binary] - - return $boot_modules -} - diff --git a/repos/libports/run/qt5_openglwindow.run b/repos/libports/run/qt5_openglwindow.run index dc6fd953ff..90d4533af6 100644 --- a/repos/libports/run/qt5_openglwindow.run +++ b/repos/libports/run/qt5_openglwindow.run @@ -3,14 +3,6 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc import_from_depot [depot_user]/src/qt5_component \ [depot_user]/src/qt5_openglwindow -# -# Build -# - -append build_components [qt5_build_components feature] - -build $build_components - # # Generate config # @@ -18,7 +10,7 @@ build $build_components append config { } -append config [qt5_parent_provides feature] +append config [qt5_parent_provides] append config { @@ -26,7 +18,7 @@ append config { } -append config [qt5_start_nodes feature] +append config [qt5_start_nodes] append config { @@ -47,6 +39,7 @@ append config { 2018-01-01 00:01 + @@ -60,7 +53,7 @@ install_config $config # Boot modules # -append boot_modules [qt5_boot_modules feature] +append boot_modules [qt5_boot_modules] build_boot_image $boot_modules diff --git a/repos/libports/run/qt5_qpluginwidget.run b/repos/libports/run/qt5_qpluginwidget.run index f8e2d08c79..b5b6e72de6 100644 --- a/repos/libports/run/qt5_qpluginwidget.run +++ b/repos/libports/run/qt5_qpluginwidget.run @@ -1,20 +1,15 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc -import_from_depot [depot_user]/src/libcrypto \ - [depot_user]/src/libssl \ - [depot_user]/src/qt5_component \ - [depot_user]/src/qt5_network \ - [depot_user]/src/qt5_qgenodeviewwidget \ - [depot_user]/src/qt5_qpluginwidget \ - [depot_user]/src/qt5_widgets \ - [depot_user]/src/test-qpluginwidget +import_from_depot [depot_user]/src/qt5_component \ + [depot_user]/src/libqgenodeviewwidget \ + [depot_user]/src/libqpluginwidget \ + [depot_user]/src/test-qpluginwidget \ + [depot_user]/src/zlib # # Build # -append build_components [qt5_build_components feature] - append build_components { server/loader server/tar_rom @@ -30,7 +25,7 @@ build $build_components append config { } -append config [qt5_parent_provides feature] +append config [qt5_parent_provides] append config { @@ -38,7 +33,7 @@ append config { } -append config [qt5_start_nodes feature] +append config [qt5_start_nodes] append config { @@ -66,7 +61,15 @@ append config { 2018-01-01 00:01 + + + + + + + + @@ -88,7 +91,7 @@ install_config $config # Boot modules # -append boot_modules [qt5_boot_modules feature] +append boot_modules [qt5_boot_modules] append boot_modules { loader diff --git a/repos/libports/run/qt5_quicktest.run b/repos/libports/run/qt5_quicktest.run index d1de8931e4..fb5e891752 100644 --- a/repos/libports/run/qt5_quicktest.run +++ b/repos/libports/run/qt5_quicktest.run @@ -1,24 +1,9 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc -import_from_depot [depot_user]/raw/qt5_qtquick2 \ - [depot_user]/src/libcrypto \ - [depot_user]/src/libssl \ - [depot_user]/src/qt5_component \ - [depot_user]/src/qt5_network \ - [depot_user]/src/qt5_qml \ - [depot_user]/src/qt5_qtquick2 \ - [depot_user]/src/qt5_quick \ - [depot_user]/src/qt5_widgets \ +import_from_depot [depot_user]/src/qt5_component \ + [depot_user]/src/qt5_declarative \ [depot_user]/src/test-qt_quick -# -# Build -# - -append build_components [qt5_build_components feature] - -build $build_components - # # Generate config # @@ -26,7 +11,7 @@ build $build_components append config { } -append config [qt5_parent_provides feature] +append config [qt5_parent_provides] append config { @@ -34,7 +19,7 @@ append config { } -append config [qt5_start_nodes feature] +append config [qt5_start_nodes] append config { @@ -46,9 +31,9 @@ append config { 2018-01-01 00:01 + - - + @@ -70,7 +55,7 @@ install_config $config # Boot modules # -append boot_modules [qt5_boot_modules feature] +append boot_modules [qt5_boot_modules] build_boot_image $boot_modules diff --git a/repos/libports/run/qt5_samegame.run b/repos/libports/run/qt5_samegame.run index 1c7cdc33e1..ab4c9d7ca7 100644 --- a/repos/libports/run/qt5_samegame.run +++ b/repos/libports/run/qt5_samegame.run @@ -1,24 +1,10 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc -import_from_depot [depot_user]/raw/qt5_qtquick2 \ - [depot_user]/raw/qt5_samegame \ - [depot_user]/src/libcrypto \ - [depot_user]/src/libssl \ +import_from_depot [depot_user]/raw/qt5_samegame \ [depot_user]/src/qt5_component \ - [depot_user]/src/qt5_network \ - [depot_user]/src/qt5_qml \ - [depot_user]/src/qt5_qtquick2 \ - [depot_user]/src/qt5_quick \ + [depot_user]/src/qt5_declarative \ [depot_user]/src/qt5_samegame -# -# Build -# - -append build_components [qt5_build_components feature] - -build $build_components - # # Generate config # @@ -26,7 +12,7 @@ build $build_components append config { } -append config [qt5_parent_provides feature] +append config [qt5_parent_provides] append config { @@ -34,7 +20,7 @@ append config { } -append config [qt5_start_nodes feature] +append config [qt5_start_nodes] append config { @@ -46,9 +32,10 @@ append config { 2018-01-01 00:01 + - - + + @@ -71,10 +58,7 @@ install_config $config # Boot modules # -# The QtQuick plugin currently needs to be provided both in the file system -# (for Qt) and as ROM module (for 'dlopen()'). - -append boot_modules [qt5_boot_modules feature] +append boot_modules [qt5_boot_modules] build_boot_image $boot_modules diff --git a/repos/libports/run/qt5_testqstring.run b/repos/libports/run/qt5_testqstring.run index f1efa3f0fd..5f623d0dd8 100644 --- a/repos/libports/run/qt5_testqstring.run +++ b/repos/libports/run/qt5_testqstring.run @@ -1,19 +1,8 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc import_from_depot [depot_user]/src/qt5_component \ - [depot_user]/src/qt5_test \ - [depot_user]/src/qt5_widgets \ [depot_user]/src/qt5_testqstring -# -# Build -# - -append build_components [qt5_build_components feature] - -build $build_components - - # # Generate config # @@ -21,7 +10,7 @@ build $build_components append config { } -append config [qt5_parent_provides feature] +append config [qt5_parent_provides] append config { @@ -29,10 +18,10 @@ append config { } -append config [qt5_start_nodes feature] +append config [qt5_start_nodes] append config { - + @@ -42,6 +31,7 @@ append config { 2018-01-01 00:01 + @@ -63,7 +53,7 @@ install_config $config # Boot modules # -append boot_modules [qt5_boot_modules feature] +append boot_modules [qt5_boot_modules] build_boot_image $boot_modules diff --git a/repos/libports/run/qt5_tetrix.run b/repos/libports/run/qt5_tetrix.run index 2fccec1c57..906fb215a8 100644 --- a/repos/libports/run/qt5_tetrix.run +++ b/repos/libports/run/qt5_tetrix.run @@ -1,18 +1,7 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc import_from_depot [depot_user]/src/qt5_component \ - [depot_user]/src/qt5_scriptclassic \ - [depot_user]/src/qt5_tetrix \ - [depot_user]/src/qt5_ui_tools \ - [depot_user]/src/qt5_widgets - -# -# Build -# - -append build_components [qt5_build_components feature] - -build $build_components + [depot_user]/src/qt5_tetrix # # Generate config @@ -21,7 +10,7 @@ build $build_components append config { } -append config [qt5_parent_provides feature] +append config [qt5_parent_provides] append config { @@ -29,7 +18,7 @@ append config { } -append config [qt5_start_nodes feature] +append config [qt5_start_nodes] append config { @@ -42,6 +31,7 @@ append config { 2018-01-01 00:01 + @@ -63,7 +53,7 @@ install_config $config # Boot modules # -append boot_modules [qt5_boot_modules feature] +append boot_modules [qt5_boot_modules] build_boot_image $boot_modules diff --git a/repos/libports/run/qt5_textedit.run b/repos/libports/run/qt5_textedit.run index 661a2eba74..1a970cb9e0 100644 --- a/repos/libports/run/qt5_textedit.run +++ b/repos/libports/run/qt5_textedit.run @@ -1,24 +1,9 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc import_from_depot [depot_user]/src/qt5_component \ - [depot_user]/src/qt5_printsupport \ [depot_user]/src/qt5_textedit \ - [depot_user]/src/qt5_widgets \ [depot_user]/src/vfs -# -# Build -# - -if {[have_spec odroid_xu]} { - puts "Run script does not support this platform." - exit 0 -} - -append build_components [qt5_build_components feature] - -build $build_components - # # Generate config # @@ -27,7 +12,7 @@ append config { } -append config [qt5_parent_provides feature] +append config [qt5_parent_provides] append config { @@ -36,7 +21,7 @@ append config { } -append config [qt5_start_nodes feature] +append config [qt5_start_nodes] append config { @@ -64,6 +49,7 @@ append config { + @@ -86,6 +72,7 @@ append config { + @@ -104,7 +91,7 @@ install_config $config # Boot modules # -append boot_modules [qt5_boot_modules feature] +append boot_modules [qt5_boot_modules] build_boot_image $boot_modules diff --git a/repos/libports/run/qt5_virtualkeyboard.run b/repos/libports/run/qt5_virtualkeyboard.run index 2e41e8667b..6488c80971 100644 --- a/repos/libports/run/qt5_virtualkeyboard.run +++ b/repos/libports/run/qt5_virtualkeyboard.run @@ -1,41 +1,12 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc -import_from_depot [depot_user]/raw/qt5_qt_labs_folderlistmodel \ - [depot_user]/raw/qt5_qtquick_controls2 \ - [depot_user]/raw/qt5_qtquick_layouts \ - [depot_user]/raw/qt5_qtquick_templates2 \ - [depot_user]/raw/qt5_qtquick_virtualkeyboard \ - [depot_user]/raw/qt5_qtquick_window \ - [depot_user]/raw/qt5_qtquick2 \ - [depot_user]/src/libcrypto \ - [depot_user]/src/libssl \ - [depot_user]/src/qt5_component \ - [depot_user]/src/qt5_network \ - [depot_user]/src/qt5_qml \ +import_from_depot [depot_user]/src/qt5_component \ + [depot_user]/src/qt5_declarative \ [depot_user]/src/qt5_quickcontrols2 \ - [depot_user]/src/qt5_quicktemplates2 \ - [depot_user]/src/qt5_qt_labs_folderlistmodel \ - [depot_user]/src/qt5_qtquick_controls2 \ - [depot_user]/src/qt5_qtquick_layouts \ - [depot_user]/src/qt5_qtquick_templates2 \ - [depot_user]/src/qt5_qtquick_virtualkeyboard \ - [depot_user]/src/qt5_qtquick_window \ - [depot_user]/src/qt5_qtquick2 \ - [depot_user]/src/qt5_quick \ [depot_user]/src/qt5_svg \ [depot_user]/src/qt5_virtualkeyboard \ - [depot_user]/src/qt5_widgets \ [depot_user]/src/qt5_virtualkeyboard_example -# -# Build -# - -append build_components [qt5_build_components feature] - -build $build_components - - # # Generate config # @@ -43,7 +14,7 @@ build $build_components append config { } -append config [qt5_parent_provides feature] +append config [qt5_parent_provides] append config { @@ -51,7 +22,7 @@ append config { } -append config [qt5_start_nodes feature] +append config [qt5_start_nodes] append config { @@ -64,23 +35,12 @@ append config { 2018-01-01 00:01 - - - - - - - - - - - - - - - - - + + + + + + @@ -102,7 +62,7 @@ install_config $config # Boot modules # -append boot_modules [qt5_boot_modules feature] +append boot_modules [qt5_boot_modules] build_boot_image $boot_modules diff --git a/repos/libports/src/app/qt5/examples/calculatorform/target.mk b/repos/libports/src/app/qt5/examples/calculatorform/target.mk index bb95798e46..5436d41db5 100644 --- a/repos/libports/src/app/qt5/examples/calculatorform/target.mk +++ b/repos/libports/src/app/qt5/examples/calculatorform/target.mk @@ -1,15 +1,9 @@ -QT5_PORT_DIR := $(call select_from_ports,qt5) -QT5_CONTRIB_DIR := $(QT5_PORT_DIR)/src/lib/qt5/qt5 +QMAKE_PROJECT_FILE = $(QT_DIR)/qttools/examples/designer/calculatorform/calculatorform.pro -QMAKE_PROJECT_PATH = $(QT5_CONTRIB_DIR)/qttools/examples/designer/calculatorform -QMAKE_PROJECT_FILE = $(QMAKE_PROJECT_PATH)/calculatorform.pro +QMAKE_TARGET_BINARIES = calculatorform -vpath % $(QMAKE_PROJECT_PATH) +QT5_PORT_LIBS = libQt5Core libQt5Gui libQt5Widgets -include $(call select_from_repositories,src/app/qt5/tmpl/target_defaults.inc) +LIBS = libc libm mesa qt5_component stdcxx $(QT5_PORT_LIBS) -include $(call select_from_repositories,src/app/qt5/tmpl/target_final.inc) - -LIBS += qt5_component - -CC_CXX_WARN_STRICT = +include $(call select_from_repositories,lib/import/import-qt5_qmake.mk) diff --git a/repos/libports/src/app/qt5/examples/openglwindow/target.mk b/repos/libports/src/app/qt5/examples/openglwindow/target.mk index 3a6c7e7aac..a72a1fd26e 100644 --- a/repos/libports/src/app/qt5/examples/openglwindow/target.mk +++ b/repos/libports/src/app/qt5/examples/openglwindow/target.mk @@ -1,15 +1,9 @@ -QT5_PORT_DIR := $(call select_from_ports,qt5) -QT5_CONTRIB_DIR := $(QT5_PORT_DIR)/src/lib/qt5/qt5 +QMAKE_PROJECT_FILE = $(QT_DIR)/qtbase/examples/gui/openglwindow/openglwindow.pro -QMAKE_PROJECT_PATH = $(QT5_CONTRIB_DIR)/qtbase/examples/gui/openglwindow -QMAKE_PROJECT_FILE = $(QMAKE_PROJECT_PATH)/openglwindow.pro +QMAKE_TARGET_BINARIES = openglwindow -vpath % $(QMAKE_PROJECT_PATH) +QT5_PORT_LIBS = libQt5Core libQt5Gui -include $(call select_from_repositories,src/app/qt5/tmpl/target_defaults.inc) +LIBS = libc libm mesa qt5_component stdcxx $(QT5_PORT_LIBS) -include $(call select_from_repositories,src/app/qt5/tmpl/target_final.inc) - -LIBS += qt5_component - -CC_CXX_WARN_STRICT = +include $(call select_from_repositories,lib/import/import-qt5_qmake.mk) diff --git a/repos/libports/src/app/qt5/examples/samegame/target.mk b/repos/libports/src/app/qt5/examples/samegame/target.mk index 695c305a82..f7dba1e7be 100644 --- a/repos/libports/src/app/qt5/examples/samegame/target.mk +++ b/repos/libports/src/app/qt5/examples/samegame/target.mk @@ -1,7 +1,10 @@ -include $(call select_from_repositories,src/app/qt5/tmpl/target_defaults.inc) +QMAKE_PROJECT_FILE = $(PRG_DIR)/samegame.pro -include $(call select_from_repositories,src/app/qt5/tmpl/target_final.inc) +QMAKE_TARGET_BINARIES = samegame -LIBS += qt5_component +QT5_PORT_LIBS += libQt5Core libQt5Gui libQt5Network +QT5_PORT_LIBS += libQt5Qml libQt5Quick -CC_CXX_WARN_STRICT = +LIBS = libc libm mesa qt5_component stdcxx $(QT5_PORT_LIBS) + +include $(call select_from_repositories,lib/import/import-qt5_qmake.mk) diff --git a/repos/libports/src/app/qt5/examples/testqstring/target.mk b/repos/libports/src/app/qt5/examples/testqstring/target.mk index ec237858c3..f7930623e8 100644 --- a/repos/libports/src/app/qt5/examples/testqstring/target.mk +++ b/repos/libports/src/app/qt5/examples/testqstring/target.mk @@ -1,18 +1,9 @@ -QT5_PORT_DIR := $(call select_from_ports,qt5) -QT5_CONTRIB_DIR := $(QT5_PORT_DIR)/src/lib/qt5/qt5 +QMAKE_PROJECT_FILE = $(QT_DIR)/qtbase/examples/qtestlib/tutorial1 -QMAKE_PROJECT_PATH = $(QT5_CONTRIB_DIR)/qtbase/examples/qtestlib/tutorial1 -QMAKE_PROJECT_FILE = $(QMAKE_PROJECT_PATH)/tutorial1.pro +QMAKE_TARGET_BINARIES = tutorial1 -vpath % $(QMAKE_PROJECT_PATH) +QT5_PORT_LIBS = libQt5Core libQt5Gui libQt5Test libQt5Widgets -# 'testqstring.cpp' includes 'testqstring.moc' -testqstring.o: testqstring.moc +LIBS = libc libm mesa qt5_component stdcxx $(QT5_PORT_LIBS) -include $(call select_from_repositories,src/app/qt5/tmpl/target_defaults.inc) - -include $(call select_from_repositories,src/app/qt5/tmpl/target_final.inc) - -LIBS += qt5_component - -CC_CXX_WARN_STRICT = +include $(call select_from_repositories,lib/import/import-qt5_qmake.mk) diff --git a/repos/libports/src/app/qt5/examples/tetrix/target.mk b/repos/libports/src/app/qt5/examples/tetrix/target.mk index 1cbaa51917..5254da17e2 100644 --- a/repos/libports/src/app/qt5/examples/tetrix/target.mk +++ b/repos/libports/src/app/qt5/examples/tetrix/target.mk @@ -1,17 +1,9 @@ -QT5_PORT_DIR := $(call select_from_ports,qt5) -QT5_CONTRIB_DIR := $(QT5_PORT_DIR)/src/lib/qt5/qt5 +QMAKE_PROJECT_FILE = $(QT_DIR)/qtbase/examples/widgets/widgets/tetrix/tetrix.pro -QMAKE_PROJECT_PATH = $(QT5_CONTRIB_DIR)/qtscript/examples/script/qstetrix -QMAKE_PROJECT_FILE = $(QMAKE_PROJECT_PATH)/qstetrix.pro +QMAKE_TARGET_BINARIES = tetrix -vpath % $(QMAKE_PROJECT_PATH) +QT5_PORT_LIBS = libQt5Core libQt5Gui libQt5Widgets -include $(call select_from_repositories,src/app/qt5/tmpl/target_defaults.inc) +LIBS = libc libm mesa qt5_component stdcxx $(QT5_PORT_LIBS) -CC_CXX_OPT += -DQT_NO_SCRIPTTOOLS - -include $(call select_from_repositories,src/app/qt5/tmpl/target_final.inc) - -LIBS += qt5_component - -CC_CXX_WARN_STRICT = +include $(call select_from_repositories,lib/import/import-qt5_qmake.mk) diff --git a/repos/libports/src/app/qt5/examples/textedit/target.mk b/repos/libports/src/app/qt5/examples/textedit/target.mk index f3976219b5..15db93e68e 100644 --- a/repos/libports/src/app/qt5/examples/textedit/target.mk +++ b/repos/libports/src/app/qt5/examples/textedit/target.mk @@ -1,15 +1,9 @@ -QT5_PORT_DIR := $(call select_from_ports,qt5) -QT5_CONTRIB_DIR := $(QT5_PORT_DIR)/src/lib/qt5/qt5 +QMAKE_PROJECT_FILE = $(QT_DIR)/qtbase/examples/widgets/richtext/textedit/textedit.pro -QMAKE_PROJECT_PATH = $(QT5_CONTRIB_DIR)/qtbase/examples/widgets/richtext/textedit -QMAKE_PROJECT_FILE = $(QMAKE_PROJECT_PATH)/textedit.pro +QMAKE_TARGET_BINARIES = textedit -vpath % $(QMAKE_PROJECT_PATH) +QT5_PORT_LIBS = libQt5Core libQt5Gui libQt5PrintSupport libQt5Widgets -include $(call select_from_repositories,src/app/qt5/tmpl/target_defaults.inc) +LIBS = libc libm mesa qt5_component stdcxx $(QT5_PORT_LIBS) -include $(call select_from_repositories,src/app/qt5/tmpl/target_final.inc) - -LIBS += qt5_component qt5_printsupport - -CC_CXX_WARN_STRICT = +include $(call select_from_repositories,lib/import/import-qt5_qmake.mk) diff --git a/repos/libports/src/app/qt5/examples/virtualkeyboard/target.mk b/repos/libports/src/app/qt5/examples/virtualkeyboard/target.mk index fea7d1a333..0e037995e4 100644 --- a/repos/libports/src/app/qt5/examples/virtualkeyboard/target.mk +++ b/repos/libports/src/app/qt5/examples/virtualkeyboard/target.mk @@ -1,17 +1,11 @@ -QT5_PORT_DIR := $(call select_from_ports,qt5) -QT5_CONTRIB_DIR := $(QT5_PORT_DIR)/src/lib/qt5/qt5 +QMAKE_PROJECT_FILE = $(QT_DIR)/qtvirtualkeyboard/examples/virtualkeyboard/basic/basic.pro -QMAKE_PROJECT_PATH = $(QT5_CONTRIB_DIR)/qtvirtualkeyboard/examples/virtualkeyboard/basic -QMAKE_PROJECT_FILE = $(QMAKE_PROJECT_PATH)/basic.pro +QMAKE_TARGET_BINARIES = basic -vpath % $(QMAKE_PROJECT_PATH) +QT5_PORT_LIBS += libQt5Core libQt5Gui libQt5Network +QT5_PORT_LIBS += libQt5Qml libQt5Quick +QT5_PORT_LIBS += libQt5VirtualKeyboard -include $(call select_from_repositories,src/app/qt5/tmpl/target_defaults.inc) +LIBS = libc libm mesa qt5_component stdcxx $(QT5_PORT_LIBS) -CC_CXX_OPT += -D'MAIN_QML="basic-b2qt.qml"' - -include $(call select_from_repositories,src/app/qt5/tmpl/target_final.inc) - -LIBS += qt5_component qt5_virtualkeyboard - -CC_CXX_WARN_STRICT = +include $(call select_from_repositories,lib/import/import-qt5_qmake.mk) diff --git a/repos/libports/src/app/qt5/qt_launchpad/child_entry.cpp b/repos/libports/src/app/qt5/qt_launchpad/child_entry.cpp index abf45ba99e..2dfed47080 100644 --- a/repos/libports/src/app/qt5/qt_launchpad/child_entry.cpp +++ b/repos/libports/src/app/qt5/qt_launchpad/child_entry.cpp @@ -4,6 +4,13 @@ * \date 2008-04-06 */ +/* + * Copyright (C) 2008 Genode Labs GmbH + * + * This file is part of the Genode OS framework, which is distributed + * under the terms of the GNU Affero General Public License version 3. + */ + #include "child_entry.h" Child_entry::Child_entry(Launchpad_child::Name const &name, int quota_kb, diff --git a/repos/libports/src/app/qt5/qt_launchpad/kbyte_loadbar.cpp b/repos/libports/src/app/qt5/qt_launchpad/kbyte_loadbar.cpp index 3e3c23e56a..d931201411 100644 --- a/repos/libports/src/app/qt5/qt_launchpad/kbyte_loadbar.cpp +++ b/repos/libports/src/app/qt5/qt_launchpad/kbyte_loadbar.cpp @@ -4,6 +4,13 @@ * \date 2008-04-05 */ +/* + * Copyright (C) 2008 Genode Labs GmbH + * + * This file is part of the Genode OS framework, which is distributed + * under the terms of the GNU Affero General Public License version 3. + */ + #include "kbyte_loadbar.h" diff --git a/repos/libports/src/app/qt5/qt_launchpad/launch_entry.cpp b/repos/libports/src/app/qt5/qt_launchpad/launch_entry.cpp index 4ef1b4db7d..b9748f82c9 100644 --- a/repos/libports/src/app/qt5/qt_launchpad/launch_entry.cpp +++ b/repos/libports/src/app/qt5/qt_launchpad/launch_entry.cpp @@ -4,6 +4,13 @@ * \date 2008-04-06 */ +/* + * Copyright (C) 2008 Genode Labs GmbH + * + * This file is part of the Genode OS framework, which is distributed + * under the terms of the GNU Affero General Public License version 3. + */ + #include "launch_entry.h" Launch_entry::Launch_entry(Launchpad_child::Name const &prg_name, diff --git a/repos/libports/src/app/qt5/qt_launchpad/main.cpp b/repos/libports/src/app/qt5/qt_launchpad/main.cpp index 0cdc554adb..b812fb792c 100644 --- a/repos/libports/src/app/qt5/qt_launchpad/main.cpp +++ b/repos/libports/src/app/qt5/qt_launchpad/main.cpp @@ -4,16 +4,26 @@ * \date 2008-04-05 */ -/* local includes */ -#include "qt_launchpad.h" +/* + * Copyright (C) 2008-2020 Genode Labs GmbH + * + * This file is part of the Genode OS framework, which is distributed + * under the terms of the GNU Affero General Public License version 3. + */ + +/* Genode includes */ +#include +#include /* Qt includes */ #include #include -/* Genode includes */ -#include -#include +/* qt5_component includes */ +#include + +/* local includes */ +#include "qt_launchpad.h" namespace Qt_launchpad_namespace { struct Local_env; @@ -62,13 +72,11 @@ struct Qt_launchpad_namespace::Local_env : Genode::Env } }; -extern void initialize_qt_gui(Genode::Env &); - void Libc::Component::construct(Libc::Env &env) { Libc::with_libc([&] { - initialize_qt_gui(env); + qpa_init(env); Qt_launchpad_namespace::Local_env local_env(env); diff --git a/repos/libports/src/app/qt5/qt_launchpad/qt_launchpad.cpp b/repos/libports/src/app/qt5/qt_launchpad/qt_launchpad.cpp index e689905e8e..8a0816738b 100644 --- a/repos/libports/src/app/qt5/qt_launchpad/qt_launchpad.cpp +++ b/repos/libports/src/app/qt5/qt_launchpad/qt_launchpad.cpp @@ -4,6 +4,13 @@ * \date 2008-04-05 */ +/* + * Copyright (C) 2008-2020 Genode Labs GmbH + * + * This file is part of the Genode OS framework, which is distributed + * under the terms of the GNU Affero General Public License version 3. + */ + #include #include @@ -94,7 +101,7 @@ void Qt_launchpad::add_launcher(Launchpad_child::Name const &binary_name, void Qt_launchpad::add_child(Launchpad_child::Name const &name, unsigned long quota, Launchpad_child &launchpad_child, - Genode::Allocator &alloc) + Genode::Allocator &) { Child_entry *child_entry = new Child_entry(name, quota / 1024, initial_quota() / 1024, @@ -106,7 +113,7 @@ void Qt_launchpad::add_child(Launchpad_child::Name const &name, } -void Qt_launchpad::remove_child(Launchpad_child::Name const &name, Genode::Allocator &alloc) +void Qt_launchpad::remove_child(Launchpad_child::Name const &name, Genode::Allocator &) { Child_entry *child_entry = childrenDockWidgetContents->findChild(QString(name.string()) + "_child_entry"); diff --git a/repos/libports/src/app/qt5/qt_launchpad/target.mk b/repos/libports/src/app/qt5/qt_launchpad/target.mk index 21a44b1cc3..efdd9ea8b1 100644 --- a/repos/libports/src/app/qt5/qt_launchpad/target.mk +++ b/repos/libports/src/app/qt5/qt_launchpad/target.mk @@ -1,7 +1,14 @@ -include $(call select_from_repositories,src/app/qt5/tmpl/target_defaults.inc) +QMAKE_PROJECT_FILE = $(PRG_DIR)/qt_launchpad.pro -include $(call select_from_repositories,src/app/qt5/tmpl/target_final.inc) +QMAKE_TARGET_BINARIES = qt_launchpad -LIBS += launchpad +QT5_PORT_LIBS += libQt5Core libQt5Gui libQt5Widgets -CC_CXX_WARN_STRICT = +LIBS = base libc libm mesa stdcxx launchpad $(QT5_PORT_LIBS) + +include $(call select_from_repositories,lib/import/import-qt5_qmake.mk) + +QT5_GENODE_LIBS_APP += ld.lib.so launchpad.lib.a +QT5_GENODE_LIBS_APP := $(filter-out qt5_component.lib.so,$(QT5_GENODE_LIBS_APP)) + +qmake_prepared.tag: qmake_root/lib/ld.lib.so qmake_root/lib/launchpad.lib.a diff --git a/repos/libports/src/app/qt5/tmpl/target.mk.example b/repos/libports/src/app/qt5/tmpl/target.mk.example deleted file mode 100644 index f5dd6ca8db..0000000000 --- a/repos/libports/src/app/qt5/tmpl/target.mk.example +++ /dev/null @@ -1,7 +0,0 @@ -# identify the qt repository by searching for a file that is unique for qt -QT5_REP_DIR := $(call select_from_repositories,lib/import/import-qt5.inc) -QT5_REP_DIR := $(realpath $(dir $(QT5_REP_DIR))../..) - -include $(QT5_REP_DIR)/src/app/qt5/tmpl/target_defaults.inc - -include $(QT5_REP_DIR)/src/app/qt5/tmpl/target_final.inc diff --git a/repos/libports/src/app/qt5/tmpl/target_defaults.inc b/repos/libports/src/app/qt5/tmpl/target_defaults.inc deleted file mode 100644 index d94c0be29a..0000000000 --- a/repos/libports/src/app/qt5/tmpl/target_defaults.inc +++ /dev/null @@ -1,30 +0,0 @@ -# build with QtCore and QtGui support by default -# - can be overridden in the qmake project file - -QT = core gui - -# find out the name of the project directory - -PROJECT_DIR_NAME = $(notdir $(abspath $(PRG_DIR))) - -# include the qmake project file -# - if the qmake project file has a different name than the project directory, -# set QMAKE_PROJECT_FILE in target.mk before the inclusion of this file - -QMAKE_PROJECT_FILE ?= $(realpath $(PRG_DIR)/$(PROJECT_DIR_NAME).pro) - -ifneq ($(call select_from_ports,qoost),) -ifneq ($(call select_from_ports,qt5),) -ifneq ($(strip $(QMAKE_PROJECT_FILE)),) -include $(QMAKE_PROJECT_FILE) -endif -endif -endif - -# how to name the generated executable -# (if not already defined in the qmake project file) -# - can be overridden in target.mk after inclusion of this file - -ifndef TARGET -TARGET = $(PROJECT_DIR_NAME) -endif diff --git a/repos/libports/src/app/qt5/tmpl/target_final.inc b/repos/libports/src/app/qt5/tmpl/target_final.inc deleted file mode 100644 index c3bb1584b2..0000000000 --- a/repos/libports/src/app/qt5/tmpl/target_final.inc +++ /dev/null @@ -1,96 +0,0 @@ -INC_DIR += $(PRG_DIR) - -SOURCES_FILTERED = $(filter-out $(SOURCES_FILTER_OUT), $(SOURCES)) -HEADERS_FILTERED = $(filter-out $(HEADERS_FILTER_OUT), $(HEADERS)) - -# add sources defined in qmake project files -SRC_CC += $(SOURCES_FILTERED) - -# add generated sources -SRC_CC_QT_GENERATED = $(addprefix moc_,$(notdir $(HEADERS_FILTERED:.h=.cpp))) \ - $(addprefix qrc_,$(notdir $(RESOURCES:.qrc=.cpp))) - -SRC_CC += $(SRC_CC_QT_GENERATED) - -# handle relative paths in the 'HEADERS' variable -vpath %.h $(abspath $(addprefix $(PRG_DIR)/,$(sort $(dir $(HEADERS_FILTERED))))) - -# handle relative paths in the 'RESOURCES' variable -vpath %.qrc $(abspath $(addprefix $(PRG_DIR)/,$(sort $(dir $(RESOURCES))))) - -$(addsuffix .o,$(basename $(SRC_CC))): $(addprefix ui_,$(FORMS:.ui=.h)) - -LIBS += libc - -# QtCore -ifeq ($(findstring core, $(QT)), core) -QT_DEFINES += -DQT_CORE_LIB -LIBS += qt5_core -endif - -# QtGui -ifeq ($(findstring gui, $(QT)), gui) -QT_DEFINES += -DQT_GUI_LIB -LIBS += qt5_gui qt5_qpa_genode qt5_qjpeg -endif - -# QtWidgets -ifeq ($(findstring widgets, $(QT)), widgets) -QT_DEFINES += -DQT_WIDGETS_LIB -LIBS += qt5_widgets -endif - -# QtNetwork -ifeq ($(findstring network, $(QT)), network) -LIBS += qt5_network -endif - -# QtPrintSupport -ifeq ($(findstring printsupport, $(QT)), printsupport) -LIBS += qt5_printsupport -endif - -# QtQuick -ifeq ($(findstring quick, $(QT)), quick) -LIBS += qt5_quick -endif - -# QtScript -ifeq ($(findstring scriptclassic, $(QT)), scriptclassic) -LIBS += qt5_scriptclassic -else -ifeq ($(findstring script, $(QT)), script) -# qt5_script does dot work very well at this time, so qt5_scriptclassic gets used in any case -LIBS += qt5_scriptclassic -endif -endif - -# QtTest -ifeq ($(findstring testlib, $(QT)), testlib) -LIBS += qt5_test -endif - -# QtXml -ifeq ($(findstring xml, $(QT)), xml) -LIBS += qt5_xml -endif - -# Qml -ifeq ($(findstring qml, $(QT)), qml) -LIBS += qt5_qml -endif - -# QtUiTools -# Qt documentation says: CONFIG += uitools -ifeq ($(findstring uitools, $(CONFIG)), uitools) -LIBS += qt5_ui_tools -endif -# Qt5 documentation says: QT += uitools -ifeq ($(findstring uitools, $(QT)), uitools) -LIBS += qt5_ui_tools -endif - -# QtWebKit -ifeq ($(findstring webkit, $(QT)), webkit) -LIBS += qt5_webcore qt5_webkit qt5_webkitwidgets -endif diff --git a/repos/libports/src/lib/qt5/qgenodeviewwidget/qgenodeviewwidget.cpp b/repos/libports/src/lib/qgenodeviewwidget/qgenodeviewwidget.cpp similarity index 95% rename from repos/libports/src/lib/qt5/qgenodeviewwidget/qgenodeviewwidget.cpp rename to repos/libports/src/lib/qgenodeviewwidget/qgenodeviewwidget.cpp index a310a298c7..df10795e03 100644 --- a/repos/libports/src/lib/qt5/qgenodeviewwidget/qgenodeviewwidget.cpp +++ b/repos/libports/src/lib/qgenodeviewwidget/qgenodeviewwidget.cpp @@ -4,13 +4,20 @@ * \date 2010-08-26 */ +/* + * Copyright (C) 2010-2020 Genode Labs GmbH + * + * This file is part of the Genode OS framework, which is distributed + * under the terms of the GNU Affero General Public License version 3. + */ + #include #include #include -#include +#include #include @@ -18,7 +25,7 @@ ** QEmbeddedViewWidget ** *************************/ -QEmbeddedViewWidget::QEmbeddedViewWidget(QWidget *parent) { } +QEmbeddedViewWidget::QEmbeddedViewWidget(QWidget *) { } QEmbeddedViewWidget::~QEmbeddedViewWidget() { } diff --git a/repos/libports/src/lib/qgenodeviewwidget/qgenodeviewwidget.json b/repos/libports/src/lib/qgenodeviewwidget/qgenodeviewwidget.json new file mode 100644 index 0000000000..ba211835a9 --- /dev/null +++ b/repos/libports/src/lib/qgenodeviewwidget/qgenodeviewwidget.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "qgenodeviewwidget" ] +} diff --git a/repos/libports/src/lib/qgenodeviewwidget/qgenodeviewwidget.pro b/repos/libports/src/lib/qgenodeviewwidget/qgenodeviewwidget.pro new file mode 100644 index 0000000000..e9135623bf --- /dev/null +++ b/repos/libports/src/lib/qgenodeviewwidget/qgenodeviewwidget.pro @@ -0,0 +1,6 @@ +TEMPLATE = lib +CONFIG += plugin +QT = core gui gui_private widgets +HEADERS = qmake_root/include/qgenodeviewwidget/qgenodeviewwidget.h +SOURCES = qgenodeviewwidget.cpp +OTHER_FILES = qgenodeviewwidget.json diff --git a/repos/libports/src/lib/qt5/qpluginwidget/qpluginwidget.cpp b/repos/libports/src/lib/qpluginwidget/qpluginwidget.cpp similarity index 98% rename from repos/libports/src/lib/qt5/qpluginwidget/qpluginwidget.cpp rename to repos/libports/src/lib/qpluginwidget/qpluginwidget.cpp index 148008ba8b..c1f46f8588 100644 --- a/repos/libports/src/lib/qt5/qpluginwidget/qpluginwidget.cpp +++ b/repos/libports/src/lib/qpluginwidget/qpluginwidget.cpp @@ -4,6 +4,13 @@ * \date 2010-08-26 */ +/* + * Copyright (C) 2010-2020 Genode Labs GmbH + * + * This file is part of the Genode OS framework, which is distributed + * under the terms of the GNU Affero General Public License version 3. + */ + /* Genode includes */ #include #include @@ -18,7 +25,7 @@ /* Qt includes */ #include -#include +#include #include @@ -498,4 +505,3 @@ void QPluginWidget::hideEvent(QHideEvent *event) _plugin_starter->view_geometry(geometry, offset); } } - diff --git a/repos/libports/src/lib/qpluginwidget/qpluginwidget.json b/repos/libports/src/lib/qpluginwidget/qpluginwidget.json new file mode 100644 index 0000000000..ca1bf4582f --- /dev/null +++ b/repos/libports/src/lib/qpluginwidget/qpluginwidget.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "qpluginwidget" ] +} diff --git a/repos/libports/src/lib/qpluginwidget/qpluginwidget.pro b/repos/libports/src/lib/qpluginwidget/qpluginwidget.pro new file mode 100644 index 0000000000..435c330f02 --- /dev/null +++ b/repos/libports/src/lib/qpluginwidget/qpluginwidget.pro @@ -0,0 +1,6 @@ +TEMPLATE = lib +CONFIG += plugin +QT = core gui gui_private network widgets +HEADERS = qmake_root/include/qpluginwidget/qpluginwidget.h +SOURCES = qpluginwidget.cpp +OTHER_FILES = qpluginwidget.json diff --git a/repos/libports/src/lib/qt5/libc_dummies.cc b/repos/libports/src/lib/qt5/libc_dummies.cc deleted file mode 100644 index b5be0ac9a7..0000000000 --- a/repos/libports/src/lib/qt5/libc_dummies.cc +++ /dev/null @@ -1,15 +0,0 @@ -/* - * \brief quiet libc dummy functions to reduce the log noise - * \author Christian Prochaska - * \date 2014-04-16 - */ - -/* - * Copyright (C) 2014-2017 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU Affero General Public License version 3. - */ - -extern "C" void _sigprocmask() { } -extern "C" void sigprocmask() { } diff --git a/repos/libports/src/lib/qt5/patches/example_virtualkeyboard.patch b/repos/libports/src/lib/qt5/patches/example_virtualkeyboard.patch deleted file mode 100644 index 7126091592..0000000000 --- a/repos/libports/src/lib/qt5/patches/example_virtualkeyboard.patch +++ /dev/null @@ -1,44 +0,0 @@ -example_virtualkeyboard.patch - -diff --git a/qtvirtualkeyboard/examples/virtualkeyboard/basic/basic.pro b/qtvirtualkeyboard/examples/virtualkeyboard/basic/basic.pro -index 27ad414..6383ffe 100644 ---- a/qtvirtualkeyboard/examples/virtualkeyboard/basic/basic.pro -+++ b/qtvirtualkeyboard/examples/virtualkeyboard/basic/basic.pro -@@ -3,10 +3,10 @@ TARGET = basic - QT += qml quick - SOURCES += main.cpp - CONFIG += link_pkgconfig --static { -- QT += svg -- QTPLUGIN += qtvirtualkeyboardplugin --} -+#static { -+QT += svg -+QTPLUGIN += qtvirtualkeyboardplugin -+#} - - target.path = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard/basic - INSTALLS += target -@@ -22,13 +22,13 @@ OTHER_FILES += \ - content/TextArea.qml \ - content/TextField.qml \ - --disable-xcb { -- message("The disable-xcb option has been deprecated. Please use disable-desktop instead.") -- CONFIG += disable-desktop --} -+#disable-xcb { -+# message("The disable-xcb option has been deprecated. Please use disable-desktop instead.") -+# CONFIG += disable-desktop -+#} - --disable-desktop|android-embedded|!isEmpty(CROSS_COMPILE)|qnx { -- DEFINES += MAIN_QML=\\\"basic-b2qt.qml\\\" --} else { -- DEFINES += MAIN_QML=\\\"Basic.qml\\\" --} -+#disable-desktop|android-embedded|!isEmpty(CROSS_COMPILE)|qnx { -+# DEFINES += MAIN_QML=\\\"basic-b2qt.qml\\\" -+#} else { -+# DEFINES += MAIN_QML=\\\"Basic.qml\\\" -+#} diff --git a/repos/libports/src/lib/qt5/patches/header_generation.patch b/repos/libports/src/lib/qt5/patches/header_generation.patch deleted file mode 100644 index 7949d8af49..0000000000 --- a/repos/libports/src/lib/qt5/patches/header_generation.patch +++ /dev/null @@ -1,109 +0,0 @@ -header_generation.patch - -Avoid errors on header generation during port preparation. - -diff --git a/qtbase/configure b/qtbase/configure -index 3bd39ed..8585108 100755 ---- a/qtbase/configure -+++ b/qtbase/configure -@@ -89,11 +89,11 @@ if [ x"$1" = x"-top-level" ]; then - relpathMangled=`dirname "$relpath"` - outpathPrefix=../ - shift --else -- if [ -f ../.qmake.super ]; then -- echo >&2 "ERROR: You cannot configure qtbase separately within a top-level build." -- exit 1 -- fi -+#else -+# if [ -f ../.qmake.super ]; then -+# echo >&2 "ERROR: You cannot configure qtbase separately within a top-level build." -+# exit 1 -+# fi - fi - - OPT_CMDLINE= # expanded version for the script -diff --git a/qtbase/mkspecs/features/qmake_use.prf b/qtbase/mkspecs/features/qmake_use.prf -index 64faa4f..78d7392 100644 ---- a/qtbase/mkspecs/features/qmake_use.prf -+++ b/qtbase/mkspecs/features/qmake_use.prf -@@ -11,16 +11,16 @@ for(ever) { - } - CC_USES = $$resolve_depends(CC_USES, QMAKE_DEPENDS_, _CC) - for (nu, CC_USES) { -- !defined(QMAKE_LIBS_$$nu, var): \ -- error("Library '$$lower($$replace(nu, _, -))' is not defined.") -+ #!defined(QMAKE_LIBS_$$nu, var): \ -+ # error("Library '$$lower($$replace(nu, _, -))' is not defined.") - - DEFINES += $$eval(QMAKE_DEFINES_$${nu}) - INCLUDEPATH += $$eval(QMAKE_INCDIR_$${nu}) - } - LD_USES = $$resolve_depends(LD_USES, QMAKE_DEPENDS_, _LD) - for (nu, LD_USES) { -- !defined(QMAKE_LIBS_$$nu, var): \ -- error("Library '$$lower($$replace(nu, _, -))' is not defined.") -+ #!defined(QMAKE_LIBS_$$nu, var): \ -+ # error("Library '$$lower($$replace(nu, _, -))' is not defined.") - - debug: \ - LIBS$${suffix} += $$eval(QMAKE_LIBS_$${nu}_DEBUG) $$eval(QMAKE_LIBS_$$nu) -diff --git a/qtbase/mkspecs/features/qt.prf b/qtbase/mkspecs/features/qt.prf -index 3a71376..f8a4d07 100644 ---- a/qtbase/mkspecs/features/qt.prf -+++ b/qtbase/mkspecs/features/qt.prf -@@ -233,7 +233,7 @@ for(ever) { - WINRT_MANIFEST.capabilities_device_default += $$MODULE_WINRT_CAPABILITIES_DEVICE - } - } -- !isEmpty(BAD_QT):error("Unknown module(s) in QT$$var_sfx: $$replace(BAD_QT, _private$, -private)") -+ #!isEmpty(BAD_QT):error("Unknown module(s) in QT$$var_sfx: $$replace(BAD_QT, _private$, -private)") - - !isEmpty(var_sfx): break() - var_sfx = _PRIVATE -diff --git a/qtbase/mkspecs/features/qt_configure.prf b/qtbase/mkspecs/features/qt_configure.prf -index 94eb012..ee42acc 100644 ---- a/qtbase/mkspecs/features/qt_configure.prf -+++ b/qtbase/mkspecs/features/qt_configure.prf -@@ -2256,14 +2256,14 @@ defineTest(qtConfProcessOutput) { - - !isEmpty(_QMAKE_SUPER_CACHE_):!equals(OUT_PWD, $$dirname(_QMAKE_SUPER_CACHE_)) { - # sub-repo within a top-level build; no need to configure anything. -- !isEmpty(QMAKE_EXTRA_ARGS) { -- # sub-projects don't get the extra args passed down automatically, -- # so we can use their presence to detect misguided attempts to -- # configure the repositories separately. -- # caveat: a plain qmake call is indistinguishable from a recursion -- # (by design), so we cannot detect this case. -- error("You cannot configure $$TARGET separately within a top-level build.") -- } -+# !isEmpty(QMAKE_EXTRA_ARGS) { -+# # sub-projects don't get the extra args passed down automatically, -+# # so we can use their presence to detect misguided attempts to -+# # configure the repositories separately. -+# # caveat: a plain qmake call is indistinguishable from a recursion -+# # (by design), so we cannot detect this case. -+# error("You cannot configure $$TARGET separately within a top-level build.") -+# } - return() - } - -diff --git a/qtwebkit/Tools/qmake/mkspecs/features/default_pre.prf b/qtwebkit/Tools/qmake/mkspecs/features/default_pre.prf -index 5c36e93..5a52092 100644 ---- a/qtwebkit/Tools/qmake/mkspecs/features/default_pre.prf -+++ b/qtwebkit/Tools/qmake/mkspecs/features/default_pre.prf -@@ -67,10 +67,10 @@ else: PYTHON = python - CONFIG += production_build - - # Run configure before making decisions that depend on the result --root_project_file { -- load(configure) -- runConfigure() --} -+#root_project_file { -+# load(configure) -+# runConfigure() -+#} - - unix:config_gccdepends { - # We have a compiler that supports the -MD option (and neither diff --git a/repos/libports/src/lib/qt5/patches/host_tools.patch b/repos/libports/src/lib/qt5/patches/host_tools.patch deleted file mode 100644 index bd72d62f74..0000000000 --- a/repos/libports/src/lib/qt5/patches/host_tools.patch +++ /dev/null @@ -1,26 +0,0 @@ -host_tools.patch - -Support shadow build of the host tools when the source tree already -contains generated files. - -diff --git a/qtbase/configure b/qtbase/configure -index ef7bad1..3bd39ed 100755 ---- a/qtbase/configure -+++ b/qtbase/configure -@@ -673,11 +673,11 @@ if [ "$OPT_SHADOW" = "maybe" ]; then - fi - fi - if [ "$OPT_SHADOW" = "yes" ]; then -- if [ -f "$relpath/.qmake.cache" -o -f "$relpath/src/corelib/global/qconfig.h" -o -f "$relpath/src/corelib/global/qconfig.cpp" ]; then -- echo >&2 "You cannot make a shadow build from a source tree containing a previous build." -- echo >&2 "Cannot proceed." -- exit 1 -- fi -+ #if [ -f "$relpath/.qmake.cache" -o -f "$relpath/src/corelib/global/qconfig.h" -o -f "$relpath/src/corelib/global/qconfig.cpp" ]; then -+ #echo >&2 "You cannot make a shadow build from a source tree containing a previous build." -+ #echo >&2 "Cannot proceed." -+ #exit 1 -+ #fi - [ "$OPT_VERBOSE" = "yes" ] && echo "Performing shadow build..." - fi - diff --git a/repos/libports/src/lib/qt5/patches/qtbase_configuration.patch b/repos/libports/src/lib/qt5/patches/qtbase_configuration.patch deleted file mode 100644 index 74a8c600a1..0000000000 --- a/repos/libports/src/lib/qt5/patches/qtbase_configuration.patch +++ /dev/null @@ -1,172 +0,0 @@ -qtbase_configuration.patch - -diff --git a/qtbase/mkspecs/features/qt_build_config.prf b/qtbase/mkspecs/features/qt_build_config.prf -index 0c6c10d..329d1c2 100644 ---- a/qtbase/mkspecs/features/qt_build_config.prf -+++ b/qtbase/mkspecs/features/qt_build_config.prf -@@ -141,5 +141,5 @@ defineTest(qtConfig) { - contains(QT.$${module}.disabled_features, $$1): \ - return(false) - } -- error("Could not find feature $${1}.") -+ #error("Could not find feature $${1}.") - } -diff --git a/qtbase/mkspecs/genode-g++/qmake.conf b/qtbase/mkspecs/genode-g++/qmake.conf -new file mode 100644 -index 0000000..734ae5c ---- /dev/null -+++ b/qtbase/mkspecs/genode-g++/qmake.conf -@@ -0,0 +1,10 @@ -+# -+# qmake configuration for genode-g++ -+# -+ -+MAKEFILE_GENERATOR = UNIX -+ -+include(../common/unix.conf) -+include(../common/gcc-base-unix.conf) -+include(../common/g++-unix.conf) -+load(qt_config) -diff --git a/qtbase/mkspecs/genode-g++/qplatformdefs.h b/qtbase/mkspecs/genode-g++/qplatformdefs.h -new file mode 100644 -index 0000000..5e5c341 ---- /dev/null -+++ b/qtbase/mkspecs/genode-g++/qplatformdefs.h -@@ -0,0 +1,87 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2016 The Qt Company Ltd. -+** Contact: https://www.qt.io/licensing/ -+** -+** This file is part of the qmake spec of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:LGPL$ -+** Commercial License Usage -+** Licensees holding valid commercial Qt licenses may use this file in -+** accordance with the commercial license agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and The Qt Company. For licensing terms -+** and conditions see https://www.qt.io/terms-conditions. For further -+** information use the contact form at https://www.qt.io/contact-us. -+** -+** GNU Lesser General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU Lesser -+** General Public License version 3 as published by the Free Software -+** Foundation and appearing in the file LICENSE.LGPL3 included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU Lesser General Public License version 3 requirements -+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -+** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 2.0 or (at your option) the GNU General -+** Public license version 3 or any later version approved by the KDE Free -+** Qt Foundation. The licenses are as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -+** included in the packaging of this file. Please review the following -+** information to ensure the GNU General Public License requirements will -+** be met: https://www.gnu.org/licenses/gpl-2.0.html and -+** https://www.gnu.org/licenses/gpl-3.0.html. -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+#ifndef QPLATFORMDEFS_H -+#define QPLATFORMDEFS_H -+ -+// Get Qt defines/settings -+ -+#include "qglobal.h" -+ -+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs -+ -+#include -+ -+ -+// We are hot - unistd.h should have turned on the specific APIs we requested -+ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#ifndef Q_OS_GENODE -+#include -+#endif -+#include -+#include -+#include -+#include -+#ifndef QT_NO_IPV6IFNAME -+#include -+#endif -+ -+#include "../common/posix/qplatformdefs.h" -+ -+#undef QT_OPEN_LARGEFILE -+#define QT_OPEN_LARGEFILE 0 -+ -+#define QT_SNPRINTF ::snprintf -+#define QT_VSNPRINTF ::vsnprintf -+ -+#endif // QPLATFORMDEFS_H -diff --git a/qtbase/src/corelib/global/global.pri b/qtbase/src/corelib/global/global.pri -index 029357f..52086f2 100644 ---- a/qtbase/src/corelib/global/global.pri -+++ b/qtbase/src/corelib/global/global.pri -@@ -78,11 +78,11 @@ PRECOMPILED_HEADER = global/qt_pch.h - # qlogging.cpp uses backtrace(3), which is in a separate library on the BSDs. - LIBS_PRIVATE += $$QMAKE_LIBS_EXECINFO - --if(linux*|hurd*):!cross_compile:!static:!*-armcc* { -- QMAKE_LFLAGS += -Wl,-e,qt_core_boilerplate -- prog=$$quote(if (/program interpreter: (.*)]/) { print $1; }) -- DEFINES += ELF_INTERPRETER=\\\"$$system(LC_ALL=C readelf -l /bin/ls | perl -n -e \'$$prog\')\\\" --} -+#if(linux*|hurd*):!cross_compile:!static:!*-armcc* { -+# QMAKE_LFLAGS += -Wl,-e,qt_core_boilerplate -+# prog=$$quote(if (/program interpreter: (.*)]/) { print $1; }) -+# DEFINES += ELF_INTERPRETER=\\\"$$system(LC_ALL=C readelf -l /bin/ls | perl -n -e \'$$prog\')\\\" -+#} - - linux:!static { - precompile_header { -diff --git a/qtbase/src/corelib/io/io.pri b/qtbase/src/corelib/io/io.pri -index 9b60447..fcda10c 100644 ---- a/qtbase/src/corelib/io/io.pri -+++ b/qtbase/src/corelib/io/io.pri -@@ -199,7 +199,7 @@ win32 { - } else { - SOURCES += \ - io/qstandardpaths_unix.cpp \ -- io/qstorageinfo_unix.cpp -+ io/qstorageinfo_stub.cpp - } - } - -diff --git a/qtbase/src/corelib/io/qfilesystemwatcher.cpp b/qtbase/src/corelib/io/qfilesystemwatcher.cpp -index f40e166..26522bc 100644 ---- a/qtbase/src/corelib/io/qfilesystemwatcher.cpp -+++ b/qtbase/src/corelib/io/qfilesystemwatcher.cpp -@@ -47,9 +47,11 @@ - #include - #include - -+#if !defined(QT_NO_INOTIFY) - #if defined(Q_OS_LINUX) || (defined(Q_OS_QNX) && !defined(QT_NO_INOTIFY)) - #define USE_INOTIFY - #endif -+#endif - - #include "qfilesystemwatcher_polling_p.h" - #if defined(Q_OS_WIN) diff --git a/repos/libports/src/lib/qt5/patches/qtbase_fixes.patch b/repos/libports/src/lib/qt5/patches/qtbase_fixes.patch deleted file mode 100644 index 0d4ff1df8a..0000000000 --- a/repos/libports/src/lib/qt5/patches/qtbase_fixes.patch +++ /dev/null @@ -1,30 +0,0 @@ -qtbase_fixes.patch - -diff --git a/qtbase/src/widgets/kernel/qwidgetwindow.cpp b/qtbase/src/widgets/kernel/qwidgetwindow.cpp -index fbc71cd..143cc60 100644 ---- a/qtbase/src/widgets/kernel/qwidgetwindow.cpp -+++ b/qtbase/src/widgets/kernel/qwidgetwindow.cpp -@@ -369,6 +369,9 @@ bool QWidgetWindow::event(QEvent *event) - m_widget->repaint(); - return true; - -+ case QEvent::MetaCall: -+ return QWindow::event(event); -+ - default: - break; - } -diff --git a/qtbase/src/widgets/widgets/qwidgetanimator.cpp b/qtbase/src/widgets/widgets/qwidgetanimator.cpp -index 486d65d..6ab6798 100644 ---- a/qtbase/src/widgets/widgets/qwidgetanimator.cpp -+++ b/qtbase/src/widgets/widgets/qwidgetanimator.cpp -@@ -81,7 +81,8 @@ void QWidgetAnimator::abort(QWidget *w) - void QWidgetAnimator::animationFinished() - { - QPropertyAnimation *anim = qobject_cast(sender()); -- abort(static_cast(anim->targetObject())); -+ if (anim) -+ abort(static_cast(anim->targetObject())); - } - #endif // animation - diff --git a/repos/libports/src/lib/qt5/patches/qtbase_generated.patch b/repos/libports/src/lib/qt5/patches/qtbase_generated.patch deleted file mode 100644 index 4cb50c78c2..0000000000 --- a/repos/libports/src/lib/qt5/patches/qtbase_generated.patch +++ /dev/null @@ -1,788 +0,0 @@ -qtbase_generated.patch - -diff --git a/qtbase/include/QtCore/5.13.0/QtCore/private/qconfig_p.h b/qtbase/include/QtCore/5.13.0/QtCore/private/qconfig_p.h -new file mode 100644 -index 0000000..aedf7fa ---- /dev/null -+++ b/qtbase/include/QtCore/5.13.0/QtCore/private/qconfig_p.h -@@ -0,0 +1 @@ -+#include "../../../../../src/corelib/global/qconfig_p.h" -diff --git a/qtbase/include/QtCore/5.13.0/QtCore/private/qtcore-config_p.h b/qtbase/include/QtCore/5.13.0/QtCore/private/qtcore-config_p.h -new file mode 100644 -index 0000000..53f2212 ---- /dev/null -+++ b/qtbase/include/QtCore/5.13.0/QtCore/private/qtcore-config_p.h -@@ -0,0 +1 @@ -+#include "../../../../../src/corelib/qtcore-config_p.h" -diff --git a/qtbase/include/QtCore/QtConfig b/qtbase/include/QtCore/QtConfig -new file mode 100644 -index 0000000..c734263 ---- /dev/null -+++ b/qtbase/include/QtCore/QtConfig -@@ -0,0 +1 @@ -+#include "qconfig.h" -diff --git a/qtbase/include/QtCore/QtCoreDepends b/qtbase/include/QtCore/QtCoreDepends -new file mode 100644 -index 0000000..a953540 ---- /dev/null -+++ b/qtbase/include/QtCore/QtCoreDepends -@@ -0,0 +1,3 @@ -+/* This file was generated by qmake with the info from /src/corelib/corelib.pro. */ -+#ifdef __cplusplus /* create empty PCH in C mode */ -+#endif -diff --git a/qtbase/include/QtCore/qconfig.h b/qtbase/include/QtCore/qconfig.h -new file mode 100644 -index 0000000..aa8a3d6 ---- /dev/null -+++ b/qtbase/include/QtCore/qconfig.h -@@ -0,0 +1 @@ -+#include "../../src/corelib/global/qconfig.h" -diff --git a/qtbase/include/QtCore/qtcore-config.h b/qtbase/include/QtCore/qtcore-config.h -new file mode 100644 -index 0000000..29ef59d ---- /dev/null -+++ b/qtbase/include/QtCore/qtcore-config.h -@@ -0,0 +1 @@ -+#include "../../src/corelib/qtcore-config.h" -diff --git a/qtbase/include/QtGui/5.13.0/QtGui/private/qtgui-config_p.h b/qtbase/include/QtGui/5.13.0/QtGui/private/qtgui-config_p.h -new file mode 100644 -index 0000000..fa5bd06 ---- /dev/null -+++ b/qtbase/include/QtGui/5.13.0/QtGui/private/qtgui-config_p.h -@@ -0,0 +1 @@ -+#include "../../../../../src/gui/qtgui-config_p.h" -diff --git a/qtbase/include/QtGui/5.13.0/QtGui/private/qvulkanfunctions_p.h b/qtbase/include/QtGui/5.13.0/QtGui/private/qvulkanfunctions_p.h -new file mode 100644 -index 0000000..f2d2da0 ---- /dev/null -+++ b/qtbase/include/QtGui/5.13.0/QtGui/private/qvulkanfunctions_p.h -@@ -0,0 +1 @@ -+#include "../../../../../src/gui/vulkan/qvulkanfunctions_p.h" -diff --git a/qtbase/include/QtGui/QVulkanDeviceFunctions b/qtbase/include/QtGui/QVulkanDeviceFunctions -new file mode 100644 -index 0000000..141a561 ---- /dev/null -+++ b/qtbase/include/QtGui/QVulkanDeviceFunctions -@@ -0,0 +1 @@ -+#include "qvulkanfunctions.h" -diff --git a/qtbase/include/QtGui/QVulkanFunctions b/qtbase/include/QtGui/QVulkanFunctions -new file mode 100644 -index 0000000..141a561 ---- /dev/null -+++ b/qtbase/include/QtGui/QVulkanFunctions -@@ -0,0 +1 @@ -+#include "qvulkanfunctions.h" -diff --git a/qtbase/include/QtGui/QtGuiDepends b/qtbase/include/QtGui/QtGuiDepends -new file mode 100644 -index 0000000..7611c06 ---- /dev/null -+++ b/qtbase/include/QtGui/QtGuiDepends -@@ -0,0 +1,4 @@ -+/* This file was generated by qmake with the info from /src/gui/gui.pro. */ -+#ifdef __cplusplus /* create empty PCH in C mode */ -+#include -+#endif -diff --git a/qtbase/include/QtGui/qtgui-config.h b/qtbase/include/QtGui/qtgui-config.h -new file mode 100644 -index 0000000..81638f1 ---- /dev/null -+++ b/qtbase/include/QtGui/qtgui-config.h -@@ -0,0 +1 @@ -+#include "../../src/gui/qtgui-config.h" -diff --git a/qtbase/include/QtGui/qvulkanfunctions.h b/qtbase/include/QtGui/qvulkanfunctions.h -new file mode 100644 -index 0000000..55d5bab ---- /dev/null -+++ b/qtbase/include/QtGui/qvulkanfunctions.h -@@ -0,0 +1 @@ -+#include "../../src/gui/vulkan/qvulkanfunctions.h" -diff --git a/qtbase/include/QtNetwork/5.13.0/QtNetwork/private/qtnetwork-config_p.h b/qtbase/include/QtNetwork/5.13.0/QtNetwork/private/qtnetwork-config_p.h -new file mode 100644 -index 0000000..cbf4749 ---- /dev/null -+++ b/qtbase/include/QtNetwork/5.13.0/QtNetwork/private/qtnetwork-config_p.h -@@ -0,0 +1 @@ -+#include "../../../../../src/network/qtnetwork-config_p.h" -diff --git a/qtbase/include/QtNetwork/QtNetworkDepends b/qtbase/include/QtNetwork/QtNetworkDepends -new file mode 100644 -index 0000000..511727a ---- /dev/null -+++ b/qtbase/include/QtNetwork/QtNetworkDepends -@@ -0,0 +1,4 @@ -+/* This file was generated by qmake with the info from /src/network/network.pro. */ -+#ifdef __cplusplus /* create empty PCH in C mode */ -+#include -+#endif -diff --git a/qtbase/include/QtNetwork/qtnetwork-config.h b/qtbase/include/QtNetwork/qtnetwork-config.h -new file mode 100644 -index 0000000..c8cd7fb ---- /dev/null -+++ b/qtbase/include/QtNetwork/qtnetwork-config.h -@@ -0,0 +1 @@ -+#include "../../src/network/qtnetwork-config.h" -diff --git a/qtbase/include/QtOpenGL/QtOpenGLDepends b/qtbase/include/QtOpenGL/QtOpenGLDepends -new file mode 100644 -index 0000000..d2d9d9f ---- /dev/null -+++ b/qtbase/include/QtOpenGL/QtOpenGLDepends -@@ -0,0 +1,6 @@ -+/* This file was generated by qmake with the info from /src/opengl/opengl.pro. */ -+#ifdef __cplusplus /* create empty PCH in C mode */ -+#include -+#include -+#include -+#endif -diff --git a/qtbase/include/QtPrintSupport/5.13.0/QtPrintSupport/private/qtprintsupport-config_p.h b/qtbase/include/QtPrintSupport/5.13.0/QtPrintSupport/private/qtprintsupport-config_p.h -new file mode 100644 -index 0000000..7833b12 ---- /dev/null -+++ b/qtbase/include/QtPrintSupport/5.13.0/QtPrintSupport/private/qtprintsupport-config_p.h -@@ -0,0 +1 @@ -+#include "../../../../../src/printsupport/qtprintsupport-config_p.h" -diff --git a/qtbase/include/QtPrintSupport/QtPrintSupportDepends b/qtbase/include/QtPrintSupport/QtPrintSupportDepends -new file mode 100644 -index 0000000..5894583 ---- /dev/null -+++ b/qtbase/include/QtPrintSupport/QtPrintSupportDepends -@@ -0,0 +1,6 @@ -+/* This file was generated by qmake with the info from /src/printsupport/printsupport.pro. */ -+#ifdef __cplusplus /* create empty PCH in C mode */ -+#include -+#include -+#include -+#endif -diff --git a/qtbase/include/QtPrintSupport/qtprintsupport-config.h b/qtbase/include/QtPrintSupport/qtprintsupport-config.h -new file mode 100644 -index 0000000..747e599 ---- /dev/null -+++ b/qtbase/include/QtPrintSupport/qtprintsupport-config.h -@@ -0,0 +1 @@ -+#include "../../src/printsupport/qtprintsupport-config.h" -diff --git a/qtbase/include/QtSql/5.13.0/QtSql/private/qtsql-config_p.h b/qtbase/include/QtSql/5.13.0/QtSql/private/qtsql-config_p.h -new file mode 100644 -index 0000000..ffef37b ---- /dev/null -+++ b/qtbase/include/QtSql/5.13.0/QtSql/private/qtsql-config_p.h -@@ -0,0 +1 @@ -+#include "../../../../../src/sql/qtsql-config_p.h" -diff --git a/qtbase/include/QtSql/QtSqlDepends b/qtbase/include/QtSql/QtSqlDepends -new file mode 100644 -index 0000000..bba20a6 ---- /dev/null -+++ b/qtbase/include/QtSql/QtSqlDepends -@@ -0,0 +1,4 @@ -+/* This file was generated by qmake with the info from /src/sql/sql.pro. */ -+#ifdef __cplusplus /* create empty PCH in C mode */ -+#include -+#endif -diff --git a/qtbase/include/QtSql/qtsql-config.h b/qtbase/include/QtSql/qtsql-config.h -new file mode 100644 -index 0000000..fa917d5 ---- /dev/null -+++ b/qtbase/include/QtSql/qtsql-config.h -@@ -0,0 +1 @@ -+#include "../../src/sql/qtsql-config.h" -diff --git a/qtbase/include/QtTest/5.13.0/QtTest/private/qttestlib-config_p.h b/qtbase/include/QtTest/5.13.0/QtTest/private/qttestlib-config_p.h -new file mode 100644 -index 0000000..6e5b899 ---- /dev/null -+++ b/qtbase/include/QtTest/5.13.0/QtTest/private/qttestlib-config_p.h -@@ -0,0 +1 @@ -+#include "../../../../../src/testlib/qttestlib-config_p.h" -diff --git a/qtbase/include/QtTest/QtTestDepends b/qtbase/include/QtTest/QtTestDepends -new file mode 100644 -index 0000000..64e448e ---- /dev/null -+++ b/qtbase/include/QtTest/QtTestDepends -@@ -0,0 +1,4 @@ -+/* This file was generated by qmake with the info from /src/testlib/testlib.pro. */ -+#ifdef __cplusplus /* create empty PCH in C mode */ -+#include -+#endif -diff --git a/qtbase/include/QtTest/qttestlib-config.h b/qtbase/include/QtTest/qttestlib-config.h -new file mode 100644 -index 0000000..ec1c9e6 ---- /dev/null -+++ b/qtbase/include/QtTest/qttestlib-config.h -@@ -0,0 +1 @@ -+#include "../../src/testlib/qttestlib-config.h" -diff --git a/qtbase/include/QtWidgets/5.13.0/QtWidgets/private/qtwidgets-config_p.h b/qtbase/include/QtWidgets/5.13.0/QtWidgets/private/qtwidgets-config_p.h -new file mode 100644 -index 0000000..9a6332d ---- /dev/null -+++ b/qtbase/include/QtWidgets/5.13.0/QtWidgets/private/qtwidgets-config_p.h -@@ -0,0 +1 @@ -+#include "../../../../../src/widgets/qtwidgets-config_p.h" -diff --git a/qtbase/include/QtWidgets/QtWidgetsDepends b/qtbase/include/QtWidgets/QtWidgetsDepends -new file mode 100644 -index 0000000..80cfcaf ---- /dev/null -+++ b/qtbase/include/QtWidgets/QtWidgetsDepends -@@ -0,0 +1,5 @@ -+/* This file was generated by qmake with the info from /src/widgets/widgets.pro. */ -+#ifdef __cplusplus /* create empty PCH in C mode */ -+#include -+#include -+#endif -diff --git a/qtbase/include/QtWidgets/qtwidgets-config.h b/qtbase/include/QtWidgets/qtwidgets-config.h -new file mode 100644 -index 0000000..09179b0 ---- /dev/null -+++ b/qtbase/include/QtWidgets/qtwidgets-config.h -@@ -0,0 +1 @@ -+#include "../../src/widgets/qtwidgets-config.h" -diff --git a/qtbase/include/QtXml/5.13.0/QtXml/private/qtxml-config_p.h b/qtbase/include/QtXml/5.13.0/QtXml/private/qtxml-config_p.h -new file mode 100644 -index 0000000..d567490 ---- /dev/null -+++ b/qtbase/include/QtXml/5.13.0/QtXml/private/qtxml-config_p.h -@@ -0,0 +1 @@ -+#include "../../../../../src/xml/qtxml-config_p.h" -diff --git a/qtbase/include/QtXml/QtXmlDepends b/qtbase/include/QtXml/QtXmlDepends -new file mode 100644 -index 0000000..9ce6bbb ---- /dev/null -+++ b/qtbase/include/QtXml/QtXmlDepends -@@ -0,0 +1,4 @@ -+/* This file was generated by qmake with the info from /src/xml/xml.pro. */ -+#ifdef __cplusplus /* create empty PCH in C mode */ -+#include -+#endif -diff --git a/qtbase/include/QtXml/qtxml-config.h b/qtbase/include/QtXml/qtxml-config.h -new file mode 100644 -index 0000000..602a176 ---- /dev/null -+++ b/qtbase/include/QtXml/qtxml-config.h -@@ -0,0 +1 @@ -+#include "../../src/xml/qtxml-config.h" -diff --git a/qtbase/src/corelib/global/qconfig.cpp b/qtbase/src/corelib/global/qconfig.cpp -new file mode 100644 -index 0000000..a123483 ---- /dev/null -+++ b/qtbase/src/corelib/global/qconfig.cpp -@@ -0,0 +1,65 @@ -+/* Installation date */ -+static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20"; -+/* Installation Info */ -+static const char qt_configure_prefix_path_str [12+256] = "qt_prfxpath=/usr/local/Qt-5.13.0"; -+#ifdef QT_BUILD_QMAKE -+static const char qt_configure_ext_prefix_path_str [12+256] = "qt_epfxpath=/usr/local/Qt-5.13.0"; -+static const char qt_configure_host_prefix_path_str [12+256] = "qt_hpfxpath=/usr/local/Qt-5.13.0"; -+#endif -+static const short qt_configure_str_offsets[] = { -+ 0, -+ 4, -+ 12, -+ 16, -+ 24, -+ 28, -+ 36, -+ 44, -+ 48, -+ 50, -+ 52, -+ 65, -+ 74, -+#ifdef QT_BUILD_QMAKE -+ 80, -+ 81, -+ 87, -+ 91, -+ 95, -+ 97, -+ 107, -+#endif -+}; -+static const char qt_configure_strs[] = -+ "doc\0" -+ "include\0" -+ "lib\0" -+ "libexec\0" -+ "bin\0" -+ "plugins\0" -+ "imports\0" -+ "qml\0" -+ ".\0" -+ ".\0" -+ "translations\0" -+ "examples\0" -+ "tests\0" -+#ifdef QT_BUILD_QMAKE -+ "\0" -+ "false\0" -+ "bin\0" -+ "lib\0" -+ ".\0" -+ "linux-g++\0" -+ "linux-g++\0" -+#endif -+; -+#define QT_CONFIGURE_SETTINGS_PATH "etc/xdg" -+#ifdef QT_BUILD_QMAKE -+# define QT_CONFIGURE_SYSROOTIFY_PREFIX false -+#endif -+#define QT_CONFIGURE_PREFIX_PATH qt_configure_prefix_path_str + 12 -+#ifdef QT_BUILD_QMAKE -+# define QT_CONFIGURE_EXT_PREFIX_PATH qt_configure_ext_prefix_path_str + 12 -+# define QT_CONFIGURE_HOST_PREFIX_PATH qt_configure_host_prefix_path_str + 12 -+#endif -diff --git a/qtbase/src/corelib/global/qconfig.h b/qtbase/src/corelib/global/qconfig.h -new file mode 100644 -index 0000000..8170f78 ---- /dev/null -+++ b/qtbase/src/corelib/global/qconfig.h -@@ -0,0 +1,33 @@ -+#define QT_FEATURE_cross_compile -1 -+#define QT_FEATURE_framework -1 -+#define QT_FEATURE_shared 1 -+#define QT_FEATURE_rpath 1 -+#define QT_COMPILER_SUPPORTS_SSE2 1 -+#define QT_COMPILER_SUPPORTS_AES 1 -+#define QT_FEATURE_appstore_compliant -1 -+#define QT_FEATURE_debug_and_release -1 -+#define QT_FEATURE_simulator_and_device -1 -+#define QT_FEATURE_build_all -1 -+#define QT_FEATURE_c__11 1 -+#define QT_FEATURE_c__14 1 -+#define QT_FEATURE_c__1z -1 -+#define QT_FEATURE_c__2a -1 -+#define QT_FEATURE_c99 1 -+#define QT_FEATURE_c11 1 -+#define QT_FEATURE_thread 1 -+#define QT_FEATURE_future 1 -+#define QT_FEATURE_concurrent 1 -+#define QT_NO_DBUS -+#define QT_FEATURE_force_asserts -1 -+#define QT_FEATURE_pkg_config 1 -+#define QT_LARGEFILE_SUPPORT 64 -+#define QT_COMPILER_SUPPORTS_RDRND 1 -+#define QT_VISIBILITY_AVAILABLE true -+#define QT_FEATURE_separate_debug_info -1 -+#define QT_COMPILER_SUPPORTS_SHA 1 -+#define QT_FEATURE_static -1 -+#define QT_COMPILER_SUPPORTS_SIMD_ALWAYS 1 -+#define QT_VERSION_STR "5.13.0" -+#define QT_VERSION_MAJOR 5 -+#define QT_VERSION_MINOR 13 -+#define QT_VERSION_PATCH 0 -diff --git a/qtbase/src/corelib/global/qconfig_p.h b/qtbase/src/corelib/global/qconfig_p.h -new file mode 100644 -index 0000000..75c3455 ---- /dev/null -+++ b/qtbase/src/corelib/global/qconfig_p.h -@@ -0,0 +1,24 @@ -+#define QT_FEATURE_private_tests -1 -+#define QT_FEATURE_sse2 1 -+#define QT_FEATURE_alloca -1 -+#define QT_FEATURE_alloca_h -1 -+#define QT_FEATURE_alloca_malloc_h -1 -+#define QT_FEATURE_android_style_assets -1 -+#define QT_FEATURE_avx2 -1 -+#define QT_FEATURE_dbus -1 -+#define QT_FEATURE_dbus_linked -1 -+#define QT_FEATURE_gc_binaries -1 -+#define QT_FEATURE_gui 1 -+#define QT_FEATURE_libudev -1 -+#define QT_FEATURE_network 1 -+#define QT_FEATURE_posix_fallocate 1 -+#define QT_FEATURE_reduce_exports 1 -+#define QT_FEATURE_reduce_relocations -1 -+#define QT_FEATURE_release_tools -1 -+#define QT_FEATURE_sql 1 -+#define QT_FEATURE_stack_protector_strong -1 -+#define QT_FEATURE_system_zlib 1 -+#define QT_FEATURE_testlib 1 -+#define QT_FEATURE_widgets 1 -+#define QT_FEATURE_xml 1 -+#define QT_FEATURE_zstd -1 -diff --git a/qtbase/src/corelib/qtcore-config.h b/qtbase/src/corelib/qtcore-config.h -new file mode 100644 -index 0000000..347aa7f ---- /dev/null -+++ b/qtbase/src/corelib/qtcore-config.h -@@ -0,0 +1,44 @@ -+#define QT_FEATURE_properties 1 -+#define QT_FEATURE_animation 1 -+#define QT_FEATURE_textcodec 1 -+#define QT_FEATURE_big_codecs 1 -+#define QT_FEATURE_codecs 1 -+#define QT_FEATURE_commandlineparser 1 -+#define QT_FEATURE_itemmodel 1 -+#define QT_FEATURE_proxymodel 1 -+#define QT_FEATURE_concatenatetablesproxymodel 1 -+#define QT_FEATURE_cxx11_future -1 -+#define QT_FEATURE_textdate 1 -+#define QT_FEATURE_datestring 1 -+#define QT_NO_EVENTFD -+#define QT_FEATURE_filesystemiterator 1 -+#define QT_FEATURE_filesystemwatcher 1 -+#define QT_FEATURE_gestures 1 -+#define QT_NO_GLIB -+#define QT_NO_ICONV -+#define QT_FEATURE_identityproxymodel 1 -+#define QT_NO_INOTIFY -+#define QT_FEATURE_library 1 -+#define QT_FEATURE_mimetype 1 -+#define QT_FEATURE_process -1 -+#define QT_NO_PROCESS -+#define QT_FEATURE_processenvironment 1 -+#define QT_FEATURE_statemachine 1 -+#define QT_FEATURE_qeventtransition 1 -+#define QT_FEATURE_regularexpression 1 -+#define QT_FEATURE_settings 1 -+#define QT_FEATURE_sharedmemory -1 -+#define QT_NO_SHAREDMEMORY -+#define QT_FEATURE_sortfilterproxymodel 1 -+#define QT_FEATURE_std_atomic64 1 -+#define QT_FEATURE_stringlistmodel 1 -+#define QT_FEATURE_systemsemaphore -1 -+#define QT_NO_SYSTEMSEMAPHORE -+#define QT_FEATURE_temporaryfile 1 -+#define QT_FEATURE_timezone 1 -+#define QT_FEATURE_topleveldomain 1 -+#define QT_FEATURE_translation 1 -+#define QT_FEATURE_transposeproxymodel 1 -+#define QT_FEATURE_xmlstream 1 -+#define QT_FEATURE_xmlstreamreader 1 -+#define QT_FEATURE_xmlstreamwriter 1 -diff --git a/qtbase/src/corelib/qtcore-config_p.h b/qtbase/src/corelib/qtcore-config_p.h -new file mode 100644 -index 0000000..dc87c22 ---- /dev/null -+++ b/qtbase/src/corelib/qtcore-config_p.h -@@ -0,0 +1,31 @@ -+#define QT_FEATURE_clock_gettime 1 -+#define QT_FEATURE_datetimeparser 1 -+#define QT_FEATURE_dlopen 1 -+#define QT_FEATURE_doubleconversion 1 -+#define QT_FEATURE_etw -1 -+#define QT_FEATURE_futimens -1 -+#define QT_FEATURE_futimes -1 -+#define QT_FEATURE_getauxval -1 -+#define QT_FEATURE_getentropy -1 -+#define QT_FEATURE_glib -1 -+#define QT_FEATURE_glibc 1 -+#define QT_FEATURE_gnu_libiconv -1 -+#define QT_FEATURE_iconv -1 -+#define QT_FEATURE_icu -1 -+#define QT_FEATURE_inotify -1 -+#define QT_FEATURE_journald -1 -+#define QT_FEATURE_linkat 1 -+#define QT_FEATURE_lttng -1 -+#define QT_FEATURE_mimetype_database 1 -+#define QT_FEATURE_poll_ppoll -1 -+#define QT_FEATURE_poll_pollts -1 -+#define QT_FEATURE_poll_poll 1 -+#define QT_FEATURE_poll_select -1 -+#define QT_FEATURE_posix_libiconv -1 -+#define QT_FEATURE_renameat2 -1 -+#define QT_FEATURE_sha3_fast 1 -+#define QT_FEATURE_slog2 -1 -+#define QT_FEATURE_statx -1 -+#define QT_FEATURE_syslog -1 -+#define QT_FEATURE_system_doubleconversion -1 -+#define QT_FEATURE_system_pcre2 -1 -diff --git a/qtbase/src/corelib/qtcore_tracepoints_p.h b/qtbase/src/corelib/qtcore_tracepoints_p.h -new file mode 100644 -index 0000000..ff8d101 ---- /dev/null -+++ b/qtbase/src/corelib/qtcore_tracepoints_p.h -@@ -0,0 +1 @@ -+#include -diff --git a/qtbase/src/gui/qtgui-config.h b/qtbase/src/gui/qtgui-config.h -new file mode 100644 -index 0000000..7444e61 ---- /dev/null -+++ b/qtbase/src/gui/qtgui-config.h -@@ -0,0 +1,49 @@ -+#define QT_FEATURE_accessibility -1 -+#define QT_NO_ACCESSIBILITY -+#define QT_NO_ACCESSIBILITY_ATSPI_BRIDGE -+#define QT_FEATURE_action 1 -+#define QT_FEATURE_opengles2 -1 -+#define QT_FEATURE_dynamicgl -1 -+#define QT_FEATURE_angle -1 -+#define QT_FEATURE_clipboard 1 -+#define QT_FEATURE_colornames 1 -+#define QT_FEATURE_combined_angle_lib -1 -+#define QT_FEATURE_cssparser 1 -+#define QT_FEATURE_cursor 1 -+#define QT_FEATURE_desktopservices 1 -+#define QT_FEATURE_imageformat_xpm 1 -+#define QT_FEATURE_draganddrop 1 -+#define QT_FEATURE_opengl 1 -+#define QT_NO_EGL -+#define QT_NO_FONTCONFIG -+#define QT_FEATURE_imageformatplugin 1 -+#define QT_NO_HARFBUZZ -+#define QT_FEATURE_highdpiscaling 1 -+#define QT_FEATURE_im 1 -+#define QT_FEATURE_image_heuristic_mask 1 -+#define QT_FEATURE_image_text 1 -+#define QT_FEATURE_imageformat_bmp 1 -+#define QT_FEATURE_imageformat_jpeg 1 -+#define QT_FEATURE_imageformat_png 1 -+#define QT_FEATURE_imageformat_ppm 1 -+#define QT_FEATURE_imageformat_xbm 1 -+#define QT_FEATURE_movie 1 -+#define QT_FEATURE_opengles3 -1 -+#define QT_FEATURE_opengles31 -1 -+#define QT_FEATURE_opengles32 -1 -+#define QT_FEATURE_openvg -1 -+#define QT_FEATURE_pdf 1 -+#define QT_FEATURE_picture 1 -+#define QT_QPA_DEFAULT_PLATFORM_NAME "minimal" -+#define QT_FEATURE_sessionmanager -1 -+#define QT_NO_SESSIONMANAGER -+#define QT_FEATURE_shortcut 1 -+#define QT_FEATURE_standarditemmodel 1 -+#define QT_FEATURE_systemtrayicon 1 -+#define QT_FEATURE_tabletevent 1 -+#define QT_FEATURE_texthtmlparser 1 -+#define QT_FEATURE_textodfwriter 1 -+#define QT_FEATURE_validator 1 -+#define QT_FEATURE_vulkan -1 -+#define QT_FEATURE_whatsthis 1 -+#define QT_FEATURE_wheelevent 1 -diff --git a/qtbase/src/gui/qtgui-config_p.h b/qtbase/src/gui/qtgui-config_p.h -new file mode 100644 -index 0000000..00840bf ---- /dev/null -+++ b/qtbase/src/gui/qtgui-config_p.h -@@ -0,0 +1,55 @@ -+#define QT_FEATURE_accessibility_atspi_bridge -1 -+#define QT_FEATURE_angle_d3d11_qdtd -1 -+#define QT_FEATURE_direct2d -1 -+#define QT_FEATURE_direct2d1_1 -1 -+#define QT_FEATURE_dxgi -1 -+#define QT_FEATURE_direct3d11 -1 -+#define QT_FEATURE_direct3d11_1 -1 -+#define QT_FEATURE_direct3d9 -1 -+#define QT_FEATURE_directfb -1 -+#define QT_FEATURE_drm_atomic 1 -+#define QT_FEATURE_dxgi1_2 -1 -+#define QT_FEATURE_dxguid -1 -+#define QT_FEATURE_egl -1 -+#define QT_FEATURE_egl_x11 -1 -+#define QT_FEATURE_eglfs -1 -+#define QT_FEATURE_eglfs_brcm -1 -+#define QT_FEATURE_eglfs_egldevice -1 -+#define QT_FEATURE_eglfs_gbm -1 -+#define QT_FEATURE_eglfs_mali -1 -+#define QT_FEATURE_eglfs_openwfd -1 -+#define QT_FEATURE_eglfs_rcar -1 -+#define QT_FEATURE_eglfs_viv -1 -+#define QT_FEATURE_eglfs_viv_wl -1 -+#define QT_FEATURE_eglfs_vsp2 -1 -+#define QT_FEATURE_eglfs_x11 -1 -+#define QT_FEATURE_evdev 1 -+#define QT_FEATURE_fontconfig -1 -+#define QT_FEATURE_freetype 1 -+#define QT_FEATURE_gif 1 -+#define QT_FEATURE_harfbuzz -1 -+#define QT_FEATURE_ico 1 -+#define QT_FEATURE_integrityfb -1 -+#define QT_FEATURE_integrityhid -1 -+#define QT_FEATURE_jpeg 1 -+#define QT_FEATURE_kms 1 -+#define QT_FEATURE_libinput -1 -+#define QT_FEATURE_libinput_axis_api -1 -+#define QT_FEATURE_linuxfb 1 -+#define QT_FEATURE_mirclient -1 -+#define QT_FEATURE_mtdev -1 -+#define QT_FEATURE_multiprocess 1 -+#define QT_FEATURE_png 1 -+#define QT_FEATURE_system_freetype 1 -+#define QT_FEATURE_system_harfbuzz -1 -+#define QT_FEATURE_system_jpeg 1 -+#define QT_FEATURE_system_png 1 -+#define QT_FEATURE_xcb -1 -+#define QT_FEATURE_system_xcb -1 -+#define QT_FEATURE_tslib -1 -+#define QT_FEATURE_tuiotouch 1 -+#define QT_FEATURE_vnc 1 -+#define QT_FEATURE_vsp2 -1 -+#define QT_FEATURE_xlib 1 -+#define QT_FEATURE_xcb_xlib 1 -+#define QT_FEATURE_xkbcommon 1 -diff --git a/qtbase/src/gui/qtgui_tracepoints_p.h b/qtbase/src/gui/qtgui_tracepoints_p.h -new file mode 100644 -index 0000000..ff8d101 ---- /dev/null -+++ b/qtbase/src/gui/qtgui_tracepoints_p.h -@@ -0,0 +1 @@ -+#include -diff --git a/qtbase/src/network/qtnetwork-config.h b/qtbase/src/network/qtnetwork-config.h -new file mode 100644 -index 0000000..7989e9e ---- /dev/null -+++ b/qtbase/src/network/qtnetwork-config.h -@@ -0,0 +1,21 @@ -+#define QT_FEATURE_networkinterface -1 -+#define QT_NO_NETWORKINTERFACE -+#define QT_FEATURE_bearermanagement -1 -+#define QT_NO_BEARERMANAGEMENT -+#define QT_FEATURE_dnslookup 1 -+#define QT_FEATURE_schannel -1 -+#define QT_LINKED_OPENSSL true -+#define QT_FEATURE_dtls 1 -+#define QT_FEATURE_ftp 1 -+#define QT_FEATURE_http 1 -+#define QT_NO_IPV6IFNAME -+#define QT_FEATURE_localserver 1 -+#define QT_FEATURE_networkdiskcache 1 -+#define QT_FEATURE_networkproxy 1 -+#define QT_FEATURE_opensslv11 -1 -+#define QT_FEATURE_ocsp -1 -+#define QT_FEATURE_sctp -1 -+#define QT_NO_SCTP -+#define QT_FEATURE_socks5 1 -+#define QT_FEATURE_ssl 1 -+#define QT_FEATURE_udpsocket 1 -diff --git a/qtbase/src/network/qtnetwork-config_p.h b/qtbase/src/network/qtnetwork-config_p.h -new file mode 100644 -index 0000000..ab87522 ---- /dev/null -+++ b/qtbase/src/network/qtnetwork-config_p.h -@@ -0,0 +1,6 @@ -+#define QT_FEATURE_securetransport -1 -+#define QT_FEATURE_openssl_linked 1 -+#define QT_FEATURE_openssl 1 -+#define QT_FEATURE_libproxy -1 -+#define QT_FEATURE_linux_netlink 1 -+#define QT_FEATURE_system_proxies -1 -diff --git a/qtbase/src/printsupport/qtprintsupport-config.h b/qtbase/src/printsupport/qtprintsupport-config.h -new file mode 100644 -index 0000000..d1f24ca ---- /dev/null -+++ b/qtbase/src/printsupport/qtprintsupport-config.h -@@ -0,0 +1,6 @@ -+#define QT_NO_CUPS -+#define QT_NO_CUPSJOBWIDGET -+#define QT_FEATURE_printer 1 -+#define QT_FEATURE_printdialog 1 -+#define QT_FEATURE_printpreviewwidget 1 -+#define QT_FEATURE_printpreviewdialog 1 -diff --git a/qtbase/src/printsupport/qtprintsupport-config_p.h b/qtbase/src/printsupport/qtprintsupport-config_p.h -new file mode 100644 -index 0000000..dfe0a58 ---- /dev/null -+++ b/qtbase/src/printsupport/qtprintsupport-config_p.h -@@ -0,0 +1,2 @@ -+#define QT_FEATURE_cups -1 -+#define QT_FEATURE_cupsjobwidget -1 -diff --git a/qtbase/src/widgets/qtwidgets-config.h b/qtbase/src/widgets/qtwidgets-config.h -new file mode 100644 -index 0000000..3229c56 ---- /dev/null -+++ b/qtbase/src/widgets/qtwidgets-config.h -@@ -0,0 +1,78 @@ -+#define QT_FEATURE_abstractbutton 1 -+#define QT_FEATURE_abstractslider 1 -+#define QT_FEATURE_groupbox 1 -+#define QT_FEATURE_buttongroup 1 -+#define QT_FEATURE_label 1 -+#define QT_FEATURE_pushbutton 1 -+#define QT_FEATURE_menu 1 -+#define QT_FEATURE_lineedit 1 -+#define QT_FEATURE_spinbox 1 -+#define QT_FEATURE_slider 1 -+#define QT_FEATURE_scrollbar 1 -+#define QT_FEATURE_scrollarea 1 -+#define QT_FEATURE_itemviews 1 -+#define QT_FEATURE_tableview 1 -+#define QT_FEATURE_toolbutton 1 -+#define QT_FEATURE_calendarwidget 1 -+#define QT_FEATURE_checkbox 1 -+#define QT_FEATURE_dialog 1 -+#define QT_FEATURE_dialogbuttonbox 1 -+#define QT_FEATURE_colordialog 1 -+#define QT_FEATURE_listview 1 -+#define QT_FEATURE_columnview 1 -+#define QT_FEATURE_combobox 1 -+#define QT_FEATURE_commandlinkbutton 1 -+#define QT_FEATURE_completer 1 -+#define QT_FEATURE_contextmenu 1 -+#define QT_FEATURE_datawidgetmapper 1 -+#define QT_FEATURE_datetimeedit 1 -+#define QT_FEATURE_dial 1 -+#define QT_FEATURE_filesystemmodel 1 -+#define QT_FEATURE_dirmodel 1 -+#define QT_FEATURE_resizehandler 1 -+#define QT_FEATURE_mainwindow 1 -+#define QT_FEATURE_dockwidget 1 -+#define QT_FEATURE_textedit 1 -+#define QT_FEATURE_errormessage 1 -+#define QT_FEATURE_splitter 1 -+#define QT_FEATURE_stackedwidget 1 -+#define QT_FEATURE_treeview 1 -+#define QT_FEATURE_filedialog 1 -+#define QT_FEATURE_fontcombobox 1 -+#define QT_FEATURE_fontdialog 1 -+#define QT_FEATURE_formlayout 1 -+#define QT_FEATURE_fscompleter 1 -+#define QT_FEATURE_graphicsview 1 -+#define QT_FEATURE_graphicseffect 1 -+#define QT_FEATURE_inputdialog 1 -+#define QT_FEATURE_keysequenceedit 1 -+#define QT_FEATURE_lcdnumber 1 -+#define QT_FEATURE_listwidget 1 -+#define QT_FEATURE_mdiarea 1 -+#define QT_FEATURE_menubar 1 -+#define QT_FEATURE_messagebox 1 -+#define QT_FEATURE_paint_debug 1 -+#define QT_FEATURE_progressbar 1 -+#define QT_FEATURE_progressdialog 1 -+#define QT_FEATURE_radiobutton 1 -+#define QT_FEATURE_rubberband 1 -+#define QT_FEATURE_scroller 1 -+#define QT_FEATURE_sizegrip 1 -+#define QT_FEATURE_splashscreen 1 -+#define QT_FEATURE_statusbar 1 -+#define QT_FEATURE_statustip 1 -+#define QT_FEATURE_style_stylesheet 1 -+#define QT_FEATURE_syntaxhighlighter 1 -+#define QT_FEATURE_tabbar 1 -+#define QT_FEATURE_tablewidget 1 -+#define QT_FEATURE_tabwidget 1 -+#define QT_FEATURE_textbrowser 1 -+#define QT_FEATURE_toolbar 1 -+#define QT_FEATURE_toolbox 1 -+#define QT_FEATURE_tooltip 1 -+#define QT_FEATURE_treewidget 1 -+#define QT_FEATURE_undocommand 1 -+#define QT_FEATURE_undostack 1 -+#define QT_FEATURE_undogroup 1 -+#define QT_FEATURE_undoview 1 -+#define QT_FEATURE_wizard 1 -diff --git a/qtbase/src/widgets/qtwidgets-config_p.h b/qtbase/src/widgets/qtwidgets-config_p.h -new file mode 100644 -index 0000000..bfdd43b ---- /dev/null -+++ b/qtbase/src/widgets/qtwidgets-config_p.h -@@ -0,0 +1,8 @@ -+#define QT_FEATURE_widgettextcontrol 1 -+#define QT_FEATURE_effects 1 -+#define QT_FEATURE_gtk3 -1 -+#define QT_FEATURE_style_android -1 -+#define QT_FEATURE_style_fusion 1 -+#define QT_FEATURE_style_mac -1 -+#define QT_FEATURE_style_windows 1 -+#define QT_FEATURE_style_windowsvista -1 -diff --git a/qtbase/src/widgets/qtwidgets_tracepoints_p.h b/qtbase/src/widgets/qtwidgets_tracepoints_p.h -new file mode 100644 -index 0000000..ff8d101 ---- /dev/null -+++ b/qtbase/src/widgets/qtwidgets_tracepoints_p.h -@@ -0,0 +1 @@ -+#include -diff --git a/qtbase/src/xml/qtxml-config.h b/qtbase/src/xml/qtxml-config.h -new file mode 100644 -index 0000000..163246e ---- /dev/null -+++ b/qtbase/src/xml/qtxml-config.h -@@ -0,0 +1 @@ -+#define QT_FEATURE_dom 1 -diff --git a/qtbase/src/xml/qtxml-config_p.h b/qtbase/src/xml/qtxml-config_p.h -new file mode 100644 -index 0000000..e69de29 diff --git a/repos/libports/src/lib/qt5/patches/qtbase_genode.patch b/repos/libports/src/lib/qt5/patches/qtbase_genode.patch deleted file mode 100644 index 837b791c66..0000000000 --- a/repos/libports/src/lib/qt5/patches/qtbase_genode.patch +++ /dev/null @@ -1,580 +0,0 @@ -qtbase_genode.patch - -Genode-specific adaptations - -diff --git a/qtbase/src/corelib/codecs/qtextcodec.cpp b/qtbase/src/corelib/codecs/qtextcodec.cpp -index ffd8a2c..d40873a 100644 ---- a/qtbase/src/corelib/codecs/qtextcodec.cpp -+++ b/qtbase/src/corelib/codecs/qtextcodec.cpp -@@ -208,7 +208,11 @@ static QTextCodec *setupLocaleMapper() - // First part is getting that locale name. First try setlocale() which - // definitely knows it, but since we cannot fully trust it, get ready - // to fall back to environment variables. -+#ifdef Q_OS_GENODE -+ const QByteArray ctype; -+#else - const QByteArray ctype = setlocale(LC_CTYPE, 0); -+#endif /* Q_OS_GENODE */ - - // Get the first nonempty value from $LC_ALL, $LC_CTYPE, and $LANG - // environment variables. -diff --git a/qtbase/src/corelib/global/qcompilerdetection.h b/qtbase/src/corelib/global/qcompilerdetection.h -index 345ab9e..ab6c275 100644 ---- a/qtbase/src/corelib/global/qcompilerdetection.h -+++ b/qtbase/src/corelib/global/qcompilerdetection.h -@@ -881,7 +881,9 @@ - # define Q_COMPILER_ALIGNAS - # define Q_COMPILER_ALIGNOF - # define Q_COMPILER_INHERITING_CONSTRUCTORS --# define Q_COMPILER_THREAD_LOCAL -+# ifndef __GENODE__ -+# define Q_COMPILER_THREAD_LOCAL -+# endif - # if Q_CC_GNU > 408 || __GNUC_PATCHLEVEL__ >= 1 - # define Q_COMPILER_REF_QUALIFIERS - # endif -diff --git a/qtbase/src/corelib/global/qconfig.cpp b/qtbase/src/corelib/global/qconfig.cpp -index a123483..09b8a8e 100644 ---- a/qtbase/src/corelib/global/qconfig.cpp -+++ b/qtbase/src/corelib/global/qconfig.cpp -@@ -1,10 +1,10 @@ - /* Installation date */ - static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20"; - /* Installation Info */ --static const char qt_configure_prefix_path_str [12+256] = "qt_prfxpath=/usr/local/Qt-5.13.0"; -+static const char qt_configure_prefix_path_str [12+256] = "qt_prfxpath=/qt"; - #ifdef QT_BUILD_QMAKE --static const char qt_configure_ext_prefix_path_str [12+256] = "qt_epfxpath=/usr/local/Qt-5.13.0"; --static const char qt_configure_host_prefix_path_str [12+256] = "qt_hpfxpath=/usr/local/Qt-5.13.0"; -+static const char qt_configure_ext_prefix_path_str [12+256] = "qt_epfxpath="; -+static const char qt_configure_host_prefix_path_str [12+256] = "qt_hpfxpath="; - #endif - static const short qt_configure_str_offsets[] = { - 0, -diff --git a/qtbase/src/corelib/global/qsystemdetection.h b/qtbase/src/corelib/global/qsystemdetection.h -index aabe46f..e262f2f 100644 ---- a/qtbase/src/corelib/global/qsystemdetection.h -+++ b/qtbase/src/corelib/global/qsystemdetection.h -@@ -47,6 +47,7 @@ - /* - The operating system, must be one of: (Q_OS_x) - -+ GENODE - Genode - DARWIN - Any Darwin system (macOS, iOS, watchOS, tvOS) - MACOS - macOS - IOS - iOS -@@ -79,7 +80,9 @@ - - Q_OS_FREEBSD_KERNEL is always defined on FreeBSD, even if the userland is from GNU - */ - --#if defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__)) -+#if defined(__GENODE__) -+# define Q_OS_GENODE -+#elif defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__)) - # include - # if defined(TARGET_OS_MAC) && TARGET_OS_MAC - # define Q_OS_DARWIN -diff --git a/qtbase/src/corelib/global/qversiontagging.cpp b/qtbase/src/corelib/global/qversiontagging.cpp -index b5e524b..221c6a9 100644 ---- a/qtbase/src/corelib/global/qversiontagging.cpp -+++ b/qtbase/src/corelib/global/qversiontagging.cpp -@@ -42,7 +42,7 @@ - #define SYM QT_MANGLE_NAMESPACE(qt_version_tag) - //#define SSYM QT_STRINGIFY(SYM) - --#if defined(Q_CC_GNU) && defined(Q_OF_ELF) && !defined(Q_OS_ANDROID) -+#if defined(Q_CC_GNU) && defined(Q_OF_ELF) && !defined(Q_OS_ANDROID) && !defined(Q_OS_GENODE) - # define make_versioned_symbol2(sym, m, n, separator) \ - Q_CORE_EXPORT extern const char sym ## _ ## m ## _ ## n = 0; \ - asm(".symver " QT_STRINGIFY(sym) "_" QT_STRINGIFY(m) "_" QT_STRINGIFY(n) ", " \ -diff --git a/qtbase/src/corelib/io/qresource.cpp b/qtbase/src/corelib/io/qresource.cpp -index e7d739b..225cda6 100644 ---- a/qtbase/src/corelib/io/qresource.cpp -+++ b/qtbase/src/corelib/io/qresource.cpp -@@ -68,7 +68,7 @@ - # include "private/qcore_unix_p.h" - #endif - --#if defined(Q_OS_UNIX) && !defined(Q_OS_NACL) && !defined(Q_OS_INTEGRITY) -+#if defined(Q_OS_UNIX) && !defined(Q_OS_NACL) && !defined(Q_OS_INTEGRITY) && !defined(Q_OS_GENODE) - # define QT_USE_MMAP - # include - #endif -diff --git a/qtbase/src/corelib/kernel/qcoreapplication.cpp b/qtbase/src/corelib/kernel/qcoreapplication.cpp -index 5c0bf93..254a4ae 100644 ---- a/qtbase/src/corelib/kernel/qcoreapplication.cpp -+++ b/qtbase/src/corelib/kernel/qcoreapplication.cpp -@@ -612,7 +612,7 @@ void QCoreApplicationPrivate::initLocale() - if (qt_locale_initialized) - return; - qt_locale_initialized = true; --#if defined(Q_OS_UNIX) && !defined(QT_BOOTSTRAPPED) -+#if defined(Q_OS_UNIX) && !defined(QT_BOOTSTRAPPED) && !defined(Q_OS_GENODE) - setlocale(LC_ALL, ""); - #endif - } -diff --git a/qtbase/src/corelib/kernel/qeventdispatcher_unix.cpp b/qtbase/src/corelib/kernel/qeventdispatcher_unix.cpp -index df0cac0..d349ff1 100644 ---- a/qtbase/src/corelib/kernel/qeventdispatcher_unix.cpp -+++ b/qtbase/src/corelib/kernel/qeventdispatcher_unix.cpp -@@ -73,6 +73,11 @@ - # include - #endif - -+#ifdef Q_OS_GENODE -+#include -+#define perror Genode::error -+#endif /* Q_OS_GENODE */ -+ - QT_BEGIN_NAMESPACE - - static const char *socketType(QSocketNotifier::Type type) -@@ -200,6 +205,8 @@ int QThreadPipe::check(const pollfd &pfd) - #if defined(Q_OS_VXWORKS) - ::read(fds[0], c, sizeof(c)); - ::ioctl(fds[0], FIOFLUSH, 0); -+#elif defined(Q_OS_GENODE) -+ ::read(fds[0], c, sizeof(c)); // FIXME: the while loop only works in non-blocking mode - #else - # ifndef QT_NO_EVENTFD - if (fds[1] == -1) { -diff --git a/qtbase/src/corelib/kernel/qobject.h b/qtbase/src/corelib/kernel/qobject.h -index 63c5a9a..817d26b 100644 ---- a/qtbase/src/corelib/kernel/qobject.h -+++ b/qtbase/src/corelib/kernel/qobject.h -@@ -414,7 +414,7 @@ public: - { return const_cast(this)->qt_metacast(classname) != nullptr; } - - public Q_SLOTS: -- void deleteLater(); -+ virtual void deleteLater(); - - protected: - QObject *sender() const; -diff --git a/qtbase/src/corelib/kernel/qtranslator.cpp b/qtbase/src/corelib/kernel/qtranslator.cpp -index dc0ab9f..a69e088 100644 ---- a/qtbase/src/corelib/kernel/qtranslator.cpp -+++ b/qtbase/src/corelib/kernel/qtranslator.cpp -@@ -58,7 +58,7 @@ - #include "qendian.h" - #include "qresource.h" - --#if defined(Q_OS_UNIX) && !defined(Q_OS_INTEGRITY) -+#if defined(Q_OS_UNIX) && !defined(Q_OS_INTEGRITY) && !defined(Q_OS_GENODE) - #define QT_USE_MMAP - #include "private/qcore_unix_p.h" - // for mmap -diff --git a/qtbase/src/corelib/thread/qthread_unix.cpp b/qtbase/src/corelib/thread/qthread_unix.cpp -index ea78b0a..e379c71 100644 ---- a/qtbase/src/corelib/thread/qthread_unix.cpp -+++ b/qtbase/src/corelib/thread/qthread_unix.cpp -@@ -93,8 +93,10 @@ - #endif - - #if defined(Q_OS_DARWIN) || !defined(Q_OS_ANDROID) && !defined(Q_OS_OPENBSD) && defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING-0 >= 0) -+#ifndef Q_OS_GENODE - #define QT_HAS_THREAD_PRIORITY_SCHEDULING - #endif -+#endif - - #if defined(Q_OS_QNX) - #include -diff --git a/qtbase/src/corelib/tools/qdatetime.cpp b/qtbase/src/corelib/tools/qdatetime.cpp -index 511dbf0..f1a7216 100644 ---- a/qtbase/src/corelib/tools/qdatetime.cpp -+++ b/qtbase/src/corelib/tools/qdatetime.cpp -@@ -2197,6 +2197,9 @@ static int qt_timezone() - long offset; - _get_timezone(&offset); - return offset; -+#elif defined(Q_OS_GENODE) -+ /* no timezone support on Genode */ -+ return 0; - #elif defined(Q_OS_BSD4) && !defined(Q_OS_DARWIN) - time_t clock = time(NULL); - struct tm t; -diff --git a/qtbase/src/gui/image/qxpmhandler.cpp b/qtbase/src/gui/image/qxpmhandler.cpp -index a32dfda..6f27cd2 100644 ---- a/qtbase/src/gui/image/qxpmhandler.cpp -+++ b/qtbase/src/gui/image/qxpmhandler.cpp -@@ -845,8 +845,16 @@ static bool read_xpm_header( - #ifdef Q_CC_MSVC - if (sscanf_s(buf, "%d %d %d %d", w, h, ncols, cpp) < 4) - #else -+#ifdef Q_OS_GENODE -+ *w = QString(buf).section(" ", 0, 0, QString::SectionSkipEmpty).toInt(); -+ *h = QString(buf).section(" ", 1, 1, QString::SectionSkipEmpty).toInt(); -+ *ncols = QString(buf).section(" ", 2, 2, QString::SectionSkipEmpty).toInt(); -+ *cpp = QString(buf).section(" ", 3, 3, QString::SectionSkipEmpty).toInt(); -+ if (*w <= 0 || *h <= 0 || *ncols <= 0 || *cpp <= 0) -+#else - if (sscanf(buf, "%d %d %d %d", w, h, ncols, cpp) < 4) - #endif -+#endif - return false; // < 4 numbers parsed - - if (*w <= 0 || *w > 32767 || *h <= 0 || *h > 32767 || *ncols <= 0 || *ncols > (64 * 64 * 64 * 64) || *cpp <= 0 || *cpp > 15) -diff --git a/qtbase/src/gui/painting/qbrush.cpp b/qtbase/src/gui/painting/qbrush.cpp -index f56be55..5998aa0 100644 ---- a/qtbase/src/gui/painting/qbrush.cpp -+++ b/qtbase/src/gui/painting/qbrush.cpp -@@ -1402,7 +1402,12 @@ QGradient::QGradient(Preset preset) - } - - QT_END_NAMESPACE --static void initGradientPresets() { Q_INIT_RESOURCE(qmake_webgradients); } -+static void initGradientPresets() -+{ -+#ifndef Q_OS_GENODE -+ Q_INIT_RESOURCE(qmake_webgradients); -+#endif -+} - Q_CONSTRUCTOR_FUNCTION(initGradientPresets); - QT_BEGIN_NAMESPACE - -diff --git a/qtbase/src/gui/qtgui-config.h b/qtbase/src/gui/qtgui-config.h -index 7444e61..1ae740d 100644 ---- a/qtbase/src/gui/qtgui-config.h -+++ b/qtbase/src/gui/qtgui-config.h -@@ -34,7 +34,7 @@ - #define QT_FEATURE_openvg -1 - #define QT_FEATURE_pdf 1 - #define QT_FEATURE_picture 1 --#define QT_QPA_DEFAULT_PLATFORM_NAME "minimal" -+#define QT_QPA_DEFAULT_PLATFORM_NAME "genode" - #define QT_FEATURE_sessionmanager -1 - #define QT_NO_SESSIONMANAGER - #define QT_FEATURE_shortcut 1 -diff --git a/qtbase/src/network/access/qhttpnetworkreply.cpp b/qtbase/src/network/access/qhttpnetworkreply.cpp -index c9c3172..ff53f70 100644 ---- a/qtbase/src/network/access/qhttpnetworkreply.cpp -+++ b/qtbase/src/network/access/qhttpnetworkreply.cpp -@@ -249,8 +249,16 @@ void QHttpNetworkReply::setReadBufferSize(qint64 size) - - bool QHttpNetworkReply::supportsUserProvidedDownloadBuffer() - { -+#ifdef Q_OS_GENODE -+ /* -+ * Without this change Arora shows garbage when loading, for example, -+ * www.genode.org -+ */ -+ return false; -+#else - Q_D(QHttpNetworkReply); - return (!d->isChunked() && !d->autoDecompress && d->bodyLength > 0 && d->statusCode == 200); -+#endif - } - - void QHttpNetworkReply::setUserProvidedDownloadBuffer(char* b) -diff --git a/qtbase/src/network/access/qnetworkaccessfilebackend.cpp b/qtbase/src/network/access/qnetworkaccessfilebackend.cpp -index 60353cb..5ecd1b7 100644 ---- a/qtbase/src/network/access/qnetworkaccessfilebackend.cpp -+++ b/qtbase/src/network/access/qnetworkaccessfilebackend.cpp -@@ -127,6 +127,7 @@ void QNetworkAccessFileBackend::open() - url.setPath(QLatin1String("/")); - setUrl(url); - -+#ifndef Q_OS_GENODE - QString fileName = url.toLocalFile(); - if (fileName.isEmpty()) { - if (url.scheme() == QLatin1String("qrc")) { -@@ -140,6 +141,10 @@ void QNetworkAccessFileBackend::open() - fileName = url.toString(QUrl::RemoveAuthority | QUrl::RemoveFragment | QUrl::RemoveQuery); - } - } -+#else -+ QString fileName = QLatin1String(":") + url.path(); -+#endif -+ - file.setFileName(fileName); - - if (operation() == QNetworkAccessManager::GetOperation) { -diff --git a/qtbase/src/network/kernel/qhostinfo.cpp b/qtbase/src/network/kernel/qhostinfo.cpp -index 4b5acc1..1cb4e75 100644 ---- a/qtbase/src/network/kernel/qhostinfo.cpp -+++ b/qtbase/src/network/kernel/qhostinfo.cpp -@@ -728,7 +728,12 @@ QHostInfoLookupManager::QHostInfoLookupManager() : mutex(QMutex::Recursive), was - moveToThread(QCoreApplicationPrivate::mainThread()); - #if QT_CONFIG(thread) - connect(QCoreApplication::instance(), SIGNAL(destroyed()), SLOT(waitForThreadPoolDone()), Qt::DirectConnection); -+#ifdef Q_OS_GENODE -+ /* 'getaddrinfo()' is currently not thread-safe on Genode */ -+ threadPool.setMaxThreadCount(1); -+#else - threadPool.setMaxThreadCount(20); // do up to 20 DNS lookups in parallel -+#endif /* Q_OS_GENODE */ - #endif - } - -diff --git a/qtbase/src/network/kernel/qhostinfo_unix.cpp b/qtbase/src/network/kernel/qhostinfo_unix.cpp -index e4810d6..fd1be48 100644 ---- a/qtbase/src/network/kernel/qhostinfo_unix.cpp -+++ b/qtbase/src/network/kernel/qhostinfo_unix.cpp -@@ -221,7 +221,6 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName) - char hbuf[NI_MAXHOST]; - if (sa && getnameinfo(sa, saSize, hbuf, sizeof(hbuf), 0, 0, 0) == 0) - results.setHostName(QString::fromLatin1(hbuf)); -- - if (results.hostName().isEmpty()) - results.setHostName(address.toString()); - results.setAddresses(QList() << address); -diff --git a/qtbase/src/network/socket/qnativesocketengine_unix.cpp b/qtbase/src/network/socket/qnativesocketengine_unix.cpp -index 24c1712..2dffde6 100644 ---- a/qtbase/src/network/socket/qnativesocketengine_unix.cpp -+++ b/qtbase/src/network/socket/qnativesocketengine_unix.cpp -@@ -472,6 +472,22 @@ bool QNativeSocketEnginePrivate::nativeConnect(const QHostAddress &addr, quint16 - case EISCONN: - socketState = QAbstractSocket::ConnectedState; - break; -+#ifdef Q_OS_GENODE -+ /* to have Arora get an error indication, socketState needs to change -+ * to "ConnectingState" before changing to "UnconnectedState" again -+ */ -+ case ECONNABORTED: -+ if (socketState == QAbstractSocket::UnconnectedState) { -+ /* interpret ECONNABORTED as EINPROGRESS */ -+ setError(QAbstractSocket::UnfinishedSocketOperationError, InvalidSocketErrorString); -+ socketState = QAbstractSocket::ConnectingState; -+ } else { -+ /* interpret ECONNABORTED as EHOSTUNREACH */ -+ setError(QAbstractSocket::NetworkError, HostUnreachableErrorString); -+ socketState = QAbstractSocket::UnconnectedState; -+ } -+ break; -+#endif - case ECONNREFUSED: - case EINVAL: - setError(QAbstractSocket::ConnectionRefusedError, ConnectionRefusedErrorString); -diff --git a/qtbase/src/network/socket/qnet_unix_p.h b/qtbase/src/network/socket/qnet_unix_p.h -index e038352..94ed684 100644 ---- a/qtbase/src/network/socket/qnet_unix_p.h -+++ b/qtbase/src/network/socket/qnet_unix_p.h -@@ -173,6 +173,10 @@ static inline int qt_safe_ioctl(int sockfd, unsigned long request, T arg) - - static inline int qt_safe_sendmsg(int sockfd, const struct msghdr *msg, int flags) - { -+#ifdef Q_OS_GENODE -+ qWarning("qt_safe_sendmsg(): not implemented"); -+ return -1; -+#else - #ifdef MSG_NOSIGNAL - flags |= MSG_NOSIGNAL; - #else -@@ -182,14 +186,20 @@ static inline int qt_safe_sendmsg(int sockfd, const struct msghdr *msg, int flag - int ret; - EINTR_LOOP(ret, ::sendmsg(sockfd, msg, flags)); - return ret; -+#endif /* Q_OS_GENODE */ - } - - static inline int qt_safe_recvmsg(int sockfd, struct msghdr *msg, int flags) - { -+#ifdef Q_OS_GENODE -+ qWarning("qt_safe_recvmsg(): not implemented"); -+ return -1; -+#else - int ret; - - EINTR_LOOP(ret, ::recvmsg(sockfd, msg, flags)); - return ret; -+#endif /* Q_OS_GENODE */ - } - - QT_END_NAMESPACE -diff --git a/qtbase/src/network/ssl/qsslconfiguration_p.h b/qtbase/src/network/ssl/qsslconfiguration_p.h -index 83126bb..7cd978b 100644 ---- a/qtbase/src/network/ssl/qsslconfiguration_p.h -+++ b/qtbase/src/network/ssl/qsslconfiguration_p.h -@@ -85,7 +85,16 @@ public: - QSslConfigurationPrivate() - : sessionProtocol(QSsl::UnknownProtocol), - protocol(QSsl::SecureProtocols), -+#ifdef Q_OS_GENODE -+ /* -+ * With enabled peer verification, currently often a 'handshake error' -+ * occurs. This patch disables the peer verification until a fix for -+ * the handshake problem has been found. -+ */ -+ peerVerifyMode(QSslSocket::VerifyNone), -+#else - peerVerifyMode(QSslSocket::AutoVerifyPeer), -+#endif - peerVerifyDepth(0), - allowRootCertOnDemandLoading(true), - peerSessionShared(false), -diff --git a/qtbase/src/network/ssl/qsslsocket_opensslpre11.cpp b/qtbase/src/network/ssl/qsslsocket_opensslpre11.cpp -index f5aab82..f84baaa 100644 ---- a/qtbase/src/network/ssl/qsslsocket_opensslpre11.cpp -+++ b/qtbase/src/network/ssl/qsslsocket_opensslpre11.cpp -@@ -221,7 +221,10 @@ bool QSslSocketPrivate::ensureLibraryLoaded() - if (q_SSL_library_init() != 1) - return false; - q_SSL_load_error_strings(); -+#ifndef Q_OS_GENODE -+ /* FIXME: currently, on Genode this function causes 'exit(1)' */ - q_OpenSSL_add_all_algorithms_safe(); -+#endif - - #if OPENSSL_VERSION_NUMBER >= 0x10001000L - if (q_SSLeay() >= 0x10001000L) -diff --git a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h -index 17bf0fb..2908374 100644 ---- a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h -+++ b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h -@@ -55,7 +55,9 @@ - #ifdef Q_OS_FREEBSD - #include - #else -+#ifndef Q_OS_GENODE - #include "linux/input.h" -+#endif /* Q_OS_GENODE */ - #endif - - // no QT_BEGIN_NAMESPACE, since we include it internally... -@@ -648,6 +650,7 @@ const QEvdevKeyboardMap::Mapping QEvdevKeyboardHandler::s_keymap_default[] = { - { 111, 0xffff, 0x01000000, 0x06, 0x08, 0x0200 }, - { 111, 0xffff, 0x01000000, 0x0c, 0x08, 0x0200 }, - -+#ifndef Q_OS_GENODE - // 113 -> 248 - { KEY_MUTE, 0xffff, Qt::Key_VolumeMute, 0x00, 0x00, 0x0000 }, - { KEY_VOLUMEDOWN, 0xffff, Qt::Key_VolumeDown, 0x00, 0x00, 0x0000 }, -@@ -676,6 +679,7 @@ const QEvdevKeyboardMap::Mapping QEvdevKeyboardHandler::s_keymap_default[] = { - { KEY_BLUE, 0xffff, Qt::Key_Blue, 0x00, 0x00, 0x0000 }, - { KEY_CHANNELUP, 0xffff, Qt::Key_ChannelUp, 0x00, 0x00, 0x0000 }, - { KEY_CHANNELDOWN, 0xffff, Qt::Key_ChannelDown, 0x00, 0x00, 0x0000 }, -+#endif /* Q_OS_GENODE */ - }; - - const QEvdevKeyboardMap::Composing QEvdevKeyboardHandler::s_keycompose_default[] = { -diff --git a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp -index 666613f..e99bf58 100644 ---- a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp -+++ b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp -@@ -55,7 +55,9 @@ - #ifdef Q_OS_FREEBSD - #include - #else -+#ifndef Q_OS_GENODE - #include -+#endif /* Q_OS_GENODE */ - #endif - - QT_BEGIN_NAMESPACE -@@ -88,9 +90,11 @@ QEvdevKeyboardHandler::QEvdevKeyboardHandler(const QString &device, QFdContainer - if (keymapFile.isEmpty() || !loadKeymap(keymapFile)) - unloadKeymap(); - -+#ifndef Q_OS_GENODE - // socket notifier for events on the keyboard device - m_notify = new QSocketNotifier(m_fd.get(), QSocketNotifier::Read, this); - connect(m_notify, &QSocketNotifier::activated, this, &QEvdevKeyboardHandler::readKeycode); -+#endif /* Q_OS_GENODE */ - } - - QEvdevKeyboardHandler::~QEvdevKeyboardHandler() -@@ -98,6 +102,7 @@ QEvdevKeyboardHandler::~QEvdevKeyboardHandler() - unloadKeymap(); - } - -+#ifndef Q_OS_GENODE - QEvdevKeyboardHandler *QEvdevKeyboardHandler::create(const QString &device, - const QString &specification, - const QString &defaultKeymapFile) -@@ -221,10 +226,21 @@ void QEvdevKeyboardHandler::readKeycode() - } - } - } -+#endif /* Q_OS_GENODE */ - - void QEvdevKeyboardHandler::processKeyEvent(int nativecode, int unicode, int qtcode, - Qt::KeyboardModifiers modifiers, bool isPress, bool autoRepeat) - { -+#ifdef Q_OS_GENODE -+ /* characters are handled separately by the QPA plugin */ -+ unicode = 0xffff; -+ -+ /* Ctrl-A .. Ctrl-Z is handled separately by the QPA plugin */ -+ if ((modifiers & Qt::ControlModifier) && -+ ((qtcode >= Qt::Key_A) && (qtcode <= Qt::Key_Z))) -+ return; -+#endif -+ - if (!autoRepeat) - QGuiApplicationPrivate::inputDeviceManager()->setKeyboardModifiers(QEvdevKeyboardHandler::toQtModifiers(m_modifiers)); - -@@ -491,6 +507,7 @@ void QEvdevKeyboardHandler::unloadKeymap() - m_composing = 0; - m_dead_unicode = 0xffff; - -+#ifndef Q_OS_GENODE - //Set locks according to keyboard leds - quint16 ledbits[1]; - memset(ledbits, 0, sizeof(ledbits)); -@@ -513,6 +530,7 @@ void QEvdevKeyboardHandler::unloadKeymap() - } - - m_langLock = 0; -+#endif /* Q_OS_GENODE */ - } - - bool QEvdevKeyboardHandler::loadKeymap(const QString &file) -diff --git a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h -index 21e6d05..b3f18b0 100644 ---- a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h -+++ b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h -@@ -189,7 +189,10 @@ public: - bool loadKeymap(const QString &file); - void unloadKeymap(); - -+#ifndef Q_OS_GENODE -+private slots: - void readKeycode(); -+#endif /* Q_OS_GENODE */ - KeycodeAction processKeycode(quint16 keycode, bool pressed, bool autorepeat); - - void switchLang(); -diff --git a/qtbase/src/testlib/qtestcase.cpp b/qtbase/src/testlib/qtestcase.cpp -index 1f69429..938990f 100644 ---- a/qtbase/src/testlib/qtestcase.cpp -+++ b/qtbase/src/testlib/qtestcase.cpp -@@ -1554,7 +1554,7 @@ FatalSignalHandler::FatalSignalHandler() - - // tvOS/watchOS both define SA_ONSTACK (in sys/signal.h) but mark sigaltstack() as - // unavailable (__WATCHOS_PROHIBITED __TVOS_PROHIBITED in signal.h) --#if defined(SA_ONSTACK) && !defined(Q_OS_TVOS) && !defined(Q_OS_WATCHOS) -+#if defined(SA_ONSTACK) && !defined(Q_OS_TVOS) && !defined(Q_OS_WATCHOS) && !defined(Q_OS_GENODE) - // Let the signal handlers use an alternate stack - // This is necessary if SIGSEGV is to catch a stack overflow - # if defined(Q_CC_GNU) && defined(Q_OF_ELF) -diff --git a/qtbase/src/widgets/dialogs/qfiledialog.cpp b/qtbase/src/widgets/dialogs/qfiledialog.cpp -index f772eb1..9844056 100644 ---- a/qtbase/src/widgets/dialogs/qfiledialog.cpp -+++ b/qtbase/src/widgets/dialogs/qfiledialog.cpp -@@ -1146,7 +1146,7 @@ Q_AUTOTEST_EXPORT QString qt_tildeExpansion(const QString &path) - const QString homePath = QDir::homePath(); - #else - const QByteArray userName = path.midRef(1, separatorPosition - 1).toLocal8Bit(); --# if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_WASM) -+# if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_WASM) && !defined(Q_OS_GENODE) - passwd pw; - passwd *tmpPw; - char buf[200]; -diff --git a/qtbase/src/widgets/styles/qstylefactory.cpp b/qtbase/src/widgets/styles/qstylefactory.cpp -index b0ce5e5..fe0366b 100644 ---- a/qtbase/src/widgets/styles/qstylefactory.cpp -+++ b/qtbase/src/widgets/styles/qstylefactory.cpp -@@ -123,6 +123,13 @@ QStringList QStyleFactory::keys() - const PluginKeyMap::const_iterator cend = keyMap.constEnd(); - for (PluginKeyMap::const_iterator it = keyMap.constBegin(); it != cend; ++it) - list.append(it.value()); -+#ifdef Q_OS_GENODE -+/* on Genode, the first style in the list gets selected by default and we want the "Fusion" style */ -+#if QT_CONFIG(style_fusion) -+ if (!list.contains(QLatin1String("Fusion"))) -+ list << QLatin1String("Fusion"); -+#endif -+#endif - #if QT_CONFIG(style_windows) - if (!list.contains(QLatin1String("Windows"))) - list << QLatin1String("Windows"); diff --git a/repos/libports/src/lib/qt5/patches/qtbase_genode_openglwindow_example.patch b/repos/libports/src/lib/qt5/patches/qtbase_genode_openglwindow_example.patch deleted file mode 100644 index 9140585c6b..0000000000 --- a/repos/libports/src/lib/qt5/patches/qtbase_genode_openglwindow_example.patch +++ /dev/null @@ -1,21 +0,0 @@ -qtbase_genode_openglwindow_example.patch - -diff --git a/qtbase/examples/gui/openglwindow/openglwindow.pro b/qtbase/examples/gui/openglwindow/openglwindow.pro -index 93f18f3..ffff275 100644 ---- a/qtbase/examples/gui/openglwindow/openglwindow.pro -+++ b/qtbase/examples/gui/openglwindow/openglwindow.pro -@@ -1,7 +1,11 @@ --include(openglwindow.pri) -+#include(openglwindow.pri) - - SOURCES += \ -- main.cpp -+ main.cpp \ -+ openglwindow.cpp - --target.path = $$[QT_INSTALL_EXAMPLES]/gui/openglwindow -+HEADERS += \ -+ openglwindow.h -+ -+#target.path = $$[QT_INSTALL_EXAMPLES]/gui/openglwindow - INSTALLS += target diff --git a/repos/libports/src/lib/qt5/patches/qtbase_genode_qtscriptclassic.patch b/repos/libports/src/lib/qt5/patches/qtbase_genode_qtscriptclassic.patch deleted file mode 100644 index 07ce1d92ad..0000000000 --- a/repos/libports/src/lib/qt5/patches/qtbase_genode_qtscriptclassic.patch +++ /dev/null @@ -1,40 +0,0 @@ -qtbase_genode_qtscriptclassic.patch - -diff --git a/qtbase/src/corelib/global/qglobal.h b/qtbase/src/corelib/global/qglobal.h -index 223ebbc..965e6d0 100644 ---- a/qtbase/src/corelib/global/qglobal.h -+++ b/qtbase/src/corelib/global/qglobal.h -@@ -923,13 +923,17 @@ inline void qSwap(T &value1, T &value2) - swap(value1, value2); - } - -+#ifndef Q_OS_GENODE - #if QT_DEPRECATED_SINCE(5, 0) -+#endif -+#else -+/* QtScript classic still needs these functions */ - Q_CORE_EXPORT QT_DEPRECATED void *qMalloc(size_t size) Q_ALLOC_SIZE(1); - Q_CORE_EXPORT QT_DEPRECATED void qFree(void *ptr); - Q_CORE_EXPORT QT_DEPRECATED void *qRealloc(void *ptr, size_t size) Q_ALLOC_SIZE(2); - Q_CORE_EXPORT QT_DEPRECATED void *qMemCopy(void *dest, const void *src, size_t n); - Q_CORE_EXPORT QT_DEPRECATED void *qMemSet(void *dest, int c, size_t n); --#endif -+#endif /* Q_OS_GENODE */ - Q_CORE_EXPORT void *qMallocAligned(size_t size, size_t alignment) Q_ALLOC_SIZE(1); - Q_CORE_EXPORT void *qReallocAligned(void *ptr, size_t size, size_t oldsize, size_t alignment) Q_ALLOC_SIZE(2); - Q_CORE_EXPORT void qFreeAligned(void *ptr); -diff --git a/qtbase/src/corelib/kernel/qvariant_p.h b/qtbase/src/corelib/kernel/qvariant_p.h -index b22b7c2..f79d473 100644 ---- a/qtbase/src/corelib/kernel/qvariant_p.h -+++ b/qtbase/src/corelib/kernel/qvariant_p.h -@@ -380,7 +380,10 @@ public: - - void delegate(const void*) - { -+#ifndef Q_OS_GENODE -+ /* this warning appears often when using the QtScript classic lib (tetrix), not sure if it is serious */ - qWarning("Trying to create a QVariant instance of QMetaType::Void type, an invalid QVariant will be constructed instead"); -+#endif - m_x->type = QMetaType::UnknownType; - m_x->is_shared = false; - m_x->is_null = !m_copy; diff --git a/repos/libports/src/lib/qt5/patches/qtbase_genode_textedit_example.patch b/repos/libports/src/lib/qt5/patches/qtbase_genode_textedit_example.patch deleted file mode 100644 index 728db2d1d8..0000000000 --- a/repos/libports/src/lib/qt5/patches/qtbase_genode_textedit_example.patch +++ /dev/null @@ -1,64 +0,0 @@ -qtbase_genode_textedit_example.patch - -diff --git a/qtbase/examples/widgets/richtext/textedit/textedit.cpp b/qtbase/examples/widgets/richtext/textedit/textedit.cpp -index 00ea032..83de198 100644 ---- a/qtbase/examples/widgets/richtext/textedit/textedit.cpp -+++ b/qtbase/examples/widgets/richtext/textedit/textedit.cpp -@@ -451,7 +451,8 @@ void TextEdit::fileOpen() - QFileDialog fileDialog(this, tr("Open File...")); - fileDialog.setAcceptMode(QFileDialog::AcceptOpen); - fileDialog.setFileMode(QFileDialog::ExistingFile); -- fileDialog.setMimeTypeFilters(QStringList() << "text/html" << "text/plain"); -+ fileDialog.setMimeTypeFilters(QStringList() << "text/html" << "text/plain" << "application/octet-stream"); -+ fileDialog.selectMimeTypeFilter("application/octet-stream"); - if (fileDialog.exec() != QDialog::Accepted) - return; - const QString fn = fileDialog.selectedFiles().first(); -@@ -468,7 +469,12 @@ bool TextEdit::fileSave() - if (fileName.startsWith(QStringLiteral(":/"))) - return fileSaveAs(); - -- QTextDocumentWriter writer(fileName); -+ /* if the file name has no extension, assume plain text */ -+ QByteArray format = QByteArray(); -+ if (fileName.indexOf(".", 1) == -1) -+ format = "plaintext"; -+ -+ QTextDocumentWriter writer(fileName, format); - bool success = writer.write(textEdit->document()); - if (success) { - textEdit->document()->setModified(false); -@@ -485,9 +491,10 @@ bool TextEdit::fileSaveAs() - QFileDialog fileDialog(this, tr("Save as...")); - fileDialog.setAcceptMode(QFileDialog::AcceptSave); - QStringList mimeTypes; -- mimeTypes << "application/vnd.oasis.opendocument.text" << "text/html" << "text/plain"; -+ mimeTypes << "application/vnd.oasis.opendocument.text" << "text/html" << "text/plain" << "application/octet-stream"; - fileDialog.setMimeTypeFilters(mimeTypes); -- fileDialog.setDefaultSuffix("odt"); -+ fileDialog.selectMimeTypeFilter("application/octet-stream"); -+ //fileDialog.setDefaultSuffix("odt"); - if (fileDialog.exec() != QDialog::Accepted) - return false; - const QString fn = fileDialog.selectedFiles().first(); -diff --git a/qtbase/examples/widgets/richtext/textedit/textedit.pro b/qtbase/examples/widgets/richtext/textedit/textedit.pro -index b7a2155..704f738 100644 ---- a/qtbase/examples/widgets/richtext/textedit/textedit.pro -+++ b/qtbase/examples/widgets/richtext/textedit/textedit.pro -@@ -1,5 +1,4 @@ - QT += widgets --requires(qtConfig(filedialog)) - qtHaveModule(printsupport): QT += printsupport - - TEMPLATE = app -@@ -10,10 +9,6 @@ SOURCES = textedit.cpp \ - main.cpp - - RESOURCES += textedit.qrc --build_all:!build_pass { -- CONFIG -= build_all -- CONFIG += release --} - - EXAMPLE_FILES = textedit.qdoc - diff --git a/repos/libports/src/lib/qt5/patches/qtbase_qwindow_title.patch b/repos/libports/src/lib/qt5/patches/qtbase_qwindow_title.patch deleted file mode 100644 index e03802af3b..0000000000 --- a/repos/libports/src/lib/qt5/patches/qtbase_qwindow_title.patch +++ /dev/null @@ -1,14 +0,0 @@ -qtbase_qwindow_title.patch - -diff --git a/qtbase/src/widgets/kernel/qwidgetwindow.cpp b/qtbase/src/widgets/kernel/qwidgetwindow.cpp -index 143cc60..5e4842c 100644 ---- a/qtbase/src/widgets/kernel/qwidgetwindow.cpp -+++ b/qtbase/src/widgets/kernel/qwidgetwindow.cpp -@@ -150,6 +150,7 @@ QWidgetWindow::QWidgetWindow(QWidget *widget) - : QWindow(*new QWidgetWindowPrivate(), 0) - , m_widget(widget) - { -+ setTitle(widget->windowTitle()); - updateObjectName(); - // Enable QOpenGLWidget/QQuickWidget children if the platform plugin supports it, - // and the application developer has not explicitly disabled it. diff --git a/repos/libports/src/lib/qt5/patches/qtdeclarative_configuration.patch b/repos/libports/src/lib/qt5/patches/qtdeclarative_configuration.patch deleted file mode 100644 index f652b8e739..0000000000 --- a/repos/libports/src/lib/qt5/patches/qtdeclarative_configuration.patch +++ /dev/null @@ -1,16 +0,0 @@ -qtdeclarative_configuration.patch - -diff --git a/qtdeclarative/tools/tools.pro b/qtdeclarative/tools/tools.pro -index 73cb6e2..462b197 100644 ---- a/qtdeclarative/tools/tools.pro -+++ b/qtdeclarative/tools/tools.pro -@@ -20,8 +20,7 @@ qtConfig(thread):!android|android_app:!wasm { - qtHaveModule(quick) { - !static: { - SUBDIRS += \ -- qmlscene \ -- qmltime -+ qmlscene - - qtConfig(regularexpression):qtConfig(process) { - SUBDIRS += \ diff --git a/repos/libports/src/lib/qt5/patches/qtdeclarative_generated.patch b/repos/libports/src/lib/qt5/patches/qtdeclarative_generated.patch deleted file mode 100644 index 5fc7cd9080..0000000000 --- a/repos/libports/src/lib/qt5/patches/qtdeclarative_generated.patch +++ /dev/null @@ -1,183 +0,0 @@ -qtdeclarative_generated.patch - -diff --git a/qtdeclarative/include/QtQml/5.13.0/QtQml/private/qqmljsgrammar_p.h b/qtdeclarative/include/QtQml/5.13.0/QtQml/private/qqmljsgrammar_p.h -new file mode 100644 -index 0000000..ab3ad73 ---- /dev/null -+++ b/qtdeclarative/include/QtQml/5.13.0/QtQml/private/qqmljsgrammar_p.h -@@ -0,0 +1 @@ -+#include "../../../../../src/qml/qqmljsgrammar_p.h" -diff --git a/qtdeclarative/include/QtQml/5.13.0/QtQml/private/qqmljsparser_p.h b/qtdeclarative/include/QtQml/5.13.0/QtQml/private/qqmljsparser_p.h -new file mode 100644 -index 0000000..deb9e72 ---- /dev/null -+++ b/qtdeclarative/include/QtQml/5.13.0/QtQml/private/qqmljsparser_p.h -@@ -0,0 +1 @@ -+#include "../../../../../src/qml/qqmljsparser_p.h" -diff --git a/qtdeclarative/include/QtQml/5.13.0/QtQml/private/qtqml-config_p.h b/qtdeclarative/include/QtQml/5.13.0/QtQml/private/qtqml-config_p.h -new file mode 100644 -index 0000000..1fdbd71 ---- /dev/null -+++ b/qtdeclarative/include/QtQml/5.13.0/QtQml/private/qtqml-config_p.h -@@ -0,0 +1 @@ -+#include "../../../../../src/qml/qtqml-config_p.h" -diff --git a/qtdeclarative/include/QtQml/QtQmlDepends b/qtdeclarative/include/QtQml/QtQmlDepends -new file mode 100644 -index 0000000..bdbffd6 ---- /dev/null -+++ b/qtdeclarative/include/QtQml/QtQmlDepends -@@ -0,0 +1,5 @@ -+/* This file was generated by qmake with the info from /src/qml/qml.pro. */ -+#ifdef __cplusplus /* create empty PCH in C mode */ -+#include -+#include -+#endif -diff --git a/qtdeclarative/include/QtQml/qtqml-config.h b/qtdeclarative/include/QtQml/qtqml-config.h -new file mode 100644 -index 0000000..48fe1f2 ---- /dev/null -+++ b/qtdeclarative/include/QtQml/qtqml-config.h -@@ -0,0 +1 @@ -+#include "../../src/qml/qtqml-config.h" -diff --git a/qtdeclarative/include/QtQuick/5.13.0/QtQuick/private/qtquick-config_p.h b/qtdeclarative/include/QtQuick/5.13.0/QtQuick/private/qtquick-config_p.h -new file mode 100644 -index 0000000..fcdf423 ---- /dev/null -+++ b/qtdeclarative/include/QtQuick/5.13.0/QtQuick/private/qtquick-config_p.h -@@ -0,0 +1 @@ -+#include "../../../../../src/quick/qtquick-config_p.h" -diff --git a/qtdeclarative/include/QtQuick/QtQuickDepends b/qtdeclarative/include/QtQuick/QtQuickDepends -new file mode 100644 -index 0000000..d39ee68 ---- /dev/null -+++ b/qtdeclarative/include/QtQuick/QtQuickDepends -@@ -0,0 +1,6 @@ -+/* This file was generated by qmake with the info from /src/quick/quick.pro. */ -+#ifdef __cplusplus /* create empty PCH in C mode */ -+#include -+#include -+#include -+#endif -diff --git a/qtdeclarative/include/QtQuick/qtquick-config.h b/qtdeclarative/include/QtQuick/qtquick-config.h -new file mode 100644 -index 0000000..2ab295b ---- /dev/null -+++ b/qtdeclarative/include/QtQuick/qtquick-config.h -@@ -0,0 +1 @@ -+#include "../../src/quick/qtquick-config.h" -diff --git a/qtdeclarative/include/QtQuickParticles/QtQuickParticlesDepends b/qtdeclarative/include/QtQuickParticles/QtQuickParticlesDepends -new file mode 100644 -index 0000000..ae06770 ---- /dev/null -+++ b/qtdeclarative/include/QtQuickParticles/QtQuickParticlesDepends -@@ -0,0 +1,7 @@ -+/* This file was generated by qmake with the info from /src/particles/particles.pro. */ -+#ifdef __cplusplus /* create empty PCH in C mode */ -+#include -+#include -+#include -+#include -+#endif -diff --git a/qtdeclarative/include/QtQuickShapes/QtQuickShapesDepends b/qtdeclarative/include/QtQuickShapes/QtQuickShapesDepends -new file mode 100644 -index 0000000..f1be23e ---- /dev/null -+++ b/qtdeclarative/include/QtQuickShapes/QtQuickShapesDepends -@@ -0,0 +1,7 @@ -+/* This file was generated by qmake with the info from /src/quickshapes/quickshapes.pro. */ -+#ifdef __cplusplus /* create empty PCH in C mode */ -+#include -+#include -+#include -+#include -+#endif -diff --git a/qtdeclarative/include/QtQuickTest/QtQuickTestDepends b/qtdeclarative/include/QtQuickTest/QtQuickTestDepends -new file mode 100644 -index 0000000..a2d1dcf ---- /dev/null -+++ b/qtdeclarative/include/QtQuickTest/QtQuickTestDepends -@@ -0,0 +1,6 @@ -+/* This file was generated by qmake with the info from /src/qmltest/qmltest.pro. */ -+#ifdef __cplusplus /* create empty PCH in C mode */ -+#include -+#include -+#include -+#endif -diff --git a/qtdeclarative/include/QtQuickWidgets/QtQuickWidgetsDepends b/qtdeclarative/include/QtQuickWidgets/QtQuickWidgetsDepends -new file mode 100644 -index 0000000..6b0980a ---- /dev/null -+++ b/qtdeclarative/include/QtQuickWidgets/QtQuickWidgetsDepends -@@ -0,0 +1,8 @@ -+/* This file was generated by qmake with the info from /src/quickwidgets/quickwidgets.pro. */ -+#ifdef __cplusplus /* create empty PCH in C mode */ -+#include -+#include -+#include -+#include -+#include -+#endif -diff --git a/qtdeclarative/src/qml/qml_compile_hash_p.h b/qtdeclarative/src/qml/qml_compile_hash_p.h -new file mode 100644 -index 0000000..55c2602 ---- /dev/null -+++ b/qtdeclarative/src/qml/qml_compile_hash_p.h -@@ -0,0 +1,3 @@ -+// Generated file, DO NOT EDIT -+#define QML_COMPILE_HASH "ecc092fa5519e77a47ef560f0137b4cd5f417c5e" -+#define QML_COMPILE_HASH_LENGTH 40 -diff --git a/qtdeclarative/src/qml/qtqml-config.h b/qtdeclarative/src/qml/qtqml-config.h -new file mode 100644 -index 0000000..e04a385 ---- /dev/null -+++ b/qtdeclarative/src/qml/qtqml-config.h -@@ -0,0 +1,2 @@ -+#define QT_FEATURE_qml_debug -1 -+#define QT_FEATURE_qml_network 1 -diff --git a/qtdeclarative/src/qml/qtqml-config_p.h b/qtdeclarative/src/qml/qtqml-config_p.h -new file mode 100644 -index 0000000..190ec50 ---- /dev/null -+++ b/qtdeclarative/src/qml/qtqml-config_p.h -@@ -0,0 +1,12 @@ -+#define QT_FEATURE_cxx14_make_unique 1 -+#define QT_FEATURE_qml_animation 1 -+#define QT_FEATURE_qml_delegate_model 1 -+#define QT_FEATURE_qml_devtools 1 -+#define QT_FEATURE_qml_list_model 1 -+#define QT_FEATURE_qml_locale 1 -+#define QT_FEATURE_qml_preview -1 -+#define QT_FEATURE_qml_profiler -1 -+#define QT_FEATURE_qml_sequence_object 1 -+#define QT_FEATURE_qml_tracing -1 -+#define QT_FEATURE_qml_worker_script 1 -+#define QT_FEATURE_qml_xml_http_request 1 -diff --git a/qtdeclarative/src/quick/qtquick-config.h b/qtdeclarative/src/quick/qtquick-config.h -new file mode 100644 -index 0000000..a224374 ---- /dev/null -+++ b/qtdeclarative/src/quick/qtquick-config.h -@@ -0,0 +1 @@ -+#define QT_FEATURE_d3d12 -1 -diff --git a/qtdeclarative/src/quick/qtquick-config_p.h b/qtdeclarative/src/quick/qtquick-config_p.h -new file mode 100644 -index 0000000..9c6e6e0 ---- /dev/null -+++ b/qtdeclarative/src/quick/qtquick-config_p.h -@@ -0,0 +1,16 @@ -+#define QT_FEATURE_quick_animatedimage 1 -+#define QT_FEATURE_quick_shadereffect 1 -+#define QT_FEATURE_quick_path 1 -+#define QT_FEATURE_quick_canvas 1 -+#define QT_FEATURE_quick_designer 1 -+#define QT_FEATURE_quick_flipable 1 -+#define QT_FEATURE_quick_gridview 1 -+#define QT_FEATURE_quick_itemview 1 -+#define QT_FEATURE_quick_listview 1 -+#define QT_FEATURE_quick_sprite 1 -+#define QT_FEATURE_quick_particles 1 -+#define QT_FEATURE_quick_pathview 1 -+#define QT_FEATURE_quick_positioners 1 -+#define QT_FEATURE_quick_repeater 1 -+#define QT_FEATURE_quick_tableview 1 -+#define QT_FEATURE_quick_viewtransitions 1 diff --git a/repos/libports/src/lib/qt5/patches/qtdeclarative_genode.patch b/repos/libports/src/lib/qt5/patches/qtdeclarative_genode.patch deleted file mode 100644 index a7d0b104df..0000000000 --- a/repos/libports/src/lib/qt5/patches/qtdeclarative_genode.patch +++ /dev/null @@ -1,44 +0,0 @@ -qtdeclarative_genode.patch - -diff --git a/qtdeclarative/src/qml/jsruntime/qv4engine.cpp b/qtdeclarative/src/qml/jsruntime/qv4engine.cpp -index f5c5c49..1d70dce 100644 ---- a/qtdeclarative/src/qml/jsruntime/qv4engine.cpp -+++ b/qtdeclarative/src/qml/jsruntime/qv4engine.cpp -@@ -133,6 +133,10 @@ - - #endif // #ifndef V4_BOOTSTRAP - -+#if defined(Q_OS_GENODE) -+#include -+#endif -+ - QT_BEGIN_NAMESPACE - - Q_LOGGING_CATEGORY(lcTracingAll, "qt.v4.tracing.all") -diff --git a/qtdeclarative/src/qml/jsruntime/qv4global_p.h b/qtdeclarative/src/qml/jsruntime/qv4global_p.h -index d47393b..f0123b3 100644 ---- a/qtdeclarative/src/qml/jsruntime/qv4global_p.h -+++ b/qtdeclarative/src/qml/jsruntime/qv4global_p.h -@@ -116,7 +116,7 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); } - - // Black list some platforms - #if defined(V4_ENABLE_JIT) --#if defined(Q_OS_IOS) || defined(Q_OS_TVOS) -+#if defined(Q_OS_IOS) || defined(Q_OS_TVOS) || defined(Q_OS_GENODE) - # undef V4_ENABLE_JIT - #endif - #endif -diff --git a/qtdeclarative/src/qml/qml/qqmlimport.cpp b/qtdeclarative/src/qml/qml/qqmlimport.cpp -index 5a13644..2b8c225 100644 ---- a/qtdeclarative/src/qml/qml/qqmlimport.cpp -+++ b/qtdeclarative/src/qml/qml/qqmlimport.cpp -@@ -1913,6 +1913,9 @@ QString QQmlImportDatabase::resolvePlugin(QQmlTypeLoader *typeLoader, - QLatin1String(".so"), - QLatin1String(".bundle") - }; -+#elif defined(Q_OS_GENODE) -+ static const QString prefix = QLatin1String("qt5_"); -+ static const QStringList suffixes = { QLatin1String(".lib.so") }; - # else // Unix - static const QString prefix = QLatin1String("lib"); - static const QStringList suffixes = { QLatin1String(".so") }; diff --git a/repos/libports/src/lib/qt5/patches/qtquickcontrols2_generated.patch b/repos/libports/src/lib/qt5/patches/qtquickcontrols2_generated.patch deleted file mode 100644 index 01ebe8aead..0000000000 --- a/repos/libports/src/lib/qt5/patches/qtquickcontrols2_generated.patch +++ /dev/null @@ -1,67 +0,0 @@ -qtquickcontrols2_generated.patch - -diff --git a/qtquickcontrols2/src/imports/controls/qmake_QtQuick_Controls_2.qrc b/qtquickcontrols2/src/imports/controls/qmake_QtQuick_Controls_2.qrc -new file mode 100644 -index 0000000..9a0d4e2 ---- /dev/null -+++ b/qtquickcontrols2/src/imports/controls/qmake_QtQuick_Controls_2.qrc -@@ -0,0 +1,59 @@ -+ -+ -+AbstractButton.qml -+Action.qml -+ActionGroup.qml -+ApplicationWindow.qml -+BusyIndicator.qml -+Button.qml -+ButtonGroup.qml -+CheckBox.qml -+CheckDelegate.qml -+ComboBox.qml -+Container.qml -+Control.qml -+DelayButton.qml -+Dial.qml -+Dialog.qml -+DialogButtonBox.qml -+Drawer.qml -+Frame.qml -+GroupBox.qml -+ItemDelegate.qml -+Label.qml -+Menu.qml -+MenuBar.qml -+MenuBarItem.qml -+MenuItem.qml -+MenuSeparator.qml -+Page.qml -+PageIndicator.qml -+Pane.qml -+Popup.qml -+ProgressBar.qml -+RadioButton.qml -+RadioDelegate.qml -+RangeSlider.qml -+RoundButton.qml -+ScrollBar.qml -+ScrollIndicator.qml -+ScrollView.qml -+Slider.qml -+SpinBox.qml -+SplitView.qml -+StackView.qml -+SwipeDelegate.qml -+Switch.qml -+SwitchDelegate.qml -+SwipeView.qml -+TabBar.qml -+TabButton.qml -+TextArea.qml -+TextField.qml -+ToolBar.qml -+ToolButton.qml -+ToolSeparator.qml -+ToolTip.qml -+Tumbler.qml -+ -+ diff --git a/repos/libports/src/lib/qt5/patches/qtscriptclassic_qt5.patch b/repos/libports/src/lib/qt5/patches/qtscriptclassic_qt5.patch deleted file mode 100644 index 4b61724aec..0000000000 --- a/repos/libports/src/lib/qt5/patches/qtscriptclassic_qt5.patch +++ /dev/null @@ -1,456 +0,0 @@ -qtscriptclassic_qt5.patch - -diff --git a/src/qscriptcontextinfo.cpp b/src/qscriptcontextinfo.cpp -index ef080ff..df0e555 100644 ---- a/src/qscriptcontextinfo.cpp -+++ b/src/qscriptcontextinfo.cpp -@@ -108,7 +108,6 @@ QT_BEGIN_NAMESPACE - QScriptContextInfoPrivate::QScriptContextInfoPrivate() - : q_ptr(0) - { -- ref = 0; - functionType = QScriptContextInfo::NativeFunction; - functionMetaIndex = -1; - functionStartLineNumber = -1; -@@ -125,7 +124,6 @@ QScriptContextInfoPrivate::QScriptContextInfoPrivate(const QScriptContext *conte - : q_ptr(0) - { - Q_ASSERT(context); -- ref = 0; - functionType = QScriptContextInfo::NativeFunction; - functionMetaIndex = -1; - functionStartLineNumber = -1; -diff --git a/src/qscriptecmafunction.cpp b/src/qscriptecmafunction.cpp -index 7ba4596..fade83f 100644 ---- a/src/qscriptecmafunction.cpp -+++ b/src/qscriptecmafunction.cpp -@@ -328,7 +328,7 @@ QScriptValueImpl Function::method_disconnect(QScriptContextPrivate *context, QSc - return context->throwError(QScriptContext::TypeError, - QString::fromLatin1("Function.prototype.disconnect: %0::%1 is not a signal") - .arg(QLatin1String(qtSignal->metaObject()->className())) -- .arg(QLatin1String(sig.signature()))); -+ .arg(QLatin1String(sig.methodSignature()))); - } - - QScriptValueImpl receiver; -@@ -357,7 +357,7 @@ QScriptValueImpl Function::method_disconnect(QScriptContextPrivate *context, QSc - return context->throwError( - QString::fromLatin1("Function.prototype.disconnect: failed to disconnect from %0::%1") - .arg(QLatin1String(qtSignal->metaObject()->className())) -- .arg(QLatin1String(sig.signature()))); -+ .arg(QLatin1String(sig.methodSignature()))); - } - return eng->undefinedValue(); - #else -@@ -399,20 +399,20 @@ QScriptValueImpl Function::method_connect(QScriptContextPrivate *context, QScrip - return context->throwError(QScriptContext::TypeError, - QString::fromLatin1("Function.prototype.connect: %0::%1 is not a signal") - .arg(QLatin1String(qtSignal->metaObject()->className())) -- .arg(QLatin1String(sig.signature()))); -+ .arg(QLatin1String(sig.methodSignature()))); - } - - { - QList overloads = qtSignal->overloadedIndexes(); - if (!overloads.isEmpty()) { - overloads.append(qtSignal->initialIndex()); -- QByteArray signature = sig.signature(); -+ QByteArray signature = sig.methodSignature(); - QString message = QString::fromLatin1("Function.prototype.connect: ambiguous connect to %0::%1(); candidates are\n") - .arg(QLatin1String(qtSignal->metaObject()->className())) - .arg(QLatin1String(signature.left(signature.indexOf('(')))); - for (int i = 0; i < overloads.size(); ++i) { - QMetaMethod mtd = meta->method(overloads.at(i)); -- message.append(QString::fromLatin1(" %0\n").arg(QString::fromLatin1(mtd.signature()))); -+ message.append(QString::fromLatin1(" %0\n").arg(QString::fromLatin1(mtd.methodSignature()))); - } - message.append(QString::fromLatin1("Use e.g. object['%0'].connect() to connect to a particular overload") - .arg(QLatin1String(signature))); -@@ -446,7 +446,7 @@ QScriptValueImpl Function::method_connect(QScriptContextPrivate *context, QScrip - return context->throwError( - QString::fromLatin1("Function.prototype.connect: failed to connect to %0::%1") - .arg(QLatin1String(qtSignal->metaObject()->className())) -- .arg(QLatin1String(sig.signature()))); -+ .arg(QLatin1String(sig.methodSignature()))); - } - return eng->undefinedValue(); - #else -diff --git a/src/qscriptengine_p.cpp b/src/qscriptengine_p.cpp -index d36b605..4e9076d 100644 ---- a/src/qscriptengine_p.cpp -+++ b/src/qscriptengine_p.cpp -@@ -1436,7 +1436,6 @@ QScriptValueImpl QScriptEnginePrivate::create(int type, const void *ptr) - #endif - #ifndef QT_NO_QOBJECT - case QMetaType::QObjectStar: -- case QMetaType::QWidgetStar: - newQObject(&result, *reinterpret_cast(ptr)); - break; - #endif -@@ -1448,6 +1447,10 @@ QScriptValueImpl QScriptEnginePrivate::create(int type, const void *ptr) - } - - #ifndef QT_NO_QOBJECT -+ else if (type == qMetaTypeId()) { -+ newQObject(&result, *reinterpret_cast(ptr)); -+ } -+ - // lazy registration of some common list types - else if (type == qMetaTypeId()) { - qScriptRegisterSequenceMetaType(q); -@@ -1563,14 +1566,6 @@ bool QScriptEnginePrivate::convert(const QScriptValueImpl &value, - *reinterpret_cast(ptr) = value.toQObject(); - return true; - } break; -- case QMetaType::QWidgetStar: -- if (value.isQObject() || value.isNull()) { -- QObject *qo = value.toQObject(); -- if (!qo || qo->isWidgetType()) { -- *reinterpret_cast(ptr) = reinterpret_cast(qo); -- return true; -- } -- } break; - #endif - case QMetaType::QStringList: - if (value.isArray()) { -@@ -1588,6 +1583,17 @@ bool QScriptEnginePrivate::convert(const QScriptValueImpl &value, - return true; - } break; - default: -+#ifndef QT_NO_QOBJECT -+ if (type == qMetaTypeId()) { -+ if (value.isQObject() || value.isNull()) { -+ QObject *qo = value.toQObject(); -+ if (!qo || qo->isWidgetType()) { -+ *reinterpret_cast(ptr) = reinterpret_cast(qo); -+ return true; -+ } -+ } -+ } -+#endif - ; - } - -@@ -2609,6 +2615,7 @@ static QScriptValueImpl qsTranslate(QScriptContextPrivate *ctx, QScriptEnginePri - QString comment; - if (ctx->argumentCount() > 2) - comment = ctx->argument(2).toString(); -+#if 0 - QCoreApplication::Encoding encoding = QCoreApplication::CodecForTr; - if (ctx->argumentCount() > 3) { - QString encStr = ctx->argument(3).toString(); -@@ -2619,6 +2626,7 @@ static QScriptValueImpl qsTranslate(QScriptContextPrivate *ctx, QScriptEnginePri - else - return ctx->throwError(QString::fromLatin1("qsTranslate(): invalid encoding '%s'").arg(encStr)); - } -+#endif - int n = -1; - if (ctx->argumentCount() > 4) - n = ctx->argument(4).toInt32(); -@@ -2628,7 +2636,7 @@ static QScriptValueImpl qsTranslate(QScriptContextPrivate *ctx, QScriptEnginePri - result = QCoreApplication::translate(context.toLatin1().constData(), - text.toLatin1().constData(), - comment.toLatin1().constData(), -- encoding, n); -+ n); - #else - result = text; - #endif -@@ -2669,7 +2677,7 @@ static QScriptValueImpl qsTr(QScriptContextPrivate *ctx, QScriptEnginePrivate *e - result = QCoreApplication::translate(context.toLatin1().constData(), - text.toLatin1().constData(), - comment.toLatin1().constData(), -- QCoreApplication::CodecForTr, n); -+ n); - #else - result = text; - #endif -diff --git a/src/qscriptextqobject.cpp b/src/qscriptextqobject.cpp -index 06db925..cbf4e2a 100644 ---- a/src/qscriptextqobject.cpp -+++ b/src/qscriptextqobject.cpp -@@ -98,9 +98,9 @@ namespace QScript { - class QObjectNotifyCaller : public QObject - { - public: -- void callConnectNotify(const char *signal) -+ void callConnectNotify(const QMetaMethod &signal) - { connectNotify(signal); } -- void callDisconnectNotify(const char *signal) -+ void callDisconnectNotify(const QMetaMethod &signal) - { disconnectNotify(signal); } - }; - -@@ -135,7 +135,7 @@ public: - - static inline QByteArray methodName(const QMetaMethod &method) - { -- QByteArray signature = method.signature(); -+ QByteArray signature = method.methodSignature(); - return signature.left(signature.indexOf('(')); - } - -@@ -555,22 +555,22 @@ static void callQtMethod(QScriptContextPrivate *context, QMetaMethod::MethodType - } else if (actual.isQObject()) { - switch (tid) { - case QMetaType::QObjectStar: -- case QMetaType::QWidgetStar: - // perfect - break; - default: -- matchDistance += 10; -+ if (tid != qMetaTypeId()) -+ matchDistance += 10; - break; - } - } else if (actual.isNull()) { - switch (tid) { - case QMetaType::VoidStar: - case QMetaType::QObjectStar: -- case QMetaType::QWidgetStar: - // perfect - break; - default: -- if (!argType.name().endsWith('*')) -+ if (!argType.name().endsWith('*') && -+ (tid != qMetaTypeId())) - matchDistance += 10; - break; - } -@@ -647,7 +647,7 @@ static void callQtMethod(QScriptContextPrivate *context, QMetaMethod::MethodType - if (i > 0) - message += QLatin1String("\n"); - QMetaMethod mtd = metaMethod(meta, callType, conversionFailed.at(i)); -- message += QString::fromLatin1(" %0").arg(QString::fromLatin1(mtd.signature())); -+ message += QString::fromLatin1(" %0").arg(QString::fromLatin1(mtd.methodSignature())); - } - result = context->throwError(QScriptContext::TypeError, message); - } else if (!unresolved.isEmpty()) { -@@ -674,7 +674,7 @@ static void callQtMethod(QScriptContextPrivate *context, QMetaMethod::MethodType - if (i > 0) - message += QLatin1String("\n"); - QMetaMethod mtd = metaMethod(meta, callType, tooFewArgs.at(i)); -- message += QString::fromLatin1(" %0").arg(QString::fromLatin1(mtd.signature())); -+ message += QString::fromLatin1(" %0").arg(QString::fromLatin1(mtd.methodSignature())); - } - result = context->throwError(QScriptContext::SyntaxError, message); - } -@@ -691,7 +691,7 @@ static void callQtMethod(QScriptContextPrivate *context, QMetaMethod::MethodType - if (i > 0) - message += QLatin1String("\n"); - QMetaMethod mtd = metaMethod(meta, callType, candidates.at(i).index); -- message += QString::fromLatin1(" %0").arg(QString::fromLatin1(mtd.signature())); -+ message += QString::fromLatin1(" %0").arg(QString::fromLatin1(mtd.methodSignature())); - } - result = context->throwError(QScriptContext::TypeError, message); - } else { -@@ -847,7 +847,7 @@ bool ExtQObjectDataIterator::hasNext() const - for ( ; i < meta->methodCount(); ++i) { - QMetaMethod method = meta->method(i); - if (hasMethodAccess(method, i, inst->options) -- && !isObjectProperty(m_object, method.signature())) { -+ && !isObjectProperty(m_object, method.methodSignature())) { - return true; - } - } -@@ -909,9 +909,9 @@ void ExtQObjectDataIterator::next(QScript::Member *member) - for ( ; i < meta->methodCount(); ++i) { - QMetaMethod method = meta->method(i); - if (hasMethodAccess(method, i, inst->options) -- && !isObjectProperty(m_object, method.signature())) { -+ && !isObjectProperty(m_object, method.methodSignature())) { - QMetaMethod method = meta->method(i); -- QScriptNameIdImpl *nameId = eng->nameId(QLatin1String(method.signature())); -+ QScriptNameIdImpl *nameId = eng->nameId(QLatin1String(method.methodSignature())); - member->native(nameId, i, - QScriptValue::QObjectMember - | METHOD_ID); -@@ -941,7 +941,7 @@ bool ExtQObjectDataIterator::hasPrevious() const - for ( ; i >= limit; --i) { - QMetaMethod method = meta->method(i); - if (hasMethodAccess(method, i, inst->options) -- && !isObjectProperty(m_object, method.signature())) { -+ && !isObjectProperty(m_object, method.methodSignature())) { - return true; - } - } -@@ -993,9 +993,9 @@ void ExtQObjectDataIterator::previous(QScript::Member *member) - for ( ; i >= limit; --i) { - QMetaMethod method = meta->method(i); - if (hasMethodAccess(method, i, inst->options) -- && !isObjectProperty(m_object, method.signature())) { -+ && !isObjectProperty(m_object, method.methodSignature())) { - QMetaMethod method = meta->method(i); -- QScriptNameIdImpl *nameId = eng->nameId(QLatin1String(method.signature())); -+ QScriptNameIdImpl *nameId = eng->nameId(QLatin1String(method.methodSignature())); - member->native(nameId, i, - QScriptValue::QObjectMember - | METHOD_ID); -@@ -1508,7 +1508,7 @@ QScriptValueImpl QScript::ExtQObject::method_findChild(QScriptContextPrivate *co - if (Instance *instance = Instance::get(context->thisObject(), classInfo)) { - QObject *obj = instance->value; - QString name = context->argument(0).toString(); -- QObject *child = qFindChild(obj, name); -+ QObject *child = obj->findChild(name); - QScriptEngine::QObjectWrapOptions opt = QScriptEngine::PreferExistingWrapperObject; - QScriptValueImpl result; - eng->newQObject(&result, child, QScriptEngine::QtOwnership, opt); -@@ -1526,12 +1526,12 @@ QScriptValueImpl QScript::ExtQObject::method_findChildren(QScriptContextPrivate - #ifndef QT_NO_REGEXP - if (arg.isRegExp()) { - QRegExp re = arg.toRegExp(); -- found = qFindChildren(obj, re); -+ found = obj->findChildren(re); - } else - #endif - { - QString name = arg.isUndefined() ? QString() : arg.toString(); -- found = qFindChildren(obj, name); -+ found = obj->findChildren(name); - } - QScriptValueImpl result = eng->newArray(found.size()); - QScriptEngine::QObjectWrapOptions opt = QScriptEngine::PreferExistingWrapperObject; -@@ -1582,7 +1582,7 @@ static const char qt_meta_stringdata_QObjectConnectionManager[] = { - }; - - const QMetaObject QScript::QObjectConnectionManager::staticMetaObject = { -- { &QObject::staticMetaObject, qt_meta_stringdata_QObjectConnectionManager, -+ { &QObject::staticMetaObject, reinterpret_cast(qt_meta_stringdata_QObjectConnectionManager), - qt_meta_data_QObjectConnectionManager, 0 } - }; - -@@ -1684,7 +1684,7 @@ void QScript::QObjectConnectionManager::execute(int slotIndex, void **argv) - } else { - qWarning("QScriptEngine: Unable to handle unregistered datatype '%s' " - "when invoking handler of signal %s::%s", -- typeName.constData(), meta->className(), method.signature()); -+ typeName.constData(), meta->className(), method.methodSignature().constData()); - actual = eng->undefinedValue(); - } - } else { -@@ -1758,10 +1758,7 @@ bool QScript::QObjectConnectionManager::addSignalHandler( - if (ok) { - cs.append(QScript::QObjectConnection(m_slotCounter++, receiver, function, senderWrapper)); - QMetaMethod signal = sender->metaObject()->method(signalIndex); -- QByteArray signalString; -- signalString.append('2'); // signal code -- signalString.append(signal.signature()); -- static_cast(sender)->callConnectNotify(signalString); -+ static_cast(sender)->callConnectNotify(signal); - } - return ok; - } -@@ -1782,10 +1779,7 @@ bool QScript::QObjectConnectionManager::removeSignalHandler( - if (ok) { - cs.remove(i); - QMetaMethod signal = sender->metaObject()->method(signalIndex); -- QByteArray signalString; -- signalString.append('2'); // signal code -- signalString.append(signal.signature()); -- static_cast(sender)->callDisconnectNotify(signalString); -+ static_cast(sender)->callDisconnectNotify(signal); - } - return ok; - } -diff --git a/src/qscriptstring.cpp b/src/qscriptstring.cpp -index 1ed7f33..2436061 100644 ---- a/src/qscriptstring.cpp -+++ b/src/qscriptstring.cpp -@@ -88,7 +88,6 @@ QT_BEGIN_NAMESPACE - QScriptStringPrivate::QScriptStringPrivate() - : nameId(0), engine(0), q_ptr(0) - { -- ref = 0; - } - - /*! -diff --git a/src/qscriptsyntaxcheckresult_p.h b/src/qscriptsyntaxcheckresult_p.h -index bd6ef51..ed32383 100644 ---- a/src/qscriptsyntaxcheckresult_p.h -+++ b/src/qscriptsyntaxcheckresult_p.h -@@ -72,7 +72,7 @@ QT_BEGIN_NAMESPACE - class QScriptSyntaxCheckResultPrivate - { - public: -- QScriptSyntaxCheckResultPrivate() { ref = 0; } -+ QScriptSyntaxCheckResultPrivate() {} - ~QScriptSyntaxCheckResultPrivate() {} - - QScriptSyntaxCheckResult::State state; -diff --git a/src/qscriptvalue.cpp b/src/qscriptvalue.cpp -index 7fa655e..5d3d875 100644 ---- a/src/qscriptvalue.cpp -+++ b/src/qscriptvalue.cpp -@@ -347,7 +347,7 @@ QScriptValue::QScriptValue(QScriptEngine *engine, const char *val) - if (engine) { - QScriptValueImpl v; - QScriptEnginePrivate *eng_p = QScriptEnginePrivate::get(engine); -- eng_p->newString(&v, QString::fromAscii(val)); -+ eng_p->newString(&v, QString::fromLatin1(val)); - d_ptr = eng_p->registerValue(v); - d_ptr->ref.ref(); - } else { -@@ -453,7 +453,7 @@ QScriptValue::QScriptValue(const char *value) - : d_ptr(new QScriptValuePrivate) - { - d_ptr->value.m_type = QScript::LazyStringType; -- d_ptr->value.m_lazy_string_value = new QString(QString::fromAscii(value)); -+ d_ptr->value.m_lazy_string_value = new QString(QString::fromLatin1(value)); - d_ptr->ref.ref(); - } - #endif -diff --git a/src/qscriptvalue.h b/src/qscriptvalue.h -index 726fc26..a9c9ae9 100644 ---- a/src/qscriptvalue.h -+++ b/src/qscriptvalue.h -@@ -120,7 +120,7 @@ public: - QScriptValue(QScriptEngine *engine, qsreal val); - QScriptValue(QScriptEngine *engine, const QString &val); - #ifndef QT_NO_CAST_FROM_ASCII -- QT_ASCII_CAST_WARN_CONSTRUCTOR QScriptValue(QScriptEngine *engine, const char *val); -+ QT_ASCII_CAST_WARN QScriptValue(QScriptEngine *engine, const char *val); - #endif - - QScriptValue(SpecialValue value); -@@ -131,7 +131,7 @@ public: - QScriptValue(const QString &value); - QScriptValue(const QLatin1String &value); - #ifndef QT_NO_CAST_FROM_ASCII -- QT_ASCII_CAST_WARN_CONSTRUCTOR QScriptValue(const char *value); -+ QT_ASCII_CAST_WARN QScriptValue(const char *value); - #endif - - QScriptValue &operator=(const QScriptValue &other); -diff --git a/src/qscriptvalue_p.h b/src/qscriptvalue_p.h -index 7d891ed..86b62e4 100644 ---- a/src/qscriptvalue_p.h -+++ b/src/qscriptvalue_p.h -@@ -67,7 +67,6 @@ QT_BEGIN_NAMESPACE - inline QScriptValuePrivate::QScriptValuePrivate() - { - engine = 0; -- ref = 0; - } - - inline QScriptValuePrivate::~QScriptValuePrivate() -diff --git a/src/qscriptvalueimpl_p.h b/src/qscriptvalueimpl_p.h -index cf2695b..72b3252 100644 ---- a/src/qscriptvalueimpl_p.h -+++ b/src/qscriptvalueimpl_p.h -@@ -64,6 +64,7 @@ - #include "qscriptcontextfwd_p.h" - - #include -+#include - - QT_BEGIN_NAMESPACE - -@@ -348,7 +349,7 @@ inline QObject *QScriptValueImpl::toQObject() const - return data->value; - } else if (isVariant()) { - int type = variantValue().userType(); -- if ((type == QMetaType::QObjectStar) || (type == QMetaType::QWidgetStar)) -+ if ((type == QMetaType::QObjectStar) || (type == qMetaTypeId())) - return *reinterpret_cast(variantValue().constData()); - } - #endif diff --git a/repos/libports/src/lib/qt5/patches/qtscriptclassic_qt5_7.patch b/repos/libports/src/lib/qt5/patches/qtscriptclassic_qt5_7.patch deleted file mode 100644 index 6f5b64a5ec..0000000000 --- a/repos/libports/src/lib/qt5/patches/qtscriptclassic_qt5_7.patch +++ /dev/null @@ -1,37 +0,0 @@ -qtscriptclassic_qt5_7.patch - -diff --git a/src/qscriptengine_p.cpp b/src/qscriptengine_p.cpp -index 4e9076d..65ffcf0 100644 ---- a/src/qscriptengine_p.cpp -+++ b/src/qscriptengine_p.cpp -@@ -91,7 +91,7 @@ Q_DECLARE_METATYPE(QList) - - QT_BEGIN_NAMESPACE - --extern char *qdtoa(double d, int mode, int ndigits, int *decpt, int *sign, char **rve, char **digits_str); -+extern QString qdtoa(qreal d, int *decpt, int *sign); - extern double qstrtod(const char *s00, char const **se, bool *ok); - - namespace QScript { -@@ -112,10 +112,9 @@ QString numberToString(qsreal value) - - int decpt; - int sign; -- char *result = 0; -- (void) qdtoa(value, 0, 0, &decpt, &sign, 0, &result); -+ QString result = qdtoa(value, &decpt, &sign); - -- if (! result) -+ if (result.isEmpty()) - return QString(); - - else if (decpt <= 0 && decpt > -6) { -@@ -165,8 +164,6 @@ QString numberToString(qsreal value) - } - } - -- free(result); -- - return QString::fromLatin1(buf); - } - diff --git a/repos/libports/src/lib/qt5/patches/qtsvg_generated.patch b/repos/libports/src/lib/qt5/patches/qtsvg_generated.patch deleted file mode 100644 index b6e91ba28b..0000000000 --- a/repos/libports/src/lib/qt5/patches/qtsvg_generated.patch +++ /dev/null @@ -1,14 +0,0 @@ -qtsvg_generated.patch - -diff --git a/qtsvg/include/QtSvg/QtSvgDepends b/qtsvg/include/QtSvg/QtSvgDepends -new file mode 100644 -index 0000000..a4800e1 ---- /dev/null -+++ b/qtsvg/include/QtSvg/QtSvgDepends -@@ -0,0 +1,6 @@ -+/* This file was generated by qmake with the info from /src/svg/svg.pro. */ -+#ifdef __cplusplus /* create empty PCH in C mode */ -+#include -+#include -+#include -+#endif diff --git a/repos/libports/src/lib/qt5/patches/qttools_configuration.patch b/repos/libports/src/lib/qt5/patches/qttools_configuration.patch deleted file mode 100644 index ad4e21d6b1..0000000000 --- a/repos/libports/src/lib/qt5/patches/qttools_configuration.patch +++ /dev/null @@ -1,43 +0,0 @@ -qttools_configuration.patch - -diff --git a/qttools/src/designer/src/lib/lib.pro b/qttools/src/designer/src/lib/lib.pro -index de0dc73..c294782 100644 ---- a/qttools/src/designer/src/lib/lib.pro -+++ b/qttools/src/designer/src/lib/lib.pro -@@ -12,8 +12,8 @@ DEFINES += \ - static:DEFINES += QT_DESIGNER_STATIC - - include(extension/extension.pri) --include(sdk/sdk.pri) --include(shared/shared.pri) -+#include(sdk/sdk.pri) -+#include(shared/shared.pri) - include(uilib/uilib.pri) - PRECOMPILED_HEADER=lib_pch.h - -diff --git a/qttools/src/designer/src/src.pro b/qttools/src/designer/src/src.pro -index 79e9e64..bee94b6 100644 ---- a/qttools/src/designer/src/src.pro -+++ b/qttools/src/designer/src/src.pro -@@ -7,8 +7,6 @@ SUBDIRS = \ - qtConfig(process) { - SUBDIRS += \ - lib \ -- components \ -- designer - - lib.depends = uiplugin - components.depends = lib -diff --git a/qttools/src/src.pro b/qttools/src/src.pro -index 5c256ea..a7edd3b 100644 ---- a/qttools/src/src.pro -+++ b/qttools/src/src.pro -@@ -16,7 +16,7 @@ qtHaveModule(widgets) { - } - } - --SUBDIRS += linguist \ -+SUBDIRS += \ - qtattributionsscanner - - qtConfig(library) { diff --git a/repos/libports/src/lib/qt5/patches/qttools_generated.patch b/repos/libports/src/lib/qt5/patches/qttools_generated.patch deleted file mode 100644 index 23ea237786..0000000000 --- a/repos/libports/src/lib/qt5/patches/qttools_generated.patch +++ /dev/null @@ -1,14 +0,0 @@ -qttools_generated.patch - -diff --git a/qttools/include/QtUiTools/QtUiToolsDepends b/qttools/include/QtUiTools/QtUiToolsDepends -new file mode 100644 -index 0000000..fc2ca80 ---- /dev/null -+++ b/qttools/include/QtUiTools/QtUiToolsDepends -@@ -0,0 +1,6 @@ -+/* This file was generated by qmake with the info from /src/designer/src/uitools/uitools.pro. */ -+#ifdef __cplusplus /* create empty PCH in C mode */ -+#include -+#include -+#include -+#endif diff --git a/repos/libports/src/lib/qt5/patches/qtvirtualkeyboard_configuration.patch b/repos/libports/src/lib/qt5/patches/qtvirtualkeyboard_configuration.patch deleted file mode 100644 index 6f4d492a2f..0000000000 --- a/repos/libports/src/lib/qt5/patches/qtvirtualkeyboard_configuration.patch +++ /dev/null @@ -1,34 +0,0 @@ -qtvirtualkeyboard_configuration.patch - -diff --git a/qtvirtualkeyboard/src/config.pri b/qtvirtualkeyboard/src/config.pri -index 435ae5e..839f62c 100644 ---- a/qtvirtualkeyboard/src/config.pri -+++ b/qtvirtualkeyboard/src/config.pri -@@ -43,7 +43,7 @@ disable-layouts { - thai: CONFIG += lang-th_TH - - # Use all languages by default -- !contains(CONFIG, lang-.*): CONFIG += lang-all -+ !contains(CONFIG, lang-.*): CONFIG += lang-en_GB - - # Flag for activating all languages - lang-all: CONFIG += \ -diff --git a/qtvirtualkeyboard/src/virtualkeyboard/virtualkeyboard.pro b/qtvirtualkeyboard/src/virtualkeyboard/virtualkeyboard.pro -index cb28d6a..e832d66 100644 ---- a/qtvirtualkeyboard/src/virtualkeyboard/virtualkeyboard.pro -+++ b/qtvirtualkeyboard/src/virtualkeyboard/virtualkeyboard.pro -@@ -405,10 +405,10 @@ OTHER_FILES += \ - SOURCES += desktopinputpanel.cpp inputview.cpp - HEADERS += desktopinputpanel_p.h inputview_p.h - DEFINES += QT_VIRTUALKEYBOARD_DESKTOP -- !no-pkg-config:packagesExist(xcb) { -- PKGCONFIG += xcb xcb-xfixes -- DEFINES += QT_VIRTUALKEYBOARD_HAVE_XCB -- } -+# !no-pkg-config:packagesExist(xcb) { -+# PKGCONFIG += xcb xcb-xfixes -+# DEFINES += QT_VIRTUALKEYBOARD_HAVE_XCB -+# } - } - - record-trace-input { diff --git a/repos/libports/src/lib/qt5/patches/qtvirtualkeyboard_generated.patch b/repos/libports/src/lib/qt5/patches/qtvirtualkeyboard_generated.patch deleted file mode 100644 index d363064910..0000000000 --- a/repos/libports/src/lib/qt5/patches/qtvirtualkeyboard_generated.patch +++ /dev/null @@ -1,22 +0,0 @@ -qtvirtualkeyboard_generated.patch - -diff --git a/qtvirtualkeyboard/src/virtualkeyboard/qmake_virtualkeyboard_layouts.qrc b/qtvirtualkeyboard/src/virtualkeyboard/qmake_virtualkeyboard_layouts.qrc -new file mode 100644 -index 0000000..a6e60dc ---- /dev/null -+++ b/qtvirtualkeyboard/src/virtualkeyboard/qmake_virtualkeyboard_layouts.qrc -@@ -0,0 +1,14 @@ -+ -+ -+content/layouts/fallback/dialpad.qml -+content/layouts/fallback/digits.qml -+content/layouts/fallback/numbers.qml -+content/layouts/fallback/main.qml -+content/layouts/fallback/symbols.qml -+content/layouts/en_GB/dialpad.fallback -+content/layouts/en_GB/digits.fallback -+content/layouts/en_GB/main.fallback -+content/layouts/en_GB/numbers.fallback -+content/layouts/en_GB/symbols.fallback -+ -+ diff --git a/repos/libports/src/lib/qt5/patches/qtwebkit_configuration.patch b/repos/libports/src/lib/qt5/patches/qtwebkit_configuration.patch deleted file mode 100644 index 66446fd57c..0000000000 --- a/repos/libports/src/lib/qt5/patches/qtwebkit_configuration.patch +++ /dev/null @@ -1,128 +0,0 @@ -qtwebkit_configuration.patch - -diff --git a/.gitmodules b/.gitmodules -index 008555c..0cea9ba 100644 ---- a/.gitmodules -+++ b/.gitmodules -@@ -385,4 +385,8 @@ - path = qtcoap - url = ../qtcoap.git - branch = 5.13.0 -- status = preview -\ No newline at end of file -+ status = preview -+[submodule "qtwebkit"] -+ depends = qtbase -+ path = qtwebkit -+ project = WebKit.pro -diff --git a/qtwebkit/Tools/qmake/mkspecs/features/configure.prf b/qtwebkit/Tools/qmake/mkspecs/features/configure.prf -index 23d9904..6ea194f 100644 ---- a/qtwebkit/Tools/qmake/mkspecs/features/configure.prf -+++ b/qtwebkit/Tools/qmake/mkspecs/features/configure.prf -@@ -49,7 +49,6 @@ defineTest(runConfigure) { - - WEBKIT_CONFIG += \ - build_webkit1 \ -- build_webkit2 \ - build_tests \ - $$WEBKIT_TOOLS_CONFIG - -diff --git a/qtwebkit/Tools/qmake/mkspecs/features/features.prf b/qtwebkit/Tools/qmake/mkspecs/features/features.prf -index 328a8be..91e2c07 100644 ---- a/qtwebkit/Tools/qmake/mkspecs/features/features.prf -+++ b/qtwebkit/Tools/qmake/mkspecs/features/features.prf -@@ -37,14 +37,14 @@ defineTest(detectFeatures) { - qtHaveModule(printsupport): WEBKIT_CONFIG += have_qtprintsupport - qtHaveModule(widgets): WEBKIT_CONFIG += have_qstyle - qtHaveModule(testlib): WEBKIT_CONFIG += have_qttestlib -- qtHaveModule(positioning): WEBKIT_CONFIG += have_qtpositioning -- qtHaveModule(sensors): WEBKIT_CONFIG += have_qtsensors -+ #qtHaveModule(positioning): WEBKIT_CONFIG += have_qtpositioning -+ #qtHaveModule(sensors): WEBKIT_CONFIG += have_qtsensors - -- config_libxml2: WEBKIT_CONFIG += use_libxml2 -- config_libxslt: WEBKIT_CONFIG += xslt -- config_libzlib: WEBKIT_CONFIG += use_zlib -- config_libwebp: WEBKIT_CONFIG += use_webp -- config_leveldb: WEBKIT_CONFIG += use_system_leveldb -+ #config_libxml2: WEBKIT_CONFIG += use_libxml2 -+ #config_libxslt: WEBKIT_CONFIG += xslt -+ #config_libzlib: WEBKIT_CONFIG += use_zlib -+ #config_libwebp: WEBKIT_CONFIG += use_webp -+ #config_leveldb: WEBKIT_CONFIG += use_system_leveldb - - # We can't use Qt's 3rdparty sources for libjpeg and libpng outside of qtbase, but if Qt - # is using the system libraries, use them to take advantage of the WebCore image decoders as well. -@@ -56,10 +56,10 @@ defineTest(detectFeatures) { - else: CONFIGURE_WARNINGS += "Qt not configured to use system libpng, QImageDecoder will decode PNG images" - - linux-* { -- config_libXcomposite: WEBKIT_CONFIG += have_xcomposite -- config_libXrender: WEBKIT_CONFIG += have_xrender -+ #config_libXcomposite: WEBKIT_CONFIG += have_xcomposite -+ #config_libXrender: WEBKIT_CONFIG += have_xrender - -- config_glx:!qtConfig(opengles2): WEBKIT_CONFIG += have_glx -+ #config_glx:!qtConfig(opengles2): WEBKIT_CONFIG += have_glx - - # We need fontconfig to set up the test fonts for DumpRenderTree and WebKitTestRunner. - config_fontconfig: WEBKIT_CONFIG += have_fontconfig -@@ -109,9 +109,9 @@ defineTest(detectFeatures) { - use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video - } - -- !enable?(video):qtHaveModule(multimediawidgets) { -- WEBKIT_CONFIG += video use_qt_multimedia -- } -+ #!enable?(video):qtHaveModule(multimediawidgets) { -+ # WEBKIT_CONFIG += video use_qt_multimedia -+ #} - - !enable?(video) { - CONFIGURE_WARNINGS += "Missing GStreamer or QtMultimedia, disabling HTML5 media element support" -@@ -126,7 +126,7 @@ defineTest(detectFeatures) { - } - - # Gamepad API Support (depends on udev and linux/joystick.h) -- linux:!android: WEBKIT_CONFIG += gamepad -+ #linux:!android: WEBKIT_CONFIG += gamepad - - # Support for Graphics Surface - # GraphicsSurface requires GraphicsContext3D and hence use_3d_graphics -diff --git a/qtwebkit/Tools/qmake/mkspecs/features/features.pri b/qtwebkit/Tools/qmake/mkspecs/features/features.pri -index ba18b35..dd27a42 100644 ---- a/qtwebkit/Tools/qmake/mkspecs/features/features.pri -+++ b/qtwebkit/Tools/qmake/mkspecs/features/features.pri -@@ -59,7 +59,7 @@ FEATURE_DEFAULTS = \ - ENABLE_HIGH_DPI_CANVAS=0 \ - ENABLE_ICONDATABASE=1 \ - ENABLE_IFRAME_SEAMLESS=1 \ -- ENABLE_INDEXED_DATABASE=1 \ -+ ENABLE_INDEXED_DATABASE=0 \ - ENABLE_INPUT_SPEECH=0 \ - ENABLE_INPUT_TYPE_COLOR=1 \ - ENABLE_INPUT_TYPE_DATE=0 \ -diff --git a/qtwebkit/include/QtWebKit/headers.pri b/qtwebkit/include/QtWebKit/headers.pri -index 6775f3a..8b4aff7 100644 ---- a/qtwebkit/include/QtWebKit/headers.pri -+++ b/qtwebkit/include/QtWebKit/headers.pri -@@ -1,5 +1,5 @@ --SYNCQT.HEADER_FILES = WebKit/qt/Api/qwebdatabase.h WebKit/qt/Api/qwebelement.h WebKit/qt/Api/qwebhistory.h WebKit/qt/Api/qwebhistoryinterface.h WebKit/qt/Api/qwebkitglobal.h WebKit/qt/Api/qwebkitplatformplugin.h WebKit/qt/Api/qwebpluginfactory.h WebKit/qt/Api/qwebsecurityorigin.h WebKit/qt/Api/qwebsettings.h ../include/QtWebKit/qtwebkitversion.h ../include/QtWebKit/QtWebKit --SYNCQT.HEADER_CLASSES = ../include/QtWebKit/QWebDatabase ../include/QtWebKit/QWebElement ../include/QtWebKit/QWebElementCollection ../include/QtWebKit/QWebHistoryItem ../include/QtWebKit/QWebHistory ../include/QtWebKit/QWebHistoryInterface ../include/QtWebKit/QWebSelectData ../include/QtWebKit/QWebSelectMethod ../include/QtWebKit/QWebNotificationData ../include/QtWebKit/QWebNotificationPresenter ../include/QtWebKit/QWebHapticFeedbackPlayer ../include/QtWebKit/QWebTouchModifier ../include/QtWebKit/QWebFullScreenVideoHandler ../include/QtWebKit/QWebSpellChecker ../include/QtWebKit/QWebKitPlatformPlugin ../include/QtWebKit/QWebPluginFactory ../include/QtWebKit/QWebSecurityOrigin ../include/QtWebKit/QWebSettings ../include/QtWebKit/QtWebKitVersion -+SYNCQT.HEADER_FILES = WebKit/qt/Api/qwebdatabase.h WebKit/qt/Api/qwebelement.h WebKit/qt/Api/qwebhistory.h WebKit/qt/Api/qwebhistoryinterface.h WebKit/qt/Api/qwebkitglobal.h WebKit/qt/Api/qwebkitplatformplugin.h WebKit/qt/Api/qwebpluginfactory.h WebKit/qt/Api/qwebsecurityorigin.h WebKit/qt/Api/qwebsettings.h qtwebkitversion.h QtWebKit -+SYNCQT.GENERATED_HEADER_FILES = QWebDatabase QWebElement QWebElementCollection QWebHistoryItem QWebHistory QWebHistoryInterface QWebSelectData QWebSelectMethod QWebNotificationData QWebNotificationPresenter QWebHapticFeedbackPlayer QWebTouchModifier QWebFullScreenVideoHandler QWebSpellChecker QWebKitPlatformPlugin QWebPluginFactory QWebSecurityOrigin QWebSettings QtWebKitVersion - SYNCQT.PRIVATE_HEADER_FILES = WebKit/qt/Api/qhttpheader_p.h WebKit/qt/Api/qwebdatabase_p.h WebKit/qt/Api/qwebelement_p.h WebKit/qt/Api/qwebhistory_p.h WebKit/qt/Api/qwebplugindatabase_p.h WebKit/qt/Api/qwebscriptworld.h WebKit/qt/Api/qwebscriptworld_p.h WebKit/qt/Api/qwebsecurityorigin_p.h WebKit2/UIProcess/API/qt/qquicknetworkreply_p.h WebKit2/UIProcess/API/qt/qquicknetworkrequest_p.h WebKit2/UIProcess/API/qt/qquickurlschemedelegate_p.h WebKit2/UIProcess/API/qt/qquickwebpage_p.h WebKit2/UIProcess/API/qt/qquickwebpage_p_p.h WebKit2/UIProcess/API/qt/qquickwebview_p.h WebKit2/UIProcess/API/qt/qquickwebview_p_p.h WebKit2/UIProcess/API/qt/qtwebsecurityorigin_p.h WebKit2/UIProcess/API/qt/qwebchannelwebkittransport_p.h WebKit2/UIProcess/API/qt/qwebdownloaditem_p.h WebKit2/UIProcess/API/qt/qwebdownloaditem_p_p.h WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h WebKit2/UIProcess/API/qt/qwebkittest_p.h WebKit2/UIProcess/API/qt/qwebloadrequest_p.h WebKit2/UIProcess/API/qt/qwebnavigationhistory_p.h WebKit2/UIProcess/API/qt/qwebnavigationhistory_p_p.h WebKit2/UIProcess/API/qt/qwebnavigationrequest_p.h WebKit2/UIProcess/API/qt/qwebpermissionrequest_p.h WebKit2/UIProcess/API/qt/qwebpreferences_p.h WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h WebKit2/UIProcess/API/qt/raw/qrawwebview_p_p.h WebKit2/UIProcess/API/qt/tests/bytearraytestdata.h WebKit2/UIProcess/API/qt/tests/testwindow.h WebKit2/UIProcess/API/qt/tests/util.h - SYNCQT.INJECTED_PRIVATE_HEADER_FILES = - SYNCQT.QPA_HEADER_FILES = -diff --git a/qtwebkit/include/QtWebKitWidgets/headers.pri b/qtwebkit/include/QtWebKitWidgets/headers.pri -index 9d386e2..8d11b79 100644 ---- a/qtwebkit/include/QtWebKitWidgets/headers.pri -+++ b/qtwebkit/include/QtWebKitWidgets/headers.pri -@@ -1,5 +1,5 @@ --SYNCQT.HEADER_FILES = WebKit/qt/WidgetApi/qgraphicswebview.h WebKit/qt/WidgetApi/qwebframe.h WebKit/qt/WidgetApi/qwebinspector.h WebKit/qt/WidgetApi/qwebpage.h WebKit/qt/WidgetApi/qwebview.h ../include/QtWebKitWidgets/qtwebkitwidgetsversion.h ../include/QtWebKitWidgets/QtWebKitWidgets --SYNCQT.HEADER_CLASSES = ../include/QtWebKitWidgets/QGraphicsWebView ../include/QtWebKitWidgets/QWebHitTestResult ../include/QtWebKitWidgets/QWebFrame ../include/QtWebKitWidgets/QWebInspector ../include/QtWebKitWidgets/QWebPage ../include/QtWebKitWidgets/QWebView ../include/QtWebKitWidgets/QtWebKitWidgetsVersion -+SYNCQT.HEADER_FILES = WebKit/qt/WidgetApi/qgraphicswebview.h WebKit/qt/WidgetApi/qwebframe.h WebKit/qt/WidgetApi/qwebinspector.h WebKit/qt/WidgetApi/qwebpage.h WebKit/qt/WidgetApi/qwebview.h qtwebkitwidgetsversion.h QtWebKitWidgets -+SYNCQT.GENERATED_HEADER_FILES = QGraphicsWebView QWebHitTestResult QWebFrame QWebInspector QWebPage QWebView QtWebKitWidgetsVersion - SYNCQT.PRIVATE_HEADER_FILES = WebKit/qt/WidgetApi/qwebframe_p.h WebKit/qt/WidgetApi/qwebinspector_p.h WebKit/qt/WidgetApi/qwebpage_p.h WebKit/qt/WidgetApi/qwebviewaccessible_p.h - SYNCQT.INJECTED_PRIVATE_HEADER_FILES = - SYNCQT.QPA_HEADER_FILES = diff --git a/repos/libports/src/lib/qt5/patches/qtwebkit_fixes.patch b/repos/libports/src/lib/qt5/patches/qtwebkit_fixes.patch deleted file mode 100644 index d1608f88b3..0000000000 --- a/repos/libports/src/lib/qt5/patches/qtwebkit_fixes.patch +++ /dev/null @@ -1,71 +0,0 @@ -qtwebkit_fixes.patch - -diff --git a/qtwebkit/Source/WebCore/platform/network/NetworkStateNotifier.h b/qtwebkit/Source/WebCore/platform/network/NetworkStateNotifier.h -index 6edc5b7..e09917b 100644 ---- a/qtwebkit/Source/WebCore/platform/network/NetworkStateNotifier.h -+++ b/qtwebkit/Source/WebCore/platform/network/NetworkStateNotifier.h -@@ -116,7 +116,7 @@ private: - #endif - }; - --#if !PLATFORM(MAC) && !PLATFORM(WIN) && !(PLATFORM(QT) && !defined(QT_NO_BEARERMANAGEMENT)) && !PLATFORM(BLACKBERRY) && !PLATFORM(EFL) -+//#if !PLATFORM(MAC) && !PLATFORM(WIN) && !(PLATFORM(QT) && !defined(QT_NO_BEARERMANAGEMENT)) && !PLATFORM(BLACKBERRY) && !PLATFORM(EFL) - - inline NetworkStateNotifier::NetworkStateNotifier() - : m_isOnLine(true) -@@ -125,7 +125,7 @@ inline NetworkStateNotifier::NetworkStateNotifier() - - inline void NetworkStateNotifier::updateState() { } - --#endif -+//#endif - - NetworkStateNotifier& networkStateNotifier(); - -diff --git a/qtwebkit/Source/WebCore/platform/network/qt/NetworkStateNotifierQt.cpp b/qtwebkit/Source/WebCore/platform/network/qt/NetworkStateNotifierQt.cpp -index 61e4e6e..5957df8 100644 ---- a/qtwebkit/Source/WebCore/platform/network/qt/NetworkStateNotifierQt.cpp -+++ b/qtwebkit/Source/WebCore/platform/network/qt/NetworkStateNotifierQt.cpp -@@ -20,6 +20,9 @@ - #include "config.h" - #include "NetworkStateNotifier.h" - -+/* QtNetwork configuration macros */ -+#include -+ - #if (PLATFORM(QT) && !defined(QT_NO_BEARERMANAGEMENT)) - - #include "NetworkStateNotifierPrivate.h" -diff --git a/qtwebkit/Source/WebCore/platform/qt/SharedTimerQt.cpp b/qtwebkit/Source/WebCore/platform/qt/SharedTimerQt.cpp -index aaca428..38558c2 100644 ---- a/qtwebkit/Source/WebCore/platform/qt/SharedTimerQt.cpp -+++ b/qtwebkit/Source/WebCore/platform/qt/SharedTimerQt.cpp -@@ -137,8 +137,12 @@ void stopSharedTimer() - SharedTimerQt::inst()->stop(); - } - --#include "SharedTimerQt.moc" -- - } - -+/** -+ * moc 5.13.0 generates '#include ' in SharedTimerQt.moc, which -+ * triggers compile errors when included within the namespace -+ */ -+#include "SharedTimerQt.moc" -+ - // vim: ts=4 sw=4 et -diff --git a/qtwebkit/Source/WebKit/qt/Api/qwebsettings.cpp b/qtwebkit/Source/WebKit/qt/Api/qwebsettings.cpp -index d3a8642..c4e4aa1 100644 ---- a/qtwebkit/Source/WebKit/qt/Api/qwebsettings.cpp -+++ b/qtwebkit/Source/WebKit/qt/Api/qwebsettings.cpp -@@ -57,7 +57,8 @@ - #include - #include - -- -+/* QtNetwork configuration macros */ -+#include - - QWEBKIT_EXPORT void qt_networkAccessAllowed(bool isAllowed) - { diff --git a/repos/libports/src/lib/qt5/patches/qtwebkit_generated.patch b/repos/libports/src/lib/qt5/patches/qtwebkit_generated.patch deleted file mode 100644 index e516d4e099..0000000000 --- a/repos/libports/src/lib/qt5/patches/qtwebkit_generated.patch +++ /dev/null @@ -1,28 +0,0 @@ -qtwebkit_generated.patch - -diff --git a/qtwebkit/include/QtWebKit/QtWebKitDepends b/qtwebkit/include/QtWebKit/QtWebKitDepends -new file mode 100644 -index 0000000..bb9610b ---- /dev/null -+++ b/qtwebkit/include/QtWebKit/QtWebKitDepends -@@ -0,0 +1,6 @@ -+/* This file was generated by qmake with the info from /Source/api.pri. */ -+#ifdef __cplusplus /* create empty PCH in C mode */ -+#include -+#include -+#include -+#endif -diff --git a/qtwebkit/include/QtWebKitWidgets/QtWebKitWidgetsDepends b/qtwebkit/include/QtWebKitWidgets/QtWebKitWidgetsDepends -new file mode 100644 -index 0000000..9072063 ---- /dev/null -+++ b/qtwebkit/include/QtWebKitWidgets/QtWebKitWidgetsDepends -@@ -0,0 +1,8 @@ -+/* This file was generated by qmake with the info from /Source/widgetsapi.pri. */ -+#ifdef __cplusplus /* create empty PCH in C mode */ -+#include -+#include -+#include -+#include -+#include -+#endif diff --git a/repos/libports/src/lib/qt5/patches/qtwebkit_genode.patch b/repos/libports/src/lib/qt5/patches/qtwebkit_genode.patch deleted file mode 100644 index 428a4dc973..0000000000 --- a/repos/libports/src/lib/qt5/patches/qtwebkit_genode.patch +++ /dev/null @@ -1,426 +0,0 @@ -qtwebkit_genode.patch - -diff --git a/qtwebkit/Source/JavaScriptCore/assembler/ARMAssembler.h b/qtwebkit/Source/JavaScriptCore/assembler/ARMAssembler.h -index 19db71d..9cbe4e3 100644 ---- a/qtwebkit/Source/JavaScriptCore/assembler/ARMAssembler.h -+++ b/qtwebkit/Source/JavaScriptCore/assembler/ARMAssembler.h -@@ -29,9 +29,14 @@ - - #if ENABLE(ASSEMBLER) && CPU(ARM_TRADITIONAL) - -+#if OS(GENODE) -+#include -+#endif -+ - #include "AssemblerBufferWithConstantPool.h" - #include "JITCompilationEffort.h" - #include -+ - namespace JSC { - - typedef uint32_t ARMWord; -@@ -1069,6 +1074,8 @@ namespace JSC { - UNUSED_PARAM(size); - #elif OS(QNX) - msync(code, size, MS_INVALIDATE_ICACHE); -+#elif OS(GENODE) -+ Genode::cache_coherent((Genode::addr_t)code, size); - #else - #error "The cacheFlush support is missing on this platform." - #endif -diff --git a/qtwebkit/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp b/qtwebkit/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp -index ca0fa21..782aabf 100644 ---- a/qtwebkit/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp -+++ b/qtwebkit/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp -@@ -65,7 +65,8 @@ static bool isVFPPresent() - } - #endif - --#if (COMPILER(RVCT) && defined(__TARGET_FPU_VFP)) || (COMPILER(GCC) && defined(__VFP_FP__)) -+#if (COMPILER(RVCT) && defined(__TARGET_FPU_VFP)) || \ -+ (COMPILER(GCC) && defined(__VFP_FP__) && !defined(__SOFTFP__)) - return true; - #else - return false; -diff --git a/qtwebkit/Source/JavaScriptCore/dfg/DFGOperations.cpp b/qtwebkit/Source/JavaScriptCore/dfg/DFGOperations.cpp -index 1305c0a..9af93c0 100644 ---- a/qtwebkit/Source/JavaScriptCore/dfg/DFGOperations.cpp -+++ b/qtwebkit/Source/JavaScriptCore/dfg/DFGOperations.cpp -@@ -1796,6 +1796,7 @@ namespace JSC { - - #if COMPILER(GCC) && CPU(X86_64) - asm ( -+".text" "\n" \ - ".globl " SYMBOL_STRING(getHostCallReturnValue) "\n" - HIDE_SYMBOL(getHostCallReturnValue) "\n" - SYMBOL_STRING(getHostCallReturnValue) ":" "\n" -diff --git a/qtwebkit/Source/JavaScriptCore/jit/ExecutableAllocator.h b/qtwebkit/Source/JavaScriptCore/jit/ExecutableAllocator.h -index 42e1f95..369f3a8 100644 ---- a/qtwebkit/Source/JavaScriptCore/jit/ExecutableAllocator.h -+++ b/qtwebkit/Source/JavaScriptCore/jit/ExecutableAllocator.h -@@ -105,7 +105,15 @@ class DemandExecutableAllocator; - #if CPU(ARM) || CPU(MIPS) - static const size_t fixedExecutableMemoryPoolSize = 16 * 1024 * 1024; - #elif CPU(X86_64) && !CPU(X32) -+#if OS(GENODE) -+/* -+ * Genode's 'mmap()' implementation currently does not support on-demand -+ * allocation of physical memory and tries to allocate the whole amount at once. -+ */ -+static const size_t fixedExecutableMemoryPoolSize = 32 * 1024 * 1024; -+#else - static const size_t fixedExecutableMemoryPoolSize = 1024 * 1024 * 1024; -+#endif - #else - static const size_t fixedExecutableMemoryPoolSize = 32 * 1024 * 1024; - #endif -diff --git a/qtwebkit/Source/WTF/wtf/Assertions.cpp b/qtwebkit/Source/WTF/wtf/Assertions.cpp -index 1b2091f..15d1d03 100644 ---- a/qtwebkit/Source/WTF/wtf/Assertions.cpp -+++ b/qtwebkit/Source/WTF/wtf/Assertions.cpp -@@ -75,6 +75,10 @@ - #include - #endif - -+#if OS(GENODE) -+#include -+#endif -+ - extern "C" { - - WTF_ATTRIBUTE_PRINTF(1, 0) -@@ -341,6 +345,11 @@ void WTFCrash() - if (globalHook) - globalHook(); - -+#if OS(GENODE) -+ Genode::error("WebKit CRASH in '", WTF_PRETTY_FUNCTION, "'"); -+ Genode::error(" in ", __FILE__, ":", __LINE__); -+#endif /* OS(GENODE) */ -+ - WTFReportBacktrace(); - *(int *)(uintptr_t)0xbbadbeef = 0; - // More reliable, but doesn't say BBADBEEF. -diff --git a/qtwebkit/Source/WTF/wtf/FastMalloc.cpp b/qtwebkit/Source/WTF/wtf/FastMalloc.cpp -index 82fbd25..9791492 100644 ---- a/qtwebkit/Source/WTF/wtf/FastMalloc.cpp -+++ b/qtwebkit/Source/WTF/wtf/FastMalloc.cpp -@@ -111,7 +111,7 @@ - #endif - - // Use a background thread to periodically scavenge memory to release back to the system --#if PLATFORM(IOS) -+#if PLATFORM(IOS) || OS(GENODE) - #define USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY 0 - #else - #define USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY 1 -diff --git a/qtwebkit/Source/WTF/wtf/InlineASM.h b/qtwebkit/Source/WTF/wtf/InlineASM.h -index 2dc40ef..aeb9ac6 100644 ---- a/qtwebkit/Source/WTF/wtf/InlineASM.h -+++ b/qtwebkit/Source/WTF/wtf/InlineASM.h -@@ -64,12 +64,12 @@ - #elif OS(AIX) - // IBM's own file format - #define HIDE_SYMBOL(name) ".lglobl " #name --#elif OS(LINUX) \ -+#elif (OS(LINUX) \ - || OS(FREEBSD) \ - || OS(OPENBSD) \ - || OS(SOLARIS) \ - || (OS(HPUX) && CPU(IA64)) \ -- || OS(NETBSD) -+ || OS(NETBSD)) \ - // ELF platform - #define HIDE_SYMBOL(name) ".hidden " #name - #else -diff --git a/qtwebkit/Source/WTF/wtf/OSAllocatorPosix.cpp b/qtwebkit/Source/WTF/wtf/OSAllocatorPosix.cpp -index fb24cd9..db2ec31 100644 ---- a/qtwebkit/Source/WTF/wtf/OSAllocatorPosix.cpp -+++ b/qtwebkit/Source/WTF/wtf/OSAllocatorPosix.cpp -@@ -33,6 +33,10 @@ - #include - #include - -+#if OS(GENODE) -+#include -+#endif -+ - namespace WTF { - - #if CPU(MIPS) -@@ -156,8 +160,12 @@ void* OSAllocator::reserveAndCommit(size_t bytes, Usage usage, bool writable, bo - result = 0; - else - #endif -+#if OS(GENODE) -+ Genode::error("WTF::OSAllocator::reserveAndCommit(): mmap() failed"); -+#endif - CRASH(); - } -+#if !OS(GENODE) - if (result && includesGuardPages) { - // We use mmap to remap the guardpages rather than using mprotect as - // mprotect results in multiple references to the code region. This -@@ -166,6 +174,7 @@ void* OSAllocator::reserveAndCommit(size_t bytes, Usage usage, bool writable, bo - mmap(result, pageSize(), PROT_NONE, MAP_FIXED | MAP_PRIVATE | MAP_ANON, fd, 0); - mmap(static_cast(result) + bytes - pageSize(), pageSize(), PROT_NONE, MAP_FIXED | MAP_PRIVATE | MAP_ANON, fd, 0); - } -+#endif /* OS(GENODE) */ - return result; - } - -@@ -224,9 +233,20 @@ void OSAllocator::decommit(void* address, size_t bytes) - - void OSAllocator::releaseDecommitted(void* address, size_t bytes) - { -+#if OS(GENODE) -+ /* -+ * 'releaseDecommitted()' sometimes gets called with a start address -+ * different than the one returned by 'mmap()' to release only a part of the -+ * allocated memory. This feature is currently not supported by Genode's -+ * 'munmap()' implementation, so we don't crash on purpose if the result of -+ * 'munmap()' is -1. -+ */ -+ munmap(address, bytes); -+#else - int result = munmap(address, bytes); - if (result == -1) - CRASH(); -+#endif /* OS(GENODE) */ - } - - } // namespace WTF -diff --git a/qtwebkit/Source/WTF/wtf/OSRandomSource.cpp b/qtwebkit/Source/WTF/wtf/OSRandomSource.cpp -index 2495abf..7f05661 100644 ---- a/qtwebkit/Source/WTF/wtf/OSRandomSource.cpp -+++ b/qtwebkit/Source/WTF/wtf/OSRandomSource.cpp -@@ -29,6 +29,10 @@ - #include - #include - -+#if OS(GENODE) -+#include -+#endif /* OS(GENODE) */ -+ - #if OS(UNIX) - #include - #include -@@ -43,6 +47,10 @@ namespace WTF { - - void cryptographicallyRandomValuesFromOS(unsigned char* buffer, size_t length) - { -+#if OS(GENODE) -+ Genode::warning("cryptographicallyRandomValuesFromOS(): no strong source of randomness available"); -+ return; -+#endif /* OS(GENODE) */ - #if OS(UNIX) - int fd = open("/dev/urandom", O_RDONLY, 0); - if (fd < 0) -diff --git a/qtwebkit/Source/WTF/wtf/Platform.h b/qtwebkit/Source/WTF/wtf/Platform.h -index 562840c..89a1919 100644 ---- a/qtwebkit/Source/WTF/wtf/Platform.h -+++ b/qtwebkit/Source/WTF/wtf/Platform.h -@@ -498,6 +498,12 @@ - #endif - - -+/* OS(GENODE) */ -+#ifdef __GENODE__ -+/* Note: WTF_OS_FREEBSD is defined, too */ -+#define WTF_OS_GENODE 1 -+#endif -+ - /* Operating environments */ - - /* FIXME: these are all mixes of OS, operating environment and policy choices. */ -@@ -650,6 +656,11 @@ - #define HAVE_SYS_PARAM_H 1 - #define HAVE_SYS_TIME_H 1 - #define WTF_USE_PTHREADS 1 -+ -+#elif OS(GENODE) -+#define HAVE_ERRNO_H 1 -+#define HAVE_SYS_TIME_H 1 -+ - #endif /* OS(UNIX) */ - - #if OS(UNIX) && !OS(ANDROID) && !OS(QNX) -@@ -672,7 +683,7 @@ - #endif - #endif - --#if !OS(WINDOWS) && !OS(SOLARIS) && !OS(ANDROID) -+#if !OS(WINDOWS) && !OS(SOLARIS) && !OS(ANDROID) && !OS(GENODE) - #define HAVE_TM_GMTOFF 1 - #define HAVE_TM_ZONE 1 - #define HAVE_TIMEGM 1 -@@ -719,7 +730,7 @@ - #if PLATFORM(QT) - /* We must not customize the global operator new and delete for the Qt port. */ - #define ENABLE_GLOBAL_FASTMALLOC_NEW 0 --#if !OS(UNIX) -+#if !OS(UNIX) || OS(GENODE) - #define USE_SYSTEM_MALLOC 1 - #endif - #endif -@@ -838,7 +849,7 @@ - #define ENABLE_DFG_JIT 1 - #endif - /* Enable the DFG JIT on ARM, MIPS and SH4. */ --#if CPU(ARM_TRADITIONAL) || CPU(MIPS) || CPU(SH4) -+#if (CPU(ARM_TRADITIONAL) || CPU(MIPS) || CPU(SH4)) && !OS(GENODE) - #define ENABLE_DFG_JIT 1 - #endif - #endif -@@ -914,7 +925,7 @@ - #define ENABLE_REGEXP_TRACING 0 - - /* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */ --#if !defined(ENABLE_YARR_JIT) && !ENABLE(LLINT_C_LOOP) && !(OS(QNX) && PLATFORM(QT)) -+#if !defined(ENABLE_YARR_JIT) && !ENABLE(LLINT_C_LOOP) && !(OS(QNX) && PLATFORM(QT)) && !OS(GENODE) - #define ENABLE_YARR_JIT 1 - - /* Setting this flag compares JIT results with interpreter results. */ -diff --git a/qtwebkit/Source/WTF/wtf/StackBounds.cpp b/qtwebkit/Source/WTF/wtf/StackBounds.cpp -index 061cae7..04d012c 100644 ---- a/qtwebkit/Source/WTF/wtf/StackBounds.cpp -+++ b/qtwebkit/Source/WTF/wtf/StackBounds.cpp -@@ -44,6 +44,10 @@ - #include - #include - -+#elif OS(GENODE) -+ -+#include -+ - #elif OS(UNIX) - - #include -@@ -124,6 +128,15 @@ void StackBounds::initialize() - #endif - } - -+#elif OS(GENODE) -+ -+void StackBounds::initialize() -+{ -+ Genode::Thread::Stack_info stack_info = Genode::Thread::mystack(); -+ m_bound = (void*)stack_info.base; -+ m_origin = (void*)stack_info.top; -+} -+ - #elif OS(UNIX) - - void StackBounds::initialize() -diff --git a/qtwebkit/Source/WTF/wtf/TCSystemAlloc.cpp b/qtwebkit/Source/WTF/wtf/TCSystemAlloc.cpp -index ae67918..6d7b69a 100644 ---- a/qtwebkit/Source/WTF/wtf/TCSystemAlloc.cpp -+++ b/qtwebkit/Source/WTF/wtf/TCSystemAlloc.cpp -@@ -49,6 +49,11 @@ - #include - #endif - -+#if OS(GENODE) -+#include -+#include -+#endif -+ - #ifndef MAP_ANONYMOUS - #define MAP_ANONYMOUS MAP_ANON - #endif -@@ -370,6 +375,21 @@ void* TCMalloc_SystemAlloc(size_t size, size_t *actual_size, size_t alignment) { - } - #endif - -+#if OS(GENODE) -+ if (actual_size) -+ *actual_size = size; -+ -+ void* real_address = malloc(sizeof(Genode::addr_t) + size + alignment); -+ Genode::addr_t address = reinterpret_cast(real_address); -+ address += sizeof(Genode::addr_t); -+ address = Genode::align_addr(address, Genode::log2(alignment)); -+ address -= sizeof(Genode::addr_t); -+ *(Genode::addr_t*)address = (Genode::addr_t)real_address; -+ address += sizeof(Genode::addr_t); -+ -+ return (void*)address;; -+#endif -+ - // nothing worked - reset failure flags and try again - devmem_failure = false; - sbrk_failure = false; -diff --git a/qtwebkit/Source/WebCore/inspector/front-end/InspectorBackendCommands.qrc b/qtwebkit/Source/WebCore/inspector/front-end/InspectorBackendCommands.qrc -index 5b1488b..22df481 100644 ---- a/qtwebkit/Source/WebCore/inspector/front-end/InspectorBackendCommands.qrc -+++ b/qtwebkit/Source/WebCore/inspector/front-end/InspectorBackendCommands.qrc -@@ -1,6 +1,6 @@ - - -- InspectorBackendCommands.js -+ ../../../../../../qtwebkit/Source/WebCore/generated/InspectorBackendCommands.js - - - -diff --git a/qtwebkit/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp b/qtwebkit/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp -index b2c8d48..caeb3ec 100644 ---- a/qtwebkit/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp -+++ b/qtwebkit/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp -@@ -18,6 +18,8 @@ - */ - - #include "config.h" -+ -+#if ENABLE(VIDEO) - #include "MediaPlayerPrivateQt.h" - - #include "Frame.h" -@@ -666,3 +668,4 @@ PlatformMedia MediaPlayerPrivateQt::platformMedia() const - } // namespace WebCore - - #include "moc_MediaPlayerPrivateQt.cpp" -+#endif /* ENABLE(VIDEO) */ -diff --git a/qtwebkit/Source/WebCore/platform/network/qt/SocketStreamHandlePrivate.h b/qtwebkit/Source/WebCore/platform/network/qt/SocketStreamHandlePrivate.h -index 647c4ef..ec4a645 100644 ---- a/qtwebkit/Source/WebCore/platform/network/qt/SocketStreamHandlePrivate.h -+++ b/qtwebkit/Source/WebCore/platform/network/qt/SocketStreamHandlePrivate.h -@@ -65,6 +65,7 @@ public Q_SLOTS: - #endif - public: - void initConnections(); -+ void init(const KURL& url); - QTcpSocket* m_socket; - SocketStreamHandle* m_streamHandle; - }; -diff --git a/qtwebkit/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp b/qtwebkit/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp -index cd71190..4f8a7b9 100644 ---- a/qtwebkit/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp -+++ b/qtwebkit/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp -@@ -58,6 +58,19 @@ SocketStreamHandlePrivate::SocketStreamHandlePrivate(SocketStreamHandle* streamH - return; - - initConnections(); -+ } -+ -+/* -+ * This code was factored out from the constructor, because its execution can -+ * end up in 'SocketStreamHandle::platformSend()', which needs the -+ * 'SocketStreamHandle::m_p' member, which gets initialized only after the -+ * constructor returned. -+ * -+ * Genode issue #1677 -+ */ -+void SocketStreamHandlePrivate::init(const KURL& url) -+{ -+ bool isSecure = url.protocolIs("wss"); - - unsigned int port = url.hasPort() ? url.port() : (isSecure ? 443 : 80); - -@@ -188,6 +201,7 @@ SocketStreamHandle::SocketStreamHandle(const KURL& url, SocketStreamHandleClient - { - LOG(Network, "SocketStreamHandle %p new client %p", this, m_client); - m_p = new SocketStreamHandlePrivate(this, url); -+ m_p->init(url); - } - - SocketStreamHandle::SocketStreamHandle(QTcpSocket* socket, SocketStreamHandleClient* client) diff --git a/repos/libports/src/lib/qt5/patches/series b/repos/libports/src/lib/qt5/patches/series deleted file mode 100644 index b9eafc33c1..0000000000 --- a/repos/libports/src/lib/qt5/patches/series +++ /dev/null @@ -1,24 +0,0 @@ -example_virtualkeyboard.patch -qtbase_fixes.patch -qtbase_configuration.patch -qtdeclarative_configuration.patch -qttools_configuration.patch -qtvirtualkeyboard_configuration.patch -qtwebkit_fixes.patch -qtwebkit_configuration.patch -qtbase_generated.patch -qtdeclarative_generated.patch -qtquickcontrols2_generated.patch -qtsvg_generated.patch -qttools_generated.patch -qtvirtualkeyboard_generated.patch -qtwebkit_generated.patch -qtbase_genode.patch -qtbase_genode_qtscriptclassic.patch -qtbase_genode_textedit_example.patch -qtbase_genode_openglwindow_example.patch -qtbase_qwindow_title.patch -qtdeclarative_genode.patch -qtwebkit_genode.patch -host_tools.patch -header_generation.patch diff --git a/repos/libports/src/lib/qt5/patches/series.qtscriptclassic b/repos/libports/src/lib/qt5/patches/series.qtscriptclassic deleted file mode 100644 index 13e61816a2..0000000000 --- a/repos/libports/src/lib/qt5/patches/series.qtscriptclassic +++ /dev/null @@ -1,2 +0,0 @@ -qtscriptclassic_qt5.patch -qtscriptclassic_qt5_7.patch diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/imageformats/jpeg/import_plugin.cc b/repos/libports/src/lib/qt5/qtbase/src/plugins/imageformats/jpeg/import_plugin.cc deleted file mode 100644 index 06150fe565..0000000000 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/imageformats/jpeg/import_plugin.cc +++ /dev/null @@ -1,16 +0,0 @@ -/* - * \brief Static instance of the QJpegPlugin - * \author Christian Prochaska - * \date 2017-05-27 - */ - -/* - * Copyright (C) 2017 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU Affero General Public License version 3. - */ - -#include "main.h" - -Q_IMPORT_PLUGIN(QJpegPlugin) diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/genode.json b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/genode.json deleted file mode 100644 index 604fac4842..0000000000 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/genode.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "Keys": [ "genode" ] -} diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/main.cpp b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/main.cpp deleted file mode 100644 index c8a196ba56..0000000000 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/main.cpp +++ /dev/null @@ -1,51 +0,0 @@ -/* - * \brief Genode QPA plugin - * \author Christian Prochaska - * \date 2013-05-08 - */ - -/* - * Copyright (C) 2013-2017 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU Affero General Public License version 3. - */ - -/* libc includes */ -#include - -/* Qt includes */ -#include "qgenodeintegrationplugin.h" - -QT_BEGIN_NAMESPACE - -Genode::Env *QGenodeIntegrationPlugin::_env = nullptr; - -void initialize_qt_gui(Genode::Env &env) -{ - QGenodeIntegrationPlugin::env(env); -} - - -QStringList QGenodeIntegrationPlugin::keys() const -{ - QStringList list; - list << "Gui"; - return list; -} - - -QPlatformIntegration *QGenodeIntegrationPlugin::create(const QString& system, const QStringList& paramList) -{ - Q_UNUSED(paramList); - if (system.toLower() == "genode") { - assert(_env != nullptr); - return new QGenodeIntegration(*_env); - } - - return 0; -} - -Q_IMPORT_PLUGIN(QGenodeIntegrationPlugin) - -QT_END_NAMESPACE diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeclipboard.cpp b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeclipboard.cpp deleted file mode 100644 index 304f2a2415..0000000000 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeclipboard.cpp +++ /dev/null @@ -1,142 +0,0 @@ -/* - * \brief QGenodeClipboard - * \author Christian Prochaska - * \date 2015-09-18 - */ - -/* - * Copyright (C) 2015-2017 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU Affero General Public License version 3. - */ - -#include "qgenodeclipboard.h" - -#ifndef QT_NO_CLIPBOARD - -/* Genode includes */ -#include - -/* Qt includes */ -#include - -QT_BEGIN_NAMESPACE - - -static constexpr bool verbose = false; - - -QGenodeClipboard::QGenodeClipboard(Genode::Env &env) -: _clipboard_signal_handler(env.ep(), *this, &QGenodeClipboard::_clipboard_changed) -{ - try { - - Genode::Attached_rom_dataspace config(env, "config"); - - if (config.xml().attribute_value("clipboard", false)) { - - try { - - _clipboard_ds = new Genode::Attached_rom_dataspace(env, "clipboard"); - - _clipboard_ds->sigh(_clipboard_signal_handler); - _clipboard_ds->update(); - - } catch (...) { } - - try { - _clipboard_reporter = new Genode::Reporter(env, "clipboard"); - _clipboard_reporter->enabled(true); - } catch (...) { } - - } - } catch (...) { } - - connect(this, SIGNAL(_clipboard_changed()), - this, SLOT(_handle_clipboard()), - Qt::QueuedConnection); -} - - -QGenodeClipboard::~QGenodeClipboard() -{ - free(_decoded_clipboard_content); - delete _clipboard_ds; - delete _clipboard_reporter; -} - - -void QGenodeClipboard::_handle_clipboard() -{ - emitChanged(QClipboard::Clipboard); -} - - -QMimeData *QGenodeClipboard::mimeData(QClipboard::Mode mode) -{ - if (!_clipboard_ds) - return 0; - - _clipboard_ds->update(); - - if (!_clipboard_ds->valid()) { - if (verbose) - Genode::error("invalid clipboard dataspace"); - return 0; - } - - char *xml_data = _clipboard_ds->local_addr(); - - try { - Genode::Xml_node node(xml_data); - - if (!node.has_type("clipboard")) { - Genode::error("invalid clipboard xml syntax"); - return 0; - } - - free(_decoded_clipboard_content); - - _decoded_clipboard_content = (char*)malloc(node.content_size()); - - if (!_decoded_clipboard_content) { - Genode::error("could not allocate buffer for decoded clipboard content"); - return 0; - } - - _mimedata->setText(QString::fromUtf8(_decoded_clipboard_content, - node.decoded_content(_decoded_clipboard_content, - node.content_size()))); - - } catch (Genode::Xml_node::Invalid_syntax) { - Genode::error("invalid clipboard xml syntax"); - return 0; - } - - return _mimedata; -} - - -void QGenodeClipboard::setMimeData(QMimeData *data, QClipboard::Mode mode) -{ - if (!data || !data->hasText() || !supportsMode(mode)) - return; - - QString text = data->text(); - QByteArray utf8text = text.toUtf8(); - - if (!_clipboard_reporter) - return; - - try { - Genode::Reporter::Xml_generator xml(*_clipboard_reporter, [&] () { - xml.append_sanitized(utf8text.constData(), utf8text.size()); }); - } catch (...) { - Genode::error("could not write clipboard data"); - } -} - -QT_END_NAMESPACE - -#endif /* QT_NO_CLIPBOARD */ diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeclipboard.h b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeclipboard.h deleted file mode 100644 index 3806a79b0e..0000000000 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeclipboard.h +++ /dev/null @@ -1,71 +0,0 @@ -/* - * \brief QGenodeClipboard - * \author Christian Prochaska - * \date 2015-09-18 - */ - -/* - * Copyright (C) 2015-2017 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU Affero General Public License version 3. - */ - -#ifndef _QGENODECLIPBOARD_H_ -#define _QGENODECLIPBOARD_H_ - -#include - -#ifndef QT_NO_CLIPBOARD - -/* Genode includes */ -#include -#include -#include - -/* Qt includes */ -#include - -QT_BEGIN_NAMESPACE - -class QGenodeClipboard : public QObject, public QPlatformClipboard -{ - Q_OBJECT - - private: - - Genode::Attached_rom_dataspace *_clipboard_ds = nullptr; - Genode::Io_signal_handler _clipboard_signal_handler; - - Genode::Reporter *_clipboard_reporter = nullptr; - - char *_decoded_clipboard_content = nullptr; - - QMember _mimedata; - - /* - * Genode signals are handled as Qt signals to avoid blocking in the - * Genode signal handler, which could cause nested signal handler - * execution. - */ - - private Q_SLOTS: - - void _handle_clipboard(); - - Q_SIGNALS: - - void _clipboard_changed(); - - public: - - QGenodeClipboard(Genode::Env &env); - ~QGenodeClipboard(); - QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard); - void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard); -}; - -QT_END_NAMESPACE - -#endif /* QT_NO_CLIPBOARD */ -#endif /* _QGENODECLIPBOARD_H_ */ diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodecursor.cpp b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodecursor.cpp deleted file mode 100644 index c17908c0b6..0000000000 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodecursor.cpp +++ /dev/null @@ -1,79 +0,0 @@ -/* - * \brief QGenodeCursor - * \author Christian Prochaska - * \date 2017-11-13 - */ - -/* - * Copyright (C) 2017 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU Affero General Public License version 3. - */ - - -/* Genode includes */ -#include - -/* Qt includes */ -#include -#include "qgenodecursor.h" - -QT_BEGIN_NAMESPACE - -QGenodeCursor::QGenodeCursor(Genode::Env &env) -{ - try { - _shape_report_connection.construct(env, "shape", sizeof(Pointer::Shape_report)); - _shape_report_ds.construct(env.rm(), _shape_report_connection->dataspace()); - _shape_report = _shape_report_ds->local_addr(); - } catch (Genode::Service_denied) { } -} - -void QGenodeCursor::changeCursor(QCursor *widgetCursor, QWindow *window) -{ - Q_UNUSED(window); - -#ifndef QT_NO_CURSOR - - if (!_shape_report) - return; - - const Qt::CursorShape shape = widgetCursor ? - widgetCursor->shape() : - Qt::ArrowCursor; - - _shape_report->visible = (shape != Qt::BlankCursor); - - QImage cursor; - - if (shape == Qt::BitmapCursor) { - // application supplied cursor - cursor = widgetCursor->pixmap().toImage(); - _shape_report->x_hot = widgetCursor->hotSpot().x(); - _shape_report->y_hot = widgetCursor->hotSpot().y(); - } else { - // system cursor - QPlatformCursorImage platformImage(0, 0, 0, 0, 0, 0); - platformImage.set(shape); - cursor = *platformImage.image(); - _shape_report->x_hot = platformImage.hotspot().x(); - _shape_report->y_hot = platformImage.hotspot().y(); - } - - cursor = cursor.convertToFormat(QImage::Format_RGBA8888); - - _shape_report->width = cursor.width(); - _shape_report->height = cursor.height(); - - memcpy(_shape_report->shape, cursor.constBits(), - cursor.width() * cursor.height() * 4); - - _shape_report_connection->submit(sizeof(Pointer::Shape_report)); - -#else // !QT_NO_CURSOR - Q_UNUSED(widgetCursor); -#endif -} - -QT_END_NAMESPACE diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodecursor.h b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodecursor.h deleted file mode 100644 index 63ddc44209..0000000000 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodecursor.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * \brief QGenodeCursor - * \author Christian Prochaska - * \date 2017-11-13 - */ - -/* - * Copyright (C) 2017 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU Affero General Public License version 3. - */ - - -#ifndef _QGENODECURSOR_H_ -#define _QGENODECURSOR_H_ - -/* Genode includes */ -#include -#include -#include - -/* Qt includes */ -#include - -QT_BEGIN_NAMESPACE - -class QGenodeCursor : public QPlatformCursor -{ - private: - - Genode::Constructible _shape_report_connection; - Genode::Constructible _shape_report_ds; - Pointer::Shape_report *_shape_report { nullptr }; - - public: - - QGenodeCursor(Genode::Env &env); - - virtual void changeCursor(QCursor *widgetCursor, QWindow *window) override; -}; - -QT_END_NAMESPACE - -#endif /* _QGENODECURSOR_H_ */ diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeglcontext.cpp b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeglcontext.cpp deleted file mode 100644 index 03cf998f1d..0000000000 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeglcontext.cpp +++ /dev/null @@ -1,143 +0,0 @@ -/* - * \brief QGenodeGLContext - * \author Christian Prochaska - * \date 2013-11-18 - */ - -/* - * Copyright (C) 2013-2017 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU Affero General Public License version 3. - */ - -/* Genode includes */ -#include - -/* EGL includes */ -#define EGL_EGLEXT_PROTOTYPES - -#include -#include - -/* Qt includes */ -#include -#include - -/* local includes */ -#include "qgenodeplatformwindow.h" -#include "qgenodeglcontext.h" - -static const bool qnglc_verbose = false; - -QT_BEGIN_NAMESPACE - -QGenodeGLContext::QGenodeGLContext(QOpenGLContext *context) - : QPlatformOpenGLContext() -{ - if (qnglc_verbose) - Genode::log(__func__, "called"); - - if (!eglBindAPI(EGL_OPENGL_API)) - qFatal("eglBindAPI() failed"); - - _egl_display = eglGetDisplay(EGL_DEFAULT_DISPLAY); - if (_egl_display == EGL_NO_DISPLAY) - qFatal("eglGetDisplay() failed"); - - int major = -1; - int minor = -1; - if (!eglInitialize(_egl_display, &major, &minor)) - qFatal("eglInitialize() failed"); - - if (qnglc_verbose) - Genode::log("eglInitialize() returned major: ", major, ", minor: ", minor); - - _egl_config = q_configFromGLFormat(_egl_display, context->format(), false, EGL_PBUFFER_BIT); - if (_egl_config == 0) - qFatal("Could not find a matching EGL config"); - - _format = q_glFormatFromConfig(_egl_display, _egl_config); - - _egl_context = eglCreateContext(_egl_display, _egl_config, EGL_NO_CONTEXT, 0); - if (_egl_context == EGL_NO_CONTEXT) - qFatal("eglCreateContext() failed"); -} - - -bool QGenodeGLContext::makeCurrent(QPlatformSurface *surface) -{ - if (qnglc_verbose) - Genode::log(__func__, " called"); - - doneCurrent(); - - QGenodePlatformWindow *w = static_cast(surface); - - Genode_egl_window egl_window = { w->geometry().width(), - w->geometry().height(), - w->framebuffer() }; - - if (qnglc_verbose) - Genode::log(__func__, ": w->framebuffer()=", w->framebuffer()); - - if (w->egl_surface() != EGL_NO_SURFACE) - if (!eglDestroySurface(_egl_display, w->egl_surface())) - qFatal("eglDestroySurface() failed"); - - EGLSurface egl_surface = - eglCreatePixmapSurface(_egl_display, _egl_config, &egl_window, 0); - - if (egl_surface == EGL_NO_SURFACE) - qFatal("eglCreateiWindowSurface() failed"); - - w->egl_surface(egl_surface); - - if (!eglMakeCurrent(_egl_display, w->egl_surface(), w->egl_surface(), _egl_context)) - qFatal("eglMakeCurrent() failed"); - - return true; -} - - -void QGenodeGLContext::doneCurrent() -{ - if (qnglc_verbose) - Genode::log(__func__, " called"); - - if (!eglMakeCurrent(_egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT)) - qFatal("eglMakeCurrent() failed"); -} - - -void QGenodeGLContext::swapBuffers(QPlatformSurface *surface) -{ - if (qnglc_verbose) - Genode::log(__func__, " called"); - - QGenodePlatformWindow *w = static_cast(surface); - - if (!eglSwapBuffers(_egl_display, w->egl_surface())) - qFatal("eglSwapBuffers() failed"); - - w->refresh(0, 0, w->geometry().width(), w->geometry().height()); -} - - -QFunctionPointer QGenodeGLContext::getProcAddress(const char *procName) -{ - if (qnglc_verbose) - Genode::log("procName=", Genode::Cstring(procName), " , " - "pointer=", eglGetProcAddress(procName)); - - return static_cast(eglGetProcAddress(procName)); -} - - -QSurfaceFormat QGenodeGLContext::format() const -{ - return _format; -} - -QT_END_NAMESPACE - diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeglcontext.h b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeglcontext.h deleted file mode 100644 index 22f3c2d3fd..0000000000 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeglcontext.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * \brief QGenodeGLContext - * \author Christian Prochaska - * \date 2013-11-18 - */ - -/* - * Copyright (C) 2013-2017 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU Affero General Public License version 3. - */ - -#ifndef QGENODEGLCONTEXT_H -#define QGENODEGLCONTEXT_H - -#include - -#include - -#include - - -QT_BEGIN_NAMESPACE - - -class QGenodeGLContext : public QPlatformOpenGLContext -{ - private: - - QSurfaceFormat _format; - - EGLDisplay _egl_display; - EGLContext _egl_context; - EGLConfig _egl_config; - - public: - - QGenodeGLContext(QOpenGLContext *context); - - QSurfaceFormat format() const Q_DECL_OVERRIDE; - - void swapBuffers(QPlatformSurface *surface) Q_DECL_OVERRIDE; - - bool makeCurrent(QPlatformSurface *surface) Q_DECL_OVERRIDE; - - void doneCurrent() Q_DECL_OVERRIDE; - - QFunctionPointer getProcAddress(const char *procName) Q_DECL_OVERRIDE; -}; - -QT_END_NAMESPACE - -#endif // QGENODEGLCONTEXT_H diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeintegration.cpp b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeintegration.cpp deleted file mode 100644 index 68b8ebf2e4..0000000000 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeintegration.cpp +++ /dev/null @@ -1,111 +0,0 @@ -/* - * \brief QGenodeIntegration - * \author Christian Prochaska - * \date 2013-05-08 - */ - -/* - * Copyright (C) 2013-2017 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU Affero General Public License version 3. - */ - -/* Qt includes */ -#include -#include - -#include "qgenodeclipboard.h" -#include "qgenodeglcontext.h" -#include "qgenodeintegration.h" -#include "qgenodeplatformwindow.h" -#include "qgenodescreen.h" -#include "qgenodewindowsurface.h" -#include "QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h" -#include "QtFontDatabaseSupport/private/qfreetypefontdatabase_p.h" - -QT_BEGIN_NAMESPACE - -static const bool verbose = false; - - -QGenodeIntegration::QGenodeIntegration(Genode::Env &env) -: _env(env), - _genode_screen(new QGenodeScreen(env)) { } - - -bool QGenodeIntegration::hasCapability(QPlatformIntegration::Capability cap) const -{ - switch (cap) { - case ThreadedPixmaps: return true; - default: return QPlatformIntegration::hasCapability(cap); - } -} - - -QPlatformWindow *QGenodeIntegration::createPlatformWindow(QWindow *window) const -{ - if (verbose) - qDebug() << "QGenodeIntegration::createPlatformWindow(" << window << ")"; - - QRect screen_geometry = _genode_screen->geometry(); - return new QGenodePlatformWindow(_env, window, - screen_geometry.width(), - screen_geometry.height()); -} - - -QPlatformBackingStore *QGenodeIntegration::createPlatformBackingStore(QWindow *window) const -{ - if (verbose) - qDebug() << "QGenodeIntegration::createPlatformBackingStore(" << window << ")"; - return new QGenodeWindowSurface(window); -} - - -QAbstractEventDispatcher *QGenodeIntegration::createEventDispatcher() const -{ - if (verbose) - qDebug() << "QGenodeIntegration::createEventDispatcher()"; - return createUnixEventDispatcher(); -} - - -void QGenodeIntegration::initialize() -{ - QWindowSystemInterface::handleScreenAdded(_genode_screen); - - QString icStr = QPlatformInputContextFactory::requested(); - if (icStr.isNull()) - icStr = QLatin1String("compose"); - m_inputContext.reset(QPlatformInputContextFactory::create(icStr)); -} - - -QPlatformFontDatabase *QGenodeIntegration::fontDatabase() const -{ - static QFreeTypeFontDatabase db; - return &db; -} - - -#ifndef QT_NO_CLIPBOARD -QPlatformClipboard *QGenodeIntegration::clipboard() const -{ - static QGenodeClipboard cb(_env); - return &cb; -} -#endif - - -QPlatformOpenGLContext *QGenodeIntegration::createPlatformOpenGLContext(QOpenGLContext *context) const -{ - return new QGenodeGLContext(context); -} - -QPlatformInputContext *QGenodeIntegration::inputContext() const -{ - return m_inputContext.data(); -} - -QT_END_NAMESPACE diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeintegration.h b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeintegration.h deleted file mode 100644 index f3bb695ee1..0000000000 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeintegration.h +++ /dev/null @@ -1,60 +0,0 @@ -/* - * \brief QGenodeIntegration - * \author Christian Prochaska - * \date 2013-05-08 - */ - -/* - * Copyright (C) 2013-2017 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU Affero General Public License version 3. - */ - - -#ifndef _QGENODEINTEGRATION_H_ -#define _QGENODEINTEGRATION_H_ - -#include - -#include -#include -#include - -#include "qgenodescreen.h" - -QT_BEGIN_NAMESPACE - -class QGenodeIntegration : public QPlatformIntegration -{ - private: - - Genode::Env &_env; - QGenodeScreen *_genode_screen; - QScopedPointer m_inputContext; - - public: - - QGenodeIntegration(Genode::Env &env); - - void initialize() Q_DECL_OVERRIDE; - bool hasCapability(QPlatformIntegration::Capability cap) const Q_DECL_OVERRIDE; - - QPlatformWindow *createPlatformWindow(QWindow *window) const Q_DECL_OVERRIDE; - QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const Q_DECL_OVERRIDE; - - QAbstractEventDispatcher *createEventDispatcher() const Q_DECL_OVERRIDE; - - QPlatformFontDatabase *fontDatabase() const Q_DECL_OVERRIDE; - -#ifndef QT_NO_CLIPBOARD - QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE; -#endif - QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const Q_DECL_OVERRIDE; - - QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE; -}; - -QT_END_NAMESPACE - -#endif /* _QGENODEINTEGRATION_H_ */ diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeintegrationplugin.h b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeintegrationplugin.h deleted file mode 100644 index 0d37d03b07..0000000000 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeintegrationplugin.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * \brief Genode QPA plugin - * \author Christian Prochaska - * \date 2013-05-08 - */ - -/* - * Copyright (C) 2013-2017 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU Affero General Public License version 3. - */ - -#ifndef _QGENODEINTEGRATIONPLUGIN_H_ -#define _QGENODEINTEGRATIONPLUGIN_H_ - -/* Genode includes */ -#include - -/* Qt includes */ -#include -#include "qgenodeintegration.h" - -QT_BEGIN_NAMESPACE - -class QGenodeIntegrationPlugin : public QPlatformIntegrationPlugin -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "genode.json") - -private: - static Genode::Env *_env; - -public: - QStringList keys() const; - QPlatformIntegration *create(const QString&, const QStringList&); - - static void env(Genode::Env &env) { _env = &env; } -}; - -QT_END_NAMESPACE - -#endif /* _QGENODEINTEGRATIONPLUGIN_H_ */ diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeplatformwindow.cpp b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeplatformwindow.cpp deleted file mode 100644 index bdcbd83475..0000000000 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeplatformwindow.cpp +++ /dev/null @@ -1,904 +0,0 @@ -/* - * \brief QGenodePlatformWindow - * \author Christian Prochaska - * \author Christian Helmuth - * \date 2013-05-08 - */ - -/* - * Copyright (C) 2013-2019 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU Affero General Public License version 3. - */ - - -/* Genode includes */ -#include -#include - -/* Qt includes */ -#include -#include -#include - -#include "qgenodeplatformwindow.h" - -QT_BEGIN_NAMESPACE - -static const bool qnpw_verbose = false/*true*/; - -QStringList QGenodePlatformWindow::_gui_session_label_list; - -QTouchDevice * QGenodePlatformWindow::_init_touch_device() -{ - QVector::iterator i = _touch_points.begin(); - for (unsigned n = 0; i != _touch_points.end(); ++i, ++n) { - i->id = n; - i->state = Qt::TouchPointReleased; - } - - QTouchDevice *dev = new QTouchDevice; - - dev->setName("Genode multi-touch device"); - dev->setType(QTouchDevice::TouchScreen); - dev->setCapabilities(QTouchDevice::Position); - - QWindowSystemInterface::registerTouchDevice(dev); - - return dev; -} - -void QGenodePlatformWindow::_process_touch_events(QList const &events) -{ - if (events.empty()) return; - - QList touch_points; - for (QList::const_iterator i = events.begin(); i != events.end(); ++i) { - - i->handle_touch([&] (Input::Touch_id id, int x, int y) { - - if (id.value >= _touch_points.size()) { - Genode::warning("drop touch input, out of bounds"); - return; - } - - QWindowSystemInterface::TouchPoint &otp = _touch_points[id.value]; - QWindowSystemInterface::TouchPoint tp; - - tp.id = id.value; - tp.area = QRectF(QPointF(0, 0), QSize(1, 1)); - - /* report 1x1 rectangular area centered at screen coordinates */ - tp.area.moveCenter(QPointF(x, y)); - - tp.state = otp.state == Qt::TouchPointReleased - ? Qt::TouchPointPressed : Qt::TouchPointMoved; - tp.pressure = 1; - - otp = tp; - touch_points.push_back(tp); - }); - - i->handle_touch_release([&] (Input::Touch_id id) { - - if (id.value >= _touch_points.size()) { - Genode::warning("drop touch input, out of bounds"); - return; - } - - QWindowSystemInterface::TouchPoint &otp = _touch_points[id.value]; - QWindowSystemInterface::TouchPoint tp; - - tp.id = id.value; - tp.area = QRectF(QPointF(0, 0), QSize(1, 1)); - tp.state = Qt::TouchPointReleased; - tp.pressure = 0; - - otp = tp; - touch_points.push_back(tp); - }); - } - - QWindowSystemInterface::handleTouchEvent(0, _touch_device, touch_points); -} - - -static Qt::Key key_from_unicode(unsigned unicode) -{ - /* special keys: function-key unicodes */ - switch (unicode) { - case 0x0008: return Qt::Key_Backspace; - case 0x0009: return Qt::Key_Tab; - case 0x000a: return Qt::Key_Return; - case 0x001b: return Qt::Key_Escape; - case 0xf700: return Qt::Key_Up; - case 0xf701: return Qt::Key_Down; - case 0xf702: return Qt::Key_Left; - case 0xf703: return Qt::Key_Right; - case 0xf704: return Qt::Key_F1; - case 0xf705: return Qt::Key_F2; - case 0xf706: return Qt::Key_F3; - case 0xf707: return Qt::Key_F4; - case 0xf708: return Qt::Key_F5; - case 0xf709: return Qt::Key_F6; - case 0xf70a: return Qt::Key_F7; - case 0xf70b: return Qt::Key_F8; - case 0xf70c: return Qt::Key_F9; - case 0xf70d: return Qt::Key_F10; - case 0xf70e: return Qt::Key_F11; - case 0xf70f: return Qt::Key_F12; - case 0xf727: return Qt::Key_Insert; - case 0xf728: return Qt::Key_Delete; - case 0xf729: return Qt::Key_Home; - case 0xf72b: return Qt::Key_End; - case 0xf72c: return Qt::Key_PageUp; - case 0xf72d: return Qt::Key_PageDown; - default: break; - }; - - /* - * Qt key enums are equal to the corresponding Unicode codepoints of the - * upper-case character. - */ - - /* printable keys */ - if (unicode >= (unsigned)Qt::Key_Space && unicode <= (unsigned)Qt::Key_ydiaeresis) - return Qt::Key(QChar(unicode).toUpper().unicode()); - - return Qt::Key_unknown; -} - - -QGenodePlatformWindow::Mapped_key QGenodePlatformWindow::_map_key(Input::Keycode key, - Codepoint codepoint, - Mapped_key::Event e) -{ - /* non-printable key mappings */ - switch (key) { - case Input::KEY_ENTER: return Mapped_key { Qt::Key_Return }; - case Input::KEY_KPENTER: return Mapped_key { Qt::Key_Return }; /* resolves aliasing on repeat */ - case Input::KEY_ESC: return Mapped_key { Qt::Key_Escape }; - case Input::KEY_TAB: return Mapped_key { Qt::Key_Tab }; - case Input::KEY_BACKSPACE: return Mapped_key { Qt::Key_Backspace }; - case Input::KEY_INSERT: return Mapped_key { Qt::Key_Insert }; - case Input::KEY_DELETE: return Mapped_key { Qt::Key_Delete }; - case Input::KEY_PRINT: return Mapped_key { Qt::Key_Print }; - case Input::KEY_CLEAR: return Mapped_key { Qt::Key_Clear }; - case Input::KEY_HOME: return Mapped_key { Qt::Key_Home }; - case Input::KEY_END: return Mapped_key { Qt::Key_End }; - case Input::KEY_LEFT: return Mapped_key { Qt::Key_Left }; - case Input::KEY_UP: return Mapped_key { Qt::Key_Up }; - case Input::KEY_RIGHT: return Mapped_key { Qt::Key_Right }; - case Input::KEY_DOWN: return Mapped_key { Qt::Key_Down }; - case Input::KEY_PAGEUP: return Mapped_key { Qt::Key_PageUp }; - case Input::KEY_PAGEDOWN: return Mapped_key { Qt::Key_PageDown }; - case Input::KEY_LEFTSHIFT: return Mapped_key { Qt::Key_Shift }; - case Input::KEY_RIGHTSHIFT: return Mapped_key { Qt::Key_Shift }; - case Input::KEY_LEFTCTRL: return Mapped_key { Qt::Key_Control }; - case Input::KEY_RIGHTCTRL: return Mapped_key { Qt::Key_Control }; - case Input::KEY_LEFTMETA: return Mapped_key { Qt::Key_Meta }; - case Input::KEY_RIGHTMETA: return Mapped_key { Qt::Key_Meta }; - case Input::KEY_LEFTALT: return Mapped_key { Qt::Key_Alt }; - case Input::KEY_RIGHTALT: return Mapped_key { Qt::Key_AltGr }; - case Input::KEY_COMPOSE: return Mapped_key { Qt::Key_Menu }; - case Input::KEY_CAPSLOCK: return Mapped_key { Qt::Key_CapsLock }; - case Input::KEY_SYSRQ: return Mapped_key { Qt::Key_SysReq }; - case Input::KEY_SCROLLLOCK: return Mapped_key { Qt::Key_ScrollLock }; - case Input::KEY_PAUSE: return Mapped_key { Qt::Key_Pause }; - case Input::KEY_F1: return Mapped_key { Qt::Key_F1 }; - case Input::KEY_F2: return Mapped_key { Qt::Key_F2 }; - case Input::KEY_F3: return Mapped_key { Qt::Key_F3 }; - case Input::KEY_F4: return Mapped_key { Qt::Key_F4 }; - case Input::KEY_F5: return Mapped_key { Qt::Key_F5 }; - case Input::KEY_F6: return Mapped_key { Qt::Key_F6 }; - case Input::KEY_F7: return Mapped_key { Qt::Key_F7 }; - case Input::KEY_F8: return Mapped_key { Qt::Key_F8 }; - case Input::KEY_F9: return Mapped_key { Qt::Key_F9 }; - case Input::KEY_F10: return Mapped_key { Qt::Key_F10 }; - case Input::KEY_F11: return Mapped_key { Qt::Key_F11 }; - case Input::KEY_F12: return Mapped_key { Qt::Key_F12 }; - case Input::KEY_F13: return Mapped_key { Qt::Key_F13 }; - case Input::KEY_F14: return Mapped_key { Qt::Key_F14 }; - case Input::KEY_F15: return Mapped_key { Qt::Key_F15 }; - case Input::KEY_F16: return Mapped_key { Qt::Key_F16 }; - case Input::KEY_F17: return Mapped_key { Qt::Key_F17 }; - case Input::KEY_F18: return Mapped_key { Qt::Key_F18 }; - case Input::KEY_F19: return Mapped_key { Qt::Key_F19 }; - case Input::KEY_F20: return Mapped_key { Qt::Key_F20 }; - case Input::KEY_F21: return Mapped_key { Qt::Key_F21 }; - case Input::KEY_F22: return Mapped_key { Qt::Key_F22 }; - case Input::KEY_F23: return Mapped_key { Qt::Key_F23 }; - case Input::KEY_F24: return Mapped_key { Qt::Key_F24 }; - case Input::KEY_BACK: return Mapped_key { Qt::Key_Back }; - case Input::KEY_FORWARD: return Mapped_key { Qt::Key_Forward }; - case Input::KEY_VOLUMEDOWN: return Mapped_key { Qt::Key_VolumeDown }; - case Input::KEY_MUTE: return Mapped_key { Qt::Key_VolumeMute }; - case Input::KEY_VOLUMEUP: return Mapped_key { Qt::Key_VolumeUp }; - case Input::KEY_PREVIOUSSONG: return Mapped_key { Qt::Key_MediaPrevious }; - case Input::KEY_PLAYPAUSE: return Mapped_key { Qt::Key_MediaTogglePlayPause }; - case Input::KEY_NEXTSONG: return Mapped_key { Qt::Key_MediaNext }; - - default: break; - }; - - /* - * We remember the mapping of pressed keys (but not repeated codepoints) in - * '_pressed' to derive the release mapping. - */ - - switch (e) { - case Mapped_key::PRESSED: - case Mapped_key::REPEAT: - { - Qt::Key const qt_key = key_from_unicode(codepoint.value); - if (qt_key != Qt::Key_unknown) { - /* do not insert repeated codepoints */ - if (e == Mapped_key::PRESSED) - _pressed.insert(key, qt_key); - - return Mapped_key { qt_key, codepoint }; - } - } break; - - case Mapped_key::RELEASED: - if (Qt::Key qt_key = _pressed.take(key)) { - return Mapped_key { qt_key }; - } - break; - } - - /* dead keys and aborted sequences end up here */ - Genode::warning("key (", Input::key_name(key), ",", (unsigned)key, - ",U+", Genode::Hex((unsigned short)codepoint.value, - Genode::Hex::OMIT_PREFIX, Genode::Hex::PAD), - ") lacks Qt mapping"); - return Mapped_key { Qt::Key_unknown, codepoint }; -} - - -void QGenodePlatformWindow::_key_event(Input::Keycode key, Codepoint codepoint, - Mapped_key::Event e) -{ - bool const pressed = e != Mapped_key::RELEASED; - - Qt::KeyboardModifier current_modifier = Qt::NoModifier; - - /* FIXME ignores two keys for one modifier were pressed and only one was released */ - switch (key) { - case Input::KEY_LEFTALT: current_modifier = Qt::AltModifier; break; - case Input::KEY_LEFTCTRL: - case Input::KEY_RIGHTCTRL: current_modifier = Qt::ControlModifier; break; - case Input::KEY_LEFTSHIFT: - case Input::KEY_RIGHTSHIFT: current_modifier = Qt::ShiftModifier; break; - default: break; - } - - _keyboard_modifiers.setFlag(current_modifier, pressed); - - QEvent::Type const event_type = pressed ? QEvent::KeyPress : QEvent::KeyRelease; - Mapped_key const mapped_key = _map_key(key, codepoint, e); - unsigned const unicode = mapped_key.codepoint.valid() - ? mapped_key.codepoint.value : 0; - bool const autorepeat = e == Mapped_key::REPEAT; - - QWindowSystemInterface::handleExtendedKeyEvent(window(), - event_type, - mapped_key.key, - _keyboard_modifiers, - key, 0, int(_keyboard_modifiers), - unicode ? QString(unicode) : QString(), - autorepeat); -} - - -void QGenodePlatformWindow::_mouse_button_event(Input::Keycode button, bool press) -{ - Qt::MouseButton current_mouse_button = Qt::NoButton; - - switch (button) { - case Input::BTN_LEFT: current_mouse_button = Qt::LeftButton; break; - case Input::BTN_RIGHT: current_mouse_button = Qt::RightButton; break; - case Input::BTN_MIDDLE: current_mouse_button = Qt::MidButton; break; - case Input::BTN_SIDE: current_mouse_button = Qt::ExtraButton1; break; - case Input::BTN_EXTRA: current_mouse_button = Qt::ExtraButton2; break; - case Input::BTN_FORWARD: current_mouse_button = Qt::ExtraButton3; break; - case Input::BTN_BACK: current_mouse_button = Qt::ExtraButton4; break; - case Input::BTN_TASK: current_mouse_button = Qt::ExtraButton5; break; - default: return; - } - - _mouse_button_state.setFlag(current_mouse_button, press); - - /* on mouse click, make this window the focused window */ - if (press) requestActivateWindow(); - - QWindowSystemInterface::handleMouseEvent(window(), - _local_position(), - _mouse_position, - _mouse_button_state, - current_mouse_button, - press ? QEvent::MouseButtonPress - : QEvent::MouseButtonRelease, - _keyboard_modifiers); -} - - -void QGenodePlatformWindow::_handle_input() -{ - QList touch_events; - - _input_session.for_each_event([&] (Input::Event const &event) { - - event.handle_absolute_motion([&] (int x, int y) { - _mouse_position = QPoint(x, y); - - QWindowSystemInterface::handleMouseEvent(window(), - _local_position(), - _mouse_position, - _mouse_button_state, - Qt::NoButton, - QEvent::MouseMove, - _keyboard_modifiers); - }); - - event.handle_press([&] (Input::Keycode key, Codepoint codepoint) { - if (key > 0 && key < 0x100) - _key_event(key, codepoint, Mapped_key::PRESSED); - else if (key >= Input::BTN_LEFT && key <= Input::BTN_TASK) - _mouse_button_event(key, true); - }); - - event.handle_release([&] (Input::Keycode key) { - if (key > 0 && key < 0x100) - _key_event(key, Codepoint { Codepoint::INVALID }, Mapped_key::RELEASED); - else if (key >= Input::BTN_LEFT && key <= Input::BTN_TASK) - _mouse_button_event(key, false); - }); - - event.handle_repeat([&] (Codepoint codepoint) { - _key_event(Input::KEY_UNKNOWN, codepoint, Mapped_key::REPEAT); - }); - - event.handle_wheel([&] (int x, int y) { - QWindowSystemInterface::handleWheelEvent(window(), - _local_position(), - _local_position(), - QPoint(), - QPoint(0, y * 120), - _keyboard_modifiers); }); - - if (event.touch() || event.touch_release()) - touch_events.push_back(event); - }); - - /* process all gathered touch events */ - _process_touch_events(touch_events); -} - - -void QGenodePlatformWindow::_handle_mode_changed() -{ - Framebuffer::Mode mode(_gui_session.mode()); - - if ((mode.area.w() == 0) && (mode.area.h() == 0)) { - /* interpret a size of 0x0 as indication to close the window */ - QWindowSystemInterface::handleCloseEvent(window(), 0); - /* don't actually set geometry to 0x0; either close or remain open */ - return; - } - - if (mode.area != _current_mode.area) { - - QRect geo(geometry()); - geo.setWidth (mode.area.w()); - geo.setHeight(mode.area.h()); - - QWindowSystemInterface::handleGeometryChange(window(), geo); - - setGeometry(geo); - } -} - - -Gui::Session::View_handle QGenodePlatformWindow::_create_view() -{ - if (window()->type() == Qt::Desktop) - return Gui::Session::View_handle(); - - if (window()->type() == Qt::Dialog) - return _gui_session.create_view(); - - /* - * Popup menus should never get a window decoration, therefore we set a top - * level Qt window as 'transient parent'. - */ - if (!window()->transientParent() && (window()->type() == Qt::Popup)) { - QWindow *top_window = QGuiApplication::topLevelWindows().first(); - window()->setTransientParent(top_window); - } - - if (window()->transientParent()) { - QGenodePlatformWindow *parent_platform_window = - static_cast(window()->transientParent()->handle()); - - Gui::Session::View_handle parent_handle = - _gui_session.view_handle(parent_platform_window->view_cap()); - - Gui::Session::View_handle result = - _gui_session.create_view(parent_handle); - - _gui_session.release_view_handle(parent_handle); - - return result; - } - - return _gui_session.create_view(); -} - -void QGenodePlatformWindow::_adjust_and_set_geometry(const QRect &rect) -{ - /* limit window size to screen size */ - QRect adjusted_rect(rect.intersected(screen()->geometry())); - - /* Currently, top level windows must start at (0,0) */ - if (!window()->transientParent()) - adjusted_rect.moveTo(0, 0); - - QPlatformWindow::setGeometry(adjusted_rect); - - Framebuffer::Mode const mode { .area = { (unsigned)adjusted_rect.width(), - (unsigned)adjusted_rect.height() } }; - _gui_session.buffer(mode, false); - - _current_mode = mode; - - _framebuffer_changed = true; - _geometry_changed = true; - - emit framebuffer_changed(); -} - - -QString QGenodePlatformWindow::_sanitize_label(QString label) -{ - enum { MAX_LABEL = 25 }; - - /* remove any occurences of '"' */ - label.remove("\""); - - /* truncate label and append '..' */ - if (label.length() > MAX_LABEL) { - label.truncate(MAX_LABEL - 2); - label.append(".."); - } - - /* Make sure that the window is distinguishable by the layouter */ - if (label.isEmpty()) - label = QString("Untitled Window"); - - if (_gui_session_label_list.contains(label)) - for (unsigned int i = 2; ; i++) { - QString versioned_label = label + "." + QString::number(i); - if (!_gui_session_label_list.contains(versioned_label)) { - label = versioned_label; - break; - } - } - - return label; -} - - -QGenodePlatformWindow::QGenodePlatformWindow(Genode::Env &env, QWindow *window, - int screen_width, int screen_height) -: QPlatformWindow(window), - _env(env), - _gui_session_label(_sanitize_label(window->title())), - _gui_session(env, _gui_session_label.toStdString().c_str()), - _framebuffer_session(_gui_session.framebuffer_session()), - _framebuffer(0), - _framebuffer_changed(false), - _geometry_changed(false), - _view_handle(_create_view()), - _input_session(env.rm(), _gui_session.input_session()), - _ev_buf(env.rm(), _input_session.dataspace()), - _resize_handle(!window->flags().testFlag(Qt::Popup)), - _decoration(!window->flags().testFlag(Qt::Popup)), - _egl_surface(EGL_NO_SURFACE), - _input_signal_handler(_env.ep(), *this, - &QGenodePlatformWindow::_input), - _mode_changed_signal_handler(_env.ep(), *this, - &QGenodePlatformWindow::_mode_changed), - _touch_device(_init_touch_device()) -{ - if (qnpw_verbose) - if (window->transientParent()) - qDebug() << "QGenodePlatformWindow(): child window of" << window->transientParent(); - - _gui_session_label_list.append(_gui_session_label); - - _input_session.sigh(_input_signal_handler); - - _gui_session.mode_sigh(_mode_changed_signal_handler); - - _adjust_and_set_geometry(geometry()); - - if (_view_handle.valid()) { - - /* bring the view to the top */ - typedef Gui::Session::Command Command; - _gui_session.enqueue(_view_handle); - _gui_session.execute(); - } - - connect(this, SIGNAL(_input()), - this, SLOT(_handle_input()), - Qt::QueuedConnection); - - connect(this, SIGNAL(_mode_changed()), - this, SLOT(_handle_mode_changed()), - Qt::QueuedConnection); -} - -QGenodePlatformWindow::~QGenodePlatformWindow() -{ - _gui_session_label_list.removeOne(_gui_session_label); -} - -QSurfaceFormat QGenodePlatformWindow::format() const -{ - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::format()"; - return QPlatformWindow::format(); -} - -void QGenodePlatformWindow::setGeometry(const QRect &rect) -{ - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::setGeometry(" << rect << ")"; - - _adjust_and_set_geometry(rect); - - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::setGeometry() finished"; -} - -QRect QGenodePlatformWindow::geometry() const -{ - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::geometry(): returning" << QPlatformWindow::geometry(); - return QPlatformWindow::geometry(); -} - -QMargins QGenodePlatformWindow::frameMargins() const -{ - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::frameMargins()"; - return QPlatformWindow::frameMargins(); -} - -void QGenodePlatformWindow::setVisible(bool visible) -{ - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::setVisible(" << visible << ")"; - - typedef Gui::Session::Command Command; - - if (visible) { - QRect g(geometry()); - - if (window()->transientParent()) { - /* translate global position to parent-relative position */ - g.moveTo(window()->transientParent()->mapFromGlobal(g.topLeft())); - } - - _gui_session.enqueue(_view_handle, - Gui::Rect(Gui::Point(g.x(), g.y()), - Gui::Area(g.width(), g.height()))); - } else { - - _gui_session.enqueue(_view_handle, - Gui::Rect(Gui::Point(), Gui::Area(0, 0))); - } - - _gui_session.execute(); - - - - QPlatformWindow::setVisible(visible); - - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::setVisible() finished"; -} - -void QGenodePlatformWindow::setWindowFlags(Qt::WindowFlags flags) -{ - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::setWindowFlags(" << flags << ")"; - - QPlatformWindow::setWindowFlags(flags); - - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::setWindowFlags() finished"; -} - -void QGenodePlatformWindow::setWindowState(Qt::WindowStates state) -{ - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::setWindowState(" << state << ")"; - - QPlatformWindow::setWindowState(state); - - if ((state == Qt::WindowMaximized) || (state == Qt::WindowFullScreen)) { - QRect screen_geometry { screen()->geometry() }; - QWindowSystemInterface::handleGeometryChange(window(), screen_geometry); - setGeometry(screen_geometry); - } -} - -WId QGenodePlatformWindow::winId() const -{ - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::winId()"; - return WId(this); -} - -void QGenodePlatformWindow::setParent(const QPlatformWindow *window) -{ - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::setParent()"; - QPlatformWindow::setParent(window); -} - -void QGenodePlatformWindow::setWindowTitle(const QString &title) -{ - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::setWindowTitle(" << title << ")"; - - QPlatformWindow::setWindowTitle(title); - - _title = title.toLocal8Bit(); - - typedef Gui::Session::Command Command; - - if (_view_handle.valid()) { - _gui_session.enqueue(_view_handle, _title.constData()); - _gui_session.execute(); - } - - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::setWindowTitle() finished"; -} - -void QGenodePlatformWindow::setWindowFilePath(const QString &title) -{ - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::setWindowFilePath(" << title << ")"; - QPlatformWindow::setWindowFilePath(title); -} - -void QGenodePlatformWindow::setWindowIcon(const QIcon &icon) -{ - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::setWindowIcon()"; - QPlatformWindow::setWindowIcon(icon); -} - -void QGenodePlatformWindow::raise() -{ - /* bring the view to the top */ - _gui_session.enqueue(_view_handle); - _gui_session.execute(); - - QPlatformWindow::raise(); -} - -void QGenodePlatformWindow::lower() -{ - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::lower()"; - QPlatformWindow::lower(); -} - -bool QGenodePlatformWindow::isExposed() const -{ - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::isExposed()"; - return QPlatformWindow::isExposed(); -} - -bool QGenodePlatformWindow::isActive() const -{ - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::isActive()"; - return QPlatformWindow::isActive(); -} - -bool QGenodePlatformWindow::isEmbedded() const -{ - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::isEmbedded()"; - return QPlatformWindow::isEmbedded(); -} - -QPoint QGenodePlatformWindow::mapToGlobal(const QPoint &pos) const -{ - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::mapToGlobal(" << pos << ")"; - return QPlatformWindow::mapToGlobal(pos); -} - -QPoint QGenodePlatformWindow::mapFromGlobal(const QPoint &pos) const -{ - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::mapFromGlobal(" << pos << ")"; - return QPlatformWindow::mapFromGlobal(pos); -} - -void QGenodePlatformWindow::propagateSizeHints() -{ - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::propagateSizeHints()"; - QPlatformWindow::propagateSizeHints(); -} - -void QGenodePlatformWindow::setOpacity(qreal level) -{ - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::setOpacity(" << level << ")"; - QPlatformWindow::setOpacity(level); -} - -void QGenodePlatformWindow::setMask(const QRegion ®ion) -{ - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::setMask(" << region << ")"; - QPlatformWindow::setMask(region); -} - -void QGenodePlatformWindow::requestActivateWindow() -{ - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::requestActivateWindow()"; - QPlatformWindow::requestActivateWindow(); -} - -void QGenodePlatformWindow::handleContentOrientationChange(Qt::ScreenOrientation orientation) -{ - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::handleContentOrientationChange()"; - QPlatformWindow::handleContentOrientationChange(orientation); -} - -qreal QGenodePlatformWindow::devicePixelRatio() const -{ - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::devicePixelRatio()"; - return QPlatformWindow::devicePixelRatio(); -} - -bool QGenodePlatformWindow::setKeyboardGrabEnabled(bool grab) -{ - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::setKeyboardGrabEnabled()"; - return QPlatformWindow::setKeyboardGrabEnabled(grab); -} - -bool QGenodePlatformWindow::setMouseGrabEnabled(bool grab) -{ - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::setMouseGrabEnabled()"; - return QPlatformWindow::setMouseGrabEnabled(grab); -} - -bool QGenodePlatformWindow::setWindowModified(bool modified) -{ - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::setWindowModified()"; - return QPlatformWindow::setWindowModified(modified); -} - -bool QGenodePlatformWindow::windowEvent(QEvent *event) -{ - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::windowEvent(" << event->type() << ")"; - return QPlatformWindow::windowEvent(event); -} - -bool QGenodePlatformWindow::startSystemResize(const QPoint &pos, Qt::Corner corner) -{ - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::startSystemResize()"; - return QPlatformWindow::startSystemResize(pos, corner); -} - -void QGenodePlatformWindow::setFrameStrutEventsEnabled(bool enabled) -{ - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::setFrameStrutEventsEnabled()"; - QPlatformWindow::setFrameStrutEventsEnabled(enabled); -} - -bool QGenodePlatformWindow::frameStrutEventsEnabled() const -{ - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::frameStrutEventsEnabled()"; - return QPlatformWindow::frameStrutEventsEnabled(); -} - -/* functions used by the window surface */ - -unsigned char *QGenodePlatformWindow::framebuffer() -{ - if (qnpw_verbose) - qDebug() << "QGenodePlatformWindow::framebuffer()" << _framebuffer; - - /* - * The new framebuffer is acquired in this function to avoid a time span when - * the GUI buffer would be black and not refilled yet by Qt. - */ - - if (_framebuffer_changed) { - - _framebuffer_changed = false; - - if (_framebuffer != 0) - _env.rm().detach(_framebuffer); - - _framebuffer = _env.rm().attach(_framebuffer_session.dataspace()); - } - - return _framebuffer; -} - -void QGenodePlatformWindow::refresh(int x, int y, int w, int h) -{ - if (qnpw_verbose) - qDebug("QGenodePlatformWindow::refresh(%d, %d, %d, %d)", x, y, w, h); - - if (_geometry_changed) { - - _geometry_changed = false; - - if (window()->isVisible()) { - QRect g(geometry()); - - if (window()->transientParent()) { - /* translate global position to parent-relative position */ - g.moveTo(window()->transientParent()->mapFromGlobal(g.topLeft())); - } - - typedef Gui::Session::Command Command; - _gui_session.enqueue(_view_handle, - Gui::Rect(Gui::Point(g.x(), g.y()), - Gui::Area(g.width(), g.height()))); - _gui_session.execute(); - } - } - - _framebuffer_session.refresh(x, y, w, h); -} - -EGLSurface QGenodePlatformWindow::egl_surface() const -{ - return _egl_surface; -} - -void QGenodePlatformWindow::egl_surface(EGLSurface egl_surface) -{ - _egl_surface = egl_surface; -} - -Gui::Session_client &QGenodePlatformWindow::gui_session() -{ - return _gui_session; -} - -Gui::View_capability QGenodePlatformWindow::view_cap() const -{ - QGenodePlatformWindow *npw = const_cast(this); - return npw->_gui_session.view_capability(_view_handle); -} - -QT_END_NAMESPACE diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodescreen.h b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodescreen.h deleted file mode 100644 index 56957aa97e..0000000000 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodescreen.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - * \brief QGenodeScreen - * \author Christian Prochaska - * \date 2013-05-08 - */ - -/* - * Copyright (C) 2013-2017 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU Affero General Public License version 3. - */ - - -#ifndef _QGENODESCREEN_H_ -#define _QGENODESCREEN_H_ - -/* Genode includes */ -#include - -/* Qt includes */ -#include - -#include - -#include "qgenodecursor.h" - -QT_BEGIN_NAMESPACE - -class QGenodeScreen : public QPlatformScreen -{ - private: - - Genode::Env &_env; - QRect _geometry; - - public: - - QGenodeScreen(Genode::Env &env) : _env(env) - { - Gui::Connection _gui(env); - - Framebuffer::Mode const scr_mode = _gui.mode(); - - _geometry.setRect(0, 0, scr_mode.area.w(), - scr_mode.area.h()); - } - - QRect geometry() const { return _geometry; } - int depth() const { return 32; } - QImage::Format format() const { return QImage::Format_ARGB32; } - QDpi logicalDpi() const { return QDpi(80, 80); }; - - QPlatformCursor *cursor() const - { - static QGenodeCursor instance(_env); - return &instance; - } -}; - -QT_END_NAMESPACE - -#endif /* _QGENODESCREEN_H_ */ diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodewindowsurface.cpp b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodewindowsurface.cpp deleted file mode 100644 index e9271e0fd0..0000000000 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodewindowsurface.cpp +++ /dev/null @@ -1,131 +0,0 @@ -/* - * \brief QGenodeWindowSurface - * \author Christian Prochaska - * \date 2013-05-08 - */ - -/* - * Copyright (C) 2013-2017 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU Affero General Public License version 3. - */ - -/* Genode includes */ -#include - -/* Qt includes */ -#include - -#include - -#include "qgenodeplatformwindow.h" - -#include "qgenodewindowsurface.h" - -#include - -static const bool verbose = false; - -QT_BEGIN_NAMESPACE - -QGenodeWindowSurface::QGenodeWindowSurface(QWindow *window) - : QPlatformBackingStore(window), _backbuffer(0), _framebuffer_changed(true) -{ - //qDebug() << "QGenodeWindowSurface::QGenodeWindowSurface:" << (long)this; - - /* Calling 'QWindow::winId()' ensures that the platform window has been created */ - window->winId(); - - _platform_window = static_cast(window->handle()); - connect(_platform_window, SIGNAL(framebuffer_changed()), this, SLOT(framebuffer_changed())); -} - -QGenodeWindowSurface::~QGenodeWindowSurface() -{ - free(_backbuffer); -} - -QPaintDevice *QGenodeWindowSurface::paintDevice() -{ - if (verbose) - qDebug() << "QGenodeWindowSurface::paintDevice()"; - - if (_framebuffer_changed) { - - _framebuffer_changed = false; - /* - * It can happen that 'resize()' was not called yet, so the size needs - * to be obtained from the window. - */ - QImage::Format format = QGuiApplication::primaryScreen()->handle()->format(); - QRect geo = _platform_window->geometry(); - unsigned int const bytes_per_pixel = QGuiApplication::primaryScreen()->depth() / 8; - free(_backbuffer); - _backbuffer = (unsigned char*)malloc(geo.width() * geo.height() * bytes_per_pixel); - _image = QImage(_backbuffer, geo.width(), geo.height(), geo.width() * bytes_per_pixel, format); - - if (verbose) - qDebug() << "QGenodeWindowSurface::paintDevice(): w =" << geo.width() << ", h =" << geo.height(); - } - - if (verbose) - qDebug() << "QGenodeWindowSurface::paintDevice() finished"; - - return &_image; -} - -void QGenodeWindowSurface::flush(QWindow *window, const QRegion ®ion, const QPoint &offset) -{ - Q_UNUSED(window); - Q_UNUSED(region); - Q_UNUSED(offset); - - if (verbose) - qDebug() << "QGenodeWindowSurface::flush(" - << "window =" << window - << ", region =" << region - << ", offset =" << offset - << ")"; - - unsigned int const bytes_per_pixel = _image.depth() / 8; - - for (QRect rect : region) { - - /* - * It happened that after resizing a window, the given flush region was - * bigger than the current window size, so clipping is necessary here. - */ - - rect &= _image.rect(); - - unsigned int buffer_offset = ((rect.y() + offset.y()) * _image.bytesPerLine()) + - ((rect.x() + offset.x()) * bytes_per_pixel); - - blit(_image.bits() + buffer_offset, - _image.bytesPerLine(), - _platform_window->framebuffer() + buffer_offset, - _image.bytesPerLine(), - rect.width() * bytes_per_pixel, - rect.height()); - - _platform_window->refresh(rect.x() + offset.x(), - rect.y() + offset.y(), - rect.width(), - rect.height()); - } - -} - -void QGenodeWindowSurface::resize(const QSize &size, const QRegion &staticContents) -{ - if (verbose) - qDebug() << "QGenodeWindowSurface::resize:" << this << size; -} - -void QGenodeWindowSurface::framebuffer_changed() -{ - _framebuffer_changed = true; -} - -QT_END_NAMESPACE diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodewindowsurface.h b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodewindowsurface.h deleted file mode 100644 index 870e6cc770..0000000000 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodewindowsurface.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * \brief QGenodeWindowSurface - * \author Christian Prochaska - * \date 2013-05-08 - */ - -/* - * Copyright (C) 2013-2017 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU Affero General Public License version 3. - */ - - -#ifndef _QGENODEWINDOWSURFACE_H_ -#define _QGENODEWINDOWSURFACE_H_ - -#include - -class QGenodePlatformWindow; - -QT_BEGIN_NAMESPACE - -class QGenodeWindowSurface : public QObject, public QPlatformBackingStore -{ - Q_OBJECT - - private: - - QGenodePlatformWindow *_platform_window; - unsigned char *_backbuffer; - QImage _image; - bool _framebuffer_changed; - - public: - - QGenodeWindowSurface(QWindow *window); - ~QGenodeWindowSurface(); - - QPaintDevice *paintDevice(); - void flush(QWindow *window, const QRegion ®ion, const QPoint &offset); - void resize(const QSize &size, const QRegion &staticContents); - - public slots: - - void framebuffer_changed(); -}; - -QT_END_NAMESPACE - -#endif /* _QGENODEWINDOWSURFACE_H_ */ diff --git a/repos/libports/src/lib/qt5/qtdeclarative/src/imports/folderlistmodel/target.mk b/repos/libports/src/lib/qt5/qtdeclarative/src/imports/folderlistmodel/target.mk deleted file mode 100644 index 5d1203bae1..0000000000 --- a/repos/libports/src/lib/qt5/qtdeclarative/src/imports/folderlistmodel/target.mk +++ /dev/null @@ -1,6 +0,0 @@ -# the plugin gets loaded via 'dlopen()', therefore it is built separately - -TARGET = dummy-qt5_qmlfolderlistmodelplugin -LIBS = qt5_qmlfolderlistmodelplugin - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/src/lib/qt5/qtdeclarative/src/imports/layouts/target.mk b/repos/libports/src/lib/qt5/qtdeclarative/src/imports/layouts/target.mk deleted file mode 100644 index cfbca922d7..0000000000 --- a/repos/libports/src/lib/qt5/qtdeclarative/src/imports/layouts/target.mk +++ /dev/null @@ -1,6 +0,0 @@ -# the plugin gets loaded via 'dlopen()', therefore it is built separately - -TARGET = dummy-qt5_qquicklayoutsplugin -LIBS = qt5_qquicklayoutsplugin - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/src/lib/qt5/qtdeclarative/src/imports/qtquick2/target.mk b/repos/libports/src/lib/qt5/qtdeclarative/src/imports/qtquick2/target.mk deleted file mode 100644 index f8388c4243..0000000000 --- a/repos/libports/src/lib/qt5/qtdeclarative/src/imports/qtquick2/target.mk +++ /dev/null @@ -1,6 +0,0 @@ -# the plugin gets loaded via 'dlopen()', therefore it is built separately - -TARGET = dummy-qt5_qtquick2plugin -LIBS = qt5_qtquick2plugin - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/src/lib/qt5/qtvirtualkeyboard/src/imports/qtvirtualkeyboard/import/target.mk b/repos/libports/src/lib/qt5/qtvirtualkeyboard/src/imports/qtvirtualkeyboard/import/target.mk deleted file mode 100644 index dd6a263f2d..0000000000 --- a/repos/libports/src/lib/qt5/qtvirtualkeyboard/src/imports/qtvirtualkeyboard/import/target.mk +++ /dev/null @@ -1,6 +0,0 @@ -# the plugin gets loaded via 'dlopen()', therefore it is built separately - -TARGET = dummy-qt5_qtquickvirtualkeyboardplugin -LIBS = qt5_qtquickvirtualkeyboardplugin - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/src/lib/qt5/qtvirtualkeyboard/src/imports/qtvirtualkeyboard/settings/target.mk b/repos/libports/src/lib/qt5/qtvirtualkeyboard/src/imports/qtvirtualkeyboard/settings/target.mk deleted file mode 100644 index b8083e9a10..0000000000 --- a/repos/libports/src/lib/qt5/qtvirtualkeyboard/src/imports/qtvirtualkeyboard/settings/target.mk +++ /dev/null @@ -1,6 +0,0 @@ -# the plugin gets loaded via 'dlopen()', therefore it is built separately - -TARGET = dummy-qt5_qtquickvirtualkeyboardsettingsplugin -LIBS = qt5_qtquickvirtualkeyboardsettingsplugin - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/src/lib/qt5/qtvirtualkeyboard/src/imports/qtvirtualkeyboard/styles/target.mk b/repos/libports/src/lib/qt5/qtvirtualkeyboard/src/imports/qtvirtualkeyboard/styles/target.mk deleted file mode 100644 index 1dad6ea6dc..0000000000 --- a/repos/libports/src/lib/qt5/qtvirtualkeyboard/src/imports/qtvirtualkeyboard/styles/target.mk +++ /dev/null @@ -1,6 +0,0 @@ -# the plugin gets loaded via 'dlopen()', therefore it is built separately - -TARGET = dummy-qt5_qtquickvirtualkeyboardstylesplugin -LIBS = qt5_qtquickvirtualkeyboardstylesplugin - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/src/lib/qt5/qtvirtualkeyboard/src/imports/qtvirtualkeyboard/target.mk b/repos/libports/src/lib/qt5/qtvirtualkeyboard/src/imports/qtvirtualkeyboard/target.mk deleted file mode 100644 index c61f338e1b..0000000000 --- a/repos/libports/src/lib/qt5/qtvirtualkeyboard/src/imports/qtvirtualkeyboard/target.mk +++ /dev/null @@ -1,6 +0,0 @@ -# the plugin gets loaded via 'dlopen()', therefore it is built separately - -TARGET = dummy-qt5_qtvirtualkeyboardplugin -LIBS = qt5_qtvirtualkeyboardplugin - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/src/lib/qt5/qtwebkit/Source/WebCore/idl_files b/repos/libports/src/lib/qt5/qtwebkit/Source/WebCore/idl_files deleted file mode 100644 index 4430d1dea5..0000000000 --- a/repos/libports/src/lib/qt5/qtwebkit/Source/WebCore/idl_files +++ /dev/null @@ -1,558 +0,0 @@ -qtwebkit/Source/WebCore/Modules/filesystem/DOMFileSystem.idl -qtwebkit/Source/WebCore/Modules/filesystem/DOMFileSystemSync.idl -qtwebkit/Source/WebCore/Modules/filesystem/DOMWindowFileSystem.idl -qtwebkit/Source/WebCore/Modules/filesystem/DirectoryEntry.idl -qtwebkit/Source/WebCore/Modules/filesystem/DirectoryEntrySync.idl -qtwebkit/Source/WebCore/Modules/filesystem/DirectoryReader.idl -qtwebkit/Source/WebCore/Modules/filesystem/DirectoryReaderSync.idl -qtwebkit/Source/WebCore/Modules/filesystem/EntriesCallback.idl -qtwebkit/Source/WebCore/Modules/filesystem/Entry.idl -qtwebkit/Source/WebCore/Modules/filesystem/EntryArray.idl -qtwebkit/Source/WebCore/Modules/filesystem/EntryArraySync.idl -qtwebkit/Source/WebCore/Modules/filesystem/EntryCallback.idl -qtwebkit/Source/WebCore/Modules/filesystem/EntrySync.idl -qtwebkit/Source/WebCore/Modules/filesystem/ErrorCallback.idl -qtwebkit/Source/WebCore/Modules/filesystem/FileCallback.idl -qtwebkit/Source/WebCore/Modules/filesystem/FileEntry.idl -qtwebkit/Source/WebCore/Modules/filesystem/FileEntrySync.idl -qtwebkit/Source/WebCore/Modules/filesystem/FileSystemCallback.idl -qtwebkit/Source/WebCore/Modules/filesystem/FileWriter.idl -qtwebkit/Source/WebCore/Modules/filesystem/FileWriterCallback.idl -qtwebkit/Source/WebCore/Modules/filesystem/Metadata.idl -qtwebkit/Source/WebCore/Modules/filesystem/MetadataCallback.idl -qtwebkit/Source/WebCore/Modules/filesystem/WorkerGlobalScopeFileSystem.idl -qtwebkit/Source/WebCore/Modules/geolocation/Coordinates.idl -qtwebkit/Source/WebCore/Modules/geolocation/Geolocation.idl -qtwebkit/Source/WebCore/Modules/geolocation/Geoposition.idl -qtwebkit/Source/WebCore/Modules/geolocation/NavigatorGeolocation.idl -qtwebkit/Source/WebCore/Modules/geolocation/PositionCallback.idl -qtwebkit/Source/WebCore/Modules/geolocation/PositionError.idl -qtwebkit/Source/WebCore/Modules/geolocation/PositionErrorCallback.idl -qtwebkit/Source/WebCore/Modules/indexeddb/DOMWindowIndexedDatabase.idl -qtwebkit/Source/WebCore/Modules/indexeddb/IDBAny.idl -qtwebkit/Source/WebCore/Modules/indexeddb/IDBCursor.idl -qtwebkit/Source/WebCore/Modules/indexeddb/IDBCursorWithValue.idl -qtwebkit/Source/WebCore/Modules/indexeddb/IDBDatabase.idl -qtwebkit/Source/WebCore/Modules/indexeddb/IDBFactory.idl -qtwebkit/Source/WebCore/Modules/indexeddb/IDBIndex.idl -qtwebkit/Source/WebCore/Modules/indexeddb/IDBKeyRange.idl -qtwebkit/Source/WebCore/Modules/indexeddb/IDBObjectStore.idl -qtwebkit/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.idl -qtwebkit/Source/WebCore/Modules/indexeddb/IDBRequest.idl -qtwebkit/Source/WebCore/Modules/indexeddb/IDBTransaction.idl -qtwebkit/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.idl -qtwebkit/Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.idl -qtwebkit/Source/WebCore/Modules/notifications/DOMWindowNotifications.idl -qtwebkit/Source/WebCore/Modules/notifications/Notification.idl -qtwebkit/Source/WebCore/Modules/notifications/NotificationCenter.idl -qtwebkit/Source/WebCore/Modules/notifications/NotificationPermissionCallback.idl -qtwebkit/Source/WebCore/Modules/notifications/WorkerGlobalScopeNotifications.idl -qtwebkit/Source/WebCore/Modules/quota/DOMWindowQuota.idl -qtwebkit/Source/WebCore/Modules/quota/NavigatorStorageQuota.idl -qtwebkit/Source/WebCore/Modules/quota/StorageInfo.idl -qtwebkit/Source/WebCore/Modules/quota/StorageErrorCallback.idl -qtwebkit/Source/WebCore/Modules/quota/StorageQuota.idl -qtwebkit/Source/WebCore/Modules/quota/StorageQuotaCallback.idl -qtwebkit/Source/WebCore/Modules/quota/StorageUsageCallback.idl -qtwebkit/Source/WebCore/Modules/quota/WorkerNavigatorStorageQuota.idl -qtwebkit/Source/WebCore/Modules/webaudio/AudioBuffer.idl -qtwebkit/Source/WebCore/Modules/webaudio/AudioBufferCallback.idl -qtwebkit/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.idl -qtwebkit/Source/WebCore/Modules/webaudio/ChannelMergerNode.idl -qtwebkit/Source/WebCore/Modules/webaudio/ChannelSplitterNode.idl -qtwebkit/Source/WebCore/Modules/webaudio/AudioContext.idl -qtwebkit/Source/WebCore/Modules/webaudio/AudioDestinationNode.idl -qtwebkit/Source/WebCore/Modules/webaudio/GainNode.idl -qtwebkit/Source/WebCore/Modules/webaudio/AudioListener.idl -qtwebkit/Source/WebCore/Modules/webaudio/AudioNode.idl -qtwebkit/Source/WebCore/Modules/webaudio/PannerNode.idl -qtwebkit/Source/WebCore/Modules/webaudio/AudioParam.idl -qtwebkit/Source/WebCore/Modules/webaudio/AudioProcessingEvent.idl -qtwebkit/Source/WebCore/Modules/webaudio/BiquadFilterNode.idl -qtwebkit/Source/WebCore/Modules/webaudio/ConvolverNode.idl -qtwebkit/Source/WebCore/Modules/webaudio/DelayNode.idl -qtwebkit/Source/WebCore/Modules/webaudio/DynamicsCompressorNode.idl -qtwebkit/Source/WebCore/Modules/webaudio/ScriptProcessorNode.idl -qtwebkit/Source/WebCore/Modules/webaudio/MediaElementAudioSourceNode.idl -qtwebkit/Source/WebCore/Modules/webaudio/MediaStreamAudioSourceNode.idl -qtwebkit/Source/WebCore/Modules/webaudio/OfflineAudioContext.idl -qtwebkit/Source/WebCore/Modules/webaudio/OfflineAudioCompletionEvent.idl -qtwebkit/Source/WebCore/Modules/webaudio/OscillatorNode.idl -qtwebkit/Source/WebCore/Modules/webaudio/AnalyserNode.idl -qtwebkit/Source/WebCore/Modules/webaudio/WaveShaperNode.idl -qtwebkit/Source/WebCore/Modules/webaudio/PeriodicWave.idl -qtwebkit/Source/WebCore/Modules/webdatabase/DOMWindowWebDatabase.idl -qtwebkit/Source/WebCore/Modules/webdatabase/Database.idl -qtwebkit/Source/WebCore/Modules/webdatabase/DatabaseCallback.idl -qtwebkit/Source/WebCore/Modules/webdatabase/DatabaseSync.idl -qtwebkit/Source/WebCore/Modules/webdatabase/SQLError.idl -qtwebkit/Source/WebCore/Modules/webdatabase/SQLException.idl -qtwebkit/Source/WebCore/Modules/webdatabase/SQLResultSet.idl -qtwebkit/Source/WebCore/Modules/webdatabase/SQLResultSetRowList.idl -qtwebkit/Source/WebCore/Modules/webdatabase/SQLStatementCallback.idl -qtwebkit/Source/WebCore/Modules/webdatabase/SQLStatementErrorCallback.idl -qtwebkit/Source/WebCore/Modules/webdatabase/SQLTransaction.idl -qtwebkit/Source/WebCore/Modules/webdatabase/SQLTransactionCallback.idl -qtwebkit/Source/WebCore/Modules/webdatabase/SQLTransactionErrorCallback.idl -qtwebkit/Source/WebCore/Modules/webdatabase/SQLTransactionSync.idl -qtwebkit/Source/WebCore/Modules/webdatabase/SQLTransactionSyncCallback.idl -qtwebkit/Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.idl -qtwebkit/Source/WebCore/Modules/websockets/CloseEvent.idl -qtwebkit/Source/WebCore/Modules/websockets/WebSocket.idl -qtwebkit/Source/WebCore/css/Counter.idl -qtwebkit/Source/WebCore/css/CSSCharsetRule.idl -qtwebkit/Source/WebCore/css/CSSFontFaceLoadEvent.idl -qtwebkit/Source/WebCore/css/CSSFontFaceRule.idl -qtwebkit/Source/WebCore/css/CSSHostRule.idl -qtwebkit/Source/WebCore/css/CSSImportRule.idl -qtwebkit/Source/WebCore/css/CSSMediaRule.idl -qtwebkit/Source/WebCore/css/CSSPageRule.idl -qtwebkit/Source/WebCore/css/CSSPrimitiveValue.idl -qtwebkit/Source/WebCore/css/CSSRule.idl -qtwebkit/Source/WebCore/css/CSSRuleList.idl -qtwebkit/Source/WebCore/css/CSSStyleDeclaration.idl -qtwebkit/Source/WebCore/css/CSSStyleRule.idl -qtwebkit/Source/WebCore/css/CSSStyleSheet.idl -qtwebkit/Source/WebCore/css/CSSSupportsRule.idl -qtwebkit/Source/WebCore/css/CSSValue.idl -qtwebkit/Source/WebCore/css/CSSValueList.idl -qtwebkit/Source/WebCore/css/DOMWindowCSS.idl -qtwebkit/Source/WebCore/css/FontLoader.idl -qtwebkit/Source/WebCore/css/MediaList.idl -qtwebkit/Source/WebCore/css/MediaQueryList.idl -qtwebkit/Source/WebCore/css/Rect.idl -qtwebkit/Source/WebCore/css/RGBColor.idl -qtwebkit/Source/WebCore/css/StyleMedia.idl -qtwebkit/Source/WebCore/css/StyleSheet.idl -qtwebkit/Source/WebCore/css/StyleSheetList.idl -qtwebkit/Source/WebCore/css/WebKitCSSFilterRule.idl -qtwebkit/Source/WebCore/css/WebKitCSSFilterValue.idl -qtwebkit/Source/WebCore/css/WebKitCSSKeyframeRule.idl -qtwebkit/Source/WebCore/css/WebKitCSSKeyframesRule.idl -qtwebkit/Source/WebCore/css/WebKitCSSMatrix.idl -qtwebkit/Source/WebCore/css/WebKitCSSMixFunctionValue.idl -qtwebkit/Source/WebCore/css/WebKitCSSRegionRule.idl -qtwebkit/Source/WebCore/css/WebKitCSSTransformValue.idl -qtwebkit/Source/WebCore/css/WebKitCSSViewportRule.idl -qtwebkit/Source/WebCore/dom/Attr.idl -qtwebkit/Source/WebCore/dom/BeforeLoadEvent.idl -qtwebkit/Source/WebCore/dom/CharacterData.idl -qtwebkit/Source/WebCore/dom/ChildNode.idl -qtwebkit/Source/WebCore/dom/ClientRect.idl -qtwebkit/Source/WebCore/dom/ClientRectList.idl -qtwebkit/Source/WebCore/dom/Clipboard.idl -qtwebkit/Source/WebCore/dom/CDATASection.idl -qtwebkit/Source/WebCore/dom/Comment.idl -qtwebkit/Source/WebCore/dom/CompositionEvent.idl -qtwebkit/Source/WebCore/dom/CustomEvent.idl -qtwebkit/Source/WebCore/dom/DataTransferItem.idl -qtwebkit/Source/WebCore/dom/DataTransferItemList.idl -qtwebkit/Source/WebCore/dom/DeviceMotionEvent.idl -qtwebkit/Source/WebCore/dom/DeviceOrientationEvent.idl -qtwebkit/Source/WebCore/dom/DocumentFragment.idl -qtwebkit/Source/WebCore/dom/Document.idl -qtwebkit/Source/WebCore/dom/DocumentType.idl -qtwebkit/Source/WebCore/dom/DOMCoreException.idl -qtwebkit/Source/WebCore/dom/DOMError.idl -qtwebkit/Source/WebCore/dom/DOMImplementation.idl -qtwebkit/Source/WebCore/dom/DOMStringList.idl -qtwebkit/Source/WebCore/dom/DOMStringMap.idl -qtwebkit/Source/WebCore/dom/Element.idl -qtwebkit/Source/WebCore/dom/Entity.idl -qtwebkit/Source/WebCore/dom/EntityReference.idl -qtwebkit/Source/WebCore/dom/ErrorEvent.idl -qtwebkit/Source/WebCore/dom/Event.idl -qtwebkit/Source/WebCore/dom/EventException.idl -qtwebkit/Source/WebCore/dom/EventTarget.idl -qtwebkit/Source/WebCore/dom/FocusEvent.idl -qtwebkit/Source/WebCore/dom/HashChangeEvent.idl -qtwebkit/Source/WebCore/dom/KeyboardEvent.idl -qtwebkit/Source/WebCore/dom/MouseEvent.idl -qtwebkit/Source/WebCore/dom/MessageChannel.idl -qtwebkit/Source/WebCore/dom/MessageEvent.idl -qtwebkit/Source/WebCore/dom/MessagePort.idl -qtwebkit/Source/WebCore/dom/MutationEvent.idl -qtwebkit/Source/WebCore/dom/MutationObserver.idl -qtwebkit/Source/WebCore/dom/MutationRecord.idl -qtwebkit/Source/WebCore/dom/NamedNodeMap.idl -qtwebkit/Source/WebCore/dom/Node.idl -qtwebkit/Source/WebCore/dom/NodeFilter.idl -qtwebkit/Source/WebCore/dom/NodeIterator.idl -qtwebkit/Source/WebCore/dom/NodeList.idl -qtwebkit/Source/WebCore/dom/Notation.idl -qtwebkit/Source/WebCore/dom/OverflowEvent.idl -qtwebkit/Source/WebCore/dom/PageTransitionEvent.idl -qtwebkit/Source/WebCore/dom/PopStateEvent.idl -qtwebkit/Source/WebCore/dom/ProcessingInstruction.idl -qtwebkit/Source/WebCore/dom/ProgressEvent.idl -qtwebkit/Source/WebCore/dom/PropertyNodeList.idl -qtwebkit/Source/WebCore/dom/RangeException.idl -qtwebkit/Source/WebCore/dom/Range.idl -qtwebkit/Source/WebCore/dom/RequestAnimationFrameCallback.idl -qtwebkit/Source/WebCore/dom/ShadowRoot.idl -qtwebkit/Source/WebCore/dom/StringCallback.idl -qtwebkit/Source/WebCore/dom/Text.idl -qtwebkit/Source/WebCore/dom/TextEvent.idl -qtwebkit/Source/WebCore/dom/Touch.idl -qtwebkit/Source/WebCore/dom/TouchEvent.idl -qtwebkit/Source/WebCore/dom/TouchList.idl -qtwebkit/Source/WebCore/dom/TransitionEvent.idl -qtwebkit/Source/WebCore/dom/TreeWalker.idl -qtwebkit/Source/WebCore/dom/UIEvent.idl -qtwebkit/Source/WebCore/dom/WebKitAnimationEvent.idl -qtwebkit/Source/WebCore/dom/WebKitNamedFlow.idl -qtwebkit/Source/WebCore/dom/DOMNamedFlowCollection.idl -qtwebkit/Source/WebCore/dom/WebKitTransitionEvent.idl -qtwebkit/Source/WebCore/dom/WheelEvent.idl -qtwebkit/Source/WebCore/fileapi/Blob.idl -qtwebkit/Source/WebCore/fileapi/File.idl -qtwebkit/Source/WebCore/fileapi/FileError.idl -qtwebkit/Source/WebCore/fileapi/FileException.idl -qtwebkit/Source/WebCore/fileapi/FileList.idl -qtwebkit/Source/WebCore/fileapi/FileReader.idl -qtwebkit/Source/WebCore/fileapi/FileReaderSync.idl -qtwebkit/Source/WebCore/html/canvas/ArrayBufferView.idl -qtwebkit/Source/WebCore/html/canvas/ArrayBuffer.idl -qtwebkit/Source/WebCore/html/canvas/DataView.idl -qtwebkit/Source/WebCore/html/canvas/Int8Array.idl -qtwebkit/Source/WebCore/html/canvas/Float32Array.idl -qtwebkit/Source/WebCore/html/canvas/Float64Array.idl -qtwebkit/Source/WebCore/html/canvas/CanvasGradient.idl -qtwebkit/Source/WebCore/html/canvas/Int32Array.idl -qtwebkit/Source/WebCore/html/canvas/CanvasPattern.idl -qtwebkit/Source/WebCore/html/canvas/CanvasProxy.idl -qtwebkit/Source/WebCore/html/canvas/CanvasRenderingContext.idl -qtwebkit/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl -qtwebkit/Source/WebCore/html/canvas/DOMPath.idl -qtwebkit/Source/WebCore/html/canvas/EXTDrawBuffers.idl -qtwebkit/Source/WebCore/html/canvas/EXTTextureFilterAnisotropic.idl -qtwebkit/Source/WebCore/html/canvas/OESStandardDerivatives.idl -qtwebkit/Source/WebCore/html/canvas/OESTextureFloat.idl -qtwebkit/Source/WebCore/html/canvas/OESTextureHalfFloat.idl -qtwebkit/Source/WebCore/html/canvas/OESVertexArrayObject.idl -qtwebkit/Source/WebCore/html/canvas/OESElementIndexUint.idl -qtwebkit/Source/WebCore/html/canvas/WebGLActiveInfo.idl -qtwebkit/Source/WebCore/html/canvas/WebGLBuffer.idl -qtwebkit/Source/WebCore/html/canvas/WebGLCompressedTextureATC.idl -qtwebkit/Source/WebCore/html/canvas/WebGLCompressedTexturePVRTC.idl -qtwebkit/Source/WebCore/html/canvas/WebGLCompressedTextureS3TC.idl -qtwebkit/Source/WebCore/html/canvas/WebGLContextAttributes.idl -qtwebkit/Source/WebCore/html/canvas/WebGLContextEvent.idl -qtwebkit/Source/WebCore/html/canvas/WebGLDebugRendererInfo.idl -qtwebkit/Source/WebCore/html/canvas/WebGLDebugShaders.idl -qtwebkit/Source/WebCore/html/canvas/WebGLDepthTexture.idl -qtwebkit/Source/WebCore/html/canvas/WebGLFramebuffer.idl -qtwebkit/Source/WebCore/html/canvas/WebGLLoseContext.idl -qtwebkit/Source/WebCore/html/canvas/WebGLProgram.idl -qtwebkit/Source/WebCore/html/canvas/WebGLRenderbuffer.idl -qtwebkit/Source/WebCore/html/canvas/WebGLRenderingContext.idl -qtwebkit/Source/WebCore/html/canvas/WebGLShader.idl -qtwebkit/Source/WebCore/html/canvas/WebGLShaderPrecisionFormat.idl -qtwebkit/Source/WebCore/html/canvas/Int16Array.idl -qtwebkit/Source/WebCore/html/canvas/WebGLTexture.idl -qtwebkit/Source/WebCore/html/canvas/WebGLUniformLocation.idl -qtwebkit/Source/WebCore/html/canvas/WebGLVertexArrayObjectOES.idl -qtwebkit/Source/WebCore/html/canvas/Uint8Array.idl -qtwebkit/Source/WebCore/html/canvas/Uint8ClampedArray.idl -qtwebkit/Source/WebCore/html/canvas/Uint32Array.idl -qtwebkit/Source/WebCore/html/canvas/Uint16Array.idl -qtwebkit/Source/WebCore/html/DOMFormData.idl -qtwebkit/Source/WebCore/html/DOMSettableTokenList.idl -qtwebkit/Source/WebCore/html/DOMTokenList.idl -qtwebkit/Source/WebCore/html/DOMURL.idl -qtwebkit/Source/WebCore/html/HTMLAllCollection.idl -qtwebkit/Source/WebCore/html/HTMLAudioElement.idl -qtwebkit/Source/WebCore/html/HTMLAnchorElement.idl -qtwebkit/Source/WebCore/html/HTMLAppletElement.idl -qtwebkit/Source/WebCore/html/HTMLAreaElement.idl -qtwebkit/Source/WebCore/html/HTMLBaseElement.idl -qtwebkit/Source/WebCore/html/HTMLBaseFontElement.idl -qtwebkit/Source/WebCore/html/HTMLBodyElement.idl -qtwebkit/Source/WebCore/html/HTMLBRElement.idl -qtwebkit/Source/WebCore/html/HTMLButtonElement.idl -qtwebkit/Source/WebCore/html/HTMLCanvasElement.idl -qtwebkit/Source/WebCore/html/HTMLCollection.idl -qtwebkit/Source/WebCore/html/HTMLDataListElement.idl -qtwebkit/Source/WebCore/html/HTMLDetailsElement.idl -qtwebkit/Source/WebCore/html/HTMLDialogElement.idl -qtwebkit/Source/WebCore/html/HTMLDirectoryElement.idl -qtwebkit/Source/WebCore/html/HTMLDivElement.idl -qtwebkit/Source/WebCore/html/HTMLDListElement.idl -qtwebkit/Source/WebCore/html/HTMLDocument.idl -qtwebkit/Source/WebCore/html/HTMLElement.idl -qtwebkit/Source/WebCore/html/HTMLEmbedElement.idl -qtwebkit/Source/WebCore/html/HTMLFieldSetElement.idl -qtwebkit/Source/WebCore/html/HTMLFontElement.idl -qtwebkit/Source/WebCore/html/HTMLFormControlsCollection.idl -qtwebkit/Source/WebCore/html/HTMLFormElement.idl -qtwebkit/Source/WebCore/html/HTMLFrameElement.idl -qtwebkit/Source/WebCore/html/HTMLFrameSetElement.idl -qtwebkit/Source/WebCore/html/HTMLHeadElement.idl -qtwebkit/Source/WebCore/html/HTMLHeadingElement.idl -qtwebkit/Source/WebCore/html/HTMLHRElement.idl -qtwebkit/Source/WebCore/html/HTMLHtmlElement.idl -qtwebkit/Source/WebCore/html/HTMLIFrameElement.idl -qtwebkit/Source/WebCore/html/HTMLImageElement.idl -qtwebkit/Source/WebCore/html/HTMLInputElement.idl -qtwebkit/Source/WebCore/html/HTMLKeygenElement.idl -qtwebkit/Source/WebCore/html/HTMLLabelElement.idl -qtwebkit/Source/WebCore/html/HTMLLegendElement.idl -qtwebkit/Source/WebCore/html/HTMLLIElement.idl -qtwebkit/Source/WebCore/html/HTMLLinkElement.idl -qtwebkit/Source/WebCore/html/HTMLMapElement.idl -qtwebkit/Source/WebCore/html/HTMLMarqueeElement.idl -qtwebkit/Source/WebCore/html/HTMLMediaElement.idl -qtwebkit/Source/WebCore/html/HTMLMenuElement.idl -qtwebkit/Source/WebCore/html/HTMLMetaElement.idl -qtwebkit/Source/WebCore/html/HTMLMeterElement.idl -qtwebkit/Source/WebCore/html/HTMLModElement.idl -qtwebkit/Source/WebCore/html/HTMLObjectElement.idl -qtwebkit/Source/WebCore/html/HTMLOListElement.idl -qtwebkit/Source/WebCore/html/HTMLOptGroupElement.idl -qtwebkit/Source/WebCore/html/HTMLOptionElement.idl -qtwebkit/Source/WebCore/html/HTMLOptionsCollection.idl -qtwebkit/Source/WebCore/html/HTMLOutputElement.idl -qtwebkit/Source/WebCore/html/HTMLParagraphElement.idl -qtwebkit/Source/WebCore/html/HTMLParamElement.idl -qtwebkit/Source/WebCore/html/HTMLPreElement.idl -qtwebkit/Source/WebCore/html/HTMLProgressElement.idl -qtwebkit/Source/WebCore/html/HTMLPropertiesCollection.idl -qtwebkit/Source/WebCore/html/HTMLQuoteElement.idl -qtwebkit/Source/WebCore/html/HTMLScriptElement.idl -qtwebkit/Source/WebCore/html/HTMLSelectElement.idl -qtwebkit/Source/WebCore/html/HTMLSourceElement.idl -qtwebkit/Source/WebCore/html/HTMLSpanElement.idl -qtwebkit/Source/WebCore/html/HTMLStyleElement.idl -qtwebkit/Source/WebCore/html/HTMLTableCaptionElement.idl -qtwebkit/Source/WebCore/html/HTMLTableCellElement.idl -qtwebkit/Source/WebCore/html/HTMLTableColElement.idl -qtwebkit/Source/WebCore/html/HTMLTableElement.idl -qtwebkit/Source/WebCore/html/HTMLTableRowElement.idl -qtwebkit/Source/WebCore/html/HTMLTableSectionElement.idl -qtwebkit/Source/WebCore/html/HTMLTextAreaElement.idl -qtwebkit/Source/WebCore/html/HTMLTitleElement.idl -qtwebkit/Source/WebCore/html/HTMLTrackElement.idl -qtwebkit/Source/WebCore/html/HTMLUListElement.idl -qtwebkit/Source/WebCore/html/HTMLUnknownElement.idl -qtwebkit/Source/WebCore/html/HTMLVideoElement.idl -qtwebkit/Source/WebCore/html/ImageData.idl -qtwebkit/Source/WebCore/html/MediaController.idl -qtwebkit/Source/WebCore/html/MediaError.idl -qtwebkit/Source/WebCore/html/MicroDataItemValue.idl -qtwebkit/Source/WebCore/html/RadioNodeList.idl -qtwebkit/Source/WebCore/html/TextMetrics.idl -qtwebkit/Source/WebCore/html/TimeRanges.idl -qtwebkit/Source/WebCore/html/ValidityState.idl -qtwebkit/Source/WebCore/html/VoidCallback.idl -qtwebkit/Source/WebCore/html/shadow/HTMLContentElement.idl -qtwebkit/Source/WebCore/inspector/InjectedScriptHost.idl -qtwebkit/Source/WebCore/inspector/InspectorFrontendHost.idl -qtwebkit/Source/WebCore/inspector/JavaScriptCallFrame.idl -qtwebkit/Source/WebCore/inspector/ScriptProfile.idl -qtwebkit/Source/WebCore/inspector/ScriptProfileNode.idl -qtwebkit/Source/WebCore/loader/appcache/DOMApplicationCache.idl -qtwebkit/Source/WebCore/page/BarProp.idl -qtwebkit/Source/WebCore/page/Console.idl -qtwebkit/Source/WebCore/page/Crypto.idl -qtwebkit/Source/WebCore/page/DOMSecurityPolicy.idl -qtwebkit/Source/WebCore/page/DOMSelection.idl -qtwebkit/Source/WebCore/page/DOMWindow.idl -qtwebkit/Source/WebCore/page/EventSource.idl -qtwebkit/Source/WebCore/page/History.idl -qtwebkit/Source/WebCore/page/Location.idl -qtwebkit/Source/WebCore/page/Navigator.idl -qtwebkit/Source/WebCore/page/Performance.idl -qtwebkit/Source/WebCore/page/PerformanceEntry.idl -qtwebkit/Source/WebCore/page/PerformanceEntryList.idl -qtwebkit/Source/WebCore/page/PerformanceNavigation.idl -qtwebkit/Source/WebCore/page/PerformanceResourceTiming.idl -qtwebkit/Source/WebCore/page/PerformanceTiming.idl -qtwebkit/Source/WebCore/page/Screen.idl -qtwebkit/Source/WebCore/page/SpeechInputEvent.idl -qtwebkit/Source/WebCore/page/SpeechInputResult.idl -qtwebkit/Source/WebCore/page/SpeechInputResultList.idl -qtwebkit/Source/WebCore/page/WebKitPoint.idl -qtwebkit/Source/WebCore/page/WindowBase64.idl -qtwebkit/Source/WebCore/page/WindowTimers.idl -qtwebkit/Source/WebCore/page/WorkerNavigator.idl -qtwebkit/Source/WebCore/plugins/DOMPlugin.idl -qtwebkit/Source/WebCore/plugins/DOMMimeType.idl -qtwebkit/Source/WebCore/plugins/DOMPluginArray.idl -qtwebkit/Source/WebCore/plugins/DOMMimeTypeArray.idl -qtwebkit/Source/WebCore/storage/Storage.idl -qtwebkit/Source/WebCore/storage/StorageEvent.idl -qtwebkit/Source/WebCore/testing/Internals.idl -qtwebkit/Source/WebCore/testing/InternalSettings.idl -qtwebkit/Source/WebCore/testing/MallocStatistics.idl -qtwebkit/Source/WebCore/testing/MemoryInfo.idl -qtwebkit/Source/WebCore/testing/TypeConversions.idl -qtwebkit/Source/WebCore/workers/AbstractWorker.idl -qtwebkit/Source/WebCore/workers/DedicatedWorkerGlobalScope.idl -qtwebkit/Source/WebCore/workers/SharedWorker.idl -qtwebkit/Source/WebCore/workers/SharedWorkerGlobalScope.idl -qtwebkit/Source/WebCore/workers/Worker.idl -qtwebkit/Source/WebCore/workers/WorkerGlobalScope.idl -qtwebkit/Source/WebCore/workers/WorkerLocation.idl -qtwebkit/Source/WebCore/xml/DOMParser.idl -qtwebkit/Source/WebCore/xml/XMLHttpRequest.idl -qtwebkit/Source/WebCore/xml/XMLHttpRequestException.idl -qtwebkit/Source/WebCore/xml/XMLHttpRequestProgressEvent.idl -qtwebkit/Source/WebCore/xml/XMLHttpRequestUpload.idl -qtwebkit/Source/WebCore/xml/XMLSerializer.idl -qtwebkit/Source/WebCore/xml/XPathNSResolver.idl -qtwebkit/Source/WebCore/xml/XPathException.idl -qtwebkit/Source/WebCore/xml/XPathExpression.idl -qtwebkit/Source/WebCore/xml/XPathResult.idl -qtwebkit/Source/WebCore/xml/XPathEvaluator.idl -qtwebkit/Source/WebCore/xml/XSLTProcessor.idl -qtwebkit/Source/WebCore/svg/SVGAElement.idl -qtwebkit/Source/WebCore/svg/SVGAltGlyphDefElement.idl -qtwebkit/Source/WebCore/svg/SVGAltGlyphElement.idl -qtwebkit/Source/WebCore/svg/SVGAltGlyphItemElement.idl -qtwebkit/Source/WebCore/svg/SVGAngle.idl -qtwebkit/Source/WebCore/svg/SVGAnimateColorElement.idl -qtwebkit/Source/WebCore/svg/SVGAnimateMotionElement.idl -qtwebkit/Source/WebCore/svg/SVGAnimatedAngle.idl -qtwebkit/Source/WebCore/svg/SVGAnimatedBoolean.idl -qtwebkit/Source/WebCore/svg/SVGAnimatedEnumeration.idl -qtwebkit/Source/WebCore/svg/SVGAnimatedInteger.idl -qtwebkit/Source/WebCore/svg/SVGAnimatedLength.idl -qtwebkit/Source/WebCore/svg/SVGAnimatedLengthList.idl -qtwebkit/Source/WebCore/svg/SVGAnimatedNumber.idl -qtwebkit/Source/WebCore/svg/SVGAnimatedNumberList.idl -qtwebkit/Source/WebCore/svg/SVGAnimatedPreserveAspectRatio.idl -qtwebkit/Source/WebCore/svg/SVGAnimatedRect.idl -qtwebkit/Source/WebCore/svg/SVGAnimatedString.idl -qtwebkit/Source/WebCore/svg/SVGAnimatedTransformList.idl -qtwebkit/Source/WebCore/svg/SVGAnimateElement.idl -qtwebkit/Source/WebCore/svg/SVGAnimateTransformElement.idl -qtwebkit/Source/WebCore/svg/SVGAnimationElement.idl -qtwebkit/Source/WebCore/svg/SVGCircleElement.idl -qtwebkit/Source/WebCore/svg/SVGClipPathElement.idl -qtwebkit/Source/WebCore/svg/SVGColor.idl -qtwebkit/Source/WebCore/svg/SVGComponentTransferFunctionElement.idl -qtwebkit/Source/WebCore/svg/SVGCursorElement.idl -qtwebkit/Source/WebCore/svg/SVGDefsElement.idl -qtwebkit/Source/WebCore/svg/SVGDescElement.idl -qtwebkit/Source/WebCore/svg/SVGDocument.idl -qtwebkit/Source/WebCore/svg/SVGElement.idl -qtwebkit/Source/WebCore/svg/SVGElementInstance.idl -qtwebkit/Source/WebCore/svg/SVGElementInstanceList.idl -qtwebkit/Source/WebCore/svg/SVGEllipseElement.idl -qtwebkit/Source/WebCore/svg/SVGException.idl -qtwebkit/Source/WebCore/svg/SVGExternalResourcesRequired.idl -qtwebkit/Source/WebCore/svg/SVGFEBlendElement.idl -qtwebkit/Source/WebCore/svg/SVGFEColorMatrixElement.idl -qtwebkit/Source/WebCore/svg/SVGFEComponentTransferElement.idl -qtwebkit/Source/WebCore/svg/SVGFECompositeElement.idl -qtwebkit/Source/WebCore/svg/SVGFEConvolveMatrixElement.idl -qtwebkit/Source/WebCore/svg/SVGFEDiffuseLightingElement.idl -qtwebkit/Source/WebCore/svg/SVGFEDisplacementMapElement.idl -qtwebkit/Source/WebCore/svg/SVGFEDistantLightElement.idl -qtwebkit/Source/WebCore/svg/SVGFEDropShadowElement.idl -qtwebkit/Source/WebCore/svg/SVGFEFloodElement.idl -qtwebkit/Source/WebCore/svg/SVGFEFuncAElement.idl -qtwebkit/Source/WebCore/svg/SVGFEFuncBElement.idl -qtwebkit/Source/WebCore/svg/SVGFEFuncGElement.idl -qtwebkit/Source/WebCore/svg/SVGFEFuncRElement.idl -qtwebkit/Source/WebCore/svg/SVGFEGaussianBlurElement.idl -qtwebkit/Source/WebCore/svg/SVGFEImageElement.idl -qtwebkit/Source/WebCore/svg/SVGFEMergeElement.idl -qtwebkit/Source/WebCore/svg/SVGFEMergeNodeElement.idl -qtwebkit/Source/WebCore/svg/SVGFEMorphologyElement.idl -qtwebkit/Source/WebCore/svg/SVGFEOffsetElement.idl -qtwebkit/Source/WebCore/svg/SVGFEPointLightElement.idl -qtwebkit/Source/WebCore/svg/SVGFESpecularLightingElement.idl -qtwebkit/Source/WebCore/svg/SVGFESpotLightElement.idl -qtwebkit/Source/WebCore/svg/SVGFETileElement.idl -qtwebkit/Source/WebCore/svg/SVGFETurbulenceElement.idl -qtwebkit/Source/WebCore/svg/SVGFilterElement.idl -qtwebkit/Source/WebCore/svg/SVGFilterPrimitiveStandardAttributes.idl -qtwebkit/Source/WebCore/svg/SVGFitToViewBox.idl -qtwebkit/Source/WebCore/svg/SVGFontElement.idl -qtwebkit/Source/WebCore/svg/SVGFontFaceElement.idl -qtwebkit/Source/WebCore/svg/SVGFontFaceFormatElement.idl -qtwebkit/Source/WebCore/svg/SVGFontFaceNameElement.idl -qtwebkit/Source/WebCore/svg/SVGFontFaceSrcElement.idl -qtwebkit/Source/WebCore/svg/SVGFontFaceUriElement.idl -qtwebkit/Source/WebCore/svg/SVGForeignObjectElement.idl -qtwebkit/Source/WebCore/svg/SVGGElement.idl -qtwebkit/Source/WebCore/svg/SVGGlyphElement.idl -qtwebkit/Source/WebCore/svg/SVGGlyphRefElement.idl -qtwebkit/Source/WebCore/svg/SVGGradientElement.idl -qtwebkit/Source/WebCore/svg/SVGGraphicsElement.idl -qtwebkit/Source/WebCore/svg/SVGHKernElement.idl -qtwebkit/Source/WebCore/svg/SVGImageElement.idl -qtwebkit/Source/WebCore/svg/SVGLength.idl -qtwebkit/Source/WebCore/svg/SVGLengthList.idl -qtwebkit/Source/WebCore/svg/SVGLinearGradientElement.idl -qtwebkit/Source/WebCore/svg/SVGLineElement.idl -qtwebkit/Source/WebCore/svg/SVGMarkerElement.idl -qtwebkit/Source/WebCore/svg/SVGMaskElement.idl -qtwebkit/Source/WebCore/svg/SVGMatrix.idl -qtwebkit/Source/WebCore/svg/SVGMetadataElement.idl -qtwebkit/Source/WebCore/svg/SVGMissingGlyphElement.idl -qtwebkit/Source/WebCore/svg/SVGMPathElement.idl -qtwebkit/Source/WebCore/svg/SVGNumber.idl -qtwebkit/Source/WebCore/svg/SVGNumberList.idl -qtwebkit/Source/WebCore/svg/SVGPaint.idl -qtwebkit/Source/WebCore/svg/SVGPathElement.idl -qtwebkit/Source/WebCore/svg/SVGPathSegArcAbs.idl -qtwebkit/Source/WebCore/svg/SVGPathSegArcRel.idl -qtwebkit/Source/WebCore/svg/SVGPathSegClosePath.idl -qtwebkit/Source/WebCore/svg/SVGPathSegCurvetoCubicAbs.idl -qtwebkit/Source/WebCore/svg/SVGPathSegCurvetoCubicRel.idl -qtwebkit/Source/WebCore/svg/SVGPathSegCurvetoCubicSmoothAbs.idl -qtwebkit/Source/WebCore/svg/SVGPathSegCurvetoCubicSmoothRel.idl -qtwebkit/Source/WebCore/svg/SVGPathSegCurvetoQuadraticAbs.idl -qtwebkit/Source/WebCore/svg/SVGPathSegCurvetoQuadraticRel.idl -qtwebkit/Source/WebCore/svg/SVGPathSegCurvetoQuadraticSmoothAbs.idl -qtwebkit/Source/WebCore/svg/SVGPathSegCurvetoQuadraticSmoothRel.idl -qtwebkit/Source/WebCore/svg/SVGPathSeg.idl -qtwebkit/Source/WebCore/svg/SVGPathSegLinetoAbs.idl -qtwebkit/Source/WebCore/svg/SVGPathSegLinetoHorizontalAbs.idl -qtwebkit/Source/WebCore/svg/SVGPathSegLinetoHorizontalRel.idl -qtwebkit/Source/WebCore/svg/SVGPathSegLinetoRel.idl -qtwebkit/Source/WebCore/svg/SVGPathSegLinetoVerticalAbs.idl -qtwebkit/Source/WebCore/svg/SVGPathSegLinetoVerticalRel.idl -qtwebkit/Source/WebCore/svg/SVGPathSegList.idl -qtwebkit/Source/WebCore/svg/SVGPathSegMovetoAbs.idl -qtwebkit/Source/WebCore/svg/SVGPathSegMovetoRel.idl -qtwebkit/Source/WebCore/svg/SVGPatternElement.idl -qtwebkit/Source/WebCore/svg/SVGPoint.idl -qtwebkit/Source/WebCore/svg/SVGPointList.idl -qtwebkit/Source/WebCore/svg/SVGPolygonElement.idl -qtwebkit/Source/WebCore/svg/SVGPolylineElement.idl -qtwebkit/Source/WebCore/svg/SVGPreserveAspectRatio.idl -qtwebkit/Source/WebCore/svg/SVGRadialGradientElement.idl -qtwebkit/Source/WebCore/svg/SVGRectElement.idl -qtwebkit/Source/WebCore/svg/SVGRect.idl -qtwebkit/Source/WebCore/svg/SVGRenderingIntent.idl -qtwebkit/Source/WebCore/svg/SVGScriptElement.idl -qtwebkit/Source/WebCore/svg/SVGSetElement.idl -qtwebkit/Source/WebCore/svg/SVGStopElement.idl -qtwebkit/Source/WebCore/svg/SVGStringList.idl -qtwebkit/Source/WebCore/svg/SVGStyleElement.idl -qtwebkit/Source/WebCore/svg/SVGStyledElement.idl -qtwebkit/Source/WebCore/svg/SVGSVGElement.idl -qtwebkit/Source/WebCore/svg/SVGSwitchElement.idl -qtwebkit/Source/WebCore/svg/SVGSymbolElement.idl -qtwebkit/Source/WebCore/svg/SVGTests.idl -qtwebkit/Source/WebCore/svg/SVGTextContentElement.idl -qtwebkit/Source/WebCore/svg/SVGTextElement.idl -qtwebkit/Source/WebCore/svg/SVGTextPathElement.idl -qtwebkit/Source/WebCore/svg/SVGTextPositioningElement.idl -qtwebkit/Source/WebCore/svg/SVGTitleElement.idl -qtwebkit/Source/WebCore/svg/SVGTransform.idl -qtwebkit/Source/WebCore/svg/SVGTransformList.idl -qtwebkit/Source/WebCore/svg/SVGTRefElement.idl -qtwebkit/Source/WebCore/svg/SVGTSpanElement.idl -qtwebkit/Source/WebCore/svg/SVGURIReference.idl -qtwebkit/Source/WebCore/svg/SVGUnitTypes.idl -qtwebkit/Source/WebCore/svg/SVGUseElement.idl -qtwebkit/Source/WebCore/svg/SVGViewElement.idl -qtwebkit/Source/WebCore/svg/SVGVKernElement.idl -qtwebkit/Source/WebCore/svg/SVGViewSpec.idl -qtwebkit/Source/WebCore/svg/SVGZoomAndPan.idl -qtwebkit/Source/WebCore/svg/SVGZoomEvent.idl -generated/InternalSettingsGenerated.idl diff --git a/repos/libports/src/lib/qt5/tools/lib_mk_file_generator/README b/repos/libports/src/lib/qt5/tools/lib_mk_file_generator/README deleted file mode 100644 index 8a9ad42a37..0000000000 --- a/repos/libports/src/lib/qt5/tools/lib_mk_file_generator/README +++ /dev/null @@ -1,16 +0,0 @@ -The scripts in this directory have been used to generate the -'lib/mk/qt5_*_generated.inc' files. - -Usage: - -- download and extract the Qt5 and qtwebkit source archives -- apply all qtbase/qtdeclarative/qttools/qtwebkit patches from the 'src/lib/qt5/patches' directory -- create a build directory next to the extracted Qt5 source directory -- copy the scripts into this build directory -- change into the build directory -- execute the 'create_generated_incs' script -- move the generated files into the 'lib/mk' directory - -Notes: - -- ICU (libicu-dev) must be installed on the host system to get the QtWebKit files generated diff --git a/repos/libports/src/lib/qt5/tools/lib_mk_file_generator/create_generated_inc b/repos/libports/src/lib/qt5/tools/lib_mk_file_generator/create_generated_inc deleted file mode 100755 index f989f8c2d4..0000000000 --- a/repos/libports/src/lib/qt5/tools/lib_mk_file_generator/create_generated_inc +++ /dev/null @@ -1,129 +0,0 @@ -#!/bin/bash - -LANG=C - -function extract_defines() -{ - sed -e '/DEFINES =/!d' \ - -e 's/DEFINES = /QT_DEFINES += /' Makefile > defines.inc - - echo -e "" >> defines.inc -} - -function extract_incpath() -{ - sed -e '/INCPATH =/!d' \ - -e 's/INCPATH = //' \ - -e 's/ / \\\n/g' \ - Makefile > incpath.inc.tmp - - echo -e "QT_INCPATH += \\" > incpath.inc - - sed -e '/\/qt-everywhere-src.*\//!d' \ - -e 's/.*\/qt-everywhere-src-[^\/]*\// /' \ - -e 's/linux-g++/genode-g++/' \ - incpath.inc.tmp >> incpath.inc - - echo -e "" >> incpath.inc -} - - -function extract_sources() -{ - sed \ - -e ':a;N;$!ba;s/\n//g' \ - -e 's/OBJECTS .*//' \ - -e 's/.*SOURCES =/QT_SOURCES += \\/' \ - -e 's/\\/\\\n/g' \ - -e 's/\.cpp \.moc/\.cpp \\\n\t\t\.moc/g' \ - -e 's/\.cpp \.rcc/\.cpp \\\n\t\t\.rcc/g' \ - -e 's/\.cc generated/\.cc \\\n\t\tgenerated/g' \ - Makefile > sources.inc.tmp - - sed -e 's/.*\// /' \ - sources.inc.tmp > sources.inc - - echo -e "" >> sources.inc -} - - -function extract_vpath() -{ - sed \ - -e ':a;N;$!ba;s/\n//g' \ - -e 's/OBJECTS .*//' \ - -e 's/.*SOURCES =//' \ - -e 's/\\/\\\n/g' \ - -e 's/\.cpp \.moc/\.cpp \\\n\t\t\.moc/' \ - -e 's/\.cpp \.rcc/\.cpp \\\n\t\t\.rcc/' \ - -e 's/\.cc generated/\.cc \\\n\t\tgenerated/g' \ - Makefile > vpath.inc.tmp - - echo -e "QT_VPATH += \\" > vpath.inc - - sed -e '/\/qt-everywhere-src.*\//!d' \ - -e 's/.*\/qt-everywhere-src-[^\/]*\// /' \ - -e 's/\/[^\/]* [\\]*$/ \\/' \ - vpath.inc.tmp | sort -u >> vpath.inc - - echo -e "" >> vpath.inc -} - - -function extract_compiler_moc_header_make_all() -{ - sed -e '/compiler_moc_header_make_all:/!d' \ - -e 's/compiler_moc_header_make_all:/COMPILER_MOC_HEADER_MAKE_ALL_FILES = \\\n /' \ - -e 's/\.moc\/release-static-emb-x86_64\///g' \ - -e 's/\.cpp /\.cpp \\\n /g' \ - Makefile > compiler_moc_header_make_all.inc.tmp - - sed -e 's/.*\// /' \ - compiler_moc_header_make_all.inc.tmp > compiler_moc_header_make_all.inc - - echo -e "" >> compiler_moc_header_make_all.inc -} - - -function extract_compiler_moc_source_make_all() -{ - sed -e '/compiler_moc_source_make_all:/!d' \ - -e 's/compiler_moc_source_make_all:/COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \\\n /' \ - -e 's/\.moc\/release-static-emb-x86_64\///g' \ - -e 's/\.moc /\.moc \\\n /g' \ - Makefile > compiler_moc_source_make_all.inc.tmp - - sed -e 's/.*\// /' \ - compiler_moc_source_make_all.inc.tmp > compiler_moc_source_make_all.inc - - echo -e "" >> compiler_moc_source_make_all.inc -} - - -extract_defines -extract_incpath -extract_sources -extract_vpath -extract_compiler_moc_header_make_all -extract_compiler_moc_source_make_all - -cat defines.inc > $1_generated.inc - -cat incpath.inc >> $1_generated.inc - -cat sources.inc >> $1_generated.inc - -cat vpath.inc >> $1_generated.inc - -echo -e "# some source files need to be generated by moc from other source/header files before" >> $1_generated.inc -echo -e "# they get #included again by the original source file in the compiling stage\n" >> $1_generated.inc - -echo -e "# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc)" >> $1_generated.inc -echo -e "# extracted from 'compiler_moc_header_make_all' target\n" >> $1_generated.inc - -cat compiler_moc_header_make_all.inc >> $1_generated.inc - -echo -e "# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc)" >> $1_generated.inc -echo -e "# extracted from 'compiler_moc_source_make_all' rule\n" >> $1_generated.inc - -cat compiler_moc_source_make_all.inc >> $1_generated.inc diff --git a/repos/libports/src/lib/qt5/tools/lib_mk_file_generator/create_generated_incs b/repos/libports/src/lib/qt5/tools/lib_mk_file_generator/create_generated_incs deleted file mode 100755 index 26603b647e..0000000000 --- a/repos/libports/src/lib/qt5/tools/lib_mk_file_generator/create_generated_incs +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh - -QT_VERSION=5.13.0 - -./genode_qt5_configure - -make -j32 - -# qtbase - -cd qtbase/src/3rdparty/pcre2 && ../../../../create_generated_inc qt5_pcre2 && cp qt5_pcre2_generated.inc ../../../.. && cd ../../../.. -cd qtbase/src/corelib && ../../../create_generated_inc qt5_core && cp qt5_core_generated.inc ../../.. && cd ../../.. -cd qtbase/src/gui && ../../../create_generated_inc qt5_gui && cp qt5_gui_generated.inc ../../.. && cd ../../.. -cd qtbase/src/network && ../../../create_generated_inc qt5_network && cp qt5_network_generated.inc ../../.. && cd ../../.. -cd qtbase/src/opengl && ../../../create_generated_inc qt5_opengl && cp qt5_opengl_generated.inc ../../.. && cd ../../.. -cd qtbase/src/printsupport && ../../../create_generated_inc qt5_printsupport && cp qt5_printsupport_generated.inc ../../.. && cd ../../.. -cd qtbase/src/sql && ../../../create_generated_inc qt5_sql && cp qt5_sql_generated.inc ../../.. && cd ../../.. -cd qtbase/src/testlib && ../../../create_generated_inc qt5_test && cp qt5_test_generated.inc ../../.. && cd ../../.. -cd qtbase/src/widgets && ../../../create_generated_inc qt5_widgets && cp qt5_widgets_generated.inc ../../.. && cd ../../.. -cd qtbase/src/xml && ../../../create_generated_inc qt5_xml && cp qt5_xml_generated.inc ../../.. && cd ../../.. - -cd qttools/src/designer/src/uitools && ../../../../../create_generated_inc qt5_ui_tools && cp qt5_ui_tools_generated.inc ../../../../.. && cd ../../../../.. - -cd qtdeclarative/src/qml && ../../../create_generated_inc qt5_qml && cp qt5_qml_generated.inc ../../.. && cd ../../.. -cd qtdeclarative/src/quick && ../../../create_generated_inc qt5_quick && cp qt5_quick_generated.inc ../../.. && cd ../../.. -cd qtdeclarative/src/imports/qtquick2 && ../../../../create_generated_inc qt5_qtquick2plugin && cp qt5_qtquick2plugin_generated.inc ../../../.. && cd ../../../.. -cd qtdeclarative/src/imports/folderlistmodel && ../../../../create_generated_inc qt5_qmlfolderlistmodelplugin && cp qt5_qmlfolderlistmodelplugin_generated.inc ../../../.. && cd ../../../.. -cd qtdeclarative/src/imports/layouts && ../../../../create_generated_inc qt5_qquicklayoutsplugin && cp qt5_qquicklayoutsplugin_generated.inc ../../../.. && cd ../../../.. -cd qtdeclarative/src/imports/window && ../../../../create_generated_inc qt5_windowplugin && cp qt5_windowplugin_generated.inc ../../../.. && cd ../../../.. - -cd qtquickcontrols2/src/quicktemplates2 && ../../../create_generated_inc qt5_quicktemplates2 && cp qt5_quicktemplates2_generated.inc ../../.. && cd ../../.. -cd qtquickcontrols2/src/quickcontrols2 && ../../../create_generated_inc qt5_quickcontrols2 && cp qt5_quickcontrols2_generated.inc ../../.. && cd ../../.. -cd qtquickcontrols2/src/imports/controls && ../../../../create_generated_inc qt5_qtquickcontrols2plugin && cp qt5_qtquickcontrols2plugin_generated.inc ../../../.. && cd ../../../.. -cd qtquickcontrols2/src/imports/templates && ../../../../create_generated_inc qt5_qtquicktemplates2plugin && cp qt5_qtquicktemplates2plugin_generated.inc ../../../.. && cd ../../../.. - -cd qtsvg/src/svg && ../../../create_generated_inc qt5_svg && cp qt5_svg_generated.inc ../../.. && cd ../../.. - -cd qtvirtualkeyboard/src/virtualkeyboard && ../../../create_generated_inc qt5_virtualkeyboard && cp qt5_virtualkeyboard_generated.inc ../../.. && cd ../../.. -cd qtvirtualkeyboard/src/plugin && ../../../create_generated_inc qt5_qtvirtualkeyboardplugin && cp qt5_qtvirtualkeyboardplugin_generated.inc ../../.. && cd ../../.. -cd qtvirtualkeyboard/src/import && ../../../create_generated_inc qt5_qtquickvirtualkeyboardplugin && cp qt5_qtquickvirtualkeyboardplugin_generated.inc ../../.. && cd ../../.. -cd qtvirtualkeyboard/src/settings && ../../../create_generated_inc qt5_qtquickvirtualkeyboardsettingsplugin && cp qt5_qtquickvirtualkeyboardsettingsplugin_generated.inc ../../.. && cd ../../.. -cd qtvirtualkeyboard/src/styles && ../../../create_generated_inc qt5_qtquickvirtualkeyboardstylesplugin && cp qt5_qtquickvirtualkeyboardstylesplugin_generated.inc ../../.. && cd ../../.. - -# qtwebkit - -make -C qtwebkit/Source/JavaScriptCore -f Makefile.JavaScriptCore sub-DerivedSources-pri > JavaScriptCore.log -cd qtwebkit/Source/JavaScriptCore -../../../qtbase/bin/qmake ../../../../qt-everywhere-src-${QT_VERSION}/qtwebkit/Source/JavaScriptCore/Target.pri -o Makefile - ../../../create_generated_inc qt5_jscore && cp qt5_jscore_generated.inc ../../.. && cd ../../.. -cd qtwebkit/Source/WTF -ln -sf Makefile.WTF Makefile && ../../../create_generated_inc qt5_wtf && cp qt5_wtf_generated.inc ../../.. && cd ../../.. - -make -C qtwebkit/Source/ThirdParty/ANGLE -f Makefile.ANGLE sub-DerivedSources-pri > ANGLE.log -cd qtwebkit/Source/ThirdParty/ANGLE -../../../../qtbase/bin/qmake ../../../../../qt-everywhere-src-${QT_VERSION}/qtwebkit/Source/ThirdParty/ANGLE/Target.pri -o Makefile - ../../../../create_generated_inc qt5_angle && cp qt5_angle_generated.inc ../../../.. && cd ../../../.. - -make -C qtwebkit/Source/WebCore -f Makefile.WebCore sub-DerivedSources-pri > WebCore.log -cd qtwebkit/Source/WebCore -../../../qtbase/bin/qmake ../../../../qt-everywhere-src-${QT_VERSION}/qtwebkit/Source/WebCore/Target.pri -o Makefile - ../../../create_generated_inc qt5_webcore && cp qt5_webcore_generated.inc ../../.. && cd ../../.. -cd qtwebkit/Source/WebKit -ln -sf Makefile.WebKit1 Makefile && ../../../create_generated_inc qt5_webkit && cp qt5_webkit_generated.inc ../../.. && cd ../../.. - -cd qtwebkit/Source -ln -sf Makefile.widgetsapi Makefile && ../../create_generated_inc qt5_webkitwidgets && cp qt5_webkitwidgets_generated.inc ../.. && cd ../.. diff --git a/repos/libports/src/lib/qt5/tools/lib_mk_file_generator/genode_qt5_configure b/repos/libports/src/lib/qt5/tools/lib_mk_file_generator/genode_qt5_configure deleted file mode 100755 index 2c4972901f..0000000000 --- a/repos/libports/src/lib/qt5/tools/lib_mk_file_generator/genode_qt5_configure +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh - -# command line arguments are grouped: -# general -# QtCore -# QtNetwork -# QtGui -# QtSql - -../qt-everywhere-src-5.13.0/configure \ - -opensource \ - -confirm-license \ - -no-separate-debug-info \ - -no-sse3 \ - -no-ssse3 \ - -no-sse4.1 \ - -no-sse4.2 \ - -no-avx \ - -no-avx2 \ - -no-avx512 \ - -no-reduce-relocations \ - -no-pch \ - -no-use-gold-linker \ - -skip qttranslations \ - -make tools \ - -nomake examples \ - -no-dbus \ - -no-accessibility \ - -no-qml-debug \ - \ - -no-glib \ - -no-eventfd \ - -no-inotify \ - -no-iconv \ - -no-icu \ - -qt-pcre \ - -system-zlib \ - -no-feature-alloca \ - -no-feature-alloca_h \ - -no-feature-cxx11_future \ - -no-feature-futimens \ - -no-feature-futimes \ - -no-feature-getauxval \ - -no-feature-poll_ppoll \ - -no-feature-process \ - -no-feature-sharedmemory \ - -no-feature-systemsemaphore \ - -no-feature-threadsafe-cloexec \ - \ - -openssl-linked \ - -no-system-proxies \ - -no-feature-ipv6ifname \ - -no-feature-networkinterface \ - \ - -no-cups \ - -no-fontconfig \ - -system-freetype \ - -no-harfbuzz \ - -opengl desktop \ - -qpa minimal \ - -no-xcb \ - -system-libjpeg \ - -system-libpng \ - -no-feature-sessionmanager \ - \ - -qt-sqlite diff --git a/repos/libports/src/lib/qt5/qt_component.cc b/repos/libports/src/lib/qt5_component/qt_component.cc similarity index 71% rename from repos/libports/src/lib/qt5/qt_component.cc rename to repos/libports/src/lib/qt5_component/qt_component.cc index ec1f94781f..99320d44d0 100644 --- a/repos/libports/src/lib/qt5/qt_component.cc +++ b/repos/libports/src/lib/qt5_component/qt_component.cc @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2017 Genode Labs GmbH + * Copyright (C) 2017-2020 Genode Labs GmbH * * This file is part of the Genode OS framework, which is distributed * under the terms of the GNU Affero General Public License version 3. @@ -15,23 +15,25 @@ #include /* libc includes */ -#include /* 'exit' */ +#include /* 'exit' */ + +/* qt5_component includes */ +#include /* provided by the application */ extern "C" int main(int argc, char const **argv); -void initialize_qt_gui(Genode::Env &env) __attribute__((weak)); -void initialize_qt_gui(Genode::Env &) { } - void Libc::Component::construct(Libc::Env &env) { Libc::with_libc([&] { - initialize_qt_gui(env); + qpa_init(env); int argc = 1; char const *argv[] = { "qt5_app", 0 }; - exit(main(argc, argv)); + int exit_value = main(argc, argv); + + exit(exit_value); }); } diff --git a/repos/libports/src/test/qt5/qpluginwidget/main.cpp b/repos/libports/src/test/qt5/qpluginwidget/main.cpp index 730d41bdbc..ad333edef9 100644 --- a/repos/libports/src/test/qt5/qpluginwidget/main.cpp +++ b/repos/libports/src/test/qt5/qpluginwidget/main.cpp @@ -4,22 +4,31 @@ * \date 2012-04-23 */ +/* + * Copyright (C) 2012-2020 Genode Labs GmbH + * + * This file is part of the Genode OS framework, which is distributed + * under the terms of the GNU Affero General Public License version 3. + */ + /* Qt includes */ #include #include -#include /* Qoost includes */ #include -extern void initialize_qt_gui(Genode::Env &); +/* qpluginwidget includes */ +#include + +/* qt5_component includes */ +#include void Libc::Component::construct(Libc::Env &env) { Libc::with_libc([&] { - initialize_qt_gui(env); - QPluginWidget::env(env); + qpa_init(env); int argc = 1; char const *argv[] = { "test-qpluginwidget", 0 }; @@ -28,11 +37,27 @@ void Libc::Component::construct(Libc::Env &env) Compound_widget w; - QString plugin_args("ram_quota=4M, caps=500"); - QPluginWidget plugin_widget(&w, QUrl("rom:///test-plugin.tar"), - plugin_args, 100, 100); + QPluginLoader plugin_loader("/qt/plugins/qpluginwidget/libqpluginwidget.lib.so"); + + QObject *plugin = plugin_loader.instance(); + + if (!plugin) + qFatal("Error: Could not load QPluginWidget Qt plugin"); + + QPluginWidgetInterface *plugin_widget_interface = qobject_cast(plugin); + + plugin_widget_interface->env(env); + + QString plugin_args("ram_quota=4M, caps=500"); + + QPluginWidget *plugin_widget = static_cast( + plugin_widget_interface->createWidget(&w, + QUrl("rom:///test-plugin.tar"), + plugin_args, 100, 100) + ); + + w.layout()->addWidget(plugin_widget); - w.layout()->addWidget(&plugin_widget); w.resize(150, 150); w.show(); diff --git a/repos/libports/src/test/qt5/qpluginwidget/qpluginwidget.pro b/repos/libports/src/test/qt5/qpluginwidget/qpluginwidget.pro index d7342a0605..931269034d 100644 --- a/repos/libports/src/test/qt5/qpluginwidget/qpluginwidget.pro +++ b/repos/libports/src/test/qt5/qpluginwidget/qpluginwidget.pro @@ -1,4 +1,4 @@ -TEMPLATE = app -TARGET = test-qpluginwidget -QT = core gui widgets -SOURCES += main.cpp +TEMPLATE = app +TARGET = test-qpluginwidget +QT = core gui network widgets +SOURCES = main.cpp diff --git a/repos/libports/src/test/qt5/qpluginwidget/target.mk b/repos/libports/src/test/qt5/qpluginwidget/target.mk index 4a86863fc7..3f9fdb112a 100644 --- a/repos/libports/src/test/qt5/qpluginwidget/target.mk +++ b/repos/libports/src/test/qt5/qpluginwidget/target.mk @@ -1,8 +1,16 @@ -include $(call select_from_repositories,src/app/qt5/tmpl/target_defaults.inc) +QMAKE_PROJECT_FILE = $(PRG_DIR)/qpluginwidget.pro -include $(call select_from_repositories,src/app/qt5/tmpl/target_final.inc) +QMAKE_TARGET_BINARIES = test-qpluginwidget -LIBS += qt5_qpluginwidget qt5_network qoost +QT5_PORT_LIBS = libQt5Core libQt5Gui libQt5Network libQt5Widgets + +LIBS = libc libm mesa qt5_component stdcxx libqgenodeviewwidget libqpluginwidget qoost $(QT5_PORT_LIBS) + +include $(call select_from_repositories,lib/import/import-qt5_qmake.mk) + +# +# create tar archive for test plugin +# TEST_PLUGIN_TAR = $(BUILD_BASE_DIR)/bin/test-plugin.tar @@ -13,5 +21,3 @@ $(TEST_PLUGIN_TAR): config.plugin clean: $(VERBOSE)rm $(TEST_PLUGIN_TAR) - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/src/test/qt5/qt_core/target.mk b/repos/libports/src/test/qt5/qt_core/target.mk index 695c305a82..c17d25fd28 100644 --- a/repos/libports/src/test/qt5/qt_core/target.mk +++ b/repos/libports/src/test/qt5/qt_core/target.mk @@ -1,7 +1,9 @@ -include $(call select_from_repositories,src/app/qt5/tmpl/target_defaults.inc) +QMAKE_PROJECT_FILE = $(PRG_DIR)/qt_core.pro -include $(call select_from_repositories,src/app/qt5/tmpl/target_final.inc) +QMAKE_TARGET_BINARIES = test-qt_core -LIBS += qt5_component +QT5_PORT_LIBS = libQt5Core -CC_CXX_WARN_STRICT = +LIBS = libc libm qt5_component stdcxx $(QT5_PORT_LIBS) + +include $(call select_from_repositories,lib/import/import-qt5_qmake.mk) diff --git a/repos/libports/src/test/qt5/qt_quick/qt_quick.pro b/repos/libports/src/test/qt5/qt_quick/qt_quick.pro index 5ca40ce8aa..0438b3b63b 100644 --- a/repos/libports/src/test/qt5/qt_quick/qt_quick.pro +++ b/repos/libports/src/test/qt5/qt_quick/qt_quick.pro @@ -1,6 +1,6 @@ TEMPLATE += app TARGET = test-qt_quick -QT += quick +QT += quick qml SOURCES += main.cpp RESOURCES += qt_quick.qrc CONFIG += debug diff --git a/repos/libports/src/test/qt5/qt_quick/target.mk b/repos/libports/src/test/qt5/qt_quick/target.mk index 695c305a82..66a61131f3 100644 --- a/repos/libports/src/test/qt5/qt_quick/target.mk +++ b/repos/libports/src/test/qt5/qt_quick/target.mk @@ -1,7 +1,10 @@ -include $(call select_from_repositories,src/app/qt5/tmpl/target_defaults.inc) +QMAKE_PROJECT_FILE = $(PRG_DIR)/qt_quick.pro -include $(call select_from_repositories,src/app/qt5/tmpl/target_final.inc) +QMAKE_TARGET_BINARIES = test-qt_quick -LIBS += qt5_component +QT5_PORT_LIBS += libQt5Core libQt5Gui libQt5Network +QT5_PORT_LIBS += libQt5Qml libQt5Quick -CC_CXX_WARN_STRICT = +LIBS = libc libm mesa qt5_component stdcxx $(QT5_PORT_LIBS) + +include $(call select_from_repositories,lib/import/import-qt5_qmake.mk) diff --git a/repos/ports/ports/arora.hash b/repos/ports/ports/arora.hash deleted file mode 100644 index 5891a66219..0000000000 --- a/repos/ports/ports/arora.hash +++ /dev/null @@ -1 +0,0 @@ -e8f003dcdad6f1600c73a046f4306942a557f9bb diff --git a/repos/ports/ports/arora.port b/repos/ports/ports/arora.port deleted file mode 100644 index 736f41f622..0000000000 --- a/repos/ports/ports/arora.port +++ /dev/null @@ -1,12 +0,0 @@ -LICENSE := unknown -VERSION := 7c7514d85a22b570fc85b47c010d0615f39e270d -DOWNLOADS := arora.archive - -URL(arora) := https://github.com/Arora/arora/archive/$(VERSION).tar.gz -SHA(arora) := d625910daebc93ab39769907dbc80b4314d416b2bee8ce49983a2c8eead894f0 -DIR(arora) := src/app/arora - -PATCHES := $(foreach P,$(shell cat $(REP_DIR)/src/app/arora/patches/series),\ - src/app/arora/patches/$P) - -PATCH_OPT := -p1 -d src/app/arora diff --git a/repos/ports/recipes/pkg/arora/README b/repos/ports/recipes/pkg/arora/README deleted file mode 100644 index 3d22ffb520..0000000000 --- a/repos/ports/recipes/pkg/arora/README +++ /dev/null @@ -1 +0,0 @@ -Arora web browser diff --git a/repos/ports/recipes/pkg/arora/archives b/repos/ports/recipes/pkg/arora/archives deleted file mode 100644 index 1c36617a16..0000000000 --- a/repos/ports/recipes/pkg/arora/archives +++ /dev/null @@ -1,32 +0,0 @@ -_/raw/qt5_dejavusans -_/src/expat -_/src/freetype -_/src/jpeg -_/src/libc -_/src/libpng -_/src/mesa -_/src/qt5_core -_/src/qt5_gui -_/src/qt5_qjpeg -_/src/qt5_qpa_genode -_/src/stdcxx -_/src/vfs -_/src/vfs_pipe -_/src/zlib -_/raw/arora -_/src/arora -_/src/icu -_/src/libcrypto -_/src/libssl -_/src/qt5_network -_/src/qt5_printsupport -_/src/qt5_qgenodeviewwidget -_/src/qt5_opengl -_/src/qt5_qpluginwidget -_/src/qt5_scriptclassic -_/src/qt5_sql -_/src/qt5_ui_tools -_/src/qt5_webkit -_/src/qt5_widgets -_/src/vfs_jitterentropy -_/src/vfs_lxip diff --git a/repos/ports/recipes/pkg/arora/hash b/repos/ports/recipes/pkg/arora/hash deleted file mode 100644 index 4ad1003c05..0000000000 --- a/repos/ports/recipes/pkg/arora/hash +++ /dev/null @@ -1 +0,0 @@ -2020-07-02 2df48db56cecfbb7455a7e848e32888fd8bf254d diff --git a/repos/ports/recipes/pkg/arora/runtime b/repos/ports/recipes/pkg/arora/runtime deleted file mode 100644 index b0c537061d..0000000000 --- a/repos/ports/recipes/pkg/arora/runtime +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/repos/ports/recipes/raw/arora/content.mk b/repos/ports/recipes/raw/arora/content.mk deleted file mode 100644 index 909157bbdb..0000000000 --- a/repos/ports/recipes/raw/arora/content.mk +++ /dev/null @@ -1,4 +0,0 @@ -content: init.config - -init.config: - cp $(REP_DIR)/recipes/raw/arora/$@ $@ diff --git a/repos/ports/recipes/raw/arora/hash b/repos/ports/recipes/raw/arora/hash deleted file mode 100644 index 42d0be0c5c..0000000000 --- a/repos/ports/recipes/raw/arora/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-21 8e34b047cc7ab47d9575bdb64a38dbcc2b36ad17 diff --git a/repos/ports/recipes/raw/arora/init.config b/repos/ports/recipes/raw/arora/init.config deleted file mode 100644 index 30c2fbcdbb..0000000000 --- a/repos/ports/recipes/raw/arora/init.config +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/repos/ports/recipes/src/arora/content.mk b/repos/ports/recipes/src/arora/content.mk deleted file mode 100644 index c54bb3cce4..0000000000 --- a/repos/ports/recipes/src/arora/content.mk +++ /dev/null @@ -1,22 +0,0 @@ -MIRROR_FROM_PORT_AND_REP_DIR := src/app/arora - -content: $(MIRROR_FROM_PORT_AND_REP_DIR) LICENSE - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/arora) - -$(MIRROR_FROM_PORT_AND_REP_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $(dir $@) - $(mirror_from_rep_dir) - -MIRROR_FROM_LIBPORTS := src/app/qt5/tmpl/target_defaults.inc \ - src/app/qt5/tmpl/target_final.inc - -content: $(MIRROR_FROM_LIBPORTS) - -$(MIRROR_FROM_LIBPORTS): - mkdir -p $(dir $@) - cp -r $(GENODE_DIR)/repos/libports/$@ $(dir $@) - -LICENSE: - cp $(PORT_DIR)/src/app/arora/LICENSE.GPL3 $@ diff --git a/repos/ports/recipes/src/arora/hash b/repos/ports/recipes/src/arora/hash deleted file mode 100644 index ecd91b943e..0000000000 --- a/repos/ports/recipes/src/arora/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-28 07e518547e24b21378fc36801ebc764c7f86d2d0 diff --git a/repos/ports/recipes/src/arora/used_apis b/repos/ports/recipes/src/arora/used_apis deleted file mode 100644 index 45b1b93396..0000000000 --- a/repos/ports/recipes/src/arora/used_apis +++ /dev/null @@ -1,21 +0,0 @@ -base -framebuffer_session -input_session -libc -loader_session -mesa -gui_session -os -qt5_core -qt5_gui -qt5_printsupport -qt5_qjpeg -qt5_network -qt5_qgenodeviewwidget -qt5_qpa_genode -qt5_qpluginwidget -qt5_scriptclassic -qt5_ui_tools -qt5_webkit -qt5_widgets -stdcxx diff --git a/repos/ports/run/arora.run b/repos/ports/run/arora.run deleted file mode 100644 index 0f2130abd0..0000000000 --- a/repos/ports/run/arora.run +++ /dev/null @@ -1,170 +0,0 @@ -source ${genode_dir}/repos/libports/run/qt5_common.inc - -set feature(Nic) 1 - -import_from_depot [depot_user]/src/arora \ - [depot_user]/src/icu \ - [depot_user]/src/libcrypto \ - [depot_user]/src/libssl \ - [depot_user]/src/qt5_network \ - [depot_user]/src/qt5_printsupport \ - [depot_user]/src/qt5_qgenodeviewwidget \ - [depot_user]/src/qt5_opengl \ - [depot_user]/src/qt5_qpluginwidget \ - [depot_user]/src/qt5_scriptclassic \ - [depot_user]/src/qt5_sql \ - [depot_user]/src/qt5_ui_tools \ - [depot_user]/src/qt5_webkit \ - [depot_user]/src/qt5_widgets \ - [depot_user]/src/vfs_jitterentropy \ - [depot_user]/src/vfs_lxip - -# -# Build -# - -append build_components [qt5_build_components feature] - -append build_components { - server/clipboard - server/loader - server/tar_rom - server/gui_fb - app/launchpad - test/nitpicker -} - -build $build_components - -# -# Generate tar archives with plugin configurations -# -exec tar cf bin/nitpicker_plugin.tar -C [genode_dir]/repos/ports/src/app/arora/demo/nitpicker_plugin config.plugin - -# -# Generate config -# - -append config { - - } -append config [qt5_parent_provides feature] -append config { - - - - - } - -append config [qt5_start_nodes feature] - -append config { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2018-01-01 00:01 - - - - - - - - - - - - - - - - - -} - -install_config $config - -# -# Boot modules -# - -append boot_modules [qt5_boot_modules feature] - -append boot_modules { - clipboard - loader - tar_rom - gui_fb - launchpad - testnit - nitpicker_plugin.tar -} - -build_boot_image $boot_modules - - -proc qemu_nic_model {} { - if [have_spec x86] { return e1000 } - if [have_spec lan9118] { return lan9118 } - if [have_spec cadence_gem] { return cadence_gem } - return nic_model_missing -} - -append qemu_args " -netdev user,id=net0 " -append qemu_args " -net nic,model=[qemu_nic_model],netdev=net0 " - -run_genode_until forever diff --git a/repos/ports/src/app/arora/arora.pro b/repos/ports/src/app/arora/arora.pro deleted file mode 100644 index 7366af6498..0000000000 --- a/repos/ports/src/app/arora/arora.pro +++ /dev/null @@ -1,3 +0,0 @@ --include $(call select_from_ports,arora)/src/app/arora/src/src.pro - -QT += widgets diff --git a/repos/ports/src/app/arora/arora_component.cc b/repos/ports/src/app/arora/arora_component.cc deleted file mode 100644 index a31ab2de41..0000000000 --- a/repos/ports/src/app/arora/arora_component.cc +++ /dev/null @@ -1,52 +0,0 @@ -/* - * \brief Entry point for Arora - * \author Christian Prochaska - * \date 2017-05-22 - */ - -/* - * Copyright (C) 2017 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU Affero General Public License version 3. - */ - -/* Genode includes */ -#include - -/* libc includes */ -#include /* 'exit' */ -#include - -/* Qt includes */ -#include - -/* provided by the application */ -extern "C" int main(int argc, char const **argv); - -extern void initialize_qt_gui(Genode::Env &); - -/* - * The main function is called from a dedicated thread, because it sometimes - * blocks on a pthread condition variable, which prevents Genode signal - * processing with the current implementation. - */ -void *arora_main(void *) -{ - int argc = 1; - char const *argv[] = { "arora", 0 }; - - exit(main(argc, argv)); -} - -void Libc::Component::construct(Libc::Env &env) -{ - Libc::with_libc([&] { - - initialize_qt_gui(env); - QPluginWidget::env(env); - - pthread_t main_thread; - pthread_create(&main_thread, nullptr, arora_main, nullptr); - }); -} diff --git a/repos/ports/src/app/arora/demo/bg.png b/repos/ports/src/app/arora/demo/bg.png deleted file mode 100644 index 8fcf20b7497c81dbe680fb7d45d48b10ca2b35de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 521 zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k2}mkgS)K$^jKx9jP7LeL$-D$|I14-?iy0WW zg+Z8+Vb&Z8pdfpRr>`sfEp9eZJ?U+(QT0F}$r9Iy66gHf+|;}h2Ir#G#FEq$h4Rdj z3&XMV}~LVbb4Ah9*6)6G;Rb6FagDTSb^da+(2;yF*+(7Ol|=O14-c$V|>etsqxp# S|FeP7#Ng@b=d#Wzp$PzKQL;z? diff --git a/repos/ports/src/app/arora/demo/bg_content.png b/repos/ports/src/app/arora/demo/bg_content.png deleted file mode 100644 index 99217f1508fca5ab7f097eb542f4e0faaf5a7a0a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 676 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 Web-Browser Demo (3/4) - - -

Genode Web-Browser Demo (3/4)

-
-

- Because we can start the Linux kernel as a Genode subsystem, - you can have fun with Busybox Linux in the web browser: -

-
-
-

- Click onto the plugin to pass the keyboard focus to Linux. -

-
-

- Want to reboot Linux? Just hit the "reload" button. :-) -

-

- But we can take things still a step further - streaming a block - device from a web server. -

-
-

- Note that the following demo requires an internet connection. -

-
-

- Continue: Run a Tinycore Linux image, streamed from the web -

-

diff --git a/repos/ports/src/app/arora/demo/demo.html b/repos/ports/src/app/arora/demo/demo.html deleted file mode 100644 index 38f2e0b57f..0000000000 --- a/repos/ports/src/app/arora/demo/demo.html +++ /dev/null @@ -1,7 +0,0 @@ - - - - demo - - - diff --git a/repos/ports/src/app/arora/demo/http_block.png b/repos/ports/src/app/arora/demo/http_block.png deleted file mode 100644 index cdc4d481ff464c5861a0f0bb4d615820db4741a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 76084 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 Web-Browser Demo (1/4) - - -

Genode Web-Browser Demo (1/4)

-
-

- Welcome to the web-browser demo, showcasing the Arora web browser with a complete - networking stack running natively on a microkernel. Beware, it is a tech demo - and may be rough around the edges. But we hope you will recognise the potential - that lies in the combination of existing software with Genode's concepts. -

-

- The demo consists of three parts. The first two parts do not rely on a network - connection. All data comes from the Live-CD. So if your network connection - does not work, you are still able to test drive the first two experiments. The - third demo, however, requires an internet connection. -

- -

Why bringing Arora to Genode?

-

- There were two reasons for porting Arora to the Genode Framework. First, - because today's web browsers, including Arora, are extremely complex, porting - such a huge software stack to a custom operating system is a great challenge. - Arora has become one of our most advanced workloads, stressing the base - system, the dynamic linker, the TCP/IP stack, and device drivers. - We chose Arora among the available web browsers because we already - had Qt running on Genode. Porting Arora seemed an evolutionary step, which - actually turned out to be the case. -

-

- But in addition to the technical challenge, we quickly recognised the potential - that lies beyond the plain porting work. Inspired by recent developments - of sandboxing techniques for browser plugins as introduced by Google Chrome, we - pursued a generalization of these ideas. What we found was, that the recursive - structure of Genode and its capability-based security are able to vastly improve - the isolation of browser plugins while, at the same time, making the plugins - more flexible. -

-

- Continue: Run a complete Genode subsystem as browser plugin -

-

diff --git a/repos/ports/src/app/arora/demo/nitpicker.html b/repos/ports/src/app/arora/demo/nitpicker.html deleted file mode 100644 index 345531521b..0000000000 --- a/repos/ports/src/app/arora/demo/nitpicker.html +++ /dev/null @@ -1,142 +0,0 @@ -Genode Web-Browser Demo (2/4) - - -

Genode Web-Browser Demo (2/4)

-
-

- Current-generation web browsers execute browser plugins either as part of the - web browser or within a specially tailored execution environment running - more-or-less independently from the web browser. Plugins executed in the same - process as the browser itself are a stability and security risk, in particular - if the plugin code is highly complex third-party binary-only software. So - putting this code in a sandbox sounds like a good idea. But it raises a number - of questions: Which functionality should the sandboxing mechanism provide? How - does the security policy of the sandbox look like? How is it enforced? Who is - in charge of configuring this policy? How does the browser interact with the - sandboxed plugin in order to realize the visual integration into the website? Where - do the resources needed for constructing the sandbox come from? -

-

- Indeed, many hard questions. -

- -

On Genode, each process lives in a Sandbox

-

- In the domain of web browsers, these questions pop up right now and seek for a - solution. However, when replacing "sandbox" by "execution environment" and - "plugin" by "program", it becomes apparent that these questions are classical - operating-system issues. -

-

- The Genode architecture solves these issues by design at the OS level. - Each process lives in a sandbox, created, paid-for, and controlled by its parent. - Access control is denied by default and must be granted explicitly by passing - capabilities between processes. Since each process runs in a sandbox anyway, - there is no need for a browser-specific solution. We can just run an arbitrary - fully-featured Genode subsystem as browser plugin: -

-
-

- The plugin above consists of multiple processes and uses the same - binaries as the Genode system you are running. The most significant advantage of this - technique, however, is the degree of isolation between browser and plugin. Even though - both are integrated into one GUI, they are executed isolated from each other. - Just press the X-Ray key (usually this is ScrLock) to reveal their - respective identities. The browser window is labeled as "menu -> browser -> arora", - which means that "arora" is a child process created as part of the - "browser" subsystem, which, in turn, was created by the "menu". In contrast, - the plugin is labeled as "loader -> init -> framebuffer". It is a subsystem spawned - by a "loader" service running independently from the menu. The following diagram - depicts the scenario: -

- -
- -
-
-

- The solid lines are parent-child relationships, the dotted lines are - client-server relationships as routed through the process hierarchy. -

-
-

- The browser downloads the plugin and hands it over to the loader service, - accompanied with the (memory) resources the loader needs to execute the new plugin - subsystem. Because the plugin is executed by the loader, not by the browser - directly, the browser has no direct power over the plugin. It can tell the - loader about the position on screen, where the plugin should be presented, but - it can neither interfere with the execution and data of the plugin, nor observe - user input referring to the plugin. The plugin, in turn, does not even know - about the existence of the browser. In the extreme case, if either of the two - crashes, the other remains unaffected. -

-
-

- For a test demonstrating that both subsystems are really independent, you may - lock out the browser from the GUI by force using the kill key (Print). Scroll - up to make the plugin visible and hit the kill key. After the screen - turns reddish, click onto the browser (outside the plugin). You will see - that the plugin will remain intact. However, to proceed with the demo, - you will need to stop and restart the browser demo from the main menu. -

-
- -

Pretty geeky, but is it useful in practice?

-

- Think of a trusted service provider such as a bank. When performing online - banking via a normal web application, you type in your PIN and TAN numbers into - the browser which relies on millions of lines of code - an enormous - attack surface for malware such as trojan horses. In contrast, if the trusted - service provider offered a Genode subsystem as plugin, most of this complexity - including the whole browser would be removed from the critical path. A plugin - started by Genode's loader relies on 35K lines of code only (the microkernel - plus the Genode base system). By delivering the (trusted) client application each - time the user visits the web site, the service provider can always deliver the - latest version. The plugin can be a single program or a complete subsystem. It - can even bring along its own TCP/IP stack connected to the network via Genode's - low-level network bridge. This way, the plugin will actually use a distinct IP - address as if it was executed on a separate machine. -

-

- Continue: Booting a Linux kernel in the browser -

-

diff --git a/repos/ports/src/app/arora/demo/nitpicker_plugin.png b/repos/ports/src/app/arora/demo/nitpicker_plugin.png deleted file mode 100644 index 885a24b84f371dadac7230bca29181d14da04155..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 96674 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 z z#_DMxg{Y*&u^&Rkt6nH3!U#f~0fIm@0G#2jHZd%BVN1X$z-olGH9YQ(we+SrL#c@Nh}tMgFBulAlx^l7oAAMsCkl3 z#F>t%(BBiCZn&&82)*+}5i66Oy_-|xF;eog|NNHWKV$#>5uS;KG)#?A42E%IuYLCT zjo+X2-KC4p1&&5R3rxnMpalaHPnc??)BqHgw?t~)b7&4J_0U2~%B>ZN7QCgWYxK-Y zwKJM&R=nQ&%w9R_m_fD#7>*Cly7;@*9rv7c>*@tp44HZEH%3S$j%Yzo7;@RGpBy~= z38zI^-qAB}UlXwePKscTQ`laYhv=HF@wsR24$eOas)7fU1P#ng=%(EX(PAC{0X- zMmHre({zQ6%m6D?1g0dY88Q@zmQhiNsIss^m9%J?YN%V?L{vneO0ftkpvixa6f}Ex z;`c2BAkp_5iADq{jV4|P(BC{9JWt?0ESOQ9C2A^AOL^x57rX-Q5=KQzV>G7<4m%Er zL`wXyTrk$(yEw=&0JJycUmyL-P3uhjW}uZUkcO2a%x@-|T68$542he8k{An(2`6pF z{hKlS2K)m`WDFKf^RAZ${g1^DexbWOel%q)a}kAFf(jbvEPn&YqiG$K0{)p|dJj=F zyivL5vM^vye<$(U;5a=TaD`(8>&RUl>ZfGEh%EysWku(E_>plE%kaeuWze8x$gc8(K@-_E>W4bU&IaX@kyq)fsenhAs1sSulxTk zU7fXVP+^_bE!}%Z=Csh&v3$x}0LntQZY^eG)c z4go2Hil~OBA4MigQH4rC5NJgzAwVJO@k9`%sw9|5{7f2riNyZibY zh+h4A5uq3v5WITP%Y!Wm&n47C3Di&_qWd|*&^BlL)ngyteCuY6_4&#O)Bp%g+UrxX z6+eFECl_6P)VV+QGrfc#E`8|=e>@vk9d*=gtsr_(1v04vis2)#eeAsM9}M}AWv^Zh z0BAY3e$|*s4}`d;3RK~Fj3GQ{${9ahvF72+UK#w6u}2R%`>FTU9~$zr)!+X}`JK+6 z{L$OS1>`xZ6xHrDKPC`n5K=M|-=qxyRVv2d(5HF~*w_I3PNKLckG@O3tSXm;_yiF~ z62UTPX`G!sA_}GR^C2QI!W~1$6vTw0zz`fe^{8hbU(FMzw`FgnU|RwJEANF?_B7xp ztwrEjJg{^2yi13iymaJ}+pqtJ?f4YhX6>7dHslC8WAgk5|83=0KKu{>88mnM+?Gw< zKUnkfM?X8hdK+5M=&xBC$N)8!U?7ZCQxRsWE}W<^QV@~w00B*eLBvFO_&IDE(Q+w@ z-@MkIqU!Y@s_=gjKm<`B6D35c05VZPRD%aZeGURqD80uy7!YB|kO^4Cs8BIuKxEWF znrUF?mi4t)H|`xWapu%Fh7Qysy3CN*Z#EcQCep+t1dzP=GQpev({GgCzbhlLOb@^% zBbrEyO^^EgU+pb<_5YdiD>d?Eq+?_R@>JB-r+w zwCkTcf86Y6YPM4sEW7(do z?*``J3^z;=NLhgHE#uIzDk3M$nB@5p(X7&RuW{7cX<>7UAe|+J-9b-_N z)OFeT^KY5mHgpX|*tP$av3G5J{1bb1XxF6bzAZo%uzD~r;W3e@LZQ5Q;M8{*8vY=I z5QQ5w&qsica^@OZ=XCt}Dbs)Go`;&T2tP8#D`*ToY_j9rEtwpBsYZFoN2K*%Lo`*R=6HYOKVX zx)55F$(^5`J^4Fj-4k1;Z~xTnso(Tk;TD-R@`C$6Hmpa00Fi1>MKr>I+Q2hk`b>NF z+#%TrY5b=|=bPrx6mU%ycQRZ(RG}K>fHxs!2`m)@G&?b77(U|SC4VsjOA1SgR#q@$ z&VRcN00gu72eaa>jV-o%MEB?C-Skc8au30EM}7JmbpSysUht2I*mmOT&&@veYdI8E z(Fi#`o&#k?L-BrBZt*QG>?dT>77$tLO z0hx$oRH3M3D#(yQsGcuSkstw~L5=r4nif4bL`5)z7llNaX2?jo#uuQBfK*gthu-nU zuUvZftJXf`@++7B(4lj5zMMi`=@|YlbRiIa}D^(DezZKBv+DCrzMFAQi?f@2z z_gJ5IAATI}Rh~#j11?fiL8`n3(D>@NKdY+fxiy58t>C(^= z4PxeS%(gdfKl*Wz!V^6DDXZ8854^6pcTYkc)j`_q7-Zygj>)&4f)NggO2zl4i_P<$j`}Jd{Uia|t z9evGrvNs-_{pB~-pY6%F7xCl0Hs`nJeDqrv3|+PH2dkd?WS14$mVJw6JpTHFXUK^6 zK7P}T4}AUg%|AQkhnrWQQ)f^1^pfxW@zXlDe#5LA{{ADQ$2|Dc)pvhlQ_)?`JC}_3 zr`30Vwtd*Up1f$>+*{V|-985Z3KSYsah=iBkQh%mIAn3qnM_d)05m+>6j_zYZAlUY z0cy#+BO#V9w~5e79U(R(sg;xpD;g*z3k6ZBRo1dv=6t-!YeZ5(P20U(;CkLof;NpaZ! zme^&zM5B_6S>}&QPZ|kE@;OyBGSLj^g>4$2S(`$1t)Qw|n){~Ioo1+N8C|Pnjbj*4 z=C*v+r2&fqNF?sYxvbB*Bjg}1=-ZjY-;`mgO>TffLx9sb0~9Kd;2a=`BxuNu04fp? zM5C(4pkfjN<=VYXR4_+KT#M!mVSk~!pWC}E|;kGHiqJ?Pm-f`$~Y}f;ku8 z*0QH#RyQpJhT|hgob(^V6gG0qd+)t>*(;yi8Run)tc5X`Ek3nv*jkg}cI}a;-ujO# z*IvDU#HfYSr(J%_q{^7hZ9$4!%b4}RdgRQr9UZS6BkiYeIcw0gM@6K#cFOsG_s?ry z_=Ct8oc3N&Ok$Fcl=|DUt9@fV2BAdIC67oK#1#-BCeB!(=h6%zDoG8d;@cV$%gS}A zaz-dXN~;|``d#a5qIr2rO5Y8gsp?qaB^Fi|z(|5D*}F+fVtRQ&wwRPISnmdJkYJg> zEJAmc=2^C~mN6A8iJ}Ngo_J=)Hq6HF{n6xS|M83Wp15q~ z`6Ex8)%r#eVX)o!?q5H4*{t_YetOXl?>VRatcza!(EG=~v~9(Pp+EeG2d`ManJqeI zT=$1=Jn@csM-SaXnrv9KeB2Yu@+0TX$kzVsZ=bv3;=ljEH^#T_@A>(6p1W+>bGs%0 z18~%(Q=U2ZgEJPiv=It1QMv|&nX0Ci395cyyNB%_zCoZU9Tb$Z0h0b+&Z$e4H09j- zDYW(BiNR^o=7iF1H17f5oOjru2p+^_5_~Hk?(b>>Tz%imdNmmslLctgq zb7=t(8H2G~faw^4LM$TWu?RpNMeGincCI>V`iL`M)L1xAqI%@+vquz9#rlc?z)TEc zp}9c{I+e0J&npCEa%kCCk442G7P7(nfETeV9$RgV+uH74b^8~#HNNdcklmG?9UEqh zX+LghWFEZO*H34$2!*Jrie^p{6Nk&*>TITADbrD6x_%p^UJ@x9kn}SWX#K z0)$O$;709;6C9Az2b5mVOUo!lh#uE?jzu{!(E6;A!Lc4XoDX zmd`wR(`Jmo#h*L*=bbxt40-65rKhdg9*2MCvon5dfkhtz!&?}nhy?OL%;+uBg!+wN zEk^)Py}GKKi5XE=GdfRKTw*Iifx5i(>h~|(IPA)`|836rXWIg7`Lcifz>AF4oGxF` z$-H7w0ua#+fG{n&-jNp63=xiM2qg?|)m^K4x<(k)XnvU894@Q)_fS~msm#=WmC{M~wPAri8^$OlHo z44_Dod+=&#r}`L8At4fP4`-vWH-jzau$~IVoF(El6|QcjjxQ?Vsk16Xyht6XLz@XD z0A>!0!-Z_U0K-HfDP1a_dq~g+NXwkZPtd=TH4@utj}ic=(7QY(*ipp#A8i4{77f0w9R{hFNAOFAC8ai-@ z@96$WTzwfLq5_48Q9@AkQb*PE%N|oEI7ZF;zZil5rhycfvo=#96)Fmg^=$w8HSG%l z{K0fSre%$tt&21Ul2B7dgWZs7^SpM5rPI-Z`Za?~)+uv82K6n40 z|KW)bR6)%6+?5OT|NQ#}zqozXIj0^w@82_oDga#jKQI32>?s5Gu;|Eu0l48GPP=Ww z(9lDU-PW;w?Zic!x<=Ai38LoxrGI^p-hV1Mqy$$v5+=`f9kzAu99j)lM5G%ncmdOx z)}h;5HK2R{tHXY@m+jMsv0@A|7Qp6?o#XQAzA5oAx zX6T8FI$g554-i7Hk55f<;ghhE$}Lv&b|^zWMbAi7UgWAGj4TL4; zPem2iEeT|d3Q-thEPVS*5sHf&dph6ud=)W~q^&0;5L{N>1SPGrteca>dnQQ+P!Qd- z74@(nK}Qgpx+s5C&uK&iM%8MO38ErIN&GD*8u+H)D;OAoB=FmqL#eV)1zs9ub#_yc z7|dLP#Nt-@_b2}OrWg9XXV#Iw^W?|JjDMc}->U%4B&K|quWPzUsC)3@YOo+ZBI<1d z2ST6*L;;i#!`|%=&R^Mf-imoO-IKB@$+8gwu~Kl1NPe0Z5rLQojAq6#q)4Gt=1QV|t}F(R_iO3)-JRe=f-i(FO8`YQ!ol^{Iz z(4#W}VBKpgN7(kPXXS=<1A#i8TfS%PdB+UgjDpMooN@B_jg>sM=k$xG{|Keu}4=q>AB zAGT>_9ME!f*cl>f0y9y4`)+(={Ay7^^Z3;aL378T{K2~EuGQc9Bmhhra_ripYcKZPy?OZ!*N>n6)e8o%TlKRw zKm05JjBKB{9uVY=Qlh)%_SI_)-ufK+7R^TOSb}d7mmGi>(-3B=@Uk)YVuO^L`cSWD zpn79GB{VYu#iT%wY~Q(f)-TsQcJdkkqub}~J8sl*&&?V%d`$%~6=8SBiZP4229G;s z_}FK>ELo zoNsPDSl2mp@O5*p_`8wViv^uShkR_#hyT}bM2Rdyq$WnTiBO^;cqkbyh)OIAH7&v4 z;XlX2`pp_m$<`qLUs3I)9*DrGQb`G9We|ulQW2vmgf4OER+p&^%R~9d!0xS;M}D+^ zA^`m0Uw<^Q`P6sb{pwL?9W{SvmO3a(ZY?YXh_1r8ad&+nqg5#;skYE%vTgf;ucF@X3QpaetOQNZ^3fxiL6c?f8~?swpW+-6bQAT5hy@ZWzxtG-*x@)LQOKO zK_fYn$5LZ}$e7{pz4Q9vISrM(CY1ss5jBPLh6tC>eKRhO&td?Yae>sLdJsp5@mJtgU}z*OFQH zt-j^m4~)EU+V75^eqR-&b*~)x#K!USPaHA!scK@$1Oe;aYep^HH0Gp}M@@WE8L@1~ z3sdHdJfm_%&<>GcqOOmupsA=qOSq#FJ?(841W_ee(g8KFVg$(`APNVpdae9nheuex z5}QYAfhnX(Oi~R%D+acH4UB8_2^PN4jZOdbmryci4w;ZpV>-R4E?lsSJ zqJ{x8dage5lG|sraR18JA3Xh)IH0=|;}FDpClKW{yD;+D0K-EdxQ)3y!RiSMrc|c7skJc{u_;vvE$6j*JS;MC<$m;9cf3)$XPq$+QItIM|r7K4qc{fC@xw`#O$tsoK zjAk^48*+$5cjHcpl%T2c3n9T#O%xWz<=lI#b{nfIVRfmyG*Zf4x4gP!_{#wP{Ga}G z@!a8tf>9&Qo`2}xVgLBO#S`AxIj?p602kTuq8^AqLk+;7s+hyJo_kyI(yEEI>C?N~ z0&4=ziv5<6E_bnE?beaN0Q~nao&V6_j2Qu0^ThL$1(0A;5krteU$%E-yiNM3k8%T( zL~ZbAQ*q`2_q0ROL95o9RU1tTs;DNiG^tu;O|rC4CORa06P&%0)n1$wAPfMjTCujE zQRx>1C|eFDd>hixrH&mOxGokgf($L8mt5{^L{SZuqD6y2NSH7~aLOdbf>euEsT2(= zr3G5RftAFEE50j7X?n}XLC*9o;R6bT3lKpV8c9}C1r|hNkPtHog}NNK2}2AbQAADC z#tVUU?|SCQ1)Zp!G2?~@FCIJh@ri9mu0LVIrT72Nrr`_+Rm3OW!W@=U*g?sWV*mgk07*naRG==KXJQG7FloVhJh}F)dy7Gm~ zd(342-j^r5(9t&PqT@gFt!vs|eB+0&K6A;@M}Ow#-@5T`|o=-XB%T@_Uev3 zQ!G(hcWz%cvy+;QA9ecuBLQ4CasChIj6CJOkpM2A^ses@>Um|vSJ$ri_<7TB_?zFK zb^Tv*^Up3^uxHD0dC^r_-LY)Ew7+-Z`-UFzU_nYmYzWo?eH{*!gZC$nEc&oa4mMuE zjajqd=yUA4lO+OnklQ7{&>L=k1g3YqPr*O z%TF&I_t?|*VefwLq}9QzJ4@KnqS7iAEr3pJ+Ol_0cSpUt@X?p2zO*=RFZTCTdb+Iw zFeE20InX`<2T({^!ejnKgFK_&Ral3WZ7q{}cQ5Xr+v?@*SY1`}@* zE z>TpdF3>-M`)f2GkG%{vn1?7Z0CIv*AKtiIcxnV8WPr8Q8Oc+EXgD^;lA`;=GzbF)g z1TzT+QE$uyb$Nao1jbVIOCV%)U`C@O?QaL_BtYv^-Ci_snvty|wvH6WD8hm*BC!a0 z(Ni5i`I9fq8!&hqDSGsAH-2|q*N)N4wy&N0`mSeYA-tzfP>RUvMN^Nvyz7H1{^=_)O&`8Y8^7Z ze$B{i#l!n{&Yj)HC5}f$H5jFaZh{h}lDA?kYQlPs7Pepvs)+SHovV*Vb#QmRd(*@< zN<$T0i#y(!dsd~g7B~iH4xRQyH8o9R^czSbr5=RYTb{!=OHRJ?T0;PmcV;4HX%lqn zgWt4X!=w;U+{r8=B~x|PWkwVcpcHui9?Ad3FftTEL%-R6}OnmtX zl+|G)<4F^wc;b=ulP*7b+QtfipqiT?H>jR)?kTG_ZrV5SjxXIe|Bm#LkN@B)YtKA- z$TlD%WLeDGwSb@y6HJ;p@r_Aim*hA9?Sc~lpk?~Fp0htN`SnNcSUdjK`$rx3u@6po zq#yU|9UuJ+L3oo7)4%K=B?~=>H%UwM^U@Fj=%ueZ9Snk!nwL20@C_$43U-K+3KGn1 zjwEe9@7YDms8Zeql2|7ukgUNJlroViCPV?PjoCU1NZ5SYIaE_`T46}E$S7hWl_;Pg zz|>$6jbw;IL>1@7mXt_^ns?k%Wf~Z43LKDrRzzBg+frVlkr_ ziEd27Iy~X z85txRD`P9Id))cxtxDD)^;XFWr>hR&yC=W@7f^N+6&a$H{YeIw8Gx~s)|~_dEwS6o z@3H`ISySdGV!;sA0qG)-Sq-M5Sq~8vWM$Im^M86o7``WBS0eYu5FrG-vYkRH$kdkY zzou&V*P%63I*SG{h|nyGv)~L$149n8;86eyh-MVzj12D52^l4NjS36K7!jQyM{oX? zZlv}J_|olv`$)9zYBW-iS!5k31S0MD^cO$(Ob!;J@U-y?M$CU`kp$e6@aKm3+c7OM-o&hRa$y!uI5Klj2 z?kmzRJNyPOi6_nDa2DOXw535Wm)_@ph4Cvz1g_EJuuHRuR|Z8y3FJ_m#b_E3EG6FH zoumPmBv9u+NY)D}2~Ayd&mg6N@D^^NF4^ZGsDGH4=r~mMZ zVPdMBO)PG68f2uJnFY_i1<@FtomZ%8gu$p%_~tJ~28j@%!n^LsL0}DO(#YvQO6sFK zJ3gfe=LJ&1(gBsX{$e4SXri7JBSm2<0O@oRV5rvi_*rtiw*23&xvLAc@;K8bUiZu; zLkBG`kLnfD$#yf8b!C9}pR~T8q4$1rohM1&znX%Pj5G*?1Y-~iHPS4>h>qwh1cleB zkuWF%qbukfWDY9?dk&2qr+k$YYy6|e!aIc%5cURZ^o_d^DLQ2pfDcbN`N2scx9!`u z%!5oqk5NIOu&9v?MyS7sN)}!n%3HC zBR9555m#-#?PD9;Ke%vAEBBPIF$Q(6YzDG$L9`f~x_vdzVasoPegFU{mV#de;hj~i zq1j-JQ6wl?SRt8ZESO6OiMf@WCKa-7ImC#Z(N&)XEG$A`$o<-aN`q;R5DNy)k!R4V zA!i;Kr7D6*Ac_>xf)qfAjxkv#60>S+E2^!Yt|y|mJ5ed3_gjjp$lWahNVS%M)wkN{HfYnE_%b0c6taD{i61t3`R6q7D&f|aD}QK&J9m?HC)MIl1P614P|O8hN_tIq9La}rNt4S9moH~oVccqc$e^cn`3M6Z2k zsYjDYI9rRZ;WKKrjX;LU({8x!Mno0V`O1=;uipR>_t&E!NFCmE2QG;oH8NHJqgT9^ zo#`kI=R?Kopp*l_EM|L_q2m^0?YHKRKpt}WO-app9*$L^&C z)xsh(GWJ%DL1og|EAJh%^tO+EX%mhHfH~u@cz#M&bl0UqbU#)5#?q%g4FI#pUGd!1 z44vdCoKjoRbMvw#Hv!`?XTb2i)_?;lP4>P5A(gecE6;DeefAGlzVHVCAT7u4zOHS+ zOSByWP+^zX6#ELQpqIr)m&tsy<@cLAEa|*^<`)K+U4+mInpTvI1_TXOSfK%dmYYDE zoG>#$jD-R2Gl{C~F=Z60kjR8u zr7;tC-5fPgL_i8sOcfSQ-7gN&FLe+D5WUxdL=)60R)1`ot@WQ&o#l~gdmP7ts z`~JO`-FWbENJF5SHvJ0vHm5<_Q0Yt-ah9$LT}M1cr+y4X@wVofM3lYO(#Nsn-3P#R zR}7vHC>zP7o1MZe!9alljeLQCXb5hlLhBMJ5TPInkx@Y@kaQM zzZqpA(*dKA{GlW5?nNb42*QX~IkFW!4{lt1*739E|DYNnK?4OLYO!0_!dsLO6q;1f zv31}+o2f%pBT0qy*vjo|PLP)AJKR09rVnBbhky`gv`R21@~P2iB5Fv4P5=!kh*23~ zj@E$s8{61g~T?e@D94dv8YKA;`6C)59Vb{&S>TA9*#1TSLDL~tZ%NBpA z(HX84lP7*|!S9Xf3{k39Q>BeQ@iA(k4EpTyG}CAqa^AA59h|1{C(_uX8 zm`{E4Z+W#Xtz>E!{51P=V%qt!m z9%$UxI9P?ouYW|p)1k;wu*M)1V+09gV#qB+MUBw_4Ze;n3PO_*Tm+yhR2Eh@09vpx zLKDTz6a@iNG)fdhhy@V~#9&ZBg&HY!uNaX663jBx!8}G9Pz}n0dGdq-6lSWCFwd7! zj4qdA5Qr422-eLgnHfU#R#!%4PC>W-Rx6#u{=*LP=y0PKC_32d4}Oe3hJb(ssnF1K z@H1rPq1@Lu^P7)Cs;HHlaiXw!6}Irn>niof6QF{fk3F z4e4R2_)e3YdzWjKl=uuNkONjJKNM09mR`uzDB$oSCxuy5hcbkusWB_LoJJKbh=O7@ zdS5k-fcKzeP#TTlO(Fr23bRs8$7z!R2IszNBCUIJpQT&dm@brp1^^NzG6^80s1d1x z)G3?RT?z(s_fZ3$bOlkvXy$0O#uJ3Ie za`{Kb&c3r9VxyR+v2mk+?L>rGV&Qwk_{Iw<%9QJ~l=El; zG+k-AcU1}dAz_CdmZCec#OD=gfUrO?rX8}B_VGZP+G~E?->8JvB6DNsR0>Z#!2>1$ zj#Q+m(_>0VDJBRr9UcHmT&S)Bu5r_yDq|mxSGBu)5i|P&L zqcrvOrLl-YC}}8A7@!g@CkZQ1KvP#M1+&})63xUUFuIZ>)iQ|?B_bUvmY92aJ!uSr z5DV9zHvxi0MO4xZ8m+7)6{lE7p_-{`i0ZwE4UsUaL;^Vj3e&zE>OPx)NuT`H{tT>Z<-C8Np~}F>&wbPEerqE^UQNk^qMfhkXuvqXJ3kTZo!4 zI%SF`)Miq)04C;T!lb13ob-zAXh71{@b(wJ={o_zV>AKKSSRT_WS$8|l!VhVCGSf9 z9{?97Ppm5vLeG8q*Y?O=DGr>{;XWl@CL)$pM)gl;AYEq@uu}bxuq24rJO2RsDU|jd zW`(?kvX}BYz2jO#B9=&p%8W*n06`%+1r-v7W)_f3VL?U6K(L^SmiaADG=uP{0RWV_ z6%ix~79x;XXCd(7>>xCYB%?8inI(8WLteO|qx(3)v46(sXE4n@^N^ZL1sWM#lv&-( z3t*;9vL}=nMG$=7p(#zHw?J2yn~UW&Ed8tI9B^Y;)6?Y(%f|@&!`d7n5X@G5*kTa|J4}1rlRz+ycJ*hU3!@*@YEqiyewScm6aKnY@BslkOli#e3Ji(!d&^4K&xV(oOTv`-*t_igP z)3;qQ@6+Gv%)2TDL_}&<5rQ~V-bc@{2!+xz{q^6OGxeLf#bBfbX(_7en`bnL=uo?O z?q~nsOtnZNc>+dpt%xWwLLd;B38-R8lPAJdqbFNR7J(H}A|eu}m@#@+8f!S*2YzQV zm)<_S*4wk%Ly*QgVv=Rf5{)6c1LBQ9O$AM=xxRTb75cIfu4sxjlUq+uhd9T<%|KIL zgKh-GnhmujL+2j7v)p{A_x0`0gzv^Ag`y5j0wN}60vDBK5LXi-VSq+6p=xF@vf)z+ zV9}uvM?=f+*MANV>{*;;Z{`R78nlKOVG@WKQB*Q!jED>tB-c7C$Sj8;10`CfCIv)1 zo723>xhYVI%%h_ghJsN@iFM?zq-#->WDkqj!R0S*99bPRZui7dS(hmdDzZ<;i6&e)BE28JBM zG9L+MW|oiuFLO@Ku+Wqu#hXDqIN&eVc#|U|eT>MPph|BZi62z3s<&{<`9mZnu;h&+ z$qF3o2TebzILTZ=EyM;LQM`|z(vRg{CW+u1b3>dhHJmTu0hP@BN6l3<{r}E&uSAv1 zL@F^bL}{E$Eu@T2MKXULwE~iv_W>Y-zy!wNSII0zL+-zpKZY0&;m>A(%VSlWE=MYL zp}1ZXdl5pX#zjHXGwAbI|9fu}Py?*5Ap{&QBb8YgP}D+8QPs3+Q+!k=&&#Dykq}$8 z8mn4j_@#tM@8|VL+K5=AlNAI23JWZgm@#^!R**sz{=-5Hg*S~sL_vSv=zk*%X`aJo zFSpDQhy-ia@)xLi-v)!Pm)`n?AQDwz8DLOSoZ=dTAc~89M)6|27z8nR8|x^dQAJDv z6NU(isc501MJnEl0z`;L@eb*xqEQ7gK#CxtP-MQIsSzPW)huez7=p%3#e!!RnYNSk6=EszBcTkJ4~%R=xr3ne zs}!QmH+I^DoSe>*0pr~#-2kbD1QjLM$HWbjNTRh66!mIj|BO)g!V>k0NbpXI3L@1z zN+mvHgt~ugUI9yHti~ugBwCUkRsuo`U~J68LFdpZO^pdJFRnrZ&5ELIh37$3>CGu% zhm7Gp`f`ucE3_K$h>#LU}%oFS3cd}Vs&N-0kh*l3+#i4`rG zo5;{BBc7UKv2;#)*P%M2Oj6@ZRPcY z=j!RJD)Wtq{o~E7s_yBY86D{I#_!ihRb^&XMrB645%I(mR-&n5U`Q5m?_!P;E0Kam zq((#{%yIe=xnSi&i!`DyN+`1ls^aP7>yXYnC&Z(+!&SfM^-pG_%W{5RLRG~IJvr4ttk{m{?#xNCyF;tP8im{ji$t+%TsUQ5t zt=kuk$hp2()U>%DTQ_JQ06h4>&QmWvd-Way*})w{{f7X&=@rM_3sqOHiKNWxnW`{> zh?rdhpq7!6sxz=uX{&B#naV&~`+AAV4vCG>ooxXSqwO?GtJeAd80`JDnWj>XS|cE0 zi>ooR5CQ=R8gh_##^hBgFe@tXucFMZ(v10XZhx9i*b^f=DkE}GrCh^&x;0H6ptr%BfSYT`VkSO}k@Ll9h?JtO60tr8o2Bpn(kcFsii zhjto`NgyTHmSd0r1Yt67450{H(=t1+=!W4|#nBjLacM7|I%0Kk)R<8f*~K?2zauIm z4_93PmG6yN8wvy^3vA`szS!lb8hP{7nVDEs&PR|itqw~?8d*n&QnZL%yfz&}M9DcK z(egUz(jE~UG}88wEAyr1j0{YSZdFs+VggiNDJ~G$pcca~deHR}XSzB4Bn-VM1&~0wHE+j?sy1%QZkQG3wMZ z=mvtR7>uE21;hlg-zGRwc4xli{LSCE_0EO+4!p8apT))Swq3J!061mM+=GvQee0>M zcbsr%#;n`c?N|-W#j54?Q5B@)gM0Z)pSf`NV*Ls6ydr8yacleGN#7(^tR=eAzwQ%3JggTd#Y6)Rz|`HYTTO zBwaH?VkO1%VLFTh&de$X(zu$OJ}nfZruaI=Qi-y~R9NJGVqr=`%3LI#1CuX2aqcO} znS9}q6rNn+$mfnYIQF??pEIRJ!fEbY5*)e0xg;d)gCiCqFOGe19o)yg7)*)L(S=!seC8Nm&)p z4o4G-X9}Ju#Pkr0XBU`!aFi4dY2n}t2N#%w@ z_dxa8NjyHW&(|u4g_Y< zK)Hzsl*Cknsj9_%kf~VEpsJ##LDYhp=Bg?bR2d>9s;U+u`bbTRvegs{mWU${d9w7x zym+MlW5TKey~Sp-PR3;>nG_M^T;vDGcc!y?=Lxg7 z$gz=V%x^nQlT41EyXN;c?Y-lRAG+gr&N$ka`X5Y!Bfs&CrB_{>_{50Fn4Fq{93^6; z#PITeb$CRXq(dgB6;RbtT|foMl%o#M{coH0-uW*dx$}4buMQ_maO5|gvGl5IlO%0B z0idi8P{SN0HlFWERA$17SMuz04T(z3(ix1DO}PS|gcx-)K}|SD=dc(!m!VMENf&br zae{31KNB>FAUYQ^z$~bmg@Qzs>vQ_`WB?C7y63n{Pgykfz?XKdI{hu@ZlBfPm#hS^ z?$LuM9RHGR^Ueol&e?BY`gke;m_TR0Qv2?gesD2x0{-B0mwY}kwu{bN^6fAEudiP7 zt$*Ek)tZm2`nCX=b@3^Cf8&=<`w=tcXMb|RXFvXH-~0L7emro&&s?+kHh5NpSlKxT zr5JHmOQb5o?v`V61yjNS6#>tf6pAvrkDwKrEjj3bc>=^50TUauS5~J?P8&V*M^159 zU8@=rc1FR}p+u~pi#Vwos{Z8U$T>?tIj1?pw%rBBMB6!cBHOU%*59f5#)B*7t@&oP zT?e5Q_wD3O$q3%yJ9+&uCA#u)g=$2sAr!>qBu#q78!LG>B4-r<*s&K;VJ0U}SBGt; z$%u<5AXI1=XJS-@@rL)cR>ZP(<0!5B@no&Vyp#cDo`lF8oKnT!^IZI$XC!n5d;$W4v>n9Dco7*LSsL=-$6tx$yj7?|x5e7uvh7+YWcs zqOi zjhV%mVkNd}ppdaz$-EMij_p2`vR%e1tZZrVC)FHccMYK%I@)=CCZjyb5$qk`wrAJ= z`;T8d`_w^44PzQJqMC6!VTrI6lxj+am`_O~?HhX(0E|PVkC=S$r(TSjvft$6bU5aL zc!N8L2o8=99M_xm@5|D@v9@uqI#WS9zxRZH96YrCk6Oj(Ouo_NoJO6vK<_N&jx|d`ZX43c$!$6JUL1;B{Wl zai1R=+5G#hqIpv-=^LYRmfB<|@C@lNiM65xKu!vV*P3gDri@XVcrj$;%t1|^M_~Z~ zA(hIhc8qPMuSoD33G2&#f=;=P%Gxj;niyJkV07yTmd{=DVeh?k8{+C%c`??QXpPM4 zsV~^!oio7Z5E6+P;K|dby1v6nj-hjn`tou2bw72X($Q^ui!LV{>Bq^kByH=^aZNd8 zW8xUym(IX(Vgvgh=o>5cte<*)Jl7&3fJemrGr-0wk+Z~{kw%bqU=e^J)^@g2+iYME z$x)RFMPX`ykr)LvBe7sc%pn9LRZ%B#J+VWpM9Jf zb7G0h)N8JR6ZPB>$Ay?BAx(_(0i3SG6`TeUb?B9d&2f)z>l6snbB=f1J3MsNqcjgeA)s9-4)FaQ(mRKC$QAvqo!) zu_^QHlU;MLzDVBi+S8thR}aG0$G6VeHk{Tyn+Jd&-aoYTl;y|m1Cx?9ZSO|uS@}{n z1w2Adpdn$mTlr0b_~;!icVer*tq^GSv}`4GnMJy>7?1 z7Myj$tM@T`%g9-9y&_q`nI@uEV-J85vfP4EDAZz`Ez^uQ;FFV?U~N?-V5K88fQVSl zln;#UIvzk%v~~8#_|T$RjfDfZj-ILxBePItywp&3EDsKE zxbRSG&wmDx5_rF-a#atqxJvbAW?ataC>@URcx&Iw0qAIJ-&G6xRy;%?tx`R45PG+x zjJjMg=e$qt9)9e~yl7^%v}c^i8~M0RxAA{kI^Cmy)#AT9^GiGmz z>sQC#?%(y5g*(R{-U=M8M)2%O#h9w1kyJ<`zKxjFERX&CfU+bo2$aBJf&dl8S6g4v zI8t;CYEX#)kOE~_aHLv92x3Gb2y;-%LprN3EJE~-SDe3i06;K8;Tt`)Vkw1nyUbsB z{^G&ZjFp^T_{!6^-S_{mJNbuq&s}=y*>i@rY}zsV)1SEa^o!p9((P=KO<~8k?^}N7 z>YknFoLC>c;ot7MXfJ@bpR-^KOB^-=94RfNU1=fdN()t&RK#RY$qY@7jzj>C)dpoQ z=|K;d!{DPiMxS_i#|AbVY)dx`%GG7nX)-7^MRH(C@l~XoTjs|)vjlz+o zy1eHD+;~X+qAJW}8}*oaWpjXb`WSCZ3WGyUtq-#;Ot3 zxn<~qtH<(v??hzP01@wHsux6R1eTb-iS+>jEIJb7Rxws9v~?~37HypqByg7WH;Gu; zvk=I9-5-F8O9PQ=v-jv<=cTro%?5!rX|IzntXt@z4HAtM-793lX!DP`qj)@nqPnJSFcR7uo= z5FkNQJNxx3_B{Tz1B*^Ov2Q=va$*XCl+S&|svYY-xABCtPwd|xQ|+Xy&N^lAb#EH& z{l;}Sue_?Q^6a5&E?>MAVcZ;m6&Eep|ILrxa`89IkND>Qdd1E2W>Jt5@fs6C z;jqGR=&l4EmKG}inc7T!4E2GTI+LdBBWUhxZM*aKEnm9qV$-3ebI%wTE89Km00Q8e zxe7O>uv#1(Zo-kU=ZH|%qsr0JNd_ZlN@C*7gtfe(6@i*z^kS4ZaUl~I504HloYS{_ zS0`s(!dp4=xWqS%H&O*rtZt^GDTvzprA8==>BL4UTjJu)$3czA8B^WVQu5YRCn?LU z%<_;tc^#HFzi8prl*NK)R@<=qmS1RwLswVl4gk)jyAsdBoCX55jZsx}HB(Vjx9i}e zSE57jBm2g-U2?*LH8&Ea5t@jOzAEEo<@AsC_w_935J=!$s%A}MaV8o6#C6D=?greH z{5)`IY|p$xCN4(2r(83PUPMT~-q%=g03a}@Awr^k>?SVta@hILJiB7r*Pp5m>zr!h zGG$I|PmEUat`Npr z!b#1w(u7n90*7E^Ru;moq88G&0iQX)uZPVbP$D{OW5d&Y*O*j&ZrJ5~HHVPaEL;_l~@xE+%- z$6g)xXhzOFr%FB%=7y;TQgg)AV+D^eIJl>x!}z+e5SwV>gDS7xapQk4v~^y2&IRK4 zsTtRHcuLe!Qqp#~Zr%on1#hM{*4qCXME9-$>SL|_uSqDqKK6^GMaQ6JWon2m7N{rd z=GoCG_WzKo8gc;?0qmfrh5{l?R=~L?M4SQ)M=c|3DnZDx8kIz9gka3M zSx`7Cz?O0?bB$C$j*9k;#snfbB{i2gYItZ&TAILFuExQ@0u6239MeK%6%kB#S}4xO zfSCl8gLx+v5vq*Pq+v8hCS~`!qmuM+2ARnb7=VNO#x~t`=jMSEH|@RmxD|6&6?6NJ z8%?-Z*!2}YF*e^M(ZFg#X0^`uQD6p+qNgWnN=0aTs7KHoDlKMnGC2I$82}Y!Jjehf z595~|nArW-elfoN1T;7 z>87SyyHO_rP!;5AevU9F778&qM8-z|^;*LUIb!K*D(_bKuMN!mG?Bk53ubUYtU#6mJ~XhYww z0}m&=4{hEK12$+@Oz|o*adN)YK79DmR z7r7--atJ~dh!gMx>`0-CAQqV?7=u-4{Y0g=z)2Ce&Hg{e1BrKT8V0pB+VT>Edsm=jA~UAZLxa!F#M1(6qKPK?=`mlmt0s#Yg8p#p%G?3ijo-3F|T zga}B0Fab4U$0p~jc;hw1<~I%8evNnaM;xa+o5jIvv!rj3DODn`je*)lZN&mOTU0IoJr#Q3hy%UE|b(Z!qn^f zXxDk37s!h-zi;@lxd$e8`DPe(&F1I~>D}%=hxTXHf?7>&O^lC({Z9bc4`3Wm22c1L ziE3n0rBIl#Qz92q3aZgr0wmyO>(tWXx0vHFhu)>BCdX^3+oJvwUfy!7d??2ATYN9!1Sq9NUg(4qO z;-IPpiH(zLpgI64jTq2b0W*734V24-%g9+1K+A-46Q-mV@}dc|qP}9zS)a*etZ(~) zgKwHupEr<@6VF~eC(7a6vX_7S{;l7*@{HxL_}D|+Z|rXt z2j8rrbzPeDY8ImbO9Db4&RN&xGS(Y)ICr260i_f9aHG)X1+(kR z{^EoM=ia_{`wbT^=w0=11BV_vu2l@b3b4L}oO*Jak<-j&lKDo+d~fKU3U)M^XpZs| zdw;xm&%X6;Xnfmtpg4#awav7Ww`u-XKRV@c_jb=qiMjmh+AxCz05J6g6=q_CBa5X^ z1`Hg#aHfS_w>LvDMAQwd0cIj`wXFc)Od%GCp+b%+rkg~F;w%~^SgH(BGIr(QnfQVg zR=_dGsZeB4Qt@#J7dvHDV~da!Q)W>{4$=UJ5V_5Cax@T|VXU0%VR4v8H(IC)1&%!} z1e7fN?X3@&qY{#%GUlD1>M=0c5n#&y-BJJ;DKI`XFtTC8z{sxSR*&so`jVCJ+R@YK zKju}6qY(o}P>8t5Z&TPrK2%%Sd(!{6c=oA}k4y|KG$0{(J88)kH;s%9-qqJwHo}xD zQ%$|=k;K&`adlyG_L7s{y>{@vC%(RJ*Ntafe(HPft5&3ms~^*6a&1Fa8L-40C+1z+ ze%v#=1_0JY24JS@q7>1kDrG!UGY$cp6&>IIkmVt-@d0X1<3 zB#Eyz&sh4Z5AGRWfAZkyhX0q4nB$sw*CUyq9THcUMmjfC4(@0&bZ|>{@0Kqw*>d3S zO#pV|*r!Pz$r)hE|HmwmV~Bnou#f$usi<8EpNy2bap;`E;Hp`~Y9JFe5fqLHAdnCN z5(z7f+Quoe`$r+x$bA?OhspsEmy~os1Q#*P$ds%yo>Va;nwIEebq>a27EvqlxWp7x znV}FNBToh&!8JKEpaqkagO^Cv)HFC%Vn`gXdTh}^>@SGqnq>=Ge09dOP!$c7{9ZGf z<|xNHp{&~>;0S+@MFKGP_{PDTWun-B;;T;k$fo|@1xL&&R}xo$B85yya4iX%OJ9A_ zNG8 z02a?a;*4Pf@-$ZK_-WxgS` zWR|#Na0GjYwm+G73FlBWu__; z#~mt~i9m6VEFG2}>K17y(0GPB^2v^>obKX!sz{;7cOF)B=NNn;dFKB$>tQ5vC`6Tbf+X7C6@YzdY9U< z+`v^4#y)YM%=&t_Z!}}cbfO8U3Biw z-}$ZczMOEoHQ%ZnS~*?9P_44f3`7W}(WXdmY^sWK5+5Ll2XSUbQX)7*+n5`XS%@qA zKu(<#t5QO3q!0{{IH%0YxhhhjhAd8KoE#0{uxKEDKA0JqmT95*c}v=T3T87j>prEK z#Z%D4qzk-Dljk($JBh+L$%pwwsPn8`UpEjfIc$4^3zY6x8b6$0f9 zsigq-C`j~&kN(XE`Ws8`I&JxtcUy@q;L`b}Nh8#fK5?9=FVQuk1&Yulqo4?)#88&F zf+i1hL>$ z1LC|ZOR}`LnIx$&Ia@q$_1@HFnj{`ck|0e}G-^GTWf{CXvK_r+!)F%l9p1bZz`!%2 zj2E!PFThGh05O9QKv4DVmjOT>O$!sYI30^Y>^*?9-f`6f@49B`Ln?rUfV;kX@0nlu z!UJnIK5_D#GgdYZ7$9Y=jEcZa+jGwq4uqf;cnqkV0GXOAGdbN(p#34c8o)>uoitA@ z0#vWIqk%4{PXA(GfjuSB$)iW{x95LL{AV%~?+U8oBZgn=%9HW1} zGNI})(?o>>v!#_N2 z>6M?p^0fCn0lctv2*fm6)yW&QaHMPkGB#!auAcTat0qMzr_5eGXW}_kNA8%Sp@IFI zlg9^cNydr;&pQIR=R(>IQOwl}vz*;svj}(ASeG2Wt=*NSvN` z;j%4X`ND=ZPAD-^|AQ~w`Z8O-e3xwBwD^{d{VRU=56=51j2_~z{_U-=yZ@HGCjvdV z=$&WW{K_|+cvt2MyZ&Rhy^dC|e&SU>wRD|OVc-AsU9TGAIrgSsT782z(E8gpoN&ke z`Ppy%l~cdIYu)xGH+<^;x9{778ZVsPeB*DN{r4+Z_3TGvxx|IklA{H=jYXknvy z;uXtpx%>?)ew;8&^9lFWKVScgr@Ug}_tt*-u{X`TY}GASyn4|c;!w`VMy!KVFavd^ zg-}v#cj1Q^20=S5G$T{%)Boz8woL3F*}Ch&tzVyiv<*GSR72u2^_;4Asm9!Y7CfiH zyIKKIbE0)HOI@vC_FCm^V*xW$N71lVH>o3Uz4dbb^SdHnu)K6H0deQq^GDQeR=8{p(mS@dzWcFofUd&bBi?Tk(%!f zF+#|Mqp=syX#jwzzt}V2ITPm+^)Ay2{gWj<5n$oEba%K8AAD%rjsLy+tS?j@X1=FL zd_B~XzC6N>Q%QZjNL{T+T&gnfvsdq8bO3Y^QAd+|xBuIM9S5J- zf(WR1G0Rk>;Z&dr0HEMc9SL54{wagL!=f&5PQ;jaydS_^}_o_NK4wIRBK@^_@C?sP?IM ze(k^9e@i&=jUT%Fo3DB2lH2e4r@Joy%RgEB4rx&q4h_z_{Zmg|or@$G9;vOnVaK`a zzrAJ6=pn0xLX!Kx^6=GrhONJ~XYZ`f|Iz)wF#Fuq8{hbW^ZtFsf{~Fg|Mt!A8yqZp zAw}}V4}AB-_kL^OlGERQ^3A7T+JE1}Ut0fD|M;=T-z7o`6_gx&VBZNh{rRK6yl*V4 z&zn~pCWB|KKpN4U6H}XZsEh^-kjUGl(vD)PeU2p0bwmIF7|r)>eSGkimz*rm!qtrYJvNqkMB)5tV+b#)x`*LfJ9d58NAN}&D}py z1w40hq(uM$z(g)o^G3eBlAM_pAP^MfN>pY{+r(orbswS2(8YgQh)m!};T?bt-?(GN z?|tKr6_ek3HRjZjkVst#3@pcQ|J`Mu>#dV+yyL;sb^>_+$FKUrqJAH6=Ar`&=GDgk z@vqjsV$bfA`qx}_#y$7kvvJwPnA9;a+!w3PBiOaAx#*PR!-1jA*8lR4EW2rJ&%V=Z zIP3rbAOJ~3K~%*6@XDWFb?^LsUz~FG?5}+Juh(9q6V|hH%Z_C`2T}X^KfUU@`SUm@ zFUnSQLZJu&v_$GcN*s6)$iDN z{>qEdFeHJb~wFH1HI;hNd(A)2{vjVC(K7{{DuImoA&r*At&n zIASwHEXaZl46s`F7>W4#Y?@=5fz;RpE&y2d(-#c9>ovzc3IQt$d;HO@i@*5khfe+L zFU`O3y+5=3{xELY$!}b-q0d<_T4LkFBXiu6mHGU-%cvzaW3uCx%^3rLiP13ogcXa% zfVJ4WtGTGTdH1ru3y&XM+}xQw`q;ixSJvG61E^!wvc^PhqR0T?Z-4VUKfm;XB}1p5 zvvBjZzi|Hdk{bB_2gjBJzz?op|MCSruH{k=+aKI|JOJz;$`{XBf*CY2LNU0uA(H1YLzI;i{n ztEd2&PKSSVqa**F7rG7|Csu?BuJq+O)d?I*03Z+J4I(#MQEyZnOU}i@eBv@aniF_o zL<3KnYiMdu(M(PO04@jcKR)^6ZRdFAO(!qv|7)P?lTxrFbHou%V<-uv8DK++m~1yt zP0nwZ2-9+A$Fk#Q9m;wVB_%UTY|RBH@4n~L51qPW{r&|eOX~npf3H^xS~rO8+&Z|} z_pAsel7bBsU?#Cg-6`rmOLWy@%Ga&keOmt5?j@I8aq0R+MZ*7n>)`5#$-G-UH=mUv zbH302&PT7h;r2V8SpDFwTaN$UJ-aXd9v-~-Ex&cy^$EEe0LY=dFDIYMII!f56}y+7 zE;_#k$1U^%fC|-3t*MF9TmW@-q)nFRjUxasF)*@g$5Eq# zvQCh?x~dP8U0-N|iAVF$YE(C6MO`rUI8##_CGrJgfgE|u!#JnD<20VDg6Gs6yCZLc zf)bZ$WyIPByQ}_@CJptRns=!+i&0K}LnrcKSK<9r)J09G2u)Y+t69<$D#uwx1Knw% zsq$jhVS76ZIvEs4^D{Lj~$*2D+U>l@gK?><}BqN&uxA zSPi6#68np)5ja9g0(c1pfXKuWB7h9#j1$6&6PFMD_~wI)3W6pY2izPQ9_s^uT0%tX z({rv`@x;IX^8=>>z*TQ+G<$3T#@F56fBia~{nDR5f1MAOZr?mGZ^Lez|MDwO+I-m+ zCv7g8E&IC<|L9c@Zx~*=x?wp`$J^g=<~^B*Gmz%vW8uah4V>QB@C0ooK;;xk%_InM zfD={Fw9$YaF&Y2}Y5+a2i^Xlp^S#?2AN)bj@W{Sn`drKr0m9@gb#+O6O^Dn`(21UE zRolI?t&Cb#_yi^wJf|LCw6ltA7NgIquBKbbe*V@Ey!E;t{mQRZEB?gSHSzUmuw7kK z--tg+Lu*N|R))7bEmKSS#Fs1IN@oC&B|U9=h$`9wqJBJgMFZtAU-UXGe`3!`yw2ik zzb1t>8$@ozQKBv~jM~L3-~Q8`g@?BzHMey|1G}CrUHpWlyRo#QpjirF8-UjXxDCKx zqT?VK!2JMzc=1U~hJj8)n3@8nP>>nLfih-hK^4`HmgQp?$JLl4GG=J}Ati=_Nj-o& zf4u3q2iNVKbN~I@=HGqK=0%_Svu|FqVYm6KerowvXXea6FoBt>0(!#grF(!OeEwe_ zJMT~~HoSLV^0_~`@5*fT%JD^WxzJ$l;ffP`OY_&h0M)>zC>bTt+OVzug$>)z>%8MUyz4{fuRHyOo)NV; zsz3n&AqN!oh4aEMy#MUG{^8?mFZ$E(J+d4C+~TGAZ~o^qeh5Q^sn6}p7Xi?h&EKC8 z0OzsdqHK8IU48v?X8Bwx=<2hM+jjC9TTlAp|Gw?Q>YaPfTsm^*%2@|J8~w_EJ@4Mn ze)PWc|M%|>TpnNT!+Zbu-0K|$RX`X3J2w$vEpeKI5DJ*WnW91nRTIl-`e=Ykstsi| z6bywPHtMvJ=bIxyo{wx>KlG#J=Z?H###(`Mi8<}$rkR{60+lG2Q4wiW&rjXADtJys zzf{L^c2?utTJvCZ3(5XSI@T6=Mtl4{rbVyln>_ z{F4(FT=W~KEV|^-BwdsSr!un7M*8JR=4aWYyt zfyyBOM~98RFlqx)j>0w69R*AW2Oa8qT-oWvbW_OWrmzso#VfTrGf^7*c9~eKG*A~j zvND0>Vy_kZhWwXLz2ydodLszMbw5bKY{=rqRJ`?r*WRoNjfK)FGniMMed4a)|HO)~ zjE#nbJ*3u`6%2JCQ#gnfDSq`6ul+8ICUIOi(d&Qqs{3E}F62s9kfYozmAAa_s_(Xj zTlFGnnmD#v-J2k`EzVoof8YZjz2ZB0OC1svNsT8IW*}-A`S6}kT>ja>VMH9|@F)V4 zfMPpxObL|=r76(>SsNi#^&HR)NTF_dUZsXgX%37$vEx|!3V?Xyb>Dn7-?O7BW5>_5 zeRt7vy7WdR*RJ{PyJz<-{hNC?|LZ4r@86g`8|jT8IdvN_(Sq_Y&TF^cc-isuFZj^4 zYkupVsrz()?q?I3^B+lvRqdmamW;2c`JSCXr}=EA<4u+OcYbBT3nv<&4-u#rpbt%b zq3dt;vl_s^0a$@fdT7cl$?3&0n@Y*_>LMQxpfO`38k06qR7s&YwLJ1iS3hcTETyQK ziK;?GOoB3k5k#R%1TnIpY)v6dDAR;Gn^3kE5;To97ig|PpoGvjCk>6hOxcu(C|95* zu%>dDAhHSbG_Fo3lrgT3#)Yj(-X@eNSB{MiNpITf?N29?9^VwU7GO5@j~Cq1vKa73mAt1?5RKuO<;$i*}H_{<#y5s|4n4J62kt;GhdFsBA6 zoQX!G|<*v!nFwE|G6qg+`EC?HO9GY*2FYSoy{SRe)fEhh+T z84no+gSp7Q+7%55fTX0gZWk7&$n(+>0BG(W*}P-j_Uq?e-hViP$a88r#;4tJao zcIFF90n5WU-@EB+ z3(sA7b(@89>Z-K*yg&)>I`Mm>HW{$)?7rutE_!+PyE8Qz}h>iae13 zg+opr#6%X<5{id`u_+OY!NfQ^1Td>Xg_xs>RAm5x87&oZfI^u<94|@1oHK^8sX3^z zC6O?WKqf|JtfD1%3&liI%Q8etLqOmykeI29^=%F2$dLvif!9JAg|SIc08E9D24R*s zzY-lg?nog(D7%ZJ(Vv_OSB~z3C|G14RroSuaKzSa5}&V*0C_&L{qeyc9Cx&+z;R-Q zbVjhQn7?N5?k!)cZ`t=y|A`CM9PHk9y477bf6h!uk8U{RbvOUod(J!V+JC?Bq&E#7 zX(c|LVe2+nQ>Dsf-~RX)7T>ewOaE!S7=HD+E3dx%u=6cfvfahancnZ&lIO7wUvuut zt6w&CyCv>go`OIqZ4>j)5Q1=}Cm_O1CdA&4q*7>H8cX#N1_U2!?W?*>3|7fIhzx=Y*zxd|K=QusW1$cIA15@Q`=j{ovxn)$gmN4P`!j1m$!+D?mFMc!AUgjwszJAwnF3`C4@90@Iy;yOufK z>$SwS;q9h?IWrncK9L4TMn*!UVy4tyYg9NJhFXN*#9hct z+7L_y5d|R)q>QqyS=6Z-#qxv!$R!R!a|Bb4DJ{#)G`i&y;p zUvArb|KI)au}{D0(Vai|wO5|`{ts2Dj;%xYHfqVduypQ8Euh1e3QRUun+9&}eQ3w` zR}x^?ocCJ~SMNuZqrTJ zLogS8wve-OD1b>!K7m~9ca|zG>jDaZ%V`JGq=dQ)#AO+|gB*IAqbi?kY3Pkvwn5jsGu9# zSIL6jmG^EMy5nbn@+Kxna7UhC1w;hQbcSrIteC%M?A@1r;vWH^%6kLAkJo?hvRwxs z`3nL~5V<}5jU`|FJ-uB@uwjWsgrv|Gz_FLvQmj9Dz@ksSvZ@Ku7Z#vTF zn+kITp4*hrbW-Wiabn$&(y20&4sYG?&zC;eItD(Z*I37~WW@pUQt1%Svb8c&ou{;Ns}l_#Zb zqu-ShqL@qqX&I?ZRZ2&m?~VX19NNBq=(ZJS4Zoos6?m6g(0s;Tg7a6s;jv9acgPPP z`^-gGo&KIXfig#pSkw$WeN+H+3|Y0Jn-(=P1$k1TW!`e}|NI_+vmYJ!QUA{Uk1k5s zhwlAPT6XEfs}{cGb!$$%W^eWU)Z=%jQKqh>CyjM{h7mVUSEkb;aCq^!k|(1>prfZ} zQ-`rO&^gx4kAM1N0>YY=uY0U}yXpE>D%r93(QMoPdk8PcXyB+^L$d&U5WpW+JCuK? zO9fSbR{;1ifX4yssi*#?LX}`#8hizrt1?6ez=W)f0yNGf(8(c)PCou&$)~PRq;2^9 zq;6b7DF2HN!WkhtfG*1ma%8ST=v2pYF$#c{IsDRS$Kmsxe0}8vVu}c8I{`Y}2`F`r zQ=0NPG>59#rrO8avx`Zhp|4UxRZXRG3<^L=rvk3p^1OEhh*81Thqirn!AwyBvo|&| zbQO)~G?x9#z`;k~4&ctJP9Wr`g#!YU4Ow@`?6DL;r#^q$;wy$vTYSYZFxg0*x$LL* zPknCc@n%xOv33t1N!o_fgz{p{sR;$m+xJxUKeM-7Ciqyoi@W6~rNeGm>a(T8ZYNVn zi&X;+9Nh4>*^QdP;RO~A0Ecl6(KLUL1MoTke=yDN zhQl2J0r({VZv}8C08Heex3?>MYq9zYqc|g&!Dx?i1mL>NyijMbl66HU)U}N>>NKLE zvqjaDP(4p@)#|hdx^3hm(-Ck69Xq>e!Xxm`WnnZMgmqd*2-|*HxYSt+n@= zx%W!4Ey=Pi+p^?dDK6OHU|I<9fIt!wLP=hDJd*b#A%q7!QV0nokOv7VFSPv9Afbhj z1TZCl!NC{|HkRdHC0V^$z1(|e&R*+#f9!o`=8o=_WLp#&E&WD!=FFKhXHHr5Ti-g6 z;yI8^3uSDu?UMOwntgb*2%*6SuE}~&NY+sR=-NbRNas5BzSyKc29KBd!y7L1gFJ@Q z$>BJL$-6y=p_$=u|N3vAP^Za@FF5UaUmaYxF$5p|_HSMjh77`n?GLoq?6^hn$mbCM zsEA-{YN(O<$i?D8De7^*!f?}E_E7*gHQVbXmt=i~o~eZ_D^7&WF$ACHAIf~={7)&~ zJO-Cf_sQfALm&}I2n9mYX#~wO{k2F&uu3q(6PTGT=x`X>Z*rq^N-8MOz3>51jLo_n z^zsjC1o{Xecv%O7&0%PmL=m)a7$`YmG-Z&zHHogl)3d)E5rzOjXVb0+*WAA5KNbuw zY?MpB=}U`$xiL>Z?ySAXj-B|AOIQE85ctt7Rrc%5cYQD~@^Zdxj>P z4JsQTE3`v>H0uw4|6rrjpz>u7BqZI0K& z{jML>F&sRWgYsyOVY04t>s;IDTBf1ycDq=*`rqGu?AVDPUU=-8dqtGP9mUi25!}80 zOUG}@(ZC}*XFsAc7!l0FR6{^aZv+}6q5xI_2<4%j+9bKlM5n6)q)xY1FN58UPSK*M z%fk?8je%$$!-^jL_nP&sD1AaGnsfKV%0Kj!KM5pwV*oS{l{b>ctf&F(mkOfxyP*3+ z>>DGH4@6@Ga#V3}BhVCwUA?51$icdR*L@?WtCDrJP7_%f7BBZuj6u7a z)l*`F-tBas8&qtE`j~DzjpA&S7x3t60!`s_vfdNA^}eum_uA2a`Ocef`NA##_kCTP zhyakR6TWcEpS=HHzx&%ux9nOyHsyF7z;MnaN8&L|)|I9{1mtKSSx3Kg+n>D30e!}K zul)qjcQ!J~VgH(Im`4F%!}bT-5AL|*h>ix9VadCe;q*Pru;iUHta2}a4-C8>KDLeW zAN)Ib9ZA>vq;s=ItF<3{=Xajp?IsbBK}a*tk0#Gu{)uLVK5Qr&55IY@{|QI#B+H5) zpi5ylZ9IQRLiYZhgj3YX0xcaj0J&|9Y@z_d`$l0P3YcmHyk`WYF#_T|cqEVu(UP-f z&9-`V0hIC1`=x}+ns6WqBy~)`@~3NG4gg_@jr2&U5j4`-v}@JsyViaF#AnR?^-aLk z4&&ain%p!+xbT#p`or7Te&OoRFMa3u&tCq=|I)RIzVR#A_34zuaPbq!4NI*! z<}>D}4}waXPG+JwI2;CGSZeF2(`44@v1wLo{y*>QZhQH)cYW|}0PwXtKlt|AI~R|& z=6!6|$T7)jQd>tG3hzfEN76A&)|DnD)ELd$I{NvgfBcI(CpNzE@rz#gqE@TjCzl(j z4a8}t-`%$Eiwm~xT5*I&1M=pK8p4|aylwD}^7sDo*zber*8~7yHh|jzJQ0{m2{31* za;udi75K|nocsR2z5eb$|9`)B?Ky|_XB?F&^4e!!^m++79XG3;9hW1?5TJuy>+aon zlQIbkn#tDWNal_7_jzzHh^8pS0xXo_FTL zE4MgJ1`PqwuS;EZ_N$-XY;WWCN#z=Vzb4XwC2a@hfg_hc+YxuR@EeL4pLRi-u4kib{|G(Evb2A&`OO2H|iw zP*GAfHES~%oz8@s+2bb?yJm3d(%qPn(Z%WBWtRpqXYwu^oRCXK=Vv$E%5rzWU98*3cW$J;6F&CYS^UtO{?a)AXmWDG)G%Lk(2;mM3Irtzor?)^_Nl{7e zfhfxzxkQqYR@z0?sZ;pU2UkD$qc`6BhIhQ+vR4Db*_!XiBgzl}=x*J$YV{p!|NW$A z&3(hhVHjx@N8M=B^%R;L)oF6p$xq#~bK;@bKCtCm@B6o#-g?>#AOF^mHWN|-z_e!a zE@x62(qD4_9j>olRsI%-~P@=jPZ@4`*@ZTPP>#&j04*E$*` zt~h1h1)Gz1La@r4TES=q8*apVxbmZT40};P;U;S80(==oqR;U@rGJKbj<8eiq} zXD>nWRs?|Gf5*$0DlvlOL8zn|L;wi_rHZ%-L}20)MWBRagWymRcqf!BLL_Q0V%n9oe@e76joH^ z76d{e%(D^zXwLZv1VSerP|w`kuv`RJGS{J)nT*_!@l#0wI#j(^l+N1*L>r)zWU37a z^WIT}5~9Li^y{a8{hxmC-e2`30kMOJmOpqz8Ul2%Yu){umMwnVqP20s+(jvBi>CFI zsGu2C1N0k#E<5vQ?;mN6z2=_v|Mj*{0Ion$zux$U7hHJCvwrs{&i$3;Kv5)KanK+D z`$q|bsg9_vDI{gdXCCT4EYm5iPA5ZOgH}xDNcH5SI!=vr>JB<}2m2=WXeUj|cy~|e zrb+Fj@i=Gnq^oz1uX`J3#ptSvmcXM#>=We(V29;$8H@r5WaZgz zw;%N}>^(n79RQfhP}&s4yEdWUzVDyTx@-Nlf1;3y$DR6|*Icydxof900zi%ms?hd^ zhX?>R?zm@U?T%#vV8(H)k0H4nz}WykhN%VO;mF}q0Dn5o=ecL6GM*%CjWiY$n?DoB93wP`F447msL(EDcJ@7eV2kPrkCL=h#bib#ZrYLp0(AVCCz&>LYB#9$v-vMiN4Wkq|mG7i%FPKr?`G*V-Jnso_{M@Q-%dWd^)fZmAY}IE!dFQ&X-gL(CPx{+uKmIrF4qo>Pk24vCMq-#g z{V*NErqk*4^7X)Ab5|`^A3hxYu+%o8oirZm3=0ii8?TIYFs9I|X4fqpTiW&UD_S~s zOS_uWP2Q+ixp+abgcy=CbO8;bl?RQ0s76sy z1VN}IQbmGDU?p1W1u-2&hOdUkKqLe-1EE zl;)rm%8EQz4Q#NW7MMFEBqN|onW0c2p&`SjN$F}9k^!iaS4kiumH@!TSm`K_t6B;i znGpd1bhqwWzINH#Po4Ojxo_UsD1|0P)XXvlfTnq>xv87KOXgp^bIJURKeT<%>JQ(r z;!{6+|K@N0<^9)ule60Mzi`%xSA5}V=l#zId!%UtMxl8P0G)bYZ-=IE@`wI>R<_BzTH9pkroFMY@#x-B_f9aMjAYVdXD$5dLwi;{<=9yZ zzvAo!1f0;t4+-nTd_Fkqo&UE9Wl}Hi4j#LHbbBCT-TFkAObq z^h`2kCc@BwnQz|v52r8ReB%rEb+)|_fE+Wn@RL_w@W1|W-kimgKtG*01sYmXj;fK> z07|H-3y^-oJ)5pOe%r3qEAbeK28OtXrjrh)8UkP%h$!}FC2i73WV@r(S=zT8AweNQ zLLI7TB8n)L0;)k&qDE0fjUh^aiXuwTC?N#UD563M3CU_kt%`z;?(9+wj3QopO%aeZ z1~^&K!RQI%N`jF_6}ksXq?@ZJ08!Q9iU4PxtSqbx3pIf3w2RWkh?MD)8t7+M)SA;x z0$Lz5GhXhdPKiKhhV+JXths+7&mWNdyv#LD;v@qtuq|d$ z%20=vR!J+BZfoBWZ3xgoXVqOBu3s?knDdUkY{?6E0sRya0E|>~a$_}Zzo9gPlgsAK zSv>ioi+}eM-Maq7(pCRyVQoGV-XsO7mKibwX{O zPSA$Ubtper2SVK>!isT!?z*F;TVV01^9EZxZPKv%cu zLSu4^>VY*WVv;gH5Rp7no+cP0Rn(=SjsTF7G6+bGx$+$0?vCUNE$zN32~EI|iIno} z1(KFCJWlmYb*-cu;ZRaQF`av)c1+KIxbXZ@lW9|9)Sn zbUzP%qB9{IcHH&BkA3IY@su-u@!4lD{K-v00;hWWT_o@7p3bBsn+#PeD{InwO3&F0 z^xlU<5uIjkZX-^Y+9soU9g=sWTUT9c1q@)47}V#^TDV?B9ZW)jI1$Y0B8(y8ll;5k&z7d?MzB5j#|65ugsy&sKvpk;@$_py70RXe){92pSWZ1 zmWxK)qkXTvq-?BqUVr~TpSx-IU03YuY`?5d6HivHR*$ug{nqKnU;3`gPJh`Qt*R== z$9fbRgY|&kqacH-(Do{h`XGfx^Sx`fE}I1ayC=3!A)`CeWq@mFrs!)!c>q%l!Qgf9 z8^}a+|EIj>&;u4~3bK9@5ef$ArAr%HZZgh`0s=@#RDtBmt3WCVC8O^IR5F;-3GCjq zuDW;K&e>2i1bCggFwzri0`4+8t8>;_^LK(KHnB&pzvk8pS8kY?E1ocK@ktvmz3SAv z+ar038r@{W{hQ|Q?9^3GDP?q##*wt>++((c-fk-#j@@f_&e`b!Bi50f6WU&K&YaC6 zf{pj>n7?W8@AuE>`S-5 z^9dK9@zU*0WH4ASz(7M(!=p2}f$7o!F)FS+=a=sQaEEIA;PNfsowt1Bw=UZ?vE}mn zHhukN_ip^^{3?##G}fNG?1b58-u%SHFTStwDo;B0yf{sv+`d*w|d82Z+^;| zue`DUZCTT=-+9k5OCS7?57yQ>2R|C;U^-9khbC8^{i>%eJob#eK`SRiPf34g#mBGM zu;Z@x0&Jah?0IiW+*j@EOtM?oxOMgC&fT(i#bx829T(SW;&PF&tzFIf-n?0-eC4c# zPkq-}Cp>w3bMDJI-!EM_90jOG#?ba4flY+jn}bnOP0Ln(;rM$te*G8#7Xlbep$sd; zA6Hq3sZr9DXkfH8q_~ET7}@A92aE6RphU^i(@WtnRbl-#bjJ^GJpL)r50DAI?-4n0{n?BDAKJ)%LKl$pv`k8;eXmNWd z==l0yefec~Y~;xP+nI-7|NEc(tNHV!13Dxn`P>`+>-DpL<&tYAzkJJ8D>t7y^2U!} z@_&^H*Z=j6uUWGh(`;iFe(3|3{_%11WYT9yF_Mt}e1XFwKMG3d(aN?p+it&UZ+F{; zn|IxP@}-M@{-NWKJv9v)gHX*e)yUd9ngE3t+UkL*U^;^U0B$B{9Dmu4GmgLP8rAq! z0C-^Y4fB_8y5UKCCLX$M`IZ}Aa{uP*Pprbotz*@(%jV5KZJA13?@UWJ?6~tUzkK_9 zKX&DruloC{%4VRhC-B|npZvyYb52|K*H8b8-&QST=3+`FL7B%yaS@3u<4=1cO>4Lh zUL(2LWC{XTU>cBJPvjNqP4@@BZI6t@z}J zo__x8{>Nxlfpn>B;M>dp;aB%{xBU`;5tX=Vv^r+z7jJpb{~WJ(U0mDb6IH_Ik!tqM zb7!6M)w52z@?B@2c;&Wyn5Nc>2G4c#dbnG-i7eW2%v2*=VYF8iZt51BcdlyPw(g4y zR&Kd|V$a0(@1h^*9F?iE5WpP=S|L~^uFdsa2<3nhGdQ3MYQDysSUDG9ouHv(t}#St z30%w*oCX&YbC=71?kx{|@dcd~i7uR6r*C-qd!PH$@A`g1-j2HKw8aSec9yZof(-@Z9KG0xI%W!8oP zVU~8!__+&i`?=>Y{GQcG9Q2JVH_!jvpWX9{&wO;{%U<=HXM9W{$@S5*){+Nz@*WF@ z008!G-?RSaWqba8@!HL|op$<(m(>@Y@`A1Nk3G4^W#0lkXvMmuYLa!P7=%HXDbUXo z4?cIx?=7DH#GR+iz2NI+^?x}{Htf9TxK&%0UbbiQp^MjSU-moBw6N^g$iD8jS6+MH z`!9XmqUZhooU!?PyW?3Qz4xm3eA3||SrSJIgox1;22e#ZVQd%sN9D~8qnYi{`UZh4 zbSndEWmvI`xJg0{rxga3TD=&Vj4_}>03}HTG4Di&!%Q@)nBQLNCd3loGlw6 z%Uc7*9R^FT8ASoW-6=vdhYLK@GLjHDy%U0lB;t6(xo`UGKe+R)AD^tZw+*wnYw!9w zx3B%uyUaW1qu>mk>Et!rZ~5JJoV{$`tW&?Ze;XN& z0DzocYNCK96*Nee_t362)$JRTt?3EO{3ouLt9FxBl|^Ut2O?f?GWcZX7#y zUj2&SzWlmBf6wZtPww(r?J;u#GAl-L!>lL)LB&r#XnVY5BfWP_r#AeBgU) z&IeA#yb&2yksyFdS7t*U0?4dZ&}f_;H6Rgw+8HN}pMJ^m4fn5{T!bWTL?N7x&^UiM z@Rg>4)5Q>nf?Rm47y@49Q<)?Ld_d2sX1iA@KOs|3er`p{XbI0P z=y|_g-BX^jL|2E2=Wa{Q!?qy`N1`LZ0Var01i@;f1{QC>K$dflr1iTfMX8=S;4H~3sY*$VkC6#>_y)` z|Kw-f8nv?8CZcNPPLt-Uo~~vwJU?JC0%#0C69oW$^18kOxJ@_jy6-_``iSP%d`udG z18@yBatwf%BO8K78aRJr6n-8LBSl7J3TStShYZ`VMBw6#k~^l%T%syXT;N8^U>zxc zwILy;BoKvJS5vYGdgWHf4gg`d?KP4sgZrc{yZ*Lw!l_r(=bR7(R<|=H1W2czdcpa- z|NNup{|D%8BnSoCiXlky(Olv+q@BBU`S#po%HN&^X4o}O>}^eJ4qXZ(D2ST{Rh((mYctWM!-F3ZJl`2 zihp~>p2^L>iaf*4%Y%S)1u_XxH}AUtiqZDmYXP9^7HHHwpw-od>h4;`@s+%&&Xgt0 zn-?KU>m%IrCm}5CBTYABFJ%O}P)S&Mlcp-s4VGbd3!qIn^2MyGG^;g)s)zj_{5xe?DFhE9mKp=lL;zcN zt*!3f^0j%ZHs2CA?^?YQnA}*-?ckV30$2gy%%PKXM9VZ>L&GxMGw^VJb01MRR4g_c z0s_nvq6S!wJTpvFOe9FI(THY}P=Ol=2>=an80gt00TU>aOeDBlnMRNNp3q#Jbd~m~ zSe#v%!j+I3fH7bFChi1WNvYtjaa7ZdA71*nO}Dfcg9$qynjGD=ac>0xuekE0711!7 zCMNj6X10I*{JC2+aa2S^0F~sU6lXOmY3V=Td&&BxtuugxJzMLseVZp+0PvEhEWAfu z+JWe}P!4ujeTL@`M;?oYppkmOAS_z7`Ig0tPk3TFf8lesPG=BYa#6Bj=+r`eFlZQn zewxTw23ynAX*ze-DYwlXTlia59GeJQO^$>)<5ks8faRgvMz7O&G_NZFNXY}m6>e%7 zou*C^kt8gmw6&S#F=Z}a=|wM-N%PdB+)nS!d!F@eKPqUhB*_sC0D(fqNjg-tv^Bb@ zf^ywToug+h+<<_uy*Xk7m1|T2E{pI9`eT5#`(x85Zdj^1+Bcx%Cwx5Q} z6byuB=Y@F?d=MZZFyzE#0CUz6Bx*G(M7SfPE;?Ap=cE|F?prquutftiZY=poeH zv(4LKOcLPk@Y*WvsK#V^JWJTsiOed61YUqFQk2Dd;Ek`#&%lrIQInZjZdi36;D3x{&@>p zds8xnic+(U>|J=;pK-jO%veom{Fa&Jv1|w$sY}Xe?bcn(7p>lM>x>4$m?Y!ao53+A zEEwgj2(%K=hJ$@BE+pb)~8zca@Vpcvpv6W74P z>4+Q=)NqX<(mh2&MN6a*W8|DTe@|7lcLuGJYP9^5m0AYIGf!pU2|{x9nn?X@SS+3nDw z`h=;}bdk;X-hcdi-hRUie)BJW>FULEfi%weq^DiD=BKZix7O)YrJE5VIe7{uz3H0! zo^atyFS$1Yg;gjE!5{?caj%|m<>@P*{iJyh=K2~55EAHJn45qIbWu#3_cw1~B?pm% z)fI~TI2eLP4r&nKKnRgNqu{kPkwRk>l65p{%S~#Hp>6I-MT8>3MOiy90Zx0_obw7 zAdS9O5qcgN&U^z&gHY;Uv?Z>v-0@BY=rk3OL;@**3UV^HA?u|`sTfl!$X@!CW5WDH z=yVBmF$=ka0qpfqxLXJaAo4yGs+Qc~5A^=31Xl?zqExLshL*R&s0}uO&7}N+J_=~a z06Yjxu1DVh9F_e=0PF$qsROL@L;xQG@Rag;#$vHrIj=%Ga#w5wXqH4I!eLN|CxNQK zyGD(o1c(HI_8cF;l{qXHKwvCspj-x1FQ`1N0n~u2QT3b)&fNrjZPDkxvEj5={I`>C zmkN_~B#B-9%E!O^G++r%m>(wH>k$C3+5+gR1q+dp6M6QHPj-C89qG7NzVd_{GDfk? zId0N**e4iW?I9x<>uOU_4JS$e_oO`}X2?$(?oc59I*GqQr zy*F#AkRz6M%glW)5JCZQZ)_oRQ%%62kw61!1qBEsk`Srjm3+!|o1wBoh~)XSAR&Pw z!BwNFMpFqMwX&emgG3Knxk_NGnq`B?pTX@8qk!(*^yT@b2JlD?fB-msnq^0PonSy7 zNkRNXJWLi=&pZvNkeFN%RT*h+t_n>8L>FgpQ9{b}VjIF(T4w4rIFf@(W9>q)_SADA zYSxGpg~OA~J?re+H=qE~VM(O}Wo;q`72mXe^MZXi3CGXXNq3J*>7hpwz^Yspl5ro*v~b>WMVCP) zEnu9{C#90QpVsZy<(k)1e(=z8A@W@0L%afi91TGug9f2jR31bbH7lCeViE$jjf=8OT1u@CY(FzJwz(>k1+v+`06=Gf(-M zi|(z0SmA|cYgB5Cqf!wys70w7J$W7I z65Q)xjsQ@+W)Nle*lP|_?KEDpK#Ou#08LQaoZg}!)$_8PYRZb0bj`g3g_f%5?VRQD zoRTX1RymzA^@<@~Gf84japf$hWMh!C`64}IpfI>dV>o7zJVSQy?Erz1r9kZ{R%#&C z12i-gCI2Pr3Lz{4QCR6nnMK=jmFVp_mQH`mJA~S~sbfc$X$3 zRE<)#<=H>??0cT|;w$giHC{WN9GTOy02lXEiDY>5D}Lvt*Cu6hc#VKbijE_Coojrk zp7l%5zwX)eXzn5b?iTz-uX^@3Uu1|$k~_qI@r}>^3h7-B>`*yjD&uIelfW7Q2|#j) zQ^4ZjVL0LMhJmV;0R?%L6vGMXk~5h3xF0nHec8_-oPOeE^%EAoICm-|QyO>c%wZq2 z;$*!y0GXy(>p=5bBWr_8NZt+V66ke+I%|3miik`-9s4QGLoDtDWIEgaHujgME4f#o z1@kxyp=JflKBCBbIsH8R4#@FkK`;%rwCg}ZQX~+iyEwmA_EJR|2TKSj5^2F99w=gD z*-kbFkq9|g)gXKX!dwUr5LE`rkwDN<3mU!Mnv;S=kD=x5I4i}__I4bzDvo;73EZm2 zyrB-?x@%ory7u1|tlM%+TzAv}9Fh!i4GmwF1aK9A>E;VJX|caKzRI(i9GeQNScR znSxEaV1g|lw;(kEr-QEIgVFe~UMTFT{e>DRsh~mzB5MaAI;>#!m!pPYe;G6gr#!g% z<|Ts$A+}ow z)3u20w?sr3nltJODVh0@GdTnt3Sq;(GLx`$ST@F{#0H*?go6SnT~ySY?gvVtwa8@X zO@*2nTve2}2t}&Qorn_BNK?gDs-Vy)O8yEJL>JZpP>H4MofJ4BhUh{AdnvY@|5q1j zd5F;>A}Vbs)lrY3Z6noei`w$2Esvq??P`{_!l*Y5VC`y_$I#-Y?JKLLYd^PO-Ig2U zx}B?56%^3nHUPw9u#ey%A^=VWux@DC!G8Av-zQ0jQ?1Uh3Ke%imGnSYMMNzEbpkX5 z5oqpa>8VK(p~IWX6mxvw=HfyzBvGnZohZrG%#eW)76_U|YEm-@-33{BcSS;?T2j>v z&K5}w(xI{|k#&;jAtj+A5iWVYr4`=`%A{)1Dh8N1%`*gI(t~smImsY3gC}qzo+4|AT9(wBB`K$T`VqmaX>~u|?_0@l_z3;_OS^SKDJwB)>Bt=jU=rPyk zXaHblIm`nxRD_DA;Wz`jDWphn1~O8eqJ+YQf;vYGd5V&dLDcg&K%()2f&>d%nMh>R zc4|qBF|@4}k4aHm9x-ZT?K$4m0-8EN69wc5;ByPsZCM)E?OeX<`(ywH<+0jFaG?0~ zQ~9z(w7YgJ{95%P15TiQ=dM(FFB6i6=rVL7ZYjh*7Num>|)C1b1-{ zQmfKxr@At`a7HnqCQwy_*QASqUNN~_4TzW0JsbT|*_RN(dr0^;9(EaitREAcAX2 z=!IO#+D}S9LGO~6JRT#bnIxlxSUzf4zww(_+;Zai%bs%F+_j+hS`c#MSBV(_(6*0$ zd+P&dU3%KngV`4OyQS~{-6vl7JMX(<_ULwpC;;!05`_@t1ZDQb25{13j~S7!gxc_) z187o6Q{Phvy`ifXWljaPErynj#$!^@%G>eS)Q)4;uI5;~)#|}N2MxgO>#jb2<)-ho z*6&*J;19q6JZ5ExYv>QKf5X_P04zPgCgua!j;!zxDMBKR5GCmDu2iKb>#879RZ)vW zMHxH^rHqLYlw3*Sb}7l$Jg?Ww;FthN4M(j8hX**FCX&2M64A|*)DjWuG6tShiqcF% zf|@CM z^pFn}ifzDDmsGKUxv^;f;~Qq6l0Rw)4qf&$2}1|iIa5N5(HfjcG4RNX09p-dg&1@#FKR&f6&-k^irfhgTE zg&8dr>d#U;u*PY~7hUV@iMK!LtoMSo)bP*-&_bY_s|GlzB2v1m5i4W3oXt_ctE zo-ehHsq2RlDK-58QCpT#L2awTs5M4lv^vJdMrZfNhjuz0+_>T&Pq=r}x7t6T2;j#+ zrf?1Y!89xU=L{cgPUs2%3ow2@^sS;SSN@Dz(%eCFD*6sRd9fy|^J# za*a7;&iP8u*gC2c)+CEmYF7baPBkV65zQ@;)C3b1A`hgL((Zx)cd9!{Am#g2ljknY z=t3tbuyQ%8z&+%?2S*-y?;up+u9*S@gj zY9>?bp=7cGEFSS-RG^Jj4?U)!DZzQk5=t=wjWnnUL+;FJny|cdJ`6m)#*?C*j*3&&8zPNaNk`Yd3|-^ zFa7leqpe*KZ!RS7Q+s0CuQVtk+Vf&^4MG_-dKKChwB=KbK>Iiw zsWP4W`mOi3uD}0pPG0@ct(*6Dw?BX%ya9Mj_7NNc*AOs0nh41B)7!DX5t#OvOm?~| zK&q{Vs1WKTBOy7v;i3panuwUIC>0df+^quiqtd=#;q*NH3nYTmg>-Y!oP;sEL9|r* ziw#N!qll75LK94c?gj)p;1DX!b80sQfaZi-uZ9MNcabsK=1u!%?!po6dH1A%o-8BF zL&is;6zO_*wI6_5!Yns)0-1=oS18`!02FdB0FG|TRrT>sM@M3R%IMLS`A07GzIw-< z_iwuK*3aJZw#DnW-hZH*Wg3}!!l(mOvv2?jnVdoB9C*Mp&2IU8;hiQj@pI|Q%|krg zT-huGHJOKQz4e%HuKbs$e_~?(iLbffS3dTF1##8YcYXF18*4_l?W4EvTC-q+?Qqel z&;1GjT(ao$ZyaA?(omY-3gt!alzbTTl@G+KZqq(JB-ylmW%b3|{^+#3)?a(i-tP9h z@xzM(9&>#JLo%EeI@o%P0jwTaen6wBBAh*|weEet|G8(@bq(e*j9yz!(%mdEx#b5^ ze$YI5^4gQvwDQQWyPn)&ZlU%hiOCZ!C4%NA?n&JpwB!aL<@Qf4^wpLCj6H6;Q}7#;q0B$+h zhGw-RyOYsJ+wO0C=B0o3jxT)Y18;iy-=A^V_xPwlfHXD|*Sz(GSG+n_5%7Hcfun}t zaLML1>%TMd&9T2d?WfNB-|G&(dbZ?FvMCaiLIj~$qx1>F3oTFIn0PEnwCWt9U|G_5QBXH%v4 zK%OHOlQ57R$~1N?4Q2iPm4Za-|2~!00lmm?uK3%N*R22E3gqE1N96}6=K^>ofImb( z1vY%HzJ!@;2t8?aXZa+O(UDF%Zfw^FUipmQFiJayKmofMso4xrDjt*WAC)+#Qn2Yz zYfS^XXmaEY5gd!R-MpVUxH38X?upK{Q;+_fpJjwe_y@% z-iBMr%J)xQK4o3?vMy#`w|tim{ElWHgeoLQYqv@qtXg4G-K~aOtD7CyqlVxx$s{H> ztlx6y89Pqi9NO*n!9Rc!I#LLyK=VKshybbsslJ(YVJGb4sV4;^%{j6%~Hd1%R@ z9lJM&^;_-?lesAT!xrMP-$yW*8hQYZbj~(wcB`pJ-@T02~Y% zKJD)18kLe1X9mqpRs6#nX8%$iT=aVe;%ZL37JY-wEs4B<*4Qgb+$LF=d^mRtWXMA2VPeijS2`*3u)DYY1X=08!ZV z9*8ssqbZaqp%g&1rQ#lt++@NSI+aXzAL>jTH3WxQ>aCM&*WSJ1EAuZt{YBe`-;5Zl znhij~GPU%8;%$&$Aw#{ID1l+%qV_y?0|KHHgbMiMV>luKdL}KnSZdg6@hkNg3 z5;y?B&d!dLyCWy;Y7e%yqoCnL`kyM^f4>2_OivpSLi2rT!$so8eVf?`3{M-od&5`e zZ=GDb4nI1`pvPPv!3T6$-I zK9=A2L*nF@jYr>?{x#gZBVxn=qO-5`r~W+d_Z>q&)5|f^{JVO~GgXm@BT--?99P9o z5!+*lle6d6xx8_pjUSbVC!NmjZCm!PJn4Wd4IJ@ikW4Nl<#Ca{`AK>DSPAdSl~M+7 z^d&FO!();bYv7reAtTn@y` z_PT#NZ;`udtfhfxi{|+r0~TRwBv5wD(Sx_ql~kiLz-IxRf3S50;J;!~ckSM_d#ehm>(zLS*3#gicJEzQ zc4+?pK_xk*lah{iQkbkQbj`GzEG%2I_59_VcfOy%7=V@ld)rZOTfbxP)>c#-iP1)? zU}NoQwK+$s;8ihFVH(9forFV4d-C8v)KbY59Av#7^b`tJWgcnRsSTXmo6_VWEb6}W z9p62g8u~uSU27onA{TpOdfpgABa4b`Uqx%iOxn&3pLZm z`Z>V<`b~Y{G5|MEv+Ze*$4fu`Y5T)JL}&KKOVh-TG%4fl&~5EI?9ld!uE|6<$;O=% zara~$_Dt4syqn@}YqtN)c-P(ypgr(=P(``*j&+-NR8eiL71NxND$SqWPRGw~TNT@G z4;Slvxa1KS#a1h_)t%)Q)mE)Sdi!gAuh(&>^% z6c2P3%5*mm%l{d5B)RJb&TI?>pdt_MFb{}uxGHk%yF!tK9vCEdGdHkR5jZ8HjB%n0 z98_0_g{|mJ^~qfF6g^6rvbPcz%$Eh4y-qwa=#2ysV5F<5a00*IIz_5{j2#5 z{-%fwOs)XD7{FhZb?!soptslW7=K{>j`0q1c`ucHtC26#BYJw>JBD5#Z7BO8iWiQO zhAk127v*L|c*d7b^YB8{?)~i$Le2OC=82c2FqjBjwMs$6qQ*J~u^6gU1+fr9iXm7C zAypx!N`qAz>mX`DG^qqrfd{E_=e4|<1_?u6(PN!^63=?daY^J zdw6dY<)NjBj>@B!VT4aZIo;@n^8s8B;KKlR4}CVD^8Rz69~FG<`?0f+QU;AdV-Su3 z@ZSMkgdFXB207)pxvU$?dc(%?F(pSMg72d=)67s|KR?IeP>?3U>85C?BqU>o2aiHvxR{0H1GigH43+=10Dp-#6)DI?E%J$7hjKLeE9!MS3%UUqo({Yu0H-z|533 zJL2W2A^1UxRE(G`xMJyz2FUmtDV)$QfHb$&45^ROQRD2Pbn+eO0vA`PP)tNB6DEZR z3z9wdKov-Tv?ip%B{Rc26^u}asEd+RVaT9n6A@N`_xX~P3iQ%K%>4_@1>ZquvD5^t z{LTTe6acu#0i5d(EAjfMk^oI}Jtwhujx&q{>l4@I#W^sFgD#WHX!+(nHM<1AU7qoaUEhWYRenZbk^AQ%r!6A$a1*Fj1gT=d#(K(#2WOL7<2d0#~ZL2rH`RVs5~yXvo3(2>w5N zZys++RhF@>)aa`*8e(H@bjJ*vRVVd){1vQy@6Z%Tk z=W796kML^p7?M|o?kerwl`>hbqF!RMa1rAm zA*U*Njh+Cd!%VV>M7)nU>1vFOAWEX4FUd_O*R=%PX=1c$O&u_nuraM5G0BsT@J6`| zP6#kI`SwXm7R5G|2-{m5+!(C0IrnLw{~`dNLX?E~35F7P++3N^o;!gyb_Tl*JSv0I9#0v(X?Y{1i=hF0IGciQW97PAhHL+7;ANP!blRP zu!4Su1`Mr7jk2{-+!kmE5vekjBlJ_fmK;O`l1^p>C!s{STu8Nwng|J3XSMzT!uF_E zO3M=K31o@V7>I)B=zz>ZWPvODg2=#(671rY2gHp~INW3HWg4XldD@_lAU(K#f(OFz zn+&sNG)-m+Y#YW=w_yZR^D7QS;NFKJ;`^^fVBj_VtU9O3-0OSQntxjeaL93~?)!28 zUvAvL-51+~+7VGrdMAMY1h5!W7Xq->Rttpf{Vop*%?N@AncAfh3N*Fr@Dl_lrMLv% zkIGq`rr}HLI}RMeYI%!mRQ z=XZG3!fJtgF;6bhkg9^J0iNK=qOh)jK!8AmBZF|bC?*{Q7#5q|4jSoYljKGC@TXaHY8tOm9l zfFA;QLF4#1fLj1uP<`HpshaUJOlAIUY72pObWrm>{{p~=hg{pf&$gst&{+Nd;{Y55 z;BPQ+2-okKF$f#Y7+459B+UqdZ9pPQ5v>xoDokDyMV*q#$%r3@o(=$_^}_T+?pH@$ z#y3u#*IqrdE*7Vg_z_t!^4N-MeblG~sx{*lB@pWm$I+NC$w{q4TqnbV;*3heXVg|N z!WsxsAT9*qU|+y$_01e`)})02RK^mpS*x3EAq``C8*>O2h&6h5MQGKv05}A|dk|rW zyC9s#Z>X*zfF~m&Zzihk0syaW-1jg!B71#{<{{Q!9=>RJ7-|LtGI4fe#`a#Op8+?6n}M za|UW5Pz!=4Otiz$j39UrDM?~&5vX)1GQpht0w8hdSJHD8^Db3J73;t+%K> zcVk>?DjKU1S7+8WguH^Ds;XWP2Si*d#$F47T4+R=s8A!aX%Z3&v%*0nM)lNK9NCzt zK)vWjB$icWG}=TLx(M9_p2)(%x(u*axaz_!FcGLDhPpgj!%!5LQ+Dg0)Y9QKKU6AWmh$8bZ}@ z0*4>M9FRou2q>bENFE_kk;qWJjCjA-$LD|hAAec(pVdMDsQd#m&LrjLPQo^09Of{5 zK7f+|JheLigvPN&)&518stMQ3V>y7YPIl+iXFN~_*lzPMt$kzBK$}V%V*WJ^69P@Y zhyb{;v430pN2a58AJxCh?f~A3$SSTi{JP!s_a-Ei8~b-SAppz>f~`&lx3%k5i&Q-u z+N@HwaP{P!a?}pq>-cxwa`z=)ecNSc9Jzg4`;eoYq`2kC{h#&xv7*BoQX2?^5CYw9 z7gkr1pPn`(0NPN&Ujq0EfHwoU0#g~?1O^M=Y>4^Z0N{~W-+?+^c;%MR#+d&Dd0txp zw8K7|!l&7eeK5$vZ9aQg*yy%oqD_I-)c6&^{{is-FbIvUkJVa#4FffO12ckPhBlq( zHnFC6PcgUL!;*|sWer6}shxE!P1%=@&mG<4{zvTd2hTI_cT!4l_7gzOLki3l8>vIS zp{7jzx{-S3b#8&wCdtsVCimC%h9*l*OsPR6oV;H#aFB~ABQB}Fht~UDAk3Db81a#j zv7B_&wWCzgu&OFykhJ7IYZjMuo37y8FlJTnI~c&55K%2xSNjOyxvlHk|8LA$EQrP0 z+vnH!Z&Q0;n~An*Q(&D9gfqQLFC-E?0a15f&Ct`h{ zN6qxxpS1wkAz>k4Mi6XuS~Ia~)si*0j_o#Q-&Lw5%QWJJ_dILqg^pX&zL8}f8=WP+ zez!+j0s;&wkp~OKpvh!6gJk{i$|hrHlc|uBt)K3nSi1i%qkAnZijKv(lXbBNjDJd7 z);~VE4+ZN{)f50S`F|oO^CVCS9-&I|PB~h`XRcDXh%)IcFSO&$@)Aqd+&Z>qV$~{4 zrRkVA0PK$_EcO({%38n1`Vdj`nkMsW)5aKS{W1a!jPj~L7T(>di-*lkX%ybmM z-vM|r!Y|N%R+GVQPrm@LzQFz`MBAHwpr$22tPch4u$DkgGlF0%)0+O0rHk(U)x(e6 z?`ikfeu5E6%xSjSNMA?1H0P)m0HhT5m?^pMq^mZ)^Ee?vIARX)*qIejTzpVEBV;2iAm$P@oj)xM~Q2 zjuf7>@G_0qh@|kfq`987VA7I{?)}xQHT@+ECvVqm*6{Do1n?t72I<(jl9?!8)<+;u9(5?{B`Qf-HL>Jb0DRTNl4l*T`y+oTqFym)uP}O-A&}7I_vxyH zHk`UL1R5H^LSYREl%*)cYAU=K9kDX)Vx3~#MvGky06J;hm)&<~x#-@j6_L3*jOhy^ z(&sh|Ch!+q=dIT@8|}RH&uuzR6~N&b9%i{Uw8{4Mo5IY2;qTgX=5DNAiU^tA7qPxT z{k|UuaQjA{zda$L`ZG1Y&qXY<^D<1ea%$!e>_kvdn`Q*T)~CFD^&Pie{kv}+`Uj7E zNI5)SFUvLs~J>@$fA7-kKG3Gf2&^r+T zt3Xu0p`zC`+SJ@?i(sdLgPJrW2p$|-bmPLG>^0t*wa*h4yy|ZAEVWh(03xGIy4uY< zTJ~Jrvl1@O-ey|_Z5n1FII}uU-A$d6oKEw;+`aOqC!wJY-M#Y0CqHbTr<|XpFcI}4 zb+SrPVfM-mtr0Nnx$S)_vG|TQ_m^>=(whF)001BWNkl zLPD4Q=HK_Z@vfiTk3p<{bHeY1i08ip5&k(H>@(dvY)pe~W9RMX54*<$5dxbE9krj^ ze$RaneX?hD{6~#r3jqAz>ewELh^H4dj*laX&%GN1roSN}Shr!i_urP(w9;zf|8PVN zq{m@>i^v+^cj$UT8=@IO@Zga5ao^R~-ue9#fV|I%hyKZu9-yPeu9hTG^V-zaj%V*F ziwQB$>NFuo2NSFhRIAQ!F_~x0)=SyD1-t;gFXG^;?($O*Hi`onTh(2DiWKr)(SU0- z6<%m*Wigu9XX?`@cx?=>Y6=38(aD6d5`XZg6I$cj|T9K#yO8g^uw}h zy984O!72d%RvlY`sI$|&=gk;oBTr{V0Mq*dwg)WK?3dutF{fqZI@z9qqn>T0gtXfjFU}0T#@3?bJoF;t$&RC+` zY4SjYK$}53O|o?puogrTvMVCs()(}S*O?DM#L15Wm~iF;mfUy8e*5kEh&xp~F4AFH z%+5(m?-b*C*!?#|8+(O8)^#|9)8ywkYdC1d{R_*>Z~MZYzg>Ra(mvK)kEssKxfraP z^&L#Dqrahcwo3#|ClK2IPY0zqwro9uO*yyi!2Mf9cI+%f(X^%@xDvqp)^+XrLg!;D zQ{U8;x2A)F>hJB4%xy)}If!3?$O`{l>-^dpXh%5hbk+bcBM2UB>i4nsx?7fCve&|u z*B`pqoI~Z{eV(v(&(VEs?$|-yqN8G5EACmw5GASW3*EB-TfQondzLPMM3Y39uJ;lE zEW7Wf=K#=7G5eBUUj6h=F@9MuuYKaO`)+#fLAyTUtP;x6G?F`&5a^^a+gMxDW|o1d z@0Vme1cH|Ab-P%x?v9b=-KBc_;!DSuuDX>I`Q955%nKNp{m(>Xi2hf#zb+cK!S1L& zr_=m4MI)R}+ugTyY)jywn%dfbbKd~~PD9i^0)~gfK2X|_HMJq1!1jWKhB=7qFxS6F zBn%E?_`pu;9B$JV;n6d+S(Fe3%XSAa4isZp-?0U3{oh0Y7S;2s1-oq)fU^PI0q6$+ z|93!N1Nd7JYq!1}NNX@32oeYa~VwgeH6gKh`K|=+OoN{IoE7VXf~PZhR%O5 zsrg$p*BCwnz@reBlVIv^QJ0Qr`U!SQYXF!L1lxm#X?V@gtxbv$0G-A*iYR&9K}?#< z5f0XjsDRnUpc-Zu1A*{hOp;;RW^-R#D}E882-}OXeu204eWw!$!>UJa3Ip2~f?${s zcow1_(q9ibzM*^6|36SGXJh9)6of!iL8v2y6cPFKKZsn1#h5C%ngXCH1a`QpqMJ%H z(9pK0>6qPv`8>t?rF84>%>@j6$noa?57s1a-*;G4PTkH0hyrn4Oi#n$3T(pn2THZm zw!Lq2?>$TioCx4+)#tE!No^YTj=%$Z&*`om1_eFPXKV>I1##O!{PzI<1?vlex{d8> zqC2G}P}7VccxcdrH3+vSi)zcp!BBFk?for!0v)|bD(=q*rf)Hpsh))7=EPyw*uBoknc9`f+ z3klUUBM5drnvN+BOR3);4!`>UTFZL`!ZCW$kn`Hq76NUCzqL&NrUu%~UTszy-5g=i z#`|kW=Ssx8uNZR8h8(!V=z;of>i>sX1rOxDTZ4uPfckeR5uu|08v$<)^JUC9h+8xx z2zDN7W8^jDBaMA+Q+Znmg<)~(HKTnjA}sQ8L(ZK}!ykspZw&!342G!ZPinNO);fU! zBv)TI3=VAGv$?Mi;QGdKV8hIKORa&;{l2}JXZv@keFL>Xcs&9RI=^*Y^S5bQ0Xw}A z0A>Wi&O*~M_V)K-!T{L1lVv)_-~RqE0N+9sid%$@3xQ#wp7`fx8qN$lris&%%ZaXljl zu<1!8GqmFn5z#_70r)hgPKwVWu;>o9z7QD30P84^Vc%Z|;Exf@L{0|>HJ#h__pL1i zYHC9f#7&y92zE{qL`E(#SXks4 z)%ThK4TC2h=(B+JHUESVKHmbcA7Wx3hk+J+cjKC78`?_-4)YIeO&W&f*V^cpt7ks1 zI_Ejn^UubBSv9SkHm=>NK92;j2Eelc{1t$IM1;wH3R8vSFj#N8eVc0yJXEPUewxZm z3E&7s;^FZCJ`CU=5G6O>i>Xe0V7L&Sp^9b%!OlT#SONeRB24JXqH~DKoePJYyQRXQ zp2Rhi?;s}fClM3*cEqYtk8PaOv>w__zsc;-I`&{tlYuwiWidh%9j~50j_A`xi1%y0 zgSNK%9Y+wpg#u9%XDtG5`Z=P6L>n3!25)Sxh4A}E!-Q}F;3y3IFb5&B&94OTXBhNz zTQ~v_?pXP~q!~f5^UyGS`YQ;=qt)k^vA)pQ5@9fmf!34w>4>Ex4Zy3b|7*Ox=|HV% zSnPNE*n>&!P{mqcosH1uwfa08Q!RnE9|Vnkb!PW52!TKZOf(z7uMnZL&DuG@&gbkL zW=R!@adH$w_!a=>Axdih4v|ODwgz^lKHF@X5d=FQHJQqV82AiQ^?jIQa!a3AYryq3 zj(|PJ0n9-}2%U{c0-BG3w%l$#xnCnefq_o7N&~ z)jtiurI@;&Z<{uEBDJGznij!dA~d*~4ghc_1`~W=tS^w-%x`;|_ce1C1hf7rq7N^r zz5~OP#G2RDeUT8b2C8d63E&Hj>xTJBb|z}}SuzZy*SvH-ZqtZ$`j%sd4Uf0$^v;ZrfvNHlmX6Iz*Mx&tiCgZS64V z9g=1&f*qfR#f3Ku$^8NWL)?z_3(sw7gvGE(p^sOeYXMvg;JW~RhS2IVrWV3$n)Mj+ z|F)!d8=8H2B_fRUHcS;(8-j4^cPkO^{l^G=yZNkkSZuv-XQZ~@s?OthHKIIsGsL#N z;#j-D+zhp7Mi6X2s+pv1?8L1=ZDCLgf!cijO|?H`z>K#vnWzbgG#$pDL^w&WX&fg8 z7DL8Vt**@on{C+^eb{`SA=+3AtGawd7wh+7lL0j|i`)189e~GUDwNSIjMmQM*x2up zuz6v$+j1Ok4XWRNIU?Yo9xru&x3>qP%xrES&d>}!Aez@1>0Biub&db+y=^Skd|Pji zKtzD-f(UD^BZ-;1F!v=B==b}AY%p_VHzZM0QIiDIq&cO+Qi7F5(U&4wM>Kcg=pdP)M`+=M(MTUd zG6!hL@kF=*%Kk)O)^*oue6x{837md5n5kUD;5C$_(v_c{fGbG89ysVMg<~Cv{a}nM8o<}6+i_7fmB^c z0s_KGzzKJP;;=pm$@DJa?&9V!GiWx_&3k?3+@tk-G#YcxV%gN)Xqj+kz}=IICAcR+ zPQsj2y%1&v&E1i6MlYN8`dPF0+3Q--^DN8`BPrsR%uNdM5k;>|$Re;&mHtR#E)p_G z!s&1)gbq4s@j21$^MsH6>`iyx+wB-}BBs~$1%Mwi|8cjy{q+}J+)1T6y>K8YR0*g6 z3Qz?QR$KHTAQFsQ08+$BP=HLh3*ZVE6S6qW1qN}0!(5q_Fd=9HruY%43MWB2T$Szy zs=_@xj9E-FE%(&Dhkm!8GJ3FnH)UkdKuNG9G}R&#$vUa*mu1;2i_v~UCu>n!D%E0+ zz%#-6e=-w*lOzE5Zr|VYk5ByDm8KlJw1+E*?Gm+9j)R zzxT2)CDo1q1w@ht^GeQ$uu)Zs2}o`E^a%(ZMsd0bjSv^QIccDipgG0FnMFPKv(rNy zxb^$u4x06a5SkHiCk37aMxm>yiKvxjk(F+ql9zyGIECWs#y*rvxM|-DiW^8})d-ra z3%j`|=mWi8PbMb%+V6FBqTknUx2M+2;-1mZ4h2n+`dUg4NWGW8^o&m)vB&s)m07EP zy=++z4WC7`4_ANhtaDN^Qc$%JEfgY&QfTyEl1V|J5KsnVog_elq+2FvE($}xM-m3_ z6EuUF(X-RdJ!g0Jo&699biyiG0k^sfUBn%LCy^`&!2putW&mJ0Bb&k9(d+fq>F8%u zr_qf7=!IJrO`Zgnz+9H>3+RPNR+tmP^x+KVRWUVnb5YN|Ue6AA|HWs$;^@71eZj+@ zGV#){esu~XYxd#4oVnslNmD0oFNqKpAkifeP!S1Cp3oMzs5%jhw!sW^kOrY4xT=ZL zXvjsuY?%%*Gr$VK3AzYq1e3x6x*3?n=>jU@6sKp0OJ?r(6PRiJEPeDv-QW(;j4a#} zV3cG`utHNVQqfPUS*5Tf;z?5`jU*^a2k0(zm_tAZ+}-GsBzL=FfBnJZzdT(Z?r1dQ zBiKgt-uFW9`t@C%CmenBth2AZ5a{>km~(_cDUc+hN|B@jB~(qIDk1=@xfr%8C=@u2 z9xPdmi8OP%I?dGGohD9mn1hnd%*EZz&D}@=Nb89^NGHWXz?sEeMa?O$0$V3!DJeTh z6PSCZ3z!_4GSz#v0=_Q?^2_vVz z^vjX720;0Q!{>KatX*4-EkpOp3NmQ-A)&K+Igb!hLaCxjsiG=WNf024uU`;|&=2B(p6V;Vy^1L7v;iDE``2no8A zq?wClqtgUXnz?`iP@tew)s0RSWP(nCS)ZO1xevO!1pA{BBn9S9r#qld7id-~y8y~3 zKkA6FyYgL5U_z?l)9yoMZw}l>NR%X!h^hlgL=>*-fQqPyxCpf|4nbj9RU+_AQibMp z7s9A;fg7?L)IIkkOGr$U zHYs))^VHo90P@<2d2}BGrKB>JR}$2C*{&fT3#%on|D|Gc(0$UAT+U zftYBa-E3s`IdXQIJ3WVBa5FO_+z4|T2#Je9iU;IG7kccW86c!*R!;=Y2?+XbVU2R=Dnk=@l0vwHaDvH^MPvd1`U&&Kq_For^{IXQYU=s483q{Ce4p%2D14z|aT1Y;10;EIeDWo?bYNa5n!&PW-xDmnp)m_4B zc90Z`3(Nucgs?CKl0Bt$0Dw~Gw)=2Lq!~f5jcE0~WihAI9j6z&0zmHdW`h_dP^zdf zLB%aeNldyoL-RLyXO+p~VM02Mg=9YlY znA%RE)13ksp`r27E!Yj+K^Eff?i8Vm!LvBk#gtALab~B8yH!}cfK&>pfgX#HOn_J- zA%v2WOecCKJcZR_IT~#F~Q-#yb2YqLSKu2u{o&)ggYKub`n|ItyPgiFWiBVZl@(Q)$;x{c7# zfqTcD9grQmcig=MSpr_Vv!rn)*eN`l(DgNn)oGdYw*D zj&#O~5scKKe3N}hay9^v7@=c?KnH@-iH<`%PILh6KvD$B)2>r9rLZ;wOL zM?f1Pt@`v1#7mMLfpk9l|>T@3?zMz*6X? z3QM?^?p6X;xO*w?C16E@7XmBbEFd2JqbwXKMEV73Ngzs?0?>rOsgeK+MVKx^O+wYW zO9t$1O7SWeh>)V{U~+-Di#nl35sE{Vj6PEtfsT~TKHL#$#v<58)a$HK>y8wJi~xW* z3s91Xs8B@cN-0zUC1PJNR279zTH~Tlx{wSth?1Plq5!;#dJFx=!xsP{z0#h-P38bY zv#Q*HqM&#prFJ}O1sMq;73+agV05S#Dq%Gwak#iZyil4;a$%-Y9F*)J3KwGmHzm~F zp{1+4lW=s@&D6DUXFnHaS;dtAAdu8ag?47GllA*hI{?67zDXPjNr_NgRkRR56bR0s z<#@#dzKJux`jpw9ec2J~V3|^k3Lq$;Y4-dl`J!)~a5w0wH`)OJ6s4-b5Khq)Hdx$< zbX8IM(N8*M`HfHHQW8?(B_cF-`ywMnwKGM<=|l)rq3)oF3jxu9=0wC50WB4(<`rrJ zh(qD<;EsfNN@3%HbSSKj;Bks1K$xPH?kp6VdYv`8ejmm-1iS!)pN0iRg{Tr#P*sEi z))7M?q@92W2?s^tpa>LBil`Wz0;zTj!)OT`A_5&Kph8{YjQfeGgTbi@twcXjDfWSq zI>iW2RHeC-Nh4M&?jQ!CE6iL959cpkAh{a+u8MGClO|A;FntYDjbo+5jDV%O!`xXU z$do?Z5otycY$ICJ%`#e)VjfIg8tF(PN{B{ShA5H zle-J0P!rOHYDzdERM1FRA?`wPihIYzg&O|VFdxh$dlI#j;koFQ+S7s-+HaZE;n8o+ zJ}h)x6TO<08UT={;8U7HAy-7?V^KgwMN-`J#ZNiR{`*sJAN}K#zR^8--_jwK<)S6J z%dbms{?v_g-~7r0?s>;we12~LIO!eVI_SqAeBABd_{@a|?0V$>D}VawbNBl`fFqy$ z%=Y##haEY-V(mw-pLO^ZZ$9P=vz%@!o}5lm_kcG%iCCYcIaO+L1t1kJ?LM3` z4gm-pjsijJJejB`vXJ5R4Tw5278r1T#UNzL;Lyh3 zFfdf69s{fa2?2=Uz=|YV$&}&~3aHlm)RU;EluSf67@1LMe{fu?HbyVRyDI|mN=YD< z;}fF5$$0y_-#ziC0ABf_3+AjMw9pjYLr=N8RL{HY#&TlreEj+ApMF08yzjI}-?O{- z(l0Lk`S`m(eeQnGc=wxbyZHU5-BkYcg1IMs>dHq>K;*t<3um4CixqqHK)w2si}rif zSFT*}t~b2ox{J%p z&DZb#{C~gvsZTofX}`GO?a%qvalP9*r+o0@KVH}~z5o8zbH8`xjfZ~p`gHi2&pznK z$z5Hh_OSpMKp|jk8}7pJA$nG#$+dg6%}XkgFJNkvh;_guyWr!Xi+JAW$hhxQ6&7klMQuf`+_0Yw~GT!N2(f(KdGmbya=%t!94WM9*-1hB#c#Z4-gRr z93c!;6j*^gcY(g=-`+G~SA9x9arw%!7%eLwAvIhkf=*{%dfKB8>H$aLsmC7Fn_WZ! zxW9VqTNl4%!Cv{m`G?zCe|z$+-D`h6{@V!_S^_|V*nP#nf91wQj(gq<7QgzDd#^rl z?|tp>-}SsJPd|8cmARC_BK+N#zIW{FzH{4QpL*Nrm%Q}QIjcxZU%&9`<7OXw{F2u{ zcE7v#nKzGbd&$!;0hZvGD|&MYD}V#=!#6+v>!&5(%(wXkQS*X^u_%dsNqf zA^EH8g#odPN@cSO#Hs2`DiPu=b&df6nT#xQ(GUXl?@>3dvTB751w;k|M(fiWV~^_# zz4aR3I=(3bs3{cc3#K>#eCOkfGtkgBrV5#l947{QCMhC{2&b>L^?~+YDQN%@F%*>} zz$^SG&Z~kWSxqv^z{yxo!bP(@?zIRC1TiQCtJZY|jJa?I-)9)k|*g0Kkv0xqB`E z+_R=PPL}IDuf}!1_3_oey<+^>tFCx{^F2#q1mcD6Hrg9Ej+#hcNJ3yDFa&mADe#-G zz-mMAE2>D!K=pwtu_2hU)_ws|b@9rFT0Ngak@y(&VEsE(RzXACuMb71IVd_E%WVx7 zZd}LMByv);c_)wYvAN@LN23`*u$`#pTjJFW;^ede#1XvBMWJwasMNuFn2h`cBFEUn zBP?EVZSgwgAhw9l6A>3gMCb-vHsxDznYy;x&=--m<~Gm>9nTcX)0yLk*kcE}Nz#1%Cwo3bS83S;}d(PkI z`gU)=@4}Ip_2k5@@ZO@Jrf^bbE%`HwnY2^MdeD3lCuUomUSiAb3;>-`9f5d;? z-5Xa*0y>yAQj{m3^n@iR;BLJ9Yu7(|9gEJ1$LzK2?jKyY{}sz8=9u+He{%UR4td>| zEQ8NcAFWSQ#$kmWR-*bvm%)88`o{`2oD#hu~~ z@k-6AhONmXpl7%nfH91+M|z)h$KJ=B?4LNLu!?H|o&b!3aCBzv z&f~ENfAZF|cDtopxBn`<;H@9o|1t0Q?1ASjdU*QUTTb}h98w*flxC4|NzZ!z%a*A9!v^0BjDJMTjm{b<*$m7@U$0kL}V z`JE4c;V%yP=odb*;JzFN8pGV+;90Rn1~?~owOcy`VVr!ADb&_VS{Bm-wxD)Unt_J4 z7kR|>*Z#T4AJz)o7E&#Ir#1T}fRr!`z?@D&qeDpcVNiEw0AQ|ke+OZcM!ruP`IT~v zN~8A*5uU8+R`V4?h48Y2Jphap;-FXZMNl&0^0Z1k0BT;;DC2-Zv*AFZOqqHPpn%X| z$O0K~v(4aYt|6Yx!WXHDbW-7@^#zhBO3pgyBwO;Mr>!NkxK#x^t;DHs`eOG*Z*&Oz z-~lK2UEetNz9?X}faiSqAMRb(cN?`OSO(w|fB(OiJbP|8ubAljtl1qavnky5ktaN3 z^)HX}H2@Vd3vYbw>+XE@+I424d6!NJXI7szKmYPW2i^vEz$tqicv$b3XC8V@)M@qN z^cVcW!WW!8kuvFHBW157;qK{(V~$>S$HhOKjoR&r>Mt8Uw(bVcO#1# zdsNzbSZIT0bJ98>BI^KB@$weCmWBqel?;o08|Ui|he|{4Rg@y`bqZX$v#tI!BM7!3 z71}2)oNZFWI1%R)RUBz_YG_iPXi{Ob2#;{h#n(t==o3IydW?ioDO`H}&x$kO_2IoQ zyqQTCJju>{*Xh4~&M~{M4rbrSZ+>yfoKJt|{KI~H^~&^{Ib&>#5H;^zM!b ziM9Ct7r(jSv){R9zV5Pbe))@!zF|3ls2Ttfaol+6#e0AJUoLv$a**?nJ#NvTzxvsi z9=dDMv)(fK$Opc2%41JC>avSJ_vvShocxw6-}%DBuAvTs@f<)>FzRqt;IJzc%1P}{ zH*R>SH|{9P@S!^C7LhLiB+8+JNPw}vFQea02n$QWjqa$d31d``a6$@>6;7+7Ro7S+ zjEr!%B9UhB&}M^G)t>)~L(U!_jiNYCLDb7}g=7z)JRV-L91#)}n?2Uam2}RP@70`e z2(yUvmCSTFb-+I*YAj3=byD_kGz7OEhv6xo3^`zA){l0F45| zdbODUA+En`X=k59c3&rS!0yE5m){t z&R*ZTb@v1Q?AcGhJgnCVTy()F9*;v$zx|mgCaTa$zXDI;ma zE{PqDW}u<%L_~0k$aHkjJgQ(tnOyhq4+JJey1Ns(%51f&Y$%QNSav{-Tz38Ui<4gR zq5Xbx;2+z+e(rq>-|(=@x@WxRjfZ~j(q*$ja@FmZm#4k)Gmlzw@Z;Bg{G)IF)vM?C z*Z$MH-~Xr!Z(TR$H2Lnw{^6+ieCqrKhaCU-ma`D01NiB+mKJeG(s5it>(RI9o%{`XpT1AwTz5?PczO){Z^ z9>6|035H}SvqCZiStuqVeF*z1(kn!}3h6_TRclzNxirI;k+?*ztykmFNlI1t6Hyor za2L1>jZyVHlOF%8uu3t8j2`u8{bwCn^uKZWm2V3y#a?hKIBRH7)m5)n<~P8A;jF*L7y!{HSs zyZqi+|GIl|{44SWAN|9{bB+G^qyP1H<=QtK_^HoddBACpd&Ygses}ly$dgW6d)D7P z>y|OXA9vi|H(m9OGamo*UoGDA|9$Eoee}iW|9tWM*PrNj0l?#5@!IP@ z_$NnSHpB@yTcA}gT?I~y z#I;dt6@)u2dsIDkhl5d1)!{M=r=9xr`$;-1$FoR76z{eu7DrV0y;xPsID`oS5fc@U z^7mp?nJnKyCz2|ht`H#69g0lSR5VuzT-JzTv4}PXM5Azc-Ca|9Z4;w#CP|EyXE!V> zal$pKfWj0}&rV4hBpo}Dr1Hkl0A>kMexRK2m^ZBb{ulpymqqKIt_O_u{n~3kx$EfR zZ|@zvYf=5gxma??w?=-tg2h|jc)>3pwyX9OPxS@6kFELOIUjiB!e>0O0~u2Q_^UUZ zd+Cw8k4`v`ziaiiFF*Odb-i(QS0p7+A^{3FLbB+n^v8r!MP3ZN9voN#BEmuJkwZ0p zsd{|wi~^vh89}g($ty54ia|R?gz8aJGy)bB6u>hyYNw#e?xee$1{_4v!-7ymxnAr2 z4i{hKtT}J5n{PY+>)+Y$wwo8t z{-1ALI`=LB`}DkAyJG41T>#$q)Pt8w&K-B^{zpD)-NSJ%;NDrg=&o5m2XN>$SM2v6 z6E}`@ArxOn0Jvk}%Dw!!SxYAXyzD85-lR<@~6mVv0M7k6%A|$ic0qgX@qv;+Q8*tDq>dd$i%%LAwLL;K&A(hA3 z5UY*#tMUlOi17uO9JEN)tyb)UI+an*L#PfQRh3sQvs5%qqN3E~E(v zc+X{z{Z8=t_#}SyyA>k`9dfVz?6TghXTJ29duHo(8ZeZnl`HNT2Y?HI{+0Q+jZ5EC z#~1(RzjgzFyH~B5wX3X4z{_yxyaHrzgkEsoe!A{nVFGd)3!4G(T#AUp-J<{om1YSk z;_jk+Q5BI_`4OaL28fWk%EF1lbiQF+Z3m?pL9pG3E`*E2b23p+9?)=IUN{nFJrG|7 zs1^WcK_24{cL~WVL1I&$K3nc zcfN4Z`#yZ$e(Ef!sQ>`??ucg*b4xJe7yzM{<^h&3T+{8W>K3ED2_{Fu=e_c|cN}oo zocsFSepCeQ_GWosGE#v;iatvhbpenn&8v1`2PQk|1VPj{u+0f0^*}X{qL?w2)J#AU zk&=-;tqOLMRqTJD`C&_m83GL#!mlLf``C5}?EG;nGDuYy1&jIII+dLo_GV5NwsrBPkL^+Ln|EsiIEf4k@Fa||hDaZ)Q^BIPWH6+d?XydX#bqE4p{tRGLUsYLV5D;C znZwbQ>n{80oX%rT>+eynE53jJWqXZ1>3>ap@BJsM>Z{j0<_RYscl9y57JZ4; zAFLK0uB1>yIZ!i_R24%k{9x7EGsGZx2UV;;>(DHX{+=^$E&5{Q;G>q>aTcjc&Tqn(FloWIHLt^lO$cc|NJ9$!dyl&B|v5D0y zivK?Q^M`-*KQBB$##O)^7DbdqbyYE{TC8A&LAWCeZ(0EW{(tt~Jl>YOsuEv&f9u@g z4S7lA0SSaaAV2^K$Y2CiP-djHmGnnNR8XMN7M$AIjx?g!qJj!P1)LfM<>$ntf*{aL zGKxS$1d)UULJ~5(@!or?_FDbN{?@s5PtHr;%kYMz*87}y&aG2br>ah!J+8es;C+?! zFuZXX*RocOfh4<5Rft#QtYHO-Zc4C=`k)XLTPjFvr_8p*46utFD#Ng@3$%N?U-`vf zyX!Ol_+7hCf6}9``Mu{n`J%_(ac%8?zVgq{df5N|#61r(>Arg|``nIK{q1FU*&t=| z5G)LeE5Cg4&OdnL6=$_389V*chc3MR=Qp~N0*9G9aO+&wxzM?(b3+Swn6p#%84n}t zOy7#W!$v=Ft%jI314B3bv+nOhN`z&kGGl9bPd2I}*eomaOri@>ps<`~SKlCEQNLrt z6*~E}hjeGx&w1>F&fV9LBCUEC!kK43`T+28{L0_F{*0^F4*0%nKQ(#DZ~x3a-}1gM zol=}72MJ`OkjNV5dVk2tXqH!Y5qKls_KAPH%ie=uSpLIT|H5Og0Wir<;l&Vj6oJi1 z2{l$!^GE=Ya|pKN-I?#X`gLwQ7(Iex1d=q?N*&}h7a(ef99OM$tpVrk6m4Nx0nmQ% zjpY|Vh?9o&ma4d7v87;+@JiVpSkedQ#{ndRsbw5d23eM z;-!TvBB!s+m@dVN0zfe*G86-XkQD;$kr^h@Nmi&FPnC6b6kv2KuB?WD!%W^Qn0h40 zG(gT;h!7-NC$R+4QHs!~Km5*}ull0O^M3f*m;SeNckLBBe)CtKz2_UxeA}u2<=$|LFht%HzKO8t&WZP*zsEQ?@N9Z(gvI&w6n8o;Tm; z^VjU1`ebVUR8Fj+g%Bue{yd_IW8&7PRixl`P^E3gwZ-ZUFL}3~=?! zq7q&XpGGQ)U?;iD1cld5MUV@y2R!)PYo7RLm!2`5vJoR}Hc|ziah4oN-`5L@(XgLslhqAw zVDyB4Mc>~d1-x5Q7?Y}>Qg^dZw#KpHs;s0OWAEhQ4pJQ6hXm-JqnDG6lscv=gq)i_ zYg$+jv#$|CV7UWqtqL`WYc|z-> z+WqE=YDlMnU5DBBQ@`5e(C^=G{};dyKl044EOpTY2y~&2;nXgF@k_t^6J{W#B3McO zO%!C-BB$!W+$0NODL89~RI<&6xx3gC8Z+l#yG9|MLpZ9S-)zO;*^96*#hv8`P(6XD zb>)YDAF?L9MG`W&vfhJrz=PHK0mC-5^-PdazN{=WGh_0cJp)XZbTApL6VQq7R!9lS zP_k{@v28W7f>Jbj&TBT1vd&-~tfT{{>Nllo0tMT?vI8NRTX?O_l$kU0+IfVvE1r7!|=$hGz89AjqJ(nT(}&0HT?P`rnl->4GXQDkS7s z^x9BJeNwA$F@bQA8NM~iM1gRWKqeoJ0dvu4s7+)5QZiV$EMNi1EEHw{GlA`4lDtG0 zFjxl^GfEcb2$)a3s1p#4mlke84>f3Nztno}GSzbabjxSF&p@rD(A;dB>ma&8@1*D` z^NjpjE6^S0L#a zspkKT2Tx~C5GAv_EYLUKCfXZjUiJ5(D4KPl8ilkd1 zalckQ3JG2*ud){MuqIF&MLDc<_c|;RAmkAyInconM(f4vZ>Oet$QlI$dSR;A^Yb-*c=LtM98D@H|djG#L9(aFwW3Wu_z z3u$l@!_Df#EE^~@vWucOoW)EOvdNm-v<9;>N-(3TL>&bv(apThFi^m=%!y5@%#<9C zK#8@fCWFPJF>lQg9nBjNZ0J&9F`L4?qpNi_Ezku@$tqZsP)&8XNiJicy5jPrQJN`r zk@Y?yooKOGJXMXM}U0~T-z4Yh)_r0!!j6^ZWnr%iRhb1cO$iMP#@ryM}n6=2NVCOR1t#r&x8ZHuDNckY^ttE9wmD(zSG%L1k7u z5H7d0Q2H%UeOJ(s&aA7p%W`LJV`Z|uu!Jm7&>0=GRD<9h<)zL-0}&336#k$WbYa$I zms)1rri7VIMAFkAcF#W3PRLrZnOZ5W3WJ!`e%PAz-8FMH;_NbI(8~yzP;Dp3(|f&5 z1%^gNaMa;5)==_YYKv%Ey5;N)#gV3pS>!}jA$@Kk;Odz17PyS2oB>P+frbzP3lx;h z!x};c!jzOsPbpYbkmbrwigH8L-WRb~qWq4lz;HLxtV4+Akhw=l22UT-bBrIt;N}65qLcO;#W5DHOwAsM^yMv_?ajWBl^BBLrs z62>Bh!8vl=nWN?xP8RHt@2jC31v@9TznB?&=ohEymSoM5;l1GniJ-}l%{U-6>1 zocT?!#2K$S{{jDT=8DHd)@n9dw{>c zx1Vg_@80pgv;O!BH9z((r(My+fYLroLMn$zz-ptnnB@m#X-g-QHC;!mVIi3brEVM9 zO*2XTNt;3+96wyh=&~7gwD#)jBPGdPLqB7Ocpl`_}hmj!7JO|Pn z!CShuK=ni*c!s;k zN(X>keMLdeX_EQ@c3zB#Swv|pC>wFhVO9)9By}{6@yuO$>FF$)9CPMij&zQ#R+*)_ z&YW>CGiA`fh>(goQ8Mq@poAnAbFu`SkkE)0aGOx)bZZ@5ygQ;j%-gy`>WMIeu znKOEc2z3TGD9kE-XC~KD(5BiIDKiKGnNec0c9c3=yY6)M^ld+87yra>{ll5x{)rFI zb*vtO001BWNklhKb zxu5dyzIbc-_3262bEBv3xAylMvO5Y?faYEQ^|_cw>!C32u3K|SqZ9KpHz6kq3hfG$ zPdn3C$AB7aj^P8%n$_35=7Z&ZzX%pil~htw{Bfu-dy8G-uj#lmb(3t6I=H z{&WvX-QNdIlFK8z<4Za-;gFnrSd)Eu%4zv0pKY<)sD(X56hY|#W)yn-K8pqc*=TSDWd zep%MiLxQ5dVv96}T?jRGJ%8)BqFOUT4|!zUiOZ&xL`KS8ftT6`-GDR2_oF-yq@NbN z0V`=~4y8dMp4YOo4lxvhJEuORe+STWU%?jx2H5|? zx0n?GIvAf~=(ehcr#K&u>nZD13$uNU#XP_JE_D{2mQ*rS32r!yi%JujqfdZe`9q}z zPbPnCoBpYk)oa6A2(psA$TiS6yK#yJ)<&%&SA^2Mv^hGJ6ALFwJLuy9TQ((}8ismu zsnrCyEEagkfJXgcmRiu4i1{eZ-8+>Z)UKzzAaJZ^&~h3{XB)OaRl_97)yV)uFd|?p zXzQLTxY%d``jxCbR78ueTW==VS~rX7!Z4PJc~qm8h&w04H$dGen27*jdWO$_VNVgL zRxLLGxv445GoG19T85R16u@NXsx^ugtg2OK&tW94u1YR_8rTF4A*evyGv&B}vj!a6 z#q$o~kw&iVUGH6_cNB@t}v8s3f!m5g3 zxIM4(?HE*x5|;IvWa3P0Il&@Rgs(PGdS(nanwbGnW83x;WRy@bO7KSlwLl^kb4?1~ zIVKq|cvVhA;-`%^E<6^VSW@y5Y8$F#GSpmnRD~f2Hb(lWViqwU804xY*2LsZ%zqB; z--09>@E|mTyExMwES5um-Q~qIj`YEqL|?{$=J(DF+Lc)es6AGca1uXG1Z972?T^v5 z*x~BjWeD%^NZKwdkezwmgB7MK%!GGj5>Xjr)e5W>&FPG*0Ksykn$)GZe(DHBqY8?U(SPDZC_f z1lO)>y(NWvh|-@8vbHLXgGwC*lx4xuSrzbl5Y^tj=t%j?0|3WiC(*RmEv6EC$i)n!-o z4MQ<XF}cQK>A*qD7j zidyc0Z_q?^7!s&~TaqX7#GtKko^z}VD%po=^b4Hi{>!Eb;|%E0kFr?e*eeHPO6K}? zfrrPpq2UjGkBH-%31*Cv3?;o_c~YyI8}!)al>5a1(0H!OzFTA@I0|U9XJ|7AxKPr8 zn7Q98`$MJrD0JLWjwl`MA5rjs4(?LZ8*t3TFHjrPV)E;FfUjIvyH@04{lrAAPuC1h zB>z&vTUWT$MI2EEj_kPqk0_kngt_CmSC#0UH||RhL@s_jMAud|3(8a#7ySOr!xX@N zn}Y`Ov9TKSaSX}P{yv0uZ6PBY>7ZXovJ(8)Iv4aecS#NLwDZHk#f;v@N0s_8J8L1_ zGFNp>lxQl&%#+ErP(62bb#u~Wq!fftETdm%f0Vkz+Dcx-{X04K*le2mbxw4w;g%o=W1H^7H-~#$W+i)ya?UJ z0Qu7#ecZ#A&KE(QwAu%eu4Yp$SXrc%bmAIS!4B?@o!Zn8cAw+oJo2ggpD4hL`xDe; zS01@}RLY$+V^7tqp$8Ug{UU+UqbEC_z*2N(V%WK-5G4XDxnb}7#5u@KH95YWm>%8e zQ~2)HLW!+Em?eBBTm7Q#GTO6qlu@w9bz$YKgXfz5T-GH*h*f)i18*p!(w@ zm+03~ZpU>nK$)XC5qjy?@+!!^4-@gC=bFYH$Di?q9=q~;*5s?~$Ee)OrWEsf`)r1s z@Cbz!lr6zOiMa|f#?I>uKRpnw&pvYuKO_*|UMcom2h!*J%o~KSG^|@lZQM)zq!RLz$j zW%%}kGXVzJs;5`yZV>&+pO=Tq}fQLWifKf5AQ*M{eSMroapZEhzKq&nJY~y8Oue zb^Z$Ui?yl4WW3q0KMh2#SMy)f!vF41>C@fFR zZ0j5z9NWRXdm>t7JT!~puRGU*%@+I@WZweH>el6`X`S)tvPb2%(>E^rE_#n4PiuKD zy`BCMW+!vW8c$}y(Y&L68OTN7eB|L91t#;*_=JDW5i(|39#m-!{v_!uIJNX1dcK^G zP{$;p{qzO1LvYpBZ~S{#D{BWR^Pz=JQUl8gXzx`&?m`e*SaziLSe{+R@U&ZUoB?PZ zzher+ZeF`!;em|z{7lu@In1U&TGIPg_nCIDW;f+8@rC<=YWKrN@7Kp5TTl2>Z9v`XYqUE^c7NY@TA96dL?j(HAUn5Cx zQ@p~PrLgzjR*|Ug3=&4f`WRpL1Vvs;?9poT&%sB{2n(I0%*i1mX^r*$hjo+6-RM>A z$v8ZK+vOdmQGx4`$^D=V@CX@TH^n4(T7avT^jM^e+w33V_ukfe{&3CvDfLe z3_SrruK=^AEc3*tiM0ol%#B;wh|g^ZppS|b!rt3n=7X6EUPr*9SO`Mi%avlStdcon z(4>dNr0=?c4V&X6@TrDsvaC1eMP5>kT91dD?nxY1+2#vxT0=M=?rN zLw?w1d8h|pGvC+N81;CbkpTQ3-;D+W&PTe_*IrBJnt$ew8VLYwRu6w5Zk&!NPj?o0 z0?J4giCM&-nx7XQn0tGMai8bUZ&sY27YBMCwjO-eO1>&7M3&N-wO_ep(w$paNd2Tj z8Ok{nczhaco|N>tXYT>?9*evm-#x2nvp%2TpP#WgK^DVrS7G9PI(fSj?YZar`03dN zYSc=%^Bs5T`Av>{qsiOqQEriB`)OWOTx%)M^}04{QAjfH-JXr5GL9UE3au3;AO5}| z?#~A;Qhaxw{y)kBPMx^?yiIyZKjn2msrEpKdejKblIIo}jh%s!Jyn+ST$5n}*N`qc zx~$0B;<{y7MzC2R@GLh36g$qZ)K<4nljO7{-|^7B6Xt!N{FSP5$N^EkDu#-n*Yib= z=fccJ<7&!%gFTwZN?O)^iX*coo9W1J$7+@B&DUB3Q5b8bx6zw7FD}9rJG`O)%$oC!*Z>h1v@u zvMs;1b$6AKj^kk|?%9y0*SnzD9D}vQo@wdF%>%a1XIb{1?e=mR0IZSkUfxUVM*Gv= zTxps8)R&cX`ZW#4)gGb9(++>^^MSq%Y|qq&_DuoY`8$&0mC8FJPkCgUVpJQy|E9*V zGUn+k1P&jf+IuQ)`No}WML0^EHm~wWKd#w!k@h3GP3>YQ&yrhxZgulC$?9R+LZ>cT zWxMZ1pO2AS!3#Fvtafi0{bI?+xJ&4Jdam0tW59P1;|%HO_-)FW;!N_${n0h3Z0&U} zcH?bGwnOqWdHfIVF7G#Rz*Z$p@(Z!!zoDB->Xgl|gC-3hWuP8pWa3r>QF`ysJM)DY z$*Pin*RZ6v?Z{WnoQs5&W2Sp5i#VW=mh^@$Fn!WWWDju68Q|le(oJiUn#BZPNna z32=cA^Z~T72O2!0X(5ycmch!w;b!pn~4DbmU9ES zFgN5tQaR>ln@{vr@fz`78luk^P`)VFSq?DujbtllfSkB4G}gdqfG-jRKCm0mL+s_e z3gt!WIq&yDcI%T22{e5dx4?E=5MEbH-%gnOl01M7=28m~4}ED?a{16M+q-rZ_^SJ4 zZhyQ}ad*)=fA?BZ`|zP;(_z2Guxaw~m)+X^15_8(yKb@zJ75FZ1ijYB(P`Lz_G0BA z?F|0X{caI_uz$Bm9;!t!33K_Sr06U2wfAZH366ts`p#ZwkMcW(Q#+~HocHzZ5CPD| z^~c}e9@SRw4M{_63T20lu)1#)SSl{20GYpXv57=1f_N zy6FJGSKdJS*}eQh9oi-G$?5*f#W(E0R+C16a)>!2;1#!`YaMBm7|=xy8BJVpz^|=> zl_4>Yi82`+4>P(%#}%U(AW5%UABS7TC;+q3P z_Ws~hB^-RS@FI?jxi%a(qZgJb)EE;*=pubnZOJ2_YaN`s`+! zsAjMJxPwCG=m&Iz7Xy<_AY6iIb}TTn4|P{tqeBhJ_m7jyNL#?Y;KDqA@|)+ARN3g7 zh3Z@%mWBfSFbgLZydP%=JFlXso6{&Q!n0m}T%Zb}0Jeb>E@xm2AN>2N7))OLP#gkD zl)6@ElooH;8wqQMRT9WAfDjsFgW?2eq_%MOFdd#*%YN&sSb(o9dD2bVC5q$vA|M$} zxY(ug@)|MjX8-*NHKp$<4w(Bc`_$(y9K0ps%!C&fg52P=2?%`S*7aOxj_7-Os6OzZ zY+(wQZZCSoScxc(nWlaRgBb&Zk2qhGYk0iZiHlL29~8tq0eR~oq3f2CxYYQ|B`IF6z4UF_18Ze;>hj<>-+o!u zh&ywVv&u|&ZQ}93=>?!c$|&-`jov@&4yF;-E}-3WY9V%mzLGTj{=@D5OlfcX$6F-F zgAaXkYGjiX&|}_rg+6I+geio1Bs~`1y`Ks>L?uDsBV+KQcIwXfhCR`H9@ai7{IGHl z-4E!3g}eZK1wn;E>>19sroTVppfg90nk=O!)Zl{g{K=6C>Ey$82Zu88_a$!+T8Z^? zW1k2&BC8GCFd*L&;S8g%v2G6Q?nt40v6J@P*cvJyV;7%ZPzUsGo=KSwg0*x-KjuF> zf*%u1b#4AZDTc%Qonqu!kb{82VbUx~g=*v=v%F}QdT)fl#?OX(pFaqNP;$Et5fQPG zGX;57d6M14WP7P@t9`#6{jOc%4}HWhgb85={H17NNtu-~4zfXM6;Tm6}UC{>)$UMb)yiVe` zlDxZKdJf{v{U5su@~zoWC6x}K|Dag(7Czc@8guaOBgA3HR2O2(V&6d9Wne>APbBpU z>%{d3e^t&GJZS9`a_QEe%Eg(soz)kN?Wduqn_fQLafY*1#6LQM35+hJe+f6O2{crY>4&qNYN8q5W=Q--j(M#QX()6Zyld>guUq3V!o!Xm@Wk!8BGxM3~&Xw_SK$ zn)Bwwz@sF81Lf!A@rpEMg_mg;!-7l6@b;s*o|IoM{^o#RPM8JC%hBo;+5;CjG)^*x ztS`bmtPtbyji|>+=CxH16P* ziOmvve5P(!uh(+T*5$;V+6t-NigbJ2o+%K<6V zu#iyRBf)Fpw%V+Y;pE26`Y*Qx)Pw7)Dc$g#w$zHiw#KI())4d1VH%j4T)2aw+ZP@U4M*OjY zPCJY4E*x)>y=4u(Fh1~?oE3Hgz1=fAB|KUj}NLqVT zRhkFB3%wx?D&!8`J!imOhJ>EL4VF5N7Z^5JXcGn5RQ%87PJFL-@2nk1qEc z&Z7Ab1WZA75<2AhNSjxS`kNkp>ySfSl5Y&WT_X{gzevKdTp{!K@ZEC(l&)!)%nALT z#IDu5#@ijxCoZDB8v)|rTslBnLhyOl(-Q@V<<|Do0#z@+0V9jTDx3G4+zq^>DY}EU zFI)w{pQHkI9eOi7kw5FPBdQReR}1l9sZjABj(2cx^7^RiOopY`Jg!V5oJgw`Eqjle1~>p}Sa+Zy-`G1>Z8>XapuNT=&**gK9q&6C}v>X1nn^N`IZC$Er}BQvf~9Uem>6 zuMOYC--G*nuFU6Zq(E(eC)}l%L)_NsgQ)LqzMG<1&$_A27CU8Uw7-Gjfzi;^6ilN0 z2K~a#yYcxSoED~GX(NEki-O55yb9nSs3XCqzCEgoXsP1tCE+@~3H@FO4U&i9^}3kA z?&!x!5~keOX%o$>+t}@=Ey0(b=Se~pwocmV*&PCJXw*Q>1hP^7JKZ;x|76im~{D{?QFR(J3^<2)J5nXyk1#=y<_=^p!$*Op`C3QN{2_ zt|RfikvlGth1}_#-29}g;U37Md*B4>Q;f2>i1D!SU>80IITleW1Sx7~|0gNuw##M5 z%_RFp@9v9Y@7-iNneU;OvD=mL>sgiP2iq=F6A4!dyKRniH91_!*s7@&2Ny1H7NH^| zDUjt{9Gz#M)l$6Km4YD*LV*jQUi`e=BB3^|%qk^?Q8Lw169$XWPuY*De1&FpyFLBE z5?Ss?7TWsouDFV6Rzg942wf<(lz88e`_#w)ZUT{{ROs$cu_0*%8R;H0IYU{MZ^Qy` zg8onMTJTHk7s9mw0Pc&tl(?35)q{}x9#Vey^=9rei5!eWX|ywia3wGFSE%328RSHb zas`w0p$B1a<*+JZ|K-uz=l7 zkq5%XeS5lLM|xRRs=I9{fgo{jLNBw~yrdMDqppB)~C7aGSjK?!mgEmS<|( zW6^oC;Hmd1>nkPW+^%d=BH!8C;cc_vtl8J;`n=4u|H~aA3b=m{;58i!_}1J9zv4126F2n9J6K&Cvln zTN4mCbA$%gS*wQXl5_F&M06^GaS118fUE+B5cz1Ji@qakB^Bkw=ujq5Mq-3u(sTq8 zIKmbp!V+Ss#d=V~$+5|+aT1!6O6tIl?4@wh$OEwwkZ2@0)N8)Wor)=7DOn)2b23Ej zKhk6Yn*b3UP!<3zwaw#29#TOH5Ny+O3aPd4T&CGrZCSd69G=m+Q3RRFG>69+FZ%qr_!Ab_iFGnl3gxdKC8oC;Lg zj}-wx#-YJggSAi@QKn+R|BcHr3^&3$z#j@b3`@iSGe!}K2Tw&UsUVGm1(1hTlE|RI zvig~z_qo(yt9+#-)Ezghm4lCxzPeaYF4Ka}{Im4RyMyS+^~mq*Wd$zVdU=EHp0960 zs9)4kF1_kZ{PU^*59dd}q2gorWa=#e7}Ih(tJQ#dvvYXQjP|~@@$o3)C#~<9G>}*- zOZfC`IRd2*5M?}$zLZfh$zvn{S_BtUDGJ5vC#}?2cmgFfY(o%~2HiL5iXp;^h~0A< zMo((H@?WHsFvO857Vj#P*MJ&bxe2xU?{qX8^$ENw5Hp%iv~#;6{lBrDbtz_wihvfC zAY$YjQzMf2RN1fTgqVLox`JqtWtzzwr57+ zDsqd3^Uf1gXXq`TBo#yCvV$E~r~A7Az_Lj-;KVK-<+#rjPzENki&}9*tf0@Z!0u26 z!y>cboOua|Rv1!UA`1mz;0SFh&26GKR|-UOe=ZmU(j|-QOcHMfH#EtVq0xCcj z=fA~yXh>Do&w8AmVRY`BlE{t*GsxIh1?$)>KhT&;mi@WPuE02`fI+BGpnu-Q%Ja^U*z?wTrp@g6gw zOlFovwcgLl1DvS;n+yCTZ2`47;wp*GR(HgVh}sF}zoC&y z>2)e`Cbl_35QpG2W9Jm%!{CIdWejy~t98(644UL@s;aSVGtOp?@8KiiZ@E}Au~Ha| z){=UAy+{_q3A5`ZjGkbXpW%lXy= ztp{(~ae?LYh9J`YvJ3#+%L5!fqbQ|`(rw?6zx|m&>HTVg1o)sU+p+a00o8-wM}FzD zaY#!|UX8Sa&R{L2jIWhlb=yNQ4WBj?pB5a>4MXiD`M>a%htNmV#&0kz2|+c$$iqrl zFcc*(Mot%+qrjV%1Oo^VF*Ohv%_ZodX&5#)Ey*48UQg3=+#lg%@#v&=Xc*#)4p5*1 zZP$z*s*U~sxEZ}I`5-j}1Y8h1z3s63yutA9Z$Il(*n45`vMckD*DyI{;Ve`LriH_q zMU&l}7GSn={uiOcey(KJS2`|ONby9Pq<05A$-Yp}MivQx1!O#~#Ot*oILKmo;{hhe zG-^;(F*3tr>8Oj5NHBOu{9|RKv&fA&#UJd3^Ikso-qkLM+!^JY*6Vd{&j@Zj<}s^! zhG}E310ap7K)P&{3*hujxRS|lNhHXcbzb1d%8JRe0}S0+EVID~PFap^Sg@|7L|&pF z!(*!UROFHi)c_x3M-^-e1wlpABbSeooVJ)XPi7Kh1AuZgAXm4w_iaE_gJF^e81y7+IsaVB%qvlnu0akdj5K3h4>wGwKs+&rDzqCAPL?~1ZMcpf7=gR5QTUt zRG@ka|JET5p<$rXVGJ6Qyn2iZ7Y39>sV8Dk6*fFV^Pi{Tha)g1V^ zmiN1RPqk+!`CF9tsorS5_wGaY=_|gU*Tub$^FxSby1O9dhF?6wmyMf}o1VX_K9gNH zT)i)p={V&<0+ab``-j`WiEP)}GWo^?zoiDWRajU^j}q&WQsyEVcV7f?{6FF}P2>j* zk2ge?zo#U+F?0pI{Z$o=UJhr6>{G> zM#oO2;+D0mnDaissxCnWg^wPNlv2mhPb`2vVX_&IC1*ZH#Bu@JsuHL~%@ZdxxP4H4 zN$Kve@x(AmkF>Tt_Ts}OvP>$+w%q&4ElhegZ!hIzv4I^1l&gEqv`teBuwQ@9 zOVhR{^Ls%Ag7Bc_Wt2t3<)!eO*C}j(srteDG{nh=m;#6ph>TY9IPE57DvK&L;v7e{ z81EfrVbe3~QFVqp-?+yNUZ!!aVUkppraPd{uAlY}#uFrEp}@^$Hn{cPr9-X4$8h$7 z6Fc^X0q=%!tDlIQ1_K!zvuW0h$4sdZfK4(Px*Dudr*Y?oLltLB-sC<9p)6S>BV`a~ z!i{y4c*u*`^M2%71bhgB1AgI?@9)xK`|22LSVevfgt@hXaE$*2h-E0@3_|N+1fAwv zv>c)9#td&`%7Qudgx--W=7A_)Qh=BQE2&j4K}EERp=kl~)^SPGAA+S^og0U~6%MPoaHO;q$kqMyMgC@3@qwp?qF>9^$`$@=!{0Wh ztUO7YyTT&>?zpi$PZLzKJqjWd3}n#cR;uicBEjdX_vN!pj#|XT9vNeFNE6NzC43NK z1NBe=fk`M;uof(CmauFBru&l*Y$u7LJS=A^9Ah+wUZxC1eN9U_$DFuD(@%rOGWS-G zW-?;|sKe5B710|qpP+{={z>2A1tXr+oU)ipgVOd&rcf=eGG%?6kiRYfo86=ZHH}zU zOH^^XglE6^EqEq^&lUudlGG}?YJDQEM&D#cHjCVAaiYLIsB809z{(Uw_dt@Lw}=e~ zQW{~wu*y^|`B#Ykw}!^gwxMDM^AB(PD!A=eK5Enpk|d~8#MF{hDlv4LR7nj~crH;+AS>gTs?o)BSFxMO z6bgNs5jX@cvVe%+*Ma|mlf;S=GYV`1ugidsLB}WL#j`IHW?oxIZ|g!(ydNcaV&UFF zfcYV^nF30MqJ(9Sn;wUwZ46TaiEGL-=`$C0p+*%^#u2P>6fUoXvCJ+QSJA+HLx_9CeH9}w?iv?;d4l*N;?NP`z z7PO*u7$uj43fDdXT%Gm=zdy@d;$Gsk(vO@MhFm3_?BJl_K~zz;v<${^pZ}e)uBAyV2-D}aE9!}Gwo0i-g&4pL~^V?iBd{$LYUeFM`C{% z;40ygehABOlXS+oDlg6!b^alca6NIAc2NT&FhUUyHx12_Byp}$PxqC!uat^I45tl8 zO_ey6C^O6o$y{D-o)G`foBc(U7Y$>b$=tJ*l^z~OoJ!z1IR%ztizIY-358x72?iDg zX2>8VCT7CsU_f8uTfZgED>^;3xR{HJXMN+$OC{p^0#_q~z@lPYVy}Wn+1%QUAhrA5 zvr#t_41Y;6jB1!TEDU{^cId%tht51Bwvt2>Az;lpN1tU`=xj8|@~Z1kf!Q&fm`ZYC z-h%;*6|NI|Hjic*fETXx6dqG}QmI6AR`GVDE@kPsR~T1+IG5;))cI^rhCHJ4Tcl}j~S+Fckw z1kcmjA+lmhiU_z+1E~o33^B~y-ED_s>K)i-ET)y;#)~tC)+5fQKU`vot0I~W^XhFY zOSBZR(0OZ%@qYh}1`xBlhn8v?-9ih@Ev#g*ND)n_j9l}9q2)dn&@8qnXmsR5+$)Nf zAfgy5yZz+v5vp&9|HRUe%;4mjF+oXA+J^bx`?hp429MeDQtGET(NUCxW8kncUmjoi zn7?LHUz%M3qAgLj8oUneZ^8XC$}d^kxEadVvwpkY+M9N09}SBH_!wn`_wbPx2Vpx2 z<)w!_bn91s$D0&I?s+m5j(!|3ihVf+VCWz_q!x$`$QN4jIZVoZQl7(pygFveGsqPV zF}B&9<*=}Vp$|{3NN1nu^}h&FHJ8Px?78Tv z!=+*|ukBKpE}~Uk)2Kx{r=c*&sPYDkmjp^x9>*P18dzb&qG;+VW+UHUX4`!c%ybG} zr7h-G#GsRGQRYp>iuAabky|95_khaq#NK#2G!B4KuzPX{s0h;RD@TM^fycLIcJ^$X z&yHPxJ0Uh+eVk0se>oZtSoNM?xbuMydMv%UdlT_JnY^f-XBNBb7Ct#4`r~Jg(FYke zY3!Vu_28;mtHC$^bDkd%a3e{~-ZCEySzT~|P^V7al@`LFspR_gc6WYpj5k8My=i|I z%ivC5ZDl|C+x__I1&}KJMH^AwA7@mEfFKPnc@K3kfo1;L-}e!1cu$nF(}5$V$2oIG zkEYVJ`(xx&yX{D`ytB?3s3fOg^^^@9W3w4aAjRPV8fqDRwCgsgyP^)g2sz6!h1UI; z!G6!Gb2_}44);N%t4#*c9p?OXYWl`XD{Wdzn!=3|^-D3Ij!{te>K}DU+u$GmmD1F9 z_Yq3%Eu?Y(yu>#mux1w^O6ngB4 z`Ud>Zqi85%rg}(@mbFYG>na{MJ9ZxWOD*c8rEsl}H24a&J(iLN3M3iEp~D?q%J`By zEC&5R - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/repos/ports/src/app/arora/demo/tetrix.html b/repos/ports/src/app/arora/demo/tetrix.html deleted file mode 100644 index 4f3e1fbfb9..0000000000 --- a/repos/ports/src/app/arora/demo/tetrix.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - -

- -
- - -

- - - diff --git a/repos/ports/src/app/arora/demo/tinycore.html b/repos/ports/src/app/arora/demo/tinycore.html deleted file mode 100644 index 71f5c1eab7..0000000000 --- a/repos/ports/src/app/arora/demo/tinycore.html +++ /dev/null @@ -1,120 +0,0 @@ -Genode Web-Browser Demo (4/4) - - -

Genode Web-Browser Demo (4/4)

-
-

- On Genode, each device driver is a normal program communicating with its client - via inter-process communication. Apart from the benefits regarding fault - isolation, this allows for having multiple implementations of the same - device-driver interface. For an application using such an interface, the - implementation of the interface is completely transparent. As an example, we can - provide a custom block device driver to the Linux kernel. But our driver does not - access any real block device but instead fetches data via HTTP from a - web server. -

-

- This enables us to stream a boot image of a complete Linux distribution on demand - via the internet. Of course the boot time depends on the speed of the internet - connection and on the performance of the web server providing the image. -

-
-
-

- Click onto the plugin to pass the keyboard focus to Linux. Maybe you like to watch - a short movie streamed from blender.org? Just - type in play_movie.sh and press enter. -

-
-

- In the case of the plugin above, the subsystem consists of a Linux kernel, a - small initrd, and the HTTP-block device driver including a TCP/IP stack. The Linux - system is able to access the network via a distinct IP address. -

- -
- -
-

- The figure illustrates the use of the network bridge by the web - browser, the HTTP-based block driver, and the Linux kernel. Even though the - plugin is executed as an isolated subsystem, it can interact with - system components outside the subsystem if permission is granted by the - loader. The loader may base this decision on a static policy (as used for - the demo), or it could further take plugin-provided information into account, - for example a cryptographic signature proofing the origin of the - plugin. -

- -

Have fun with the other demos!

-

- Thank you for viewing the web browser demo. - You can learn more about this framework or get the source code at: -

-
-
http://genode.org
-
-

- Genode OS Framework project website -

-
-
-

- To get in touch, subscribe to our mailing list or simply drop us a note via -

-
- info@genode.org
-
-

- To learn more about the company behind the framework, visit our company's - website: -

-
-
http://www.genode-labs.com
-
-

- Genode Labs company -

-
-
-

diff --git a/repos/ports/src/app/arora/demo/title_bg.png b/repos/ports/src/app/arora/demo/title_bg.png deleted file mode 100644 index 00049db95caca0a4da9b062e929e382270aa1086..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 785 zcmeAS@N?(olHy`uVBq!ia0vp^0ziC%g9%9H{rOe`q!^2X+?^QKos)S9vL>4nJ za0`PlBg3pY5H=O_FLR+qUIL;N=>3bA;}Wgh!W@g+}zZ>5(ej@)Wnk16ovB4 zk_-iRPv3y>Mm}){2Btbs7srr{dvB+1+!d|J)BM$X&;NVt&lk=2mDOREv?_UdL~_!E z<{n+|w)^|*R5(vE<#10qUa6SYEgo9w{hlS;Y08Ek6=t)f(5s@Js+^XLEe6vZIJa}@ zR4weBYx~Z8nskn5H&fxJSC1#8Fdu4CX>siH$;+TdqvGyrIQwQ|RihyE`%^6<0kG$WaV=wa8!n{qpMg z>WlYv8kW^`xh{FY`BeMXBD=Fkrv6{{bT)rvM(Ednd7+YOej|#phsfBZHHEC;Iz5UI8mC_S-3q6C1%vbs; zR&K-XbzSUAGy}0q9sL>?b;;pi>Tk|>}79Qhq_y6TweA@a*YROlDYic{M z2z4v+d+)s(T>s?4$?IDV#U7UAp7XI_9Y?Rn9ar(Ec}`sW+go<7>$^2~UE$O30=xXZ zK5GXr_B`qPV0AWo%(<9H#W(jncf59QUEhT{(l4@}^UNs|l=!~lW^?LC&6MizX3d*6 z>Fs#k^|)*Djs@@jontw_Mxy&&%Ix^*+YaoAysVVubmRA??CrmL8gAS+oS=EGby@M+ wIbUvS-L$FO`f|PhOZoZi6%E9qAMYFNo!-m82`#SO1Wc|Bp00i_>zopr01M+?^8f$< diff --git a/repos/ports/src/app/arora/demo_html.qrc b/repos/ports/src/app/arora/demo_html.qrc deleted file mode 100644 index b975a6644a..0000000000 --- a/repos/ports/src/app/arora/demo_html.qrc +++ /dev/null @@ -1,14 +0,0 @@ - - - demo/intro.html - demo/busybox.html - demo/tinycore.html - demo/nitpicker.html - demo/bg_content.png - demo/bg.png - demo/bg_top.png - demo/title_bg.png - demo/nitpicker_plugin.png - demo/http_block.png - - diff --git a/repos/ports/src/app/arora/patches/arora_bookmarks.patch b/repos/ports/src/app/arora/patches/arora_bookmarks.patch deleted file mode 100644 index 2849696cbc..0000000000 --- a/repos/ports/src/app/arora/patches/arora_bookmarks.patch +++ /dev/null @@ -1,28 +0,0 @@ -arora_bookmarks.patch - -From: Christian Prochaska - - ---- - src/data/defaultbookmarks.xbel | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/data/defaultbookmarks.xbel b/src/data/defaultbookmarks.xbel -index 5869929..3bde5f1 100644 ---- a/src/data/defaultbookmarks.xbel -+++ b/src/data/defaultbookmarks.xbel -@@ -1,6 +1,14 @@ - - - -+ -+ Genode Labs Company Website -+ Genode on Reddit -+ Genode Mailing List -+ Genode GitHub Repository -+ Genode.org Project Website -+ Genodians.org - Stories around the Genode Operating System -+ - - Bookmarks Bar - diff --git a/repos/ports/src/app/arora/patches/arora_disable_adblock.patch b/repos/ports/src/app/arora/patches/arora_disable_adblock.patch deleted file mode 100644 index 1c28109e0c..0000000000 --- a/repos/ports/src/app/arora/patches/arora_disable_adblock.patch +++ /dev/null @@ -1,53 +0,0 @@ -arora_disable_adblock.patch - -From: Christian Prochaska - - ---- - src/adblock/adblockmanager.cpp | 26 ++++++++++++++------------ - 1 file changed, 14 insertions(+), 12 deletions(-) - -diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp -index 959f880..964e988 100644 ---- a/src/adblock/adblockmanager.cpp -+++ b/src/adblock/adblockmanager.cpp -@@ -48,7 +48,7 @@ AdBlockManager *AdBlockManager::s_adBlockManager = 0; - AdBlockManager::AdBlockManager(QObject *parent) - : QObject(parent) - , m_loaded(false) -- , m_enabled(true) -+ , m_enabled(false) - , m_saveTimer(new AutoSaver(this)) - , m_adBlockDialog(0) - , m_adBlockNetwork(0) -@@ -203,17 +203,19 @@ void AdBlockManager::load() - settings.beginGroup(QLatin1String("AdBlock")); - m_enabled = settings.value(QLatin1String("enabled"), m_enabled).toBool(); - -- QStringList defaultSubscriptions; -- defaultSubscriptions.append(QString::fromUtf8(customSubscriptionUrl().toEncoded())); -- defaultSubscriptions.append(QLatin1String("abp:subscribe?location=http://adblockplus.mozdev.org/easylist/easylist.txt&title=EasyList")); -- -- QStringList subscriptions = settings.value(QLatin1String("subscriptions"), defaultSubscriptions).toStringList(); -- foreach (const QString &subscription, subscriptions) { -- QUrl url = QUrl::fromEncoded(subscription.toUtf8()); -- AdBlockSubscription *adBlockSubscription = new AdBlockSubscription(url, this); -- connect(adBlockSubscription, SIGNAL(rulesChanged()), this, SIGNAL(rulesChanged())); -- connect(adBlockSubscription, SIGNAL(changed()), this, SIGNAL(rulesChanged())); -- m_subscriptions.append(adBlockSubscription); -+ if (m_enabled) { -+ QStringList defaultSubscriptions; -+ defaultSubscriptions.append(QString::fromUtf8(customSubscriptionUrl().toEncoded())); -+ defaultSubscriptions.append(QLatin1String("abp:subscribe?location=http://adblockplus.mozdev.org/easylist/easylist.txt&title=EasyList")); -+ -+ QStringList subscriptions = settings.value(QLatin1String("subscriptions"), defaultSubscriptions).toStringList(); -+ foreach (const QString &subscription, subscriptions) { -+ QUrl url = QUrl::fromEncoded(subscription.toUtf8()); -+ AdBlockSubscription *adBlockSubscription = new AdBlockSubscription(url, this); -+ connect(adBlockSubscription, SIGNAL(rulesChanged()), this, SIGNAL(rulesChanged())); -+ connect(adBlockSubscription, SIGNAL(changed()), this, SIGNAL(rulesChanged())); -+ m_subscriptions.append(adBlockSubscription); -+ } - } - } - diff --git a/repos/ports/src/app/arora/patches/arora_disable_qprocess.patch b/repos/ports/src/app/arora/patches/arora_disable_qprocess.patch deleted file mode 100644 index 8b38d0e9c9..0000000000 --- a/repos/ports/src/app/arora/patches/arora_disable_qprocess.patch +++ /dev/null @@ -1,53 +0,0 @@ -arora_disable_qprocess.patch - -From: Christian Prochaska - - ---- - src/bookmarks/bookmarksmanager.cpp | 3 +++ - src/downloadmanager.cpp | 4 ++++ - 2 files changed, 7 insertions(+) - -diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp -index d3a21e2..3ddaa4a 100644 ---- a/src/bookmarks/bookmarksmanager.cpp -+++ b/src/bookmarks/bookmarksmanager.cpp -@@ -286,6 +286,8 @@ BookmarksModel *BookmarksManager::bookmarksModel() - - void BookmarksManager::importBookmarks() - { -+ /* QProcess is not available on Genode */ -+#if 0 - QStringList supportedFormats; - supportedFormats << tr("XBEL bookmarks").append(QLatin1String("(*.xbel *.xml)")); - supportedFormats << tr("HTML Netscape bookmarks").append(QLatin1String("(*.html)")); -@@ -330,6 +332,7 @@ void BookmarksManager::importBookmarks() - importRootNode->setType(BookmarkNode::Folder); - importRootNode->title = (tr("Imported %1").arg(QDate::currentDate().toString(Qt::SystemLocaleShortDate))); - addBookmark(menu(), importRootNode); -+#endif - } - - void BookmarksManager::exportBookmarks() -diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp -index b0da144..e7b6000 100644 ---- a/src/downloadmanager.cpp -+++ b/src/downloadmanager.cpp -@@ -525,6 +525,9 @@ bool DownloadManager::allowQuit() - - bool DownloadManager::externalDownload(const QUrl &url) - { -+ /* QProcess is not available on Genode */ -+ return false; -+#if 0 - QSettings settings; - settings.beginGroup(QLatin1String("downloadmanager")); - if (!settings.value(QLatin1String("external"), false).toBool()) -@@ -543,6 +546,7 @@ bool DownloadManager::externalDownload(const QUrl &url) - return false; - - return QProcess::startDetached(args.takeFirst(), args << QString::fromUtf8(url.toEncoded())); -+#endif - } - - void DownloadManager::download(const QNetworkRequest &request, bool requestFileName) diff --git a/repos/ports/src/app/arora/patches/arora_disable_ssl_messageboxes.patch b/repos/ports/src/app/arora/patches/arora_disable_ssl_messageboxes.patch deleted file mode 100644 index 2dc889db97..0000000000 --- a/repos/ports/src/app/arora/patches/arora_disable_ssl_messageboxes.patch +++ /dev/null @@ -1,47 +0,0 @@ -arora_disable_ssl_message_boxes.patch - -From: Christian Prochaska - - ---- - src/network/networkaccessmanager.cpp | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/network/networkaccessmanager.cpp b/src/network/networkaccessmanager.cpp -index 9253a8e..45e9786 100644 ---- a/src/network/networkaccessmanager.cpp -+++ b/src/network/networkaccessmanager.cpp -@@ -316,6 +316,7 @@ void NetworkAccessManager::sslErrors(QNetworkReply *reply, const QList
  • ")); -+#if 0 - int ret = QMessageBox::warning(mainWindow, - QCoreApplication::applicationName() + tr(" - SSL Errors"), - tr("SSL Errors:" -@@ -324,18 +325,25 @@ void NetworkAccessManager::sslErrors(QNetworkReply *reply, const QList").arg(reply->url().toString()).arg(errors), - QMessageBox::Yes | QMessageBox::No, - QMessageBox::No); -+#else -+ int ret = QMessageBox::Yes; -+#endif - - if (ret == QMessageBox::Yes) { - if (ca_new.count() > 0) { - QStringList certinfos; - for (int i = 0; i < ca_new.count(); ++i) - certinfos += certToFormattedString(ca_new.at(i)); -+#if 0 - ret = QMessageBox::question(mainWindow, QCoreApplication::applicationName(), - tr("Certificates:
    " - "%1
    " - "Do you want to accept all these certificates?    ") - .arg(certinfos.join(QString())), - QMessageBox::Yes | QMessageBox::No, QMessageBox::No); -+#else -+ ret = QMessageBox::Yes; -+#endif - if (ret == QMessageBox::Yes) { - ca_merge += ca_new; - diff --git a/repos/ports/src/app/arora/patches/arora_genode.patch b/repos/ports/src/app/arora/patches/arora_genode.patch deleted file mode 100644 index ad506d575a..0000000000 --- a/repos/ports/src/app/arora/patches/arora_genode.patch +++ /dev/null @@ -1,445 +0,0 @@ -arora_genode.patch - -From: Christian Prochaska - - ---- - src/adblock/adblock.pri | 2 + - src/bookmarks/bookmarks.pri | 4 + - src/bookmarks/xbel/xbel.pri | 2 + - src/browserapplication.cpp | 2 + - src/browsermainwindow.cpp | 6 ++ - src/history/history.pri | 2 + - src/locationbar/locationbar.pri | 2 + - src/main.cpp | 3 + - src/network/cookiejar/cookiejar.pri | 5 + - .../networkcookiejar/networkcookiejar.pri | 2 + - src/network/network.pri | 4 + - src/opensearch/opensearch.pri | 4 + - src/qwebplugins/clicktoflash/clicktoflash.pri | 2 + - src/qwebplugins/qwebplugins.pri | 4 + - src/src.pri | 69 +++++--------------- - src/src.pro | 53 +-------------- - src/useragent/useragent.pri | 2 + - src/utils/utils.pri | 9 +-- - 18 files changed, 63 insertions(+), 114 deletions(-) - -diff --git a/src/adblock/adblock.pri b/src/adblock/adblock.pri -index c373a68..ce18643 100644 ---- a/src/adblock/adblock.pri -+++ b/src/adblock/adblock.pri -@@ -1,3 +1,5 @@ -+INC_DIR += $(call select_from_ports,arora)/src/app/arora/src/adblock -+ - INCLUDEPATH += $$PWD - DEPENDPATH += $$PWD - -diff --git a/src/bookmarks/bookmarks.pri b/src/bookmarks/bookmarks.pri -index ee03def..0debe73 100644 ---- a/src/bookmarks/bookmarks.pri -+++ b/src/bookmarks/bookmarks.pri -@@ -1,3 +1,5 @@ -+INC_DIR += $(call select_from_ports,arora)/src/app/arora/src/bookmarks -+ - INCLUDEPATH += $$PWD - DEPENDPATH += $$PWD - -@@ -23,4 +25,4 @@ FORMS += \ - addbookmarkdialog.ui \ - bookmarksdialog.ui - --include(xbel/xbel.pri) -+include $(call select_from_ports,arora)/src/app/arora/src/bookmarks/xbel/xbel.pri -diff --git a/src/bookmarks/xbel/xbel.pri b/src/bookmarks/xbel/xbel.pri -index 02b0258..ffd181d 100644 ---- a/src/bookmarks/xbel/xbel.pri -+++ b/src/bookmarks/xbel/xbel.pri -@@ -1,3 +1,5 @@ -+INC_DIR += $(call select_from_ports,arora)/src/app/arora/src/bookmarks/xbel -+ - INCLUDEPATH += $$PWD - DEPENDPATH += $$PWD - -diff --git a/src/browserapplication.cpp b/src/browserapplication.cpp -index 75e9954..08a8e65 100644 ---- a/src/browserapplication.cpp -+++ b/src/browserapplication.cpp -@@ -129,10 +129,12 @@ BrowserApplication::BrowserApplication(int &argc, char **argv) - qDebug() << "BrowserApplication::" << __FUNCTION__ << "I am the only arora"; - #endif - -+#ifndef Q_OS_GENODE - // not sure what else to do... - if (!startSingleServer()) - return; - #endif -+#endif - - #if defined(Q_WS_MAC) - QApplication::setQuitOnLastWindowClosed(false); -diff --git a/src/browsermainwindow.cpp b/src/browsermainwindow.cpp -index ffcb8b8..de787a6 100644 ---- a/src/browsermainwindow.cpp -+++ b/src/browsermainwindow.cpp -@@ -1218,12 +1218,15 @@ void BrowserMainWindow::fileOpen() - - void BrowserMainWindow::filePrintPreview() - { -+/* QPrintPreviewDialog is currently not supported in Genode's Qt */ -+#ifndef Q_OS_GENODE - if (!currentTab()) - return; - QPrintPreviewDialog dialog(this); - connect(&dialog, SIGNAL(paintRequested(QPrinter *)), - currentTab(), SLOT(print(QPrinter *))); - dialog.exec(); -+#endif - } - - void BrowserMainWindow::filePrint() -@@ -1235,12 +1238,15 @@ void BrowserMainWindow::filePrint() - - void BrowserMainWindow::printRequested(QWebFrame *frame) - { -+/* QPrinter is currently not supported in Genode's Qt */ -+#ifndef Q_OS_GENODE - QPrinter printer; - QPrintDialog dialog(&printer, this); - dialog.setWindowTitle(tr("Print Document")); - if (dialog.exec() != QDialog::Accepted) - return; - frame->print(&printer); -+#endif - } - - void BrowserMainWindow::privateBrowsing() -diff --git a/src/history/history.pri b/src/history/history.pri -index 6ee163d..a3616e2 100644 ---- a/src/history/history.pri -+++ b/src/history/history.pri -@@ -1,3 +1,5 @@ -+INC_DIR += $(call select_from_ports,arora)/src/app/arora/src/history -+ - INCLUDEPATH += $$PWD - DEPENDPATH += $$PWD - -diff --git a/src/locationbar/locationbar.pri b/src/locationbar/locationbar.pri -index ba33005..cace42b 100644 ---- a/src/locationbar/locationbar.pri -+++ b/src/locationbar/locationbar.pri -@@ -1,3 +1,5 @@ -+INC_DIR += $(call select_from_ports,arora)/src/app/arora/src/locationbar -+ - INCLUDEPATH += $$PWD - DEPENDPATH += $$PWD - -diff --git a/src/main.cpp b/src/main.cpp -index a5405d5..1d4d531 100644 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -17,6 +17,7 @@ - * Boston, MA 02110-1301 USA - */ - -+#include - #include "browserapplication.h" - - #ifdef Q_OS_WIN -@@ -31,8 +32,10 @@ int main(int argc, char **argv) - QApplication::setGraphicsSystem(QString::fromLatin1("raster")); - #endif - BrowserApplication application(argc, argv); -+#ifndef Q_OS_GENODE - if (!application.isRunning()) - return 0; -+#endif - #ifdef Q_OS_WIN - application.setStyle(new ExplorerStyle); - #endif -diff --git a/src/network/cookiejar/cookiejar.pri b/src/network/cookiejar/cookiejar.pri -index 8ecf533..4781160 100644 ---- a/src/network/cookiejar/cookiejar.pri -+++ b/src/network/cookiejar/cookiejar.pri -@@ -1,3 +1,5 @@ -+INC_DIR += $(call select_from_ports,arora)/src/app/arora/src/network/cookiejar -+ - INCLUDEPATH += $$PWD - DEPENDPATH += $$PWD - -@@ -19,5 +21,6 @@ FORMS += \ - cookies.ui \ - cookiesexceptions.ui - --include($$PWD/networkcookiejar/networkcookiejar.pri) -+include $(call select_from_ports,arora)/src/app/arora/src/network/cookiejar/networkcookiejar/networkcookiejar.pri -+ - -diff --git a/src/network/cookiejar/networkcookiejar/networkcookiejar.pri b/src/network/cookiejar/networkcookiejar/networkcookiejar.pri -index 78ac273..f6ae783 100644 ---- a/src/network/cookiejar/networkcookiejar/networkcookiejar.pri -+++ b/src/network/cookiejar/networkcookiejar/networkcookiejar.pri -@@ -1,3 +1,5 @@ -+INC_DIR += $(call select_from_ports,arora)/src/app/arora/src/network/cookiejar/networkcookiejar -+ - INCLUDEPATH += $$PWD - DEPENDPATH += $$PWD - -diff --git a/src/network/network.pri b/src/network/network.pri -index 5c912f4..ca3bdbf 100644 ---- a/src/network/network.pri -+++ b/src/network/network.pri -@@ -1,3 +1,5 @@ -+INC_DIR += $(call select_from_ports,arora)/src/app/arora/src/network -+ - INCLUDEPATH += $$PWD - DEPENDPATH += $$PWD - -@@ -19,4 +21,4 @@ SOURCES += \ - networkproxyfactory.cpp \ - schemeaccesshandler.cpp - --include(cookiejar/cookiejar.pri) -+include $(call select_from_ports,arora)/src/app/arora/src/network/cookiejar/cookiejar.pri -diff --git a/src/opensearch/opensearch.pri b/src/opensearch/opensearch.pri -index dbace74..427cf2a 100644 ---- a/src/opensearch/opensearch.pri -+++ b/src/opensearch/opensearch.pri -@@ -1,3 +1,5 @@ -+INC_DIR += $(call select_from_ports,arora)/src/app/arora/src/opensearch -+ - INCLUDEPATH += $$PWD - DEPENDPATH += $$PWD - -@@ -23,4 +25,4 @@ SOURCES += \ - - FORMS += opensearchdialog.ui - --QT += script -+QT += scriptclassic -diff --git a/src/qwebplugins/clicktoflash/clicktoflash.pri b/src/qwebplugins/clicktoflash/clicktoflash.pri -index 2033e59..193cc82 100644 ---- a/src/qwebplugins/clicktoflash/clicktoflash.pri -+++ b/src/qwebplugins/clicktoflash/clicktoflash.pri -@@ -1,3 +1,5 @@ -+INC_DIR += $(call select_from_ports,arora)/src/app/arora/src/qwebplugins/clicktoflash -+ - INCLUDEPATH += $$PWD - DEPENDPATH += $$PWD - -diff --git a/src/qwebplugins/qwebplugins.pri b/src/qwebplugins/qwebplugins.pri -index d3d9cb7..26b19db 100644 ---- a/src/qwebplugins/qwebplugins.pri -+++ b/src/qwebplugins/qwebplugins.pri -@@ -1,3 +1,5 @@ -+INC_DIR += $(call select_from_ports,arora)/src/app/arora/src/qwebplugins -+ - INCLUDEPATH += $$PWD - DEPENDPATH += $$PWD - -@@ -9,5 +11,5 @@ SOURCES += \ - arorawebplugin.cpp \ - webpluginfactory.cpp - --include(clicktoflash/clicktoflash.pri) -+include $(call select_from_ports,arora)/src/app/arora/src/qwebplugins/clicktoflash/clicktoflash.pri - -diff --git a/src/src.pri b/src/src.pri -index 7c1a0e3..5812c05 100644 ---- a/src/src.pri -+++ b/src/src.pri -@@ -1,8 +1,9 @@ --CONFIG += qt warn_on --contains(QT_BUILD_PARTS, tools): CONFIG += uitools --else : DEFINES += QT_NO_UITOOLS -+INC_DIR += $(call select_from_ports,arora)/src/app/arora/src -+ -+CC_CXX_OPT += -DGITVERSION=\"\\\"0\\\"\" -DGITCHANGENUMBER=\"\\\"0\\\"\" -include qhash.h -include quiloader.h - --win32|os2 : Debug : CONFIG += console -+CONFIG += qt warn_on -+CONFIG += uitools - - INCLUDEPATH += $$PWD - DEPENDPATH += $$PWD -@@ -15,15 +16,6 @@ UI_DIR = $$PWD/.ui - MOC_DIR = $$PWD/.moc - OBJECTS_DIR = $$PWD/.obj - --exists(../.git/HEAD) { -- GITVERSION=$$system(git log -n1 --pretty=format:%h) -- !isEmpty(GITVERSION) { -- GITCHANGENUMBER=$$system(git log --pretty=format:%h | wc -l) -- DEFINES += GITVERSION=\"\\\"$$GITVERSION\\\"\" -- DEFINES += GITCHANGENUMBER=\"\\\"$$GITCHANGENUMBER\\\"\" -- } --} -- - FORMS += \ - aboutdialog.ui \ - autofilldialog.ui \ -@@ -89,49 +81,24 @@ SOURCES += \ - webview.cpp \ - webviewsearch.cpp - --include(adblock/adblock.pri) --include(bookmarks/bookmarks.pri) --include(history/history.pri) --include(locationbar/locationbar.pri) --include(network/network.pri) --include(opensearch/opensearch.pri) --include(qwebplugins/qwebplugins.pri) --include(utils/utils.pri) --include(useragent/useragent.pri) -+include $(call select_from_ports,arora)/src/app/arora/src/adblock/adblock.pri -+include $(call select_from_ports,arora)/src/app/arora/src/bookmarks/bookmarks.pri -+include $(call select_from_ports,arora)/src/app/arora/src/history/history.pri -+include $(call select_from_ports,arora)/src/app/arora/src/locationbar/locationbar.pri -+include $(call select_from_ports,arora)/src/app/arora/src/network/network.pri -+include $(call select_from_ports,arora)/src/app/arora/src/opensearch/opensearch.pri -+include $(call select_from_ports,arora)/src/app/arora/src/qwebplugins/qwebplugins.pri -+include $(call select_from_ports,arora)/src/app/arora/src/utils/utils.pri -+include $(call select_from_ports,arora)/src/app/arora/src/useragent/useragent.pri - - RESOURCES += \ -- $$PWD/data/data.qrc \ -- $$PWD/data/graphics/graphics.qrc \ -- $$PWD/data/searchengines/searchengines.qrc \ -- $$PWD/htmls/htmls.qrc -+ data.qrc \ -+ graphics.qrc \ -+ searchengines.qrc \ -+ htmls.qrc - - DISTFILES += ../AUTHORS \ - ../ChangeLog \ - ../LICENSE.GPL2 \ - ../LICENSE.GPL3 \ - ../README -- --win32 { -- RC_FILE = $$PWD/browser.rc -- LIBS += -luser32 --} -- --os2 { -- RC_FILE = $$PWD/browser_os2.rc --} -- --mac { -- ICON = browser.icns -- QMAKE_INFO_PLIST = Info_mac.plist --} -- --include(../webkittrunk.pri) -- --unix { -- PKGDATADIR = $$DATADIR/arora -- DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\" --} -- --win32 { -- LIBS += -ladvapi32 --} -diff --git a/src/src.pro b/src/src.pro -index dab73ff..8460fd4 100644 ---- a/src/src.pro -+++ b/src/src.pro -@@ -1,65 +1,16 @@ - TEMPLATE = app - - TARGET = arora --mac { -- TARGET = Arora -- QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 --} - - DEFINES += \ - QT_NO_CAST_FROM_ASCII \ - QT_NO_CAST_TO_ASCII \ - QT_STRICT_ITERATORS \ - --include(../install.pri) -- --include(src.pri) -+include $(call select_from_ports,arora)/src/app/arora/src/src.pri - - SOURCES += main.cpp - - DESTDIR = ../ - --include(locale/locale.pri) -- --!mac { --unix { -- INSTALLS += translations desktop iconxpm iconsvg icon16 icon32 icon128 man man-compress -- -- translations.path = $$PKGDATADIR -- translations.files += .qm/locale -- -- desktop.path = $$DATADIR/applications -- desktop.files += arora.desktop -- -- iconxpm.path = $$DATADIR/pixmaps -- iconxpm.files += data/arora.xpm -- -- iconsvg.path = $$DATADIR/icons/hicolor/scalable/apps -- iconsvg.files += data/arora.svg -- -- icon16.path = $$DATADIR/icons/hicolor/16x16/apps -- icon16.files += data/16x16/arora.png -- -- icon32.path = $$DATADIR/icons/hicolor/32x32/apps -- icon32.files += data/32x32/arora.png -- -- icon128.path = $$DATADIR/icons/hicolor/128x128/apps -- icon128.files += data/128x128/arora.png -- -- man.path = $$DATADIR/man/man1 -- man.files += data/arora.1 -- -- man-compress.path = $$DATADIR/man/man1 -- man-compress.extra = "" "gzip -9 -f \$(INSTALL_ROOT)/$$DATADIR/man/man1/arora.1" "" -- man-compress.depends = install_man -- -- GNOME_DEFAULT_APPS_PATH = $$system(pkg-config --variable=defappsdir gnome-default-applications) -- -- !isEmpty(GNOME_DEFAULT_APPS_PATH) { -- INSTALLS += gnome-default-app -- -- gnome-default-app.path = $$GNOME_DEFAULT_APPS_PATH -- gnome-default-app.files = data/arora.xml -- } --} --} -+QT_PLUGIN += qgif qjpeg -diff --git a/src/useragent/useragent.pri b/src/useragent/useragent.pri -index 78f1c48..50f6e1e 100644 ---- a/src/useragent/useragent.pri -+++ b/src/useragent/useragent.pri -@@ -1,3 +1,5 @@ -+INC_DIR += $(call select_from_ports,arora)/src/app/arora/src/useragent -+ - INCLUDEPATH += $$PWD - DEPENDPATH += $$PWD - -diff --git a/src/utils/utils.pri b/src/utils/utils.pri -index fb10c55..489a51d 100644 ---- a/src/utils/utils.pri -+++ b/src/utils/utils.pri -@@ -1,3 +1,5 @@ -+INC_DIR += $(call select_from_ports,arora)/src/app/arora/src/utils -+ - INCLUDEPATH += $$PWD - DEPENDPATH += $$PWD - -@@ -26,10 +28,3 @@ SOURCES += \ - squeezelabel.cpp \ - treesortfilterproxymodel.cpp \ - webpageproxy.cpp -- --win32 { -- HEADERS += explorerstyle.h -- SOURCES += explorerstyle.cpp -- LIBS += -lgdi32 --} -- diff --git a/repos/ports/src/app/arora/patches/arora_move_window.patch b/repos/ports/src/app/arora/patches/arora_move_window.patch deleted file mode 100644 index 4275c3e71f..0000000000 --- a/repos/ports/src/app/arora/patches/arora_move_window.patch +++ /dev/null @@ -1,24 +0,0 @@ -arora_move_window.patch - -From: Christian Prochaska - - ---- - src/browserapplication.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/browserapplication.cpp b/src/browserapplication.cpp -index 08a8e65..cb3a872 100644 ---- a/src/browserapplication.cpp -+++ b/src/browserapplication.cpp -@@ -559,6 +559,10 @@ BrowserMainWindow *BrowserApplication::newMainWindow() - if (!m_mainWindows.isEmpty()) - mainWindow()->m_autoSaver->saveIfNeccessary(); - BrowserMainWindow *browser = new BrowserMainWindow(); -+ -+ browser->resize(790, 705); -+ browser->move(215, 6); -+ - m_mainWindows.prepend(browser); - connect(this, SIGNAL(privacyChanged(bool)), - browser, SLOT(privacyChanged(bool))); diff --git a/repos/ports/src/app/arora/patches/arora_nitpicker_plugin.patch b/repos/ports/src/app/arora/patches/arora_nitpicker_plugin.patch deleted file mode 100644 index c77e20c989..0000000000 --- a/repos/ports/src/app/arora/patches/arora_nitpicker_plugin.patch +++ /dev/null @@ -1,40 +0,0 @@ -arora_nitpicker_plugin.patch - -From: Christian Prochaska - - ---- - src/qwebplugins/qwebplugins.pri | 2 +- - src/qwebplugins/webpluginfactory.cpp | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/qwebplugins/qwebplugins.pri b/src/qwebplugins/qwebplugins.pri -index 26b19db..cc54090 100644 ---- a/src/qwebplugins/qwebplugins.pri -+++ b/src/qwebplugins/qwebplugins.pri -@@ -12,4 +12,4 @@ SOURCES += \ - webpluginfactory.cpp - - include $(call select_from_ports,arora)/src/app/arora/src/qwebplugins/clicktoflash/clicktoflash.pri -- -+include $(REP_DIR)/src/app/arora/qwebplugins/nitpicker/nitpicker.pri -diff --git a/src/qwebplugins/webpluginfactory.cpp b/src/qwebplugins/webpluginfactory.cpp -index c12fe72..2e09f69 100644 ---- a/src/qwebplugins/webpluginfactory.cpp -+++ b/src/qwebplugins/webpluginfactory.cpp -@@ -20,6 +20,7 @@ - #include "webpluginfactory.h" - - #include "clicktoflashplugin.h" -+#include "nitpickerplugin.h" - - #include - #include -@@ -88,6 +89,7 @@ void WebPluginFactory::init() const - qDeleteAll(m_plugins); - m_plugins.clear(); - m_plugins.append(new ClickToFlashPlugin); -+ m_plugins.append(new NitpickerPlugin); - foreach (AroraWebPlugin *plugin, m_plugins) { - foreach (const QWebPluginFactory::MimeType &pluginMimeType, plugin->metaPlugin().mimeTypes) - m_pluginsCache.insert(pluginMimeType.name, plugin); diff --git a/repos/ports/src/app/arora/patches/arora_qt5_cpp.patch b/repos/ports/src/app/arora/patches/arora_qt5_cpp.patch deleted file mode 100644 index 4f2b80d1f6..0000000000 --- a/repos/ports/src/app/arora/patches/arora_qt5_cpp.patch +++ /dev/null @@ -1,894 +0,0 @@ -arora_qt5_cpp.patch - -From: Christian Prochaska - - ---- - src/aboutdialog.cpp | 4 +- - src/adblock/adblockmodel.cpp | 13 +++++ - src/adblock/adblocksubscription.cpp | 13 +++++ - src/autofilldialog.cpp | 5 ++ - src/autofillmanager.cpp | 14 ++++++ - src/bookmarks/bookmarksmanager.cpp | 8 +++ - src/bookmarks/bookmarksmodel.cpp | 2 + - src/browserapplication.cpp | 14 +++++- - src/downloadmanager.cpp | 8 ++- - src/history/history.cpp | 49 +++++++++++++++++++- - src/locationbar/locationbar.cpp | 2 + - src/locationbar/locationbarsiteicon.cpp | 3 + - src/modelmenu.cpp | 5 ++ - src/modeltoolbar.cpp | 3 + - src/network/cookiejar/cookieexceptionsmodel.cpp | 5 ++ - src/network/cookiejar/cookiejar.cpp | 3 + - src/network/cookiejar/cookiemodel.cpp | 5 ++ - .../networkcookiejar/networkcookiejar.cpp | 2 + - .../cookiejar/networkcookiejar/networkcookiejar.h | 2 + - .../networkcookiejar/networkcookiejar_p.h | 2 + - src/network/networkaccessmanager.cpp | 16 +++++++ - src/network/networkdiskcache.cpp | 5 ++ - src/opensearch/opensearchengine.cpp | 8 +++ - src/opensearch/opensearchenginemodel.cpp | 5 ++ - src/opensearch/opensearchmanager.cpp | 4 ++ - src/settings.cpp | 8 ++- - src/tabbar.cpp | 3 + - src/tabwidget.cpp | 2 - - src/utils/networkaccessmanagerproxy_p.h | 2 + - src/webview.cpp | 14 ++++-- - tools/cacheinfo/main.cpp | 5 ++ - tools/htmlToXBel/main.cpp | 5 ++ - 32 files changed, 225 insertions(+), 14 deletions(-) - -diff --git a/src/aboutdialog.cpp b/src/aboutdialog.cpp -index 42e1c81..ce70df2 100644 ---- a/src/aboutdialog.cpp -+++ b/src/aboutdialog.cpp -@@ -27,7 +27,9 @@ - #include - #include - --#if QT_VERSION >= 0x040600 || defined(WEBKIT_TRUNK) -+#if QT_VERSION >= 0x050000 || defined(WEBKIT_TRUNK) -+#include -+#elif QT_VERSION >= 0x040600 - #include - #endif - -diff --git a/src/adblock/adblockmodel.cpp b/src/adblock/adblockmodel.cpp -index 1b5ba2d..f17e2a0 100644 ---- a/src/adblock/adblockmodel.cpp -+++ b/src/adblock/adblockmodel.cpp -@@ -41,7 +41,12 @@ AdBlockModel::AdBlockModel(QObject *parent) - - void AdBlockModel::rulesChanged() - { -+#if QT_VERSION >= 0x050000 -+ beginResetModel(); -+ endResetModel(); -+#else - reset(); -+#endif - } - - const AdBlockRule AdBlockModel::rule(const QModelIndex &index) const -@@ -67,7 +72,11 @@ QModelIndex AdBlockModel::index(AdBlockSubscription *subscription) - int row = m_manager->subscriptions().indexOf(subscription); - if (row < 0 || row >= m_manager->subscriptions().count()) - return QModelIndex(); -+#if QT_VERSION >= 0x050000 -+ return createIndex(row, 0); -+#else - return createIndex(row, 0, 0); -+#endif - } - - QVariant AdBlockModel::headerData(int section, Qt::Orientation orientation, int role) const -@@ -159,7 +168,11 @@ QModelIndex AdBlockModel::parent(const QModelIndex &index) const - return QModelIndex(); - - int parentRow = m_manager->subscriptions().indexOf(parent); -+#if QT_VERSION >= 0x050000 -+ return createIndex(parentRow, 0); -+#else - return createIndex(parentRow, 0, 0); -+#endif - } - - Qt::ItemFlags AdBlockModel::flags(const QModelIndex &index) const -diff --git a/src/adblock/adblocksubscription.cpp b/src/adblock/adblocksubscription.cpp -index d28c590..539a9d2 100644 ---- a/src/adblock/adblocksubscription.cpp -+++ b/src/adblock/adblocksubscription.cpp -@@ -37,6 +37,10 @@ - #include - #include - -+#if QT_VERSION >= 0x050000 -+#include -+#endif -+ - // #define ADBLOCKSUBSCRIPTION_DEBUG - - AdBlockSubscription::AdBlockSubscription(const QUrl &url, QObject *parent) -@@ -58,10 +62,17 @@ void AdBlockSubscription::parseUrl(const QUrl &url) - if (url.path() != QLatin1String("subscribe")) - return; - -+#if QT_VERSION >= 0x050000 -+ m_title = QUrlQuery(url).queryItemValue(QLatin1String("title")); -+ m_enabled = QUrlQuery(url).queryItemValue(QLatin1String("enabled")) != QLatin1String("false"); -+ m_location = QUrlQuery(url).queryItemValue(QLatin1String("location")).toUtf8(); -+ QByteArray lastUpdateByteArray = QUrlQuery(url).queryItemValue(QLatin1String("lastUpdate")).toLatin1(); -+#else - m_title = QUrl::fromPercentEncoding(url.encodedQueryItemValue("title")); - m_enabled = QUrl::fromPercentEncoding(url.encodedQueryItemValue("enabled")) != QLatin1String("false"); - m_location = QUrl::fromPercentEncoding(url.encodedQueryItemValue("location")).toUtf8(); - QByteArray lastUpdateByteArray = url.encodedQueryItemValue("lastUpdate"); -+#endif - QString lastUpdateString = QUrl::fromPercentEncoding(lastUpdateByteArray); - m_lastUpdate = QDateTime::fromString(lastUpdateString, Qt::ISODate); - loadRules(); -@@ -82,7 +93,9 @@ QUrl AdBlockSubscription::url() const - queryItems.append(Query(QLatin1String("enabled"), QLatin1String("false"))); - if (m_lastUpdate.isValid()) - queryItems.append(Query(QLatin1String("lastUpdate"), m_lastUpdate.toString(Qt::ISODate))); -+#if !(QT_VERSION >= 0x050000) - url.setQueryItems(queryItems); -+#endif - return url; - } - -diff --git a/src/autofilldialog.cpp b/src/autofilldialog.cpp -index 7e1acd1..d3cb89c 100644 ---- a/src/autofilldialog.cpp -+++ b/src/autofilldialog.cpp -@@ -46,7 +46,12 @@ void AutoFillModel::autoFillChanged() - { - AutoFillManager *manager = BrowserApplication::instance()->autoFillManager(); - m_forms = manager->forms(); -+#if QT_VERSION >= 0x050000 -+ beginResetModel(); -+ endResetModel(); -+#else - reset(); -+#endif - } - - QVariant AutoFillModel::headerData(int section, Qt::Orientation orientation, int role) const -diff --git a/src/autofillmanager.cpp b/src/autofillmanager.cpp -index b4c713e..03cf2f5 100644 ---- a/src/autofillmanager.cpp -+++ b/src/autofillmanager.cpp -@@ -44,6 +44,10 @@ - #include - #include - -+#if QT_VERSION >= 0x050000 -+#include -+#endif -+ - #include - - // #define AUTOFILL_DEBUG -@@ -91,7 +95,11 @@ void AutoFillManager::loadSettings() - - QString AutoFillManager::autoFillDataFile() - { -+#if QT_VERSION >= 0x050000 -+ QString fileName = QStandardPaths::writableLocation(QStandardPaths::DataLocation); -+#else - QString fileName = QDesktopServices::storageLocation(QDesktopServices::DataLocation); -+#endif - fileName += QLatin1String("/autofill.dat"); - return fileName; - } -@@ -227,7 +235,11 @@ AutoFillManager::Form AutoFillManager::findForm(QWebPage *webPage, const QByteAr - { - Form form; - QUrl argsUrl = QUrl::fromEncoded(QByteArray("foo://bar.com/?" + outgoingData)); -+#if QT_VERSION >= 0x050000 -+ QList > encodedArgs = QUrlQuery(argsUrl).queryItems(); -+#else - QList > encodedArgs = argsUrl.queryItems(); -+#endif - QSet > args; - // XXX Is there a Qt function to do this? (unencode '+' to ' ') - for (int i = 0; i < encodedArgs.count(); ++i) { -@@ -293,7 +305,9 @@ AutoFillManager::Form AutoFillManager::findForm(QWebPage *webPage, const QByteAr - QUrl AutoFillManager::stripUrl(const QUrl &url) - { - QUrl cleanUrl = url; -+#if !(QT_VERSION >= 0x050000) - cleanUrl.setQueryItems(QList >()); -+#endif - cleanUrl.setFragment(QString()); - cleanUrl.setUserInfo(QString()); - return cleanUrl; -diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp -index 8db5abf..d3a21e2 100644 ---- a/src/bookmarks/bookmarksmanager.cpp -+++ b/src/bookmarks/bookmarksmanager.cpp -@@ -123,7 +123,11 @@ void BookmarksManager::load() - return; - m_loaded = true; - -+#if QT_VERSION >= 0x050000 -+ QString dir = QStandardPaths::writableLocation(QStandardPaths::DataLocation); -+#else - QString dir = QDesktopServices::storageLocation(QDesktopServices::DataLocation); -+#endif - QString bookmarkFile = dir + QLatin1String("/bookmarks.xbel"); - if (!QFile::exists(bookmarkFile)) - bookmarkFile = QLatin1String(":defaultbookmarks.xbel"); -@@ -184,7 +188,11 @@ void BookmarksManager::save() const - return; - - XbelWriter writer; -+#if QT_VERSION >= 0x050000 -+ QString dir = QStandardPaths::writableLocation(QStandardPaths::DataLocation); -+#else - QString dir = QDesktopServices::storageLocation(QDesktopServices::DataLocation); -+#endif - QString bookmarkFile = dir + QLatin1String("/bookmarks.xbel"); - // Save root folder titles in English (i.e. not localized) - m_menu->title = QLatin1String(BOOKMARKMENU); -diff --git a/src/bookmarks/bookmarksmodel.cpp b/src/bookmarks/bookmarksmodel.cpp -index b6f2869..d137dc5 100644 ---- a/src/bookmarks/bookmarksmodel.cpp -+++ b/src/bookmarks/bookmarksmodel.cpp -@@ -72,6 +72,8 @@ - #include - #include - -+#include -+ - BookmarksModel::BookmarksModel(BookmarksManager *bookmarkManager, QObject *parent) - : QAbstractItemModel(parent) - , m_endMacro(false) -diff --git a/src/browserapplication.cpp b/src/browserapplication.cpp -index 4514a80..f0187fe 100644 ---- a/src/browserapplication.cpp -+++ b/src/browserapplication.cpp -@@ -303,9 +303,15 @@ void BrowserApplication::quitBrowser() - */ - void BrowserApplication::postLaunch() - { -+#if QT_VERSION >= 0x050000 -+ QStandardPaths::StandardLocation location; -+ location = QStandardPaths::CacheLocation; -+ QString directory = QStandardPaths::writableLocation(location); -+#else - QDesktopServices::StandardLocation location; - location = QDesktopServices::CacheLocation; - QString directory = QDesktopServices::storageLocation(location); -+#endif - if (directory.isEmpty()) - directory = QDir::homePath() + QLatin1String("/.") + QCoreApplication::applicationName(); - QWebSettings::setIconDatabasePath(directory); -@@ -356,7 +362,7 @@ void BrowserApplication::loadSettings() - QString standardFontFamily = defaultSettings->fontFamily(QWebSettings::StandardFont); - int standardFontSize = defaultSettings->fontSize(QWebSettings::DefaultFontSize); - QFont standardFont = QFont(standardFontFamily, standardFontSize); -- standardFont = qVariantValue(settings.value(QLatin1String("standardFont"), standardFont)); -+ standardFont = qvariant_cast(settings.value(QLatin1String("standardFont"), standardFont)); - defaultSettings->setFontFamily(QWebSettings::StandardFont, standardFont.family()); - defaultSettings->setFontSize(QWebSettings::DefaultFontSize, standardFont.pointSize()); - int minimumFontSize = settings.value(QLatin1String("minimumFontSize"), -@@ -366,7 +372,7 @@ void BrowserApplication::loadSettings() - QString fixedFontFamily = defaultSettings->fontFamily(QWebSettings::FixedFont); - int fixedFontSize = defaultSettings->fontSize(QWebSettings::DefaultFixedFontSize); - QFont fixedFont = QFont(fixedFontFamily, fixedFontSize); -- fixedFont = qVariantValue(settings.value(QLatin1String("fixedFont"), fixedFont)); -+ fixedFont = qvariant_cast(settings.value(QLatin1String("fixedFont"), fixedFont)); - defaultSettings->setFontFamily(QWebSettings::FixedFont, fixedFont.family()); - defaultSettings->setFontSize(QWebSettings::DefaultFixedFontSize, fixedFont.pointSize()); - -@@ -658,7 +664,11 @@ QString BrowserApplication::installedDataDirectory() - - QString BrowserApplication::dataFilePath(const QString &fileName) - { -+#if QT_VERSION >= 0x050000 -+ QString directory = QStandardPaths::writableLocation(QStandardPaths::DataLocation); -+#else - QString directory = QDesktopServices::storageLocation(QDesktopServices::DataLocation); -+#endif - if (directory.isEmpty()) - directory = QDir::homePath() + QLatin1String("/.") + QCoreApplication::applicationName(); - if (!QFile::exists(directory)) { -diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp -index 8196353..b0da144 100644 ---- a/src/downloadmanager.cpp -+++ b/src/downloadmanager.cpp -@@ -471,7 +471,11 @@ DownloadManager::DownloadManager(QWidget *parent) - - QSettings settings; - settings.beginGroup(QLatin1String("downloadmanager")); -+#if QT_VERSION >= 0x050000 -+ QString defaultLocation = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation); -+#else - QString defaultLocation = QDesktopServices::storageLocation(QDesktopServices::DesktopLocation); -+#endif - setDownloadDirectory(settings.value(QLatin1String("downloadDirectory"), defaultLocation).toString()); - - downloadsView->setShowGrid(false); -@@ -601,9 +605,9 @@ void DownloadManager::updateActiveItemCount() - { - int acCount = activeDownloads(); - if (acCount > 0) { -- setWindowTitle(QApplication::translate("DownloadDialog", "Downloading %1", 0, QApplication::UnicodeUTF8).arg(acCount)); -+ setWindowTitle(QApplication::translate("DownloadDialog", "Downloading %1", 0).arg(acCount)); - } else { -- setWindowTitle(QApplication::translate("DownloadDialog", "Downloads", 0, QApplication::UnicodeUTF8)); -+ setWindowTitle(QApplication::translate("DownloadDialog", "Downloads", 0)); - } - } - -diff --git a/src/history/history.cpp b/src/history/history.cpp -index 7419cf0..6f976b1 100644 ---- a/src/history/history.cpp -+++ b/src/history/history.cpp -@@ -104,7 +104,12 @@ HistoryModel::HistoryModel(HistoryManager *history, QObject *parent) - - void HistoryModel::historyReset() - { -+#if QT_VERSION >= 0x050000 -+ beginResetModel(); -+ endResetModel(); -+#else - reset(); -+#endif - } - - void HistoryModel::entryAdded() -@@ -558,7 +563,12 @@ void HistoryFilterModel::recalculateFrecencies() - void HistoryFilterModel::sourceReset() - { - m_loaded = false; -+#if QT_VERSION >= 0x050000 -+ beginResetModel(); -+ endResetModel(); -+#else - reset(); -+#endif - } - - int HistoryFilterModel::rowCount(const QModelIndex &parent) const -@@ -694,7 +704,14 @@ bool HistoryFilterModel::removeRows(int row, int count, const QModelIndex &paren - this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int))); - m_loaded = false; - if (oldCount - count != rowCount()) -+#if QT_VERSION >= 0x050000 -+ { -+ beginResetModel(); -+ endResetModel(); -+ } -+#else - reset(); -+#endif - return true; - } - -@@ -838,7 +855,11 @@ QModelIndex HistoryTreeModel::index(int row, int column, const QModelIndex &pare - return QModelIndex(); - - if (!parent.isValid()) -+#if QT_VERSION >= 0x050000 -+ return createIndex(row, column); -+#else - return createIndex(row, column, 0); -+#endif - return createIndex(row, column, parent.row() + 1); - } - -@@ -847,7 +868,11 @@ QModelIndex HistoryTreeModel::parent(const QModelIndex &index) const - int offset = index.internalId(); - if (offset == 0 || !index.isValid()) - return QModelIndex(); -+#if QT_VERSION >= 0x050000 -+ return createIndex(offset - 1, 0); -+#else - return createIndex(offset - 1, 0, 0); -+#endif - } - - bool HistoryTreeModel::hasChildren(const QModelIndex &parent) const -@@ -887,13 +912,23 @@ void HistoryTreeModel::setSourceModel(QAbstractItemModel *newSourceModel) - this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int))); - } - -+#if QT_VERSION >= 0x050000 -+ beginResetModel(); -+ endResetModel(); -+#else - reset(); -+#endif - } - - void HistoryTreeModel::sourceReset() - { - m_sourceRowCache.clear(); -+#if QT_VERSION >= 0x050000 -+ beginResetModel(); -+ endResetModel(); -+#else - reset(); -+#endif - } - - void HistoryTreeModel::sourceRowsInserted(const QModelIndex &parent, int start, int end) -@@ -902,7 +937,12 @@ void HistoryTreeModel::sourceRowsInserted(const QModelIndex &parent, int start, - Q_ASSERT(!parent.isValid()); - if (start != 0 || start != end) { - m_sourceRowCache.clear(); -- reset(); -+#if QT_VERSION >= 0x050000 -+ beginResetModel(); -+ endResetModel(); -+#else -+ reset(); -+#endif - return; - } - -@@ -964,7 +1004,12 @@ bool HistoryTreeModel::removeRows(int row, int count, const QModelIndex &parent) - void HistoryTreeModel::sourceRowsRemoved(const QModelIndex &parent, int start, int end) - { - if (!removingDown) { -- reset(); -+#if QT_VERSION >= 0x050000 -+ beginResetModel(); -+ endResetModel(); -+#else -+ reset(); -+#endif - m_sourceRowCache.clear(); - return; - } -diff --git a/src/locationbar/locationbar.cpp b/src/locationbar/locationbar.cpp -index c9f5335..3124797 100644 ---- a/src/locationbar/locationbar.cpp -+++ b/src/locationbar/locationbar.cpp -@@ -31,6 +31,8 @@ - #include - #include - -+#include -+ - #include - - LocationBar::LocationBar(QWidget *parent) -diff --git a/src/locationbar/locationbarsiteicon.cpp b/src/locationbar/locationbarsiteicon.cpp -index f594700..49b2f55 100644 ---- a/src/locationbar/locationbarsiteicon.cpp -+++ b/src/locationbar/locationbarsiteicon.cpp -@@ -22,6 +22,9 @@ - #include - #include - -+#include -+#include -+ - #include "browserapplication.h" - #include "webview.h" - -diff --git a/src/modelmenu.cpp b/src/modelmenu.cpp -index 4f95d09..0f052c3 100644 ---- a/src/modelmenu.cpp -+++ b/src/modelmenu.cpp -@@ -69,6 +69,9 @@ - #include - #include - -+#include -+#include -+ - #include - - ModelMenu::ModelMenu(QWidget *parent) -@@ -344,7 +347,7 @@ void ModelMenu::mouseMoveEvent(QMouseEvent *event) - if (drag->exec() == Qt::MoveAction) { - m_model->removeRow(idx.row(), m_root); - -- if (!this->isAncestorOf(drag->target())) -+ if (!this->isAncestorOf(qobject_cast(drag->target()))) - close(); - else - aboutToShow(); -diff --git a/src/modeltoolbar.cpp b/src/modeltoolbar.cpp -index 12b77b9..800cd75 100644 ---- a/src/modeltoolbar.cpp -+++ b/src/modeltoolbar.cpp -@@ -25,6 +25,9 @@ - #include - #include - -+#include -+#include -+ - ModelToolBar::ModelToolBar(QWidget *parent) - : QToolBar(parent) - , m_model(0) -diff --git a/src/network/cookiejar/cookieexceptionsmodel.cpp b/src/network/cookiejar/cookieexceptionsmodel.cpp -index 6e45d2a..93abbca 100644 ---- a/src/network/cookiejar/cookieexceptionsmodel.cpp -+++ b/src/network/cookiejar/cookieexceptionsmodel.cpp -@@ -217,6 +217,11 @@ void CookieExceptionsModel::addHost(QString host, QStringList &add, QStringList - add.removeOne(otherRule); - remove1.removeOne(otherRule); - remove2.removeOne(otherRule); -+#if QT_VERSION >= 0x050000 -+ beginResetModel(); -+ endResetModel(); -+#else - reset(); -+#endif - } - -diff --git a/src/network/cookiejar/cookiejar.cpp b/src/network/cookiejar/cookiejar.cpp -index 532600a..f95dfb2 100644 ---- a/src/network/cookiejar/cookiejar.cpp -+++ b/src/network/cookiejar/cookiejar.cpp -@@ -71,6 +71,9 @@ - #include - #include - -+#include -+#include -+ - #include - - static const unsigned int JAR_VERSION = 23; -diff --git a/src/network/cookiejar/cookiemodel.cpp b/src/network/cookiejar/cookiemodel.cpp -index 391e2cc..318af47 100644 ---- a/src/network/cookiejar/cookiemodel.cpp -+++ b/src/network/cookiejar/cookiemodel.cpp -@@ -196,5 +196,10 @@ void CookieModel::cookiesChanged() - { - if (m_cookieJar) - m_cookies = m_cookieJar->cookies(); -+#if QT_VERSION >= 0x050000 -+ beginResetModel(); -+ endResetModel(); -+#else - reset(); -+#endif - } -diff --git a/src/network/cookiejar/networkcookiejar/networkcookiejar.cpp b/src/network/cookiejar/networkcookiejar/networkcookiejar.cpp -index 940269d..e542d79 100644 ---- a/src/network/cookiejar/networkcookiejar/networkcookiejar.cpp -+++ b/src/network/cookiejar/networkcookiejar/networkcookiejar.cpp -@@ -47,6 +47,8 @@ - #include - #endif - -+#include -+ - #include - #include - -diff --git a/src/network/cookiejar/networkcookiejar/networkcookiejar.h b/src/network/cookiejar/networkcookiejar/networkcookiejar.h -index 365b4a3..52d9c6e 100644 ---- a/src/network/cookiejar/networkcookiejar/networkcookiejar.h -+++ b/src/network/cookiejar/networkcookiejar/networkcookiejar.h -@@ -39,6 +39,8 @@ - - #include - -+#include -+ - class NetworkCookieJarPrivate; - class NetworkCookieJar : public QNetworkCookieJar { - Q_OBJECT -diff --git a/src/network/cookiejar/networkcookiejar/networkcookiejar_p.h b/src/network/cookiejar/networkcookiejar/networkcookiejar_p.h -index ea35737..bb19aa1 100644 ---- a/src/network/cookiejar/networkcookiejar/networkcookiejar_p.h -+++ b/src/network/cookiejar/networkcookiejar/networkcookiejar_p.h -@@ -37,6 +37,8 @@ - #ifndef NETWORKCOOKIEJARPRIVATE_H - #define NETWORKCOOKIEJARPRIVATE_H - -+#include -+ - #include "trie_p.h" - - QT_BEGIN_NAMESPACE -diff --git a/src/network/networkaccessmanager.cpp b/src/network/networkaccessmanager.cpp -index 56fb343..576957b 100644 ---- a/src/network/networkaccessmanager.cpp -+++ b/src/network/networkaccessmanager.cpp -@@ -213,7 +213,11 @@ void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthent - passwordDialog.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32)); - - QString introMessage = tr("Enter username and password for \"%1\" at %2"); -+#if QT_VERSION >= 0x050000 -+ introMessage = introMessage.arg(auth->realm().toHtmlEscaped()).arg(reply->url().toString().toHtmlEscaped()); -+#else - introMessage = introMessage.arg(Qt::escape(auth->realm())).arg(Qt::escape(reply->url().toString())); -+#endif - passwordDialog.introLabel->setText(introMessage); - passwordDialog.introLabel->setWordWrap(true); - -@@ -240,7 +244,11 @@ void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &prox - proxyDialog.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32)); - - QString introMessage = tr("Connect to proxy \"%1\" using:"); -+#if QT_VERSION >= 0x050000 -+ introMessage = introMessage.arg(proxy.hostName().toHtmlEscaped()); -+#else - introMessage = introMessage.arg(Qt::escape(proxy.hostName())); -+#endif - proxyDialog.introLabel->setText(introMessage); - proxyDialog.introLabel->setWordWrap(true); - -@@ -255,11 +263,19 @@ QString NetworkAccessManager::certToFormattedString(QSslCertificate cert) - { - QStringList message; - message << cert.subjectInfo(QSslCertificate::CommonName); -+#if QT_VERSION >= 0x050000 -+ /* TODO */ -+#else - message << tr("Issuer: %1").arg(cert.issuerInfo(QSslCertificate::CommonName)); -+#endif - message << tr("Not valid before: %1").arg(cert.effectiveDate().toString()); - message << tr("Valid until: %1").arg(cert.expiryDate().toString()); - -+#if QT_VERSION >= 0x050000 -+ QMultiMap names = cert.subjectAlternativeNames(); -+#else - QMultiMap names = cert.alternateSubjectNames(); -+#endif - if (names.count() > 0) { - QString list; - list += QLatin1String("
    "); -diff --git a/src/network/networkdiskcache.cpp b/src/network/networkdiskcache.cpp -index cfd0d77..adb5d92 100644 ---- a/src/network/networkdiskcache.cpp -+++ b/src/network/networkdiskcache.cpp -@@ -37,8 +37,13 @@ NetworkDiskCache::NetworkDiskCache(QObject *parent) - : QNetworkDiskCache(parent) - , m_private(false) - { -+#if QT_VERSION >= 0x050000 -+ QString diskCacheDirectory = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) -+ + QLatin1String("/browser"); -+#else - QString diskCacheDirectory = QDesktopServices::storageLocation(QDesktopServices::CacheLocation) - + QLatin1String("/browser"); -+#endif - setCacheDirectory(diskCacheDirectory); - connect(BrowserApplication::instance(), SIGNAL(privacyChanged(bool)), - this, SLOT(privacyChanged(bool))); -diff --git a/src/opensearch/opensearchengine.cpp b/src/opensearch/opensearchengine.cpp -index 0332fc1..10058d1 100644 ---- a/src/opensearch/opensearchengine.cpp -+++ b/src/opensearch/opensearchengine.cpp -@@ -202,6 +202,9 @@ void OpenSearchEngine::setSearchUrlTemplate(const QString &searchUrlTemplate) - */ - QUrl OpenSearchEngine::searchUrl(const QString &searchTerm) const - { -+#if QT_VERSION >= 0x050000 -+ return QUrl(); -+#else - if (m_searchUrlTemplate.isEmpty()) - return QUrl(); - -@@ -215,6 +218,7 @@ QUrl OpenSearchEngine::searchUrl(const QString &searchTerm) const - } - - return retVal; -+#endif - } - - /*! -@@ -254,6 +258,9 @@ void OpenSearchEngine::setSuggestionsUrlTemplate(const QString &suggestionsUrlTe - */ - QUrl OpenSearchEngine::suggestionsUrl(const QString &searchTerm) const - { -+#if QT_VERSION >= 0x050000 -+ return QUrl(); -+#else - if (m_suggestionsUrlTemplate.isEmpty()) - return QUrl(); - -@@ -267,6 +274,7 @@ QUrl OpenSearchEngine::suggestionsUrl(const QString &searchTerm) const - } - - return retVal; -+#endif - } - - /*! -diff --git a/src/opensearch/opensearchenginemodel.cpp b/src/opensearch/opensearchenginemodel.cpp -index a35f1bb..8a2e2d6 100644 ---- a/src/opensearch/opensearchenginemodel.cpp -+++ b/src/opensearch/opensearchenginemodel.cpp -@@ -172,6 +172,11 @@ QVariant OpenSearchEngineModel::headerData(int section, Qt::Orientation orientat - - void OpenSearchEngineModel::enginesChanged() - { -+#if QT_VERSION >= 0x050000 -+ QAbstractTableModel::beginResetModel(); -+ QAbstractTableModel::endResetModel(); -+#else - QAbstractTableModel::reset(); -+#endif - } - -diff --git a/src/opensearch/opensearchmanager.cpp b/src/opensearch/opensearchmanager.cpp -index d9bb0a2..9641ac8 100644 ---- a/src/opensearch/opensearchmanager.cpp -+++ b/src/opensearch/opensearchmanager.cpp -@@ -297,7 +297,11 @@ void OpenSearchManager::restoreDefaults() - - QString OpenSearchManager::enginesDirectory() const - { -+#if QT_VERSION >= 0x050000 -+ QDir directory(QStandardPaths::writableLocation(QStandardPaths::DataLocation)); -+#else - QDir directory(QDesktopServices::storageLocation(QDesktopServices::DataLocation)); -+#endif - return directory.filePath(QLatin1String("searchengines")); - } - -diff --git a/src/settings.cpp b/src/settings.cpp -index 3cbe7e8..8f5e46e 100644 ---- a/src/settings.cpp -+++ b/src/settings.cpp -@@ -123,7 +123,11 @@ void SettingsDialog::loadDefaults() - m_fixedFont = QFont(fixedFontFamily, fixedFontSize); - fixedLabel->setText(QString(QLatin1String("%1 %2")).arg(m_fixedFont.family()).arg(m_fixedFont.pointSize())); - -+#if QT_VERSION >= 0x050000 -+ downloadsLocation->setText(QStandardPaths::writableLocation(QStandardPaths::DesktopLocation)); -+#else - downloadsLocation->setText(QDesktopServices::storageLocation(QDesktopServices::DesktopLocation)); -+#endif - - blockPopupWindows->setChecked(!defaultSettings->testAttribute(QWebSettings::JavascriptCanOpenWindows)); - enableJavascript->setChecked(defaultSettings->testAttribute(QWebSettings::JavascriptEnabled)); -@@ -185,8 +189,8 @@ void SettingsDialog::loadFromSettings() - - // Appearance - settings.beginGroup(QLatin1String("websettings")); -- m_fixedFont = qVariantValue(settings.value(QLatin1String("fixedFont"), m_fixedFont)); -- m_standardFont = qVariantValue(settings.value(QLatin1String("standardFont"), m_standardFont)); -+ m_fixedFont = qvariant_cast(settings.value(QLatin1String("fixedFont"), m_fixedFont)); -+ m_standardFont = qvariant_cast(settings.value(QLatin1String("standardFont"), m_standardFont)); - - standardLabel->setText(QString(QLatin1String("%1 %2")).arg(m_standardFont.family()).arg(m_standardFont.pointSize())); - fixedLabel->setText(QString(QLatin1String("%1 %2")).arg(m_fixedFont.family()).arg(m_fixedFont.pointSize())); -diff --git a/src/tabbar.cpp b/src/tabbar.cpp -index b684be1..4e809cf 100644 ---- a/src/tabbar.cpp -+++ b/src/tabbar.cpp -@@ -72,6 +72,9 @@ - #include - #include - -+#include -+#include -+ - #include - - TabShortcut::TabShortcut(int tab, const QKeySequence &key, QWidget *parent) -diff --git a/src/tabwidget.cpp b/src/tabwidget.cpp -index 7e5b0bf..060f513 100644 ---- a/src/tabwidget.cpp -+++ b/src/tabwidget.cpp -@@ -389,7 +389,7 @@ WebView *TabWidget::makeNewTab(bool makeCurrent) - m_locationBars->setSizePolicy(locationBar->sizePolicy()); - - #ifndef AUTOTESTS -- QWidget::setTabOrder(locationBar, qFindChild(BrowserMainWindow::parentWindow(this))); -+ QWidget::setTabOrder(locationBar, BrowserMainWindow::parentWindow(this)->findChild()); - #endif - - // webview -diff --git a/src/utils/networkaccessmanagerproxy_p.h b/src/utils/networkaccessmanagerproxy_p.h -index 3779019..ad8e27e 100644 ---- a/src/utils/networkaccessmanagerproxy_p.h -+++ b/src/utils/networkaccessmanagerproxy_p.h -@@ -31,6 +31,8 @@ - - #include - -+#include -+ - #include "networkaccessmanagerproxy.h" - - class NetworkCookieJarProxy : public QNetworkCookieJar -diff --git a/src/webview.cpp b/src/webview.cpp -index 43eeeb9..ee45475 100644 ---- a/src/webview.cpp -+++ b/src/webview.cpp -@@ -87,7 +87,7 @@ - #include - - #if QT_VERSION >= 0x040600 || defined(WEBKIT_TRUNK) --#if !defined(QTWEBKIT_VERSION) || QTWEBKIT_VERSION < 0x020000 -+#if (!defined(QTWEBKIT_VERSION) || QTWEBKIT_VERSION < 0x020000) && QT_VERSION < 0x050000 - Q_DECLARE_METATYPE(QWebElement) - #endif - #include -@@ -96,8 +96,12 @@ Q_DECLARE_METATYPE(QWebElement) - #include - #include - #include -+#if !(QT_VERSION >= 0x050000) - #include - #endif -+#endif -+ -+#include - - #include - -@@ -112,7 +116,7 @@ WebView::WebView(QWidget *parent) - #endif - { - setPage(m_page); --#if QT_VERSION >= 0x040600 -+#if (QT_VERSION >= 0x040600) && (QT_VERSION < 0x050000) - QPalette p; - if (p.color(QPalette::Window) != Qt::white) { - QWindowsStyle s; -@@ -418,6 +422,9 @@ void WebView::searchRequested(QAction *action) - #if QT_VERSION >= 0x040600 || defined(WEBKIT_TRUNK) - void WebView::addSearchEngine() - { -+#if QT_VERSION >= 0x050000 -+ return; -+#else - QAction *action = qobject_cast(sender()); - if (!action) - return; -@@ -506,6 +513,7 @@ void WebView::addSearchEngine() - engine->setImage(icon().pixmap(16, 16).toImage()); - - ToolbarSearch::openSearchManager()->addEngine(engine); -+#endif - } - #endif - -@@ -580,7 +588,7 @@ void WebView::loadFinished() - void WebView::loadUrl(const QUrl &url, const QString &title) - { - if (url.scheme() == QLatin1String("javascript")) { -- QString scriptSource = QUrl::fromPercentEncoding(url.toString(Q_FLAGS(QUrl::TolerantMode|QUrl::RemoveScheme)).toAscii()); -+ QString scriptSource = QUrl::fromPercentEncoding(url.toString(Q_FLAGS(QUrl::TolerantMode|QUrl::RemoveScheme)).toLatin1()); - QVariant result = page()->mainFrame()->evaluateJavaScript(scriptSource); - return; - } -diff --git a/tools/cacheinfo/main.cpp b/tools/cacheinfo/main.cpp -index 5e88ebc..46bb048 100644 ---- a/tools/cacheinfo/main.cpp -+++ b/tools/cacheinfo/main.cpp -@@ -44,8 +44,13 @@ int main(int argc, char **argv) - } - - NetworkDiskCache diskCache; -+#if QT_VERSION >= 0x050000 -+ QString location = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) -+ + QLatin1String("/browser/"); -+#else - QString location = QDesktopServices::storageLocation(QDesktopServices::CacheLocation) - + QLatin1String("/browser/"); -+#endif - diskCache.setCacheDirectory(location); - - QNetworkCacheMetaData metaData; -diff --git a/tools/htmlToXBel/main.cpp b/tools/htmlToXBel/main.cpp -index 15c2ea5..40b6b00 100644 ---- a/tools/htmlToXBel/main.cpp -+++ b/tools/htmlToXBel/main.cpp -@@ -20,6 +20,11 @@ - #include - #include - -+#if QT_VERSION >= 0x050000 -+#include -+#include -+#endif -+ - /*! - A tool to convert html bookmark files into the xbel format. - diff --git a/repos/ports/src/app/arora/patches/arora_startpage.patch b/repos/ports/src/app/arora/patches/arora_startpage.patch deleted file mode 100644 index aa58d35631..0000000000 --- a/repos/ports/src/app/arora/patches/arora_startpage.patch +++ /dev/null @@ -1,36 +0,0 @@ -arora_startpage.patch - -From: Christian Prochaska - - ---- - src/tabwidget.cpp | 2 +- - src/webpage.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/tabwidget.cpp b/src/tabwidget.cpp -index 060f513..2c6a82a 100644 ---- a/src/tabwidget.cpp -+++ b/src/tabwidget.cpp -@@ -829,7 +829,7 @@ QUrl TabWidget::guessUrlFromString(const QString &string) - - if (url.scheme() == QLatin1String("about") - && url.path() == QLatin1String("home")) -- url = QUrl(QLatin1String("qrc:/startpage.html")); -+ url = QUrl(QLatin1String("qrc:/demo/intro.html")); - - // QUrl::isValid() is too much tolerant. - // We actually want to check if the url conforms to the RFC, which QUrl::isValid() doesn't state. -diff --git a/src/webpage.cpp b/src/webpage.cpp -index 42daf7a..e2e7265 100644 ---- a/src/webpage.cpp -+++ b/src/webpage.cpp -@@ -211,7 +211,7 @@ void WebPage::addExternalBinding(QWebFrame *frame) - frame = qobject_cast(sender()); - - if (frame->url().scheme() == QLatin1String("qrc") -- && frame->url().path() == QLatin1String("/startpage.html")) { -+ && frame->url().path() == QLatin1String("/demo/intro.html")) { - - if (!m_javaScriptAroraObject) - m_javaScriptAroraObject = new JavaScriptAroraObject(this); diff --git a/repos/ports/src/app/arora/patches/series b/repos/ports/src/app/arora/patches/series deleted file mode 100644 index 46c0217a85..0000000000 --- a/repos/ports/src/app/arora/patches/series +++ /dev/null @@ -1,9 +0,0 @@ -arora_qt5_cpp.patch -arora_genode.patch -arora_nitpicker_plugin.patch -arora_move_window.patch -arora_disable_adblock.patch -arora_bookmarks.patch -arora_startpage.patch -arora_disable_ssl_messageboxes.patch -arora_disable_qprocess.patch diff --git a/repos/ports/src/app/arora/qwebplugins/nitpicker/nitpicker.pri b/repos/ports/src/app/arora/qwebplugins/nitpicker/nitpicker.pri deleted file mode 100644 index 3a707ac59c..0000000000 --- a/repos/ports/src/app/arora/qwebplugins/nitpicker/nitpicker.pri +++ /dev/null @@ -1,13 +0,0 @@ -INC_DIR += $(PRG_DIR)/qwebplugins/nitpicker -INC_DIR += $(call select_from_ports,arora)/src/app/arora/src/qwebplugins/nitpicker - -INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD - -HEADERS += \ - nitpickerpluginwidget.h \ - nitpickerplugin.h - -SOURCES += \ - nitpickerpluginwidget.cpp \ - nitpickerplugin.cpp diff --git a/repos/ports/src/app/arora/qwebplugins/nitpicker/nitpickerplugin.cpp b/repos/ports/src/app/arora/qwebplugins/nitpicker/nitpickerplugin.cpp deleted file mode 100644 index 7227303522..0000000000 --- a/repos/ports/src/app/arora/qwebplugins/nitpicker/nitpickerplugin.cpp +++ /dev/null @@ -1,76 +0,0 @@ -#include "nitpickerplugin.h" - -#include "nitpickerpluginwidget.h" - -#include - -NitpickerPlugin::NitpickerPlugin() - : m_loaded(false) - , m_enabled(false) -{ -} - -void NitpickerPlugin::load() -{ - if (m_loaded) - return; - m_loaded = true; - QSettings settings; - settings.beginGroup(QLatin1String("webplugin/nitpicker")); - settings.endGroup(); - settings.beginGroup(QLatin1String("websettings")); -// m_enabled = settings.value(QLatin1String("enableNitpicker"), false).toBool(); - m_enabled = true; -} - -void NitpickerPlugin::save() -{ -} - -QWidget *NitpickerPlugin::create(const QString &mimeType, const QUrl &url, - const QStringList &argumentNames, const QStringList &argumentValues) -{ - load(); - if (!m_enabled) - return 0; - Q_UNUSED(mimeType); - - QString args_string = argumentNames.indexOf("args") > 0 ? - argumentValues[argumentNames.indexOf("args")] : - QString(); - - QString max_width_string = argumentNames.indexOf("width") > 0 ? - argumentValues[argumentNames.indexOf("width")] : - QString("-1"); - int max_width = max_width_string.remove("px").toInt(); - - QString max_height_string = argumentNames.indexOf("height") > 0 ? - argumentValues[argumentNames.indexOf("height")] : - QString("-1"); - int max_height = max_height_string.remove("px").toInt(); - - NitpickerPluginWidget *m_widget = new NitpickerPluginWidget(this, url, args_string, max_width, max_height); - m_widget->url = url; - m_widget->argumentNames = argumentNames; - m_widget->argumentValues = argumentValues; - return m_widget; -} - -QWebPluginFactory::Plugin NitpickerPlugin::metaPlugin() -{ - QWebPluginFactory::Plugin plugin; - plugin.name = QLatin1String("NitpickerPlugin"); - QWebPluginFactory::MimeType mimeType; - mimeType.name = QLatin1String("application/x-genode-plugin"); - plugin.mimeTypes.append(mimeType); - return plugin; -} - -void NitpickerPlugin::configure() -{ -} - -bool NitpickerPlugin::isAnonymous() const -{ - return true; -} diff --git a/repos/ports/src/app/arora/qwebplugins/nitpicker/nitpickerplugin.h b/repos/ports/src/app/arora/qwebplugins/nitpicker/nitpickerplugin.h deleted file mode 100644 index f66c785062..0000000000 --- a/repos/ports/src/app/arora/qwebplugins/nitpicker/nitpickerplugin.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef NITPICKERPLUGIN_H -#define NITPICKERPLUGIN_H - -#include "arorawebplugin.h" - -class NitpickerPlugin : public AroraWebPlugin -{ - -public: - NitpickerPlugin(); - - QWebPluginFactory::Plugin metaPlugin(); - QWidget *create(const QString &mimeType, const QUrl &url, - const QStringList &argumentNames, const QStringList &argumentValues); - void configure(); - bool isAnonymous() const; - -private: - void load(); - void save(); - - bool m_loaded; - bool m_enabled; -}; - -#endif // NITPICKERPLUGIN_H - diff --git a/repos/ports/src/app/arora/qwebplugins/nitpicker/nitpickerpluginwidget.cpp b/repos/ports/src/app/arora/qwebplugins/nitpicker/nitpickerpluginwidget.cpp deleted file mode 100644 index b3942a5beb..0000000000 --- a/repos/ports/src/app/arora/qwebplugins/nitpicker/nitpickerpluginwidget.cpp +++ /dev/null @@ -1,80 +0,0 @@ -#include "nitpickerpluginwidget.h" - -#include -#include -#include -#include -#include - -#include - -NitpickerPluginWidget::NitpickerPluginWidget(NitpickerPlugin *plugin, QUrl plugin_url, QString &args, - int max_width, int max_height, QWidget *parent) - : QPluginWidget(parent, plugin_url, args, max_width, max_height) - , m_swapping(false) - , m_plugin(plugin) -{ -} - -void NitpickerPluginWidget::configure() -{ - m_plugin->configure(); -} - -void NitpickerPluginWidget::loadAll() -{ - load(true); -} - -void NitpickerPluginWidget::load(bool loadAll) -{ - QWidget *parent = parentWidget(); - QWebView *view = 0; - while (parent) { - if (QWebView *aView = qobject_cast(parent)) { - view = aView; - break; - } - parent = parent->parentWidget(); - } - if (!view) - return; - - const QString selector = QLatin1String("%1[type=\"application/x-genode-plugin\"]"); - const QString mime = QLatin1String("application/x-genode-plugin"); - - hide(); - m_swapping = true; - QList frames; - frames.append(view->page()->mainFrame()); - while (!frames.isEmpty()) { - QWebFrame *frame = frames.takeFirst(); - QWebElement docElement = frame->documentElement(); - - QWebElementCollection elements; - elements.append(docElement.findAll(selector.arg(QLatin1String("object")))); - elements.append(docElement.findAll(selector.arg(QLatin1String("embed")))); - - QWebElement element; - foreach (element, elements) { - if (!loadAll) { - if (!element.evaluateJavaScript(QLatin1String("this.swapping")).toBool()) - continue; - } - - QWebElement substitute = element.clone(); - substitute.setAttribute(QLatin1String("type"), mime); - element.replace(substitute); - } - - frames += frame->childFrames(); - } - m_swapping = false; -} - - -void NitpickerPluginWidget::deleteLater() -{ - cleanup(); - QObject::deleteLater(); -} diff --git a/repos/ports/src/app/arora/qwebplugins/nitpicker/nitpickerpluginwidget.h b/repos/ports/src/app/arora/qwebplugins/nitpicker/nitpickerpluginwidget.h deleted file mode 100644 index ec300c3381..0000000000 --- a/repos/ports/src/app/arora/qwebplugins/nitpicker/nitpickerpluginwidget.h +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef NITPICKERPLUGINWIDGET_H -#define NITPICKERPLUGINWIDGET_H - -#include - -#include "nitpickerplugin.h" - -#include - -#include - -class NitpickerPluginWidget : public QPluginWidget -{ - Q_OBJECT - Q_PROPERTY(bool swapping READ swapping) - -public: - NitpickerPluginWidget(NitpickerPlugin *plugin, QUrl plugin_url, QString &args, - int max_width, int max_height, QWidget *parent = 0); - QUrl url; - QStringList argumentNames; - QStringList argumentValues; - bool swapping() const { return m_swapping; } - -public slots: - void deleteLater(); - -private slots: - void configure(); - void loadAll(); - void load(bool loadAll = false); - -private: - bool m_swapping; - NitpickerPlugin *m_plugin; -}; - -#endif // NITPICKERPLUGINWIDGET_H - diff --git a/repos/ports/src/app/arora/target.mk b/repos/ports/src/app/arora/target.mk deleted file mode 100644 index b941aedafa..0000000000 --- a/repos/ports/src/app/arora/target.mk +++ /dev/null @@ -1,85 +0,0 @@ -ARORA = arora-0.11.0 - -QT_TMPL_DIR = $(call select_from_repositories,src/app/qt5/tmpl) - -ifneq ($(QT_TMPL_DIR),) -LIBS += qt5_printsupport qt5_qpluginwidget qt5_qgenodeviewwidget -else -REQUIRES += qt5 -endif - -include $(QT_TMPL_DIR)/target_defaults.inc - -HEADERS_FILTER_OUT = \ - adblockschemeaccesshandler.h \ - adblockrule.h \ - arorawebplugin.h \ - bookmarknode.h \ - clicktoflashplugin.h \ - networkcookiejar_p.h \ - nitpickerplugin.h \ - networkproxyfactory.h \ - opensearchenginedelegate.h \ - opensearchreader.h \ - opensearchwriter.h \ - schemeaccesshandler.h \ - twoleveldomains_p.h \ - trie_p.h \ - xbelreader.h \ - xbelwriter.h - -SRC_CC += arora_component.cc - -LIBS += libm - -RESOURCES += demo_html.qrc - -# -# Prevent contrib code from causing warnings with our tool chain -# -CC_WARN += -Wno-unused-but-set-variable - -vpath % $(PRG_DIR) -vpath % $(PRG_DIR)/adblock -vpath % $(PRG_DIR)/bookmarks -vpath % $(PRG_DIR)/bookmarks/xbel -vpath % $(PRG_DIR)/network -vpath % $(PRG_DIR)/network/cookiejar -vpath % $(PRG_DIR)/network/cookiejar/networkcookiejar -vpath % $(PRG_DIR)/data -vpath % $(PRG_DIR)/data/graphics -vpath % $(PRG_DIR)/data/searchengines -vpath % $(PRG_DIR)/history -vpath % $(PRG_DIR)/htmls -vpath % $(PRG_DIR)/locationbar -vpath % $(PRG_DIR)/opensearch -vpath % $(PRG_DIR)/qwebplugins -vpath % $(PRG_DIR)/qwebplugins/clicktoflash -vpath % $(PRG_DIR)/qwebplugins/nitpicker -vpath % $(PRG_DIR)/useragent -vpath % $(PRG_DIR)/utils - -ARORA_PORT_DIR := $(call select_from_ports,arora) -vpath % $(ARORA_PORT_DIR)/src/app/arora/src -vpath % $(ARORA_PORT_DIR)/src/app/arora/src/adblock -vpath % $(ARORA_PORT_DIR)/src/app/arora/src/bookmarks -vpath % $(ARORA_PORT_DIR)/src/app/arora/src/bookmarks/xbel -vpath % $(ARORA_PORT_DIR)/src/app/arora/src/network -vpath % $(ARORA_PORT_DIR)/src/app/arora/src/network/cookiejar -vpath % $(ARORA_PORT_DIR)/src/app/arora/src/network/cookiejar/networkcookiejar -vpath % $(ARORA_PORT_DIR)/src/app/arora/src/data -vpath % $(ARORA_PORT_DIR)/src/app/arora/src/data/graphics -vpath % $(ARORA_PORT_DIR)/src/app/arora/src/data/searchengines -vpath % $(ARORA_PORT_DIR)/src/app/arora/src/history -vpath % $(ARORA_PORT_DIR)/src/app/arora/src/htmls -vpath % $(ARORA_PORT_DIR)/src/app/arora/src/locationbar -vpath % $(ARORA_PORT_DIR)/src/app/arora/src/opensearch -vpath % $(ARORA_PORT_DIR)/src/app/arora/src/qwebplugins -vpath % $(ARORA_PORT_DIR)/src/app/arora/src/qwebplugins/clicktoflash -vpath % $(ARORA_PORT_DIR)/src/app/arora/src/qwebplugins/nitpicker -vpath % $(ARORA_PORT_DIR)/src/app/arora/src/useragent -vpath % $(ARORA_PORT_DIR)/src/app/arora/src/utils - -include $(QT_TMPL_DIR)/target_final.inc - -CC_CXX_WARN_STRICT = diff --git a/tool/tool_chain_qt5 b/tool/tool_chain_qt5 index a2af8a01bd..70a87ff9c0 100755 --- a/tool/tool_chain_qt5 +++ b/tool/tool_chain_qt5 @@ -38,7 +38,7 @@ GENODE_DIR ?= $(realpath $(dir $(firstword $(MAKEFILE_LIST)))/..) CONTRIB_DIR = $(shell $(GENODE_DIR)/tool/ports/current qt5-host) QTBASE_DIR = $(CONTRIB_DIR)/src/lib/qtbase QTTOOLS_DIR = $(CONTRIB_DIR)/src/lib/qttools -TOOL_VERSION = 19.08 +TOOL_VERSION = 20.08 BUILD_DIR = $(GENODE_DIR)/build/tool/qt5/$(TOOL_VERSION) DEFAULT_INSTALL_LOCATION = /usr/local/genode/qt5/$(TOOL_VERSION) INSTALL_LOCATION ?= $(DEFAULT_INSTALL_LOCATION) @@ -49,9 +49,18 @@ $(QTBASE_DIR)/configure: QMAKE = $(BUILD_DIR)/qtbase/bin/qmake +# the '-no-strip' option is needed for installing syncqt.pl + $(QMAKE): $(QTBASE_DIR)/configure $(VERBOSE)mkdir -p $(BUILD_DIR)/qtbase - $(VERBOSE)cd $(BUILD_DIR)/qtbase && $(QTBASE_DIR)/configure -opensource -confirm-license -no-iconv -no-zstd -no-opengl -prefix $(INSTALL_LOCATION) + $(VERBOSE)cd $(BUILD_DIR)/qtbase && $(QTBASE_DIR)/configure \ + -opensource \ + -confirm-license \ + -no-iconv \ + -no-zstd \ + -no-opengl \ + -no-strip \ + -prefix $(INSTALL_LOCATION) $(BUILD_DIR)/qtbase/src/Makefile: $(QMAKE) $(VERBOSE)cd $(BUILD_DIR)/qtbase/src && \ @@ -59,36 +68,29 @@ $(BUILD_DIR)/qtbase/src/Makefile: $(QMAKE) $(QTBASE_DIR)/src/src.pro -qtconf $(BUILD_DIR)/qtbase/bin/qt.conf -- -opensource $(BUILD_DIR)/qtbase/bin/moc: $(BUILD_DIR)/qtbase/src/Makefile - $(VERBOSE)cd $(BUILD_DIR)/qtbase/src && \ - make -j$(MAKE_JOBS) sub-moc + $(VERBOSE)make -C $(BUILD_DIR)/qtbase/src -j$(MAKE_JOBS) sub-moc $(BUILD_DIR)/qtbase/bin/rcc: $(BUILD_DIR)/qtbase/src/Makefile - $(VERBOSE)cd $(BUILD_DIR)/qtbase/src && \ - make -j$(MAKE_JOBS) sub-rcc + $(VERBOSE)make -C $(BUILD_DIR)/qtbase/src -j$(MAKE_JOBS) sub-rcc $(BUILD_DIR)/qtbase/bin/uic: $(BUILD_DIR)/qtbase/src/Makefile - $(VERBOSE)cd $(BUILD_DIR)/qtbase/src && \ - make -j$(MAKE_JOBS) sub-uic + $(VERBOSE)make -C $(BUILD_DIR)/qtbase/src -j$(MAKE_JOBS) sub-uic $(BUILD_DIR)/qtbase/bin/qlalr: $(BUILD_DIR)/qtbase/src/Makefile - $(VERBOSE)cd $(BUILD_DIR)/qtbase/src && \ - make -j$(MAKE_JOBS) sub-qlalr + $(VERBOSE)make -C $(BUILD_DIR)/qtbase/src -j$(MAKE_JOBS) sub-qlalr $(BUILD_DIR)/qtbase/bin/qfloat16-tables: $(BUILD_DIR)/qtbase/src/Makefile - $(VERBOSE)cd $(BUILD_DIR)/qtbase/src && \ - make -j$(MAKE_JOBS) sub-qfloat16-tables + $(VERBOSE)make -C $(BUILD_DIR)/qtbase/src -j$(MAKE_JOBS) sub-qfloat16-tables -$(BUILD_DIR)/qtbase/lib/libQt5Xml.so: $(BUILD_DIR)/qtbase/src/Makefile - $(VERBOSE)cd $(BUILD_DIR)/qtbase/src && \ - make -j$(MAKE_JOBS) sub-xml +$(BUILD_DIR)/qtbase/lib/libQt5Xml.so.5: $(BUILD_DIR)/qtbase/src/Makefile + $(VERBOSE)make -C $(BUILD_DIR)/qtbase/src -j$(MAKE_JOBS) sub-xml -$(BUILD_DIR)/qttools/Makefile: $(QTTOOLS_DIR)/qttools.pro +$(BUILD_DIR)/qttools/Makefile: $(QTTOOLS_DIR)/qttools.pro $(BUILD_DIR)/qtbase/lib/libQt5Xml.so.5 $(VERBOSE)mkdir -p $(dir $@) $(VERBOSE)cd $(dir $@) && $(BUILD_DIR)/qtbase/bin/qmake $< $(BUILD_DIR)/qttools/src/linguist/lupdate/Makefile: $(QTTOOLS_DIR)/src/linguist/lupdate/lupdate.pro \ - $(BUILD_DIR)/qttools/Makefile \ - $(BUILD_DIR)/qtbase/lib/libQt5Xml.so + $(BUILD_DIR)/qttools/Makefile $(VERBOSE)mkdir -p $(dir $@) $(VERBOSE)cd $(dir $@) && $(BUILD_DIR)/qtbase/bin/qmake $< @@ -96,8 +98,7 @@ $(BUILD_DIR)/qttools/bin/lupdate: $(BUILD_DIR)/qttools/src/linguist/lupdate/Make $(VERBOSE)make -C $(dir $<) -j$(MAKE_JOBS) $(BUILD_DIR)/qttools/src/linguist/lrelease/Makefile: $(QTTOOLS_DIR)/src/linguist/lrelease/lrelease.pro \ - $(BUILD_DIR)/qttools/Makefile \ - $(BUILD_DIR)/qtbase/lib/libQt5Xml.so + $(BUILD_DIR)/qttools/Makefile $(VERBOSE)mkdir -p $(dir $@) $(VERBOSE)cd $(dir $@) && $(BUILD_DIR)/qtbase/bin/qmake $< @@ -112,40 +113,56 @@ build: $(BUILD_DIR)/qtbase/bin/moc \ $(BUILD_DIR)/qttools/bin/lupdate \ $(BUILD_DIR)/qttools/bin/lrelease -$(INSTALL_LOCATION)/bin/moc: $(BUILD_DIR)/qtbase/bin/moc +$(INSTALL_LOCATION)/bin: + $(VERBOSE)$(SUDO) mkdir -p $@ + +$(INSTALL_LOCATION)/lib: + $(VERBOSE)$(SUDO) mkdir -p $@ + +$(INSTALL_LOCATION)/lib/libQt5Core.so.5: $(BUILD_DIR)/qtbase/lib/libQt5Core.so.5 $(INSTALL_LOCATION)/lib + $(VERBOSE)$(SUDO) strip $< -o $@ + +$(INSTALL_LOCATION)/lib/libQt5Xml.so.5: $(BUILD_DIR)/qtbase/lib/libQt5Xml.so.5 + $(VERBOSE)$(SUDO) strip $< -o $@ + +$(INSTALL_LOCATION)/bin/moc: $(BUILD_DIR)/qtbase/bin/moc $(INSTALL_LOCATION)/bin $(VERBOSE)cd $(BUILD_DIR)/qtbase/src && \ - $(SUDO) make sub-moc-install_subtargets + $(SUDO) strip $< -o $@ -$(INSTALL_LOCATION)/bin/rcc: $(BUILD_DIR)/qtbase/bin/rcc +$(INSTALL_LOCATION)/bin/rcc: $(BUILD_DIR)/qtbase/bin/rcc $(INSTALL_LOCATION)/bin $(VERBOSE)cd $(BUILD_DIR)/qtbase/src && \ - $(SUDO) make sub-rcc-install_subtargets + $(SUDO) strip $< -o $@ -$(INSTALL_LOCATION)/bin/uic: $(BUILD_DIR)/qtbase/bin/uic +$(INSTALL_LOCATION)/bin/uic: $(BUILD_DIR)/qtbase/bin/uic $(INSTALL_LOCATION)/bin $(INSTALL_LOCATION)/lib/libQt5Core.so.5 $(VERBOSE)cd $(BUILD_DIR)/qtbase/src && \ - $(SUDO) make sub-uic-install_subtargets + $(SUDO) strip $< -o $@ -$(INSTALL_LOCATION)/bin/qlalr: $(BUILD_DIR)/qtbase/bin/qlalr +$(INSTALL_LOCATION)/bin/qlalr: $(BUILD_DIR)/qtbase/bin/qlalr $(INSTALL_LOCATION)/bin $(INSTALL_LOCATION)/lib/libQt5Core.so.5 $(VERBOSE)cd $(BUILD_DIR)/qtbase/src && \ - $(SUDO) make sub-qlalr-install_subtargets + $(SUDO) strip $< -o $@ -$(INSTALL_LOCATION)/bin/qfloat16-tables: $(BUILD_DIR)/qtbase/bin/qfloat16-tables - $(VERBOSE)$(SUDO) cp $< $@ +$(INSTALL_LOCATION)/bin/qfloat16-tables: $(BUILD_DIR)/qtbase/bin/qfloat16-tables $(INSTALL_LOCATION)/bin + $(VERBOSE)$(SUDO) strip $< -o $@ -$(INSTALL_LOCATION)/lib/libQt5Xml.so: $(BUILD_DIR)/qtbase/lib/libQt5Xml.so - $(VERBOSE)cd $(BUILD_DIR)/qtbase/src && \ - $(SUDO) make sub-xml-install_subtargets +$(INSTALL_LOCATION)/bin/qmake: $(BUILD_DIR)/qtbase/bin/qmake $(INSTALL_LOCATION)/bin + $(VERBOSE)$(SUDO) strip $< -o $@ -$(INSTALL_LOCATION)/bin/lupdate: $(BUILD_DIR)/qttools/bin/lupdate $(INSTALL_LOCATION)/lib/libQt5Xml.so - $(VERBOSE)$(SUDO) cp $< $@ +$(INSTALL_LOCATION)/bin/syncqt.pl: $(INSTALL_LOCATION)/bin + $(VERBOSE)$(SUDO) make -C $(BUILD_DIR)/qtbase install_syncqt -$(INSTALL_LOCATION)/bin/lrelease: $(BUILD_DIR)/qttools/bin/lrelease $(INSTALL_LOCATION)/lib/libQt5Xml.so - $(VERBOSE)$(SUDO) cp $< $@ +$(INSTALL_LOCATION)/bin/lupdate: $(BUILD_DIR)/qttools/bin/lupdate $(INSTALL_LOCATION)/bin $(INSTALL_LOCATION)/lib/libQt5Core.so.5 $(INSTALL_LOCATION)/lib/libQt5Xml.so.5 + $(VERBOSE)$(SUDO) strip $< -o $@ + +$(INSTALL_LOCATION)/bin/lrelease: $(BUILD_DIR)/qttools/bin/lrelease $(INSTALL_LOCATION)/bin $(INSTALL_LOCATION)/lib/libQt5Core.so.5 $(INSTALL_LOCATION)/lib/libQt5Xml.so.5 + $(VERBOSE)$(SUDO) strip $< -o $@ install: $(INSTALL_LOCATION)/bin/moc \ $(INSTALL_LOCATION)/bin/rcc \ $(INSTALL_LOCATION)/bin/uic \ $(INSTALL_LOCATION)/bin/qlalr \ $(INSTALL_LOCATION)/bin/qfloat16-tables \ + $(INSTALL_LOCATION)/bin/qmake \ + $(INSTALL_LOCATION)/bin/syncqt.pl \ $(INSTALL_LOCATION)/bin/lupdate \ $(INSTALL_LOCATION)/bin/lrelease ifeq ($(INSTALL_LOCATION),$(DEFAULT_INSTALL_LOCATION))