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 8fcf20b749..0000000000 Binary files a/repos/ports/src/app/arora/demo/bg.png and /dev/null differ 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 99217f1508..0000000000 Binary files a/repos/ports/src/app/arora/demo/bg_content.png and /dev/null differ diff --git a/repos/ports/src/app/arora/demo/bg_top.png b/repos/ports/src/app/arora/demo/bg_top.png deleted file mode 100644 index fe5342562a..0000000000 Binary files a/repos/ports/src/app/arora/demo/bg_top.png and /dev/null differ diff --git a/repos/ports/src/app/arora/demo/busybox.html b/repos/ports/src/app/arora/demo/busybox.html deleted file mode 100644 index e75be83782..0000000000 --- a/repos/ports/src/app/arora/demo/busybox.html +++ /dev/null @@ -1,70 +0,0 @@ -Genode 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 cdc4d481ff..0000000000 Binary files a/repos/ports/src/app/arora/demo/http_block.png and /dev/null differ diff --git a/repos/ports/src/app/arora/demo/intro.html b/repos/ports/src/app/arora/demo/intro.html deleted file mode 100644 index 164e7eacce..0000000000 --- a/repos/ports/src/app/arora/demo/intro.html +++ /dev/null @@ -1,81 +0,0 @@ -Genode 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 885a24b84f..0000000000 Binary files a/repos/ports/src/app/arora/demo/nitpicker_plugin.png and /dev/null differ diff --git a/repos/ports/src/app/arora/demo/nitpicker_plugin/config.plugin b/repos/ports/src/app/arora/demo/nitpicker_plugin/config.plugin deleted file mode 100644 index 55591ccd50..0000000000 --- a/repos/ports/src/app/arora/demo/nitpicker_plugin/config.plugin +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 00049db95c..0000000000 Binary files a/repos/ports/src/app/arora/demo/title_bg.png and /dev/null differ 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))