diff --git a/repos/gems/run/mixer_gui_qt_test.run b/repos/gems/run/mixer_gui_qt_test.run index f82c50b97c..997b9556f2 100644 --- a/repos/gems/run/mixer_gui_qt_test.run +++ b/repos/gems/run/mixer_gui_qt_test.run @@ -243,7 +243,6 @@ set boot_modules { qt5_core.lib.so freetype.lib.so gallium.lib.so - icu.lib.so libc_pipe.lib.so libm.lib.so libpng.lib.so diff --git a/repos/gems/src/app/mixer_gui_qt/main.cpp b/repos/gems/src/app/mixer_gui_qt/main.cpp index 0b7226fd11..17a462f5f9 100644 --- a/repos/gems/src/app/mixer_gui_qt/main.cpp +++ b/repos/gems/src/app/mixer_gui_qt/main.cpp @@ -8,6 +8,7 @@ #include #include #include +#include /* Qt includes */ #include @@ -21,11 +22,11 @@ enum { THREAD_STACK_SIZE = 2 * 1024 * sizeof(long) }; -struct Report_thread : Genode::Thread_deprecated +struct Report_thread : Genode::Thread { QMember proxy; - Genode::Attached_rom_dataspace channels_rom { "channel_list" }; + Genode::Attached_rom_dataspace channels_rom; Genode::Signal_receiver sig_rec; Genode::Signal_dispatcher channels_dispatcher; @@ -49,9 +50,10 @@ struct Report_thread : Genode::Thread_deprecated _report(channels_rom.local_addr(), channels_rom.size()); } - Report_thread() + Report_thread(Genode::Env &env) : - Genode::Thread_deprecated("report_thread"), + Genode::Thread(env, "report_thread", THREAD_STACK_SIZE), + channels_rom(env, "channel_list"), channels_dispatcher(sig_rec, *this, &Report_thread::_handle_channels) { channels_rom.sigh(channels_dispatcher); @@ -92,22 +94,27 @@ static inline void load_stylesheet() } +extern void initialize_qt_core(Genode::Env &); +extern void initialize_qt_gui(Genode::Env &); + void Libc::Component::construct(Libc::Env &env) { Libc::with_libc([&] { - initialize_qpa_plugin(env); + + initialize_qt_core(env); + initialize_qt_gui(env); int argc = 1; char const *argv[] = { "mixer_gui_qt", 0 }; Report_thread *report_thread; - try { report_thread = new Report_thread(); } + try { report_thread = new Report_thread(env); } catch (...) { Genode::error("Could not create Report_thread"); return -1; } - QApplication app(argc, argv); + QApplication app(argc, (char**)argv); load_stylesheet(); @@ -120,5 +127,5 @@ void Libc::Component::construct(Libc::Env &env) app.connect(&app, SIGNAL(lastWindowClosed()), SLOT(quit())); exit(app.exec()); - } + }); } diff --git a/repos/gems/src/app/mixer_gui_qt/main_window.cpp b/repos/gems/src/app/mixer_gui_qt/main_window.cpp index 6419c580cb..c939eb830a 100644 --- a/repos/gems/src/app/mixer_gui_qt/main_window.cpp +++ b/repos/gems/src/app/mixer_gui_qt/main_window.cpp @@ -148,7 +148,6 @@ class Client_widget : public Compound_widget, private: Genode::List _list; - Genode::Allocator &_alloc; Channel::Label _label; QLabel _name; @@ -170,9 +169,9 @@ class Client_widget : public Compound_widget, public: - Client_widget(Genode::Allocator &alloc, Channel::Label const &label) + Client_widget(Channel::Label const &label) : - _alloc(alloc), _label(label), + _label(label), _name(_strip_label(_label)) { setFrameStyle(QFrame::Panel | QFrame::Raised); @@ -193,7 +192,7 @@ class Client_widget : public Compound_widget, disconnect(ch, SIGNAL(channel_changed())); _hlayout.removeWidget(ch); _list.remove(ch); - Genode::destroy(&_alloc, ch); + delete ch; } } @@ -210,7 +209,7 @@ class Client_widget : public Compound_widget, Channel_widget* add_channel(Channel::Type const type, Channel::Number const number) { - Channel_widget *ch = new (&_alloc) Channel_widget(type, number); + Channel_widget *ch = new Channel_widget(type, number); connect(ch, SIGNAL(channel_changed()), this, SIGNAL(client_changed())); @@ -247,13 +246,12 @@ class Client_widget_registry : public QObject private: Genode::List _list; - Genode::Allocator &_alloc; void _remove_destroy(Client_widget *c) { disconnect(c, SIGNAL(client_changed())); _list.remove(c); - Genode::destroy(&_alloc, c); + delete c; } Q_SIGNALS: @@ -262,7 +260,7 @@ class Client_widget_registry : public QObject public: - Client_widget_registry(Genode::Allocator &alloc) : QObject(), _alloc(alloc) { } + Client_widget_registry() : QObject() { } Client_widget* first() { return _list.first(); } @@ -279,7 +277,7 @@ class Client_widget_registry : public QObject { Client_widget *c = lookup(label); if (c == nullptr) { - c = new (&_alloc) Client_widget(_alloc, label); + c = new Client_widget(label); connect(c, SIGNAL(client_changed()), this, SIGNAL(registry_changed())); _list.insert(c); @@ -303,7 +301,7 @@ class Client_widget_registry : public QObject static Client_widget_registry *client_registry() { - static Client_widget_registry inst(*Genode::env()->heap()); + static Client_widget_registry inst; return &inst; } @@ -433,7 +431,7 @@ void Main_window::report_changed(void *l, void const *p) } -Main_window::Main_window(Libc::Env &env) +Main_window::Main_window(Genode::Env &env) : _default_out_volume(0), _default_volume(0), diff --git a/repos/gems/src/app/mixer_gui_qt/main_window.h b/repos/gems/src/app/mixer_gui_qt/main_window.h index 093a49de62..2c712bbff9 100644 --- a/repos/gems/src/app/mixer_gui_qt/main_window.h +++ b/repos/gems/src/app/mixer_gui_qt/main_window.h @@ -15,6 +15,7 @@ #define _MAIN_WINDOW_H_ /* Genode includes */ +#include #include #include #include @@ -68,7 +69,7 @@ class Main_window : public Compound_widget public: - Main_window(); + Main_window(Genode::Env &); ~Main_window(); }; diff --git a/repos/libports/include/qt5/genode/thread_qt.h b/repos/libports/include/qt5/genode/thread_qt.h deleted file mode 100644 index e29b0108c6..0000000000 --- a/repos/libports/include/qt5/genode/thread_qt.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * \brief Thread with preconfigured stack size - * \author Christian Prochaska - * \date 2008-06-11 - */ - -/* - * Copyright (C) 2008-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 _INCLUDE__BASE__THREAD_QT_H_ -#define _INCLUDE__BASE__THREAD_QT_H_ - -#include - -enum { DEFAULT_STACK_SIZE = 4096*100 }; - -namespace Genode { - - class Thread_qt : public Thread_deprecated - { - public: - - explicit Thread_qt(const char *name = "Qt ") - : Thread_deprecated(name) { } - }; -} - -#endif /* _INCLUDE__BASE__THREAD_QT_H_ */ diff --git a/repos/libports/lib/import/import-qt5.inc b/repos/libports/lib/import/import-qt5.inc index f16db2aac7..16d4d0f1e4 100644 --- a/repos/libports/lib/import/import-qt5.inc +++ b/repos/libports/lib/import/import-qt5.inc @@ -18,12 +18,9 @@ include $(QT5_REP_DIR)/lib/mk/qt5_version.inc QT5_PORT_DIR := $(call select_from_ports,qt5) QT5_CONTRIB_DIR := $(QT5_PORT_DIR)/src/lib/qt5/$(QT5) -QT5_INC_DIR := $(QT5_REP_DIR)/src/lib/qt5/qtbase/src/corelib/global \ - $(QT5_CONTRIB_DIR)/qtbase/src/corelib/global \ - $(QT5_REP_DIR)/include/qt5 \ - $(QT5_REP_DIR)/include/qt5/qtbase \ +QT5_INC_DIR := $(QT5_REP_DIR)/include/qt5 \ $(QT5_CONTRIB_DIR)/qtbase/include \ - $(QT5_CONTRIB_DIR)/qtbase/mkspecs/genode-g++ \ + $(QT5_CONTRIB_DIR)/qtbase/mkspecs/genode-g++ INC_DIR += $(QT5_INC_DIR) @@ -32,21 +29,6 @@ QT_DEFINES += -DQT_STATICPLUGIN QT_DEFINES += -D__GENODE__ -# -# Prevent inclusion of non-existent 'features.h' from 'bits/os_defines.h' -# header that comes with the Codesourcery ARM tool chain. -# -QT_DEFINES += -D_GLIBCXX_OS_DEFINES - -# -# When using the Codesourcery tool chain for ARM, the compiler provides a -# built-in definition for '__linux__', which is obviously wrong when using the -# compiler for Genode. Unfortunately, Webkit tests for this definition in -# 'JavaScriptCore/wtf/Platform.h'. To prevent webkit from drawing wrong -# conclusions, we explicitly undefine '__linux__'. -# -QT_DEFINES += -U__linux__ - CC_OPT += $(QT_DEFINES) SOURCES_FILTERED = $(filter-out $(SOURCES_FILTER_OUT), $(SOURCES)) @@ -93,15 +75,15 @@ ui_%.h: %.ui $(UIC) # 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 stdlib snippet. +# 'LIBS' variable. Hence, we also need to manually import the stdcxx snippet. # -LIBS += stdcxx gallium +LIBS += stdcxx include $(call select_from_repositories,lib/import/import-stdcxx.mk) -include $(call select_from_repositories,lib/import/import-gallium.mk) # custom main() thread stack size support via main() wrapper ifeq ($(findstring -DQT_MAIN_STACK_SIZE, $(CC_CXX_OPT)), -DQT_MAIN_STACK_SIZE) diff --git a/repos/libports/lib/import/import-qt5_gui.mk b/repos/libports/lib/import/import-qt5_gui.mk index 0dd7858c3e..fe82ac2a4b 100644 --- a/repos/libports/lib/import/import-qt5_gui.mk +++ b/repos/libports/lib/import/import-qt5_gui.mk @@ -2,4 +2,14 @@ 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 also need to manually import the stdcxx snippet. +# +LIBS += gallium +include $(call select_from_repositories,lib/import/import-gallium.mk) + QT5_INC_DIR += $(QT5_CONTRIB_DIR)/qtbase/include/QtGui diff --git a/repos/libports/lib/import/import-qt5_qjpeg.mk b/repos/libports/lib/import/import-qt5_qjpeg.mk new file mode 100644 index 0000000000..5602c0bec7 --- /dev/null +++ b/repos/libports/lib/import/import-qt5_qjpeg.mk @@ -0,0 +1,3 @@ +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_scriptclassic.mk b/repos/libports/lib/import/import-qt5_scriptclassic.mk index 648476552a..cec29a3826 100644 --- a/repos/libports/lib/import/import-qt5_scriptclassic.mk +++ b/repos/libports/lib/import/import-qt5_scriptclassic.mk @@ -5,3 +5,5 @@ include $(IMPORT_QT5_INC) QT5_INC_DIR += $(QT5_PORT_DIR)/src/lib/qt5/qtscriptclassic-1.0_1-opensource/include \ $(QT5_PORT_DIR)/src/lib/qt5/qtscriptclassic-1.0_1-opensource/include/QtScript \ $(QT5_PORT_DIR)/src/lib/qt5/qtscriptclassic-1.0_1-opensource/src \ + +QT_DEFINES += -DQ_SCRIPT_EXPORT= diff --git a/repos/libports/lib/mk/qt5_angle_generated.inc b/repos/libports/lib/mk/qt5_angle_generated.inc index 639fb68e2e..f3a3c6e55c 100644 --- a/repos/libports/lib/mk/qt5_angle_generated.inc +++ b/repos/libports/lib/mk/qt5_angle_generated.inc @@ -1,4 +1,4 @@ -QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -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_QTQUICK=1 -DHAVE_QTPRINTSUPPORT=1 -DHAVE_QSTYLE=1 -DHAVE_QTTESTLIB=1 -DWTF_USE_LIBJPEG=1 -DWTF_USE_LIBPNG=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 -DQT_NO_DEBUG +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_QTQUICK=1 -DHAVE_QTPRINTSUPPORT=1 -DHAVE_QSTYLE=1 -DHAVE_QTTESTLIB=1 -DWTF_USE_LIBJPEG=1 -DWTF_USE_LIBPNG=1 -DHAVE_XRENDER=1 -DHAVE_GLX=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 \ diff --git a/repos/libports/lib/mk/qt5_core.mk b/repos/libports/lib/mk/qt5_core.mk index 370202f5e8..59d5ca07a2 100644 --- a/repos/libports/lib/mk/qt5_core.mk +++ b/repos/libports/lib/mk/qt5_core.mk @@ -13,11 +13,14 @@ QT_SOURCES += qthread_genode.cpp # remove unsupported UNIX-specific files QT_SOURCES_FILTER_OUT = \ forkfd_qt.cpp \ - qprocess_unix.cpp \ + moc_qfilesystemwatcher_inotify_p.cpp \ + qfilesystemwatcher_inotify.cpp \ qthread_unix.cpp # remove unneeded files to prevent moc warnings COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT = \ + moc_qobjectdefs.cpp \ + moc_qprocess.cpp \ moc_qsharedmemory.cpp include $(REP_DIR)/lib/mk/qt5.inc @@ -32,4 +35,4 @@ INC_DIR += $(REP_DIR)/include/qt5/qtbase/QtCore/private \ $(QT5_CONTRIB_DIR)/qtbase/include/QtCore/$(QT_VERSION)/QtCore \ $(QT5_CONTRIB_DIR)/qtbase/include/QtCore/$(QT_VERSION)/QtCore/private -LIBS += qt5_host_tools pcre16 zlib icu libc libm alarm libc_pipe pthread +LIBS += qt5_host_tools zlib pcre16 libc libm libc_pipe pthread diff --git a/repos/libports/lib/mk/qt5_core_generated.inc b/repos/libports/lib/mk/qt5_core_generated.inc index f2d2240063..aba29c1f4d 100644 --- a/repos/libports/lib/mk/qt5_core_generated.inc +++ b/repos/libports/lib/mk/qt5_core_generated.inc @@ -1,8 +1,7 @@ -QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_USING_NAMESPACE -DQT_NO_FOREACH -DQT_USE_ICU -DQT_HAVE_POLL -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 -DQT_NO_DEBUG +QT_DEFINES += -DQT_NO_USING_NAMESPACE -DQT_NO_FOREACH -DQT_HAVE_POLL -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 QT_INCPATH += \ qtbase/src/corelib \ - qtbase/src/3rdparty/pcre \ qtbase/src/3rdparty/harfbuzz/src \ qtbase/src/3rdparty/md5 \ qtbase/src/3rdparty/md4 \ @@ -12,8 +11,9 @@ QT_INCPATH += \ qtbase/src/3rdparty/forkfd \ qtbase/include \ qtbase/include/QtCore \ - qtbase/include/QtCore/5.7.1 \ - qtbase/include/QtCore/5.7.1/QtCore \ + qtbase/include/QtCore/5.8.0 \ + qtbase/include/QtCore/5.8.0/QtCore \ + qtbase/src/3rdparty/pcre \ qtbase/mkspecs/genode-g++ QT_SOURCES += \ @@ -53,13 +53,10 @@ QT_SOURCES += \ qbytearraylist.cpp \ qbytearraymatcher.cpp \ qcollator.cpp \ - qcommandlineoption.cpp \ - qcommandlineparser.cpp \ qcryptographichash.cpp \ qdatetime.cpp \ qdatetimeparser.cpp \ qeasingcurve.cpp \ - qelapsedtimer.cpp \ qfreelist.cpp \ qhash.cpp \ qline.cpp \ @@ -85,19 +82,18 @@ QT_SOURCES += \ qstringlist.cpp \ qtextboundaryfinder.cpp \ qtimeline.cpp \ - qtimezone.cpp \ - qtimezoneprivate.cpp \ qunicodetools.cpp \ qvector.cpp \ qvsnprintf.cpp \ qversionnumber.cpp \ - qelapsedtimer_unix.cpp \ qlocale_unix.cpp \ + qcollator_posix.cpp \ + qtimezone.cpp \ + qtimezoneprivate.cpp \ qtimezoneprivate_tz.cpp \ - qlocale_icu.cpp \ - qcollator_icu.cpp \ - qtimezoneprivate_icu.cpp \ qregularexpression.cpp \ + qcommandlineoption.cpp \ + qcommandlineparser.cpp \ harfbuzz-buffer.c \ harfbuzz-gdef.c \ harfbuzz-gsub.c \ @@ -160,7 +156,8 @@ QT_SOURCES += \ qfilesystemiterator_unix.cpp \ forkfd_qt.cpp \ qstandardpaths_unix.cpp \ - qstorageinfo_unix.cpp \ + qstorageinfo_stub.cpp \ + qfilesystemwatcher_inotify.cpp \ qabstractitemmodel.cpp \ qabstractproxymodel.cpp \ qitemselectionmodel.cpp \ @@ -185,6 +182,8 @@ QT_SOURCES += \ qabstracteventdispatcher.cpp \ qabstractnativeeventfilter.cpp \ qbasictimer.cpp \ + qdeadlinetimer.cpp \ + qelapsedtimer.cpp \ qeventloop.cpp \ qcoreapplication.cpp \ qcoreevent.cpp \ @@ -206,9 +205,9 @@ QT_SOURCES += \ qmath.cpp \ qsystemerror.cpp \ qcore_unix.cpp \ - qcrashhandler.cpp \ qeventdispatcher_unix.cpp \ qtimerinfo_unix.cpp \ + qelapsedtimer_unix.cpp \ qsharedmemory_posix.cpp \ qsharedmemory_systemv.cpp \ qsharedmemory_unix.cpp \ @@ -221,7 +220,13 @@ QT_SOURCES += \ qtextcodec.cpp \ qtsciicodec.cpp \ qutfcodec.cpp \ - qicucodec.cpp \ + qgb18030codec.cpp \ + qjpunicode.cpp \ + qeucjpcodec.cpp \ + qjiscodec.cpp \ + qsjiscodec.cpp \ + qeuckrcodec.cpp \ + qbig5codec.cpp \ qstatemachine.cpp \ qabstractstate.cpp \ qstate.cpp \ @@ -239,12 +244,14 @@ QT_SOURCES += \ qmimeprovider.cpp \ qxmlstream.cpp \ qxmlutils.cpp \ + qstring_compat.cpp \ qrc_mimetypes.cpp \ moc_qabstractanimation_p.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 \ @@ -255,9 +262,11 @@ QT_SOURCES += \ moc_qtextstream_p.cpp \ moc_qtemporaryfile.cpp \ moc_qsavefile.cpp \ + moc_qstandardpaths.cpp \ moc_qsettings.cpp \ moc_qfilesystemwatcher_p.cpp \ moc_qfilesystemwatcher_polling_p.cpp \ + moc_qfilesystemwatcher_inotify_p.cpp \ moc_qabstractitemmodel.cpp \ moc_qstringlistmodel.cpp \ moc_qpluginloader.cpp \ @@ -268,6 +277,7 @@ QT_SOURCES += \ moc_qcoreapplication.cpp \ moc_qcoreevent.cpp \ moc_qmimedata.cpp \ + moc_qobjectdefs.cpp \ moc_qsocketnotifier.cpp \ moc_qtimer.cpp \ moc_qtranslator.cpp \ @@ -319,6 +329,7 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ moc_qthread.cpp \ moc_qthreadpool.cpp \ moc_qfuturewatcher.cpp \ + moc_qcryptographichash.cpp \ moc_qeasingcurve.cpp \ moc_qlocale.cpp \ moc_qtimeline.cpp \ @@ -331,11 +342,13 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ moc_qtextstream_p.cpp \ moc_qtemporaryfile.cpp \ moc_qsavefile.cpp \ + moc_qstandardpaths.cpp \ moc_qsettings.cpp \ moc_qfilesystemwatcher.cpp \ moc_qfilesystemwatcher_p.cpp \ moc_qfilesystemwatcher_polling_p.cpp \ moc_qfileselector.cpp \ + moc_qfilesystemwatcher_inotify_p.cpp \ moc_qabstractitemmodel.cpp \ moc_qabstractproxymodel.cpp \ moc_qitemselectionmodel.cpp \ @@ -351,6 +364,7 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ moc_qcoreevent.cpp \ moc_qmimedata.cpp \ moc_qobject.cpp \ + moc_qobjectdefs.cpp \ moc_qsignalmapper.cpp \ moc_qsocketnotifier.cpp \ moc_qtimer.cpp \ diff --git a/repos/libports/lib/mk/qt5_gui.mk b/repos/libports/lib/mk/qt5_gui.mk index 0a5a0a39f0..ba173a9269 100644 --- a/repos/libports/lib/mk/qt5_gui.mk +++ b/repos/libports/lib/mk/qt5_gui.mk @@ -11,27 +11,13 @@ 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 + # remove unneeded files to prevent moc warnings COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT = \ - moc_qsessionmanager.cpp \ - moc_qsound.cpp \ - moc_qsound_p.cpp \ - moc_qmenudata.cpp \ - moc_qprintpreviewwidget.cpp \ - moc_qabstractprintdialog.cpp \ - moc_qabstractpagesetupdialog.cpp \ - moc_qpagesetupdialog.cpp \ - moc_qprintdialog.cpp \ - moc_qprintpreviewdialog.cpp \ - moc_qpagesetupdialog_unix_p.cpp - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES_FILTER_OUT = \ - qprintpreviewwidget.moc \ - qprintdialog_unix.moc \ - qprintpreviewdialog.moc - -# UI headers -qfiledialog.o: ui_qfiledialog.h + moc_qsessionmanager.cpp include $(REP_DIR)/lib/mk/qt5.inc @@ -42,7 +28,7 @@ INC_DIR += $(REP_DIR)/include/qt5/qtbase/QtGui/private \ $(QT5_CONTRIB_DIR)/qtbase/include/QtCore/$(QT_VERSION) \ $(QT5_CONTRIB_DIR)/qtbase/include/QtCore/$(QT_VERSION)/QtCore -LIBS += qt5_core jpeg zlib libpng gallium +LIBS += qt5_core zlib libpng # # install fonts diff --git a/repos/libports/lib/mk/qt5_gui_generated.inc b/repos/libports/lib/mk/qt5_gui_generated.inc index 02f0d2a7f5..d4e383f54d 100644 --- a/repos/libports/lib/mk/qt5_gui_generated.inc +++ b/repos/libports/lib/mk/qt5_gui_generated.inc @@ -1,13 +1,13 @@ -QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_USING_NAMESPACE -DENABLE_PIXMAN_DRAWHELPERS -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 -DQT_NO_DEBUG -DQT_CORE_LIB +QT_DEFINES += -DQT_NO_USING_NAMESPACE -DENABLE_PIXMAN_DRAWHELPERS -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.7.1 \ - qtbase/include/QtGui/5.7.1/QtGui \ - qtbase/include/QtCore/5.7.1 \ - qtbase/include/QtCore/5.7.1/QtCore \ + qtbase/include/QtGui/5.8.0 \ + qtbase/include/QtGui/5.8.0/QtGui \ + qtbase/include/QtCore/5.8.0 \ + qtbase/include/QtCore/5.8.0/QtCore \ qtbase/include/QtCore \ qtbase/mkspecs/genode-g++ @@ -85,7 +85,6 @@ QT_SOURCES += \ qmovie.cpp \ qpixmap_raster.cpp \ qpixmap_blitter.cpp \ - qnativeimage.cpp \ qimagepixmapcleanuphooks.cpp \ qicon.cpp \ qiconloader.cpp \ @@ -96,8 +95,6 @@ QT_SOURCES += \ qxbmhandler.cpp \ qxpmhandler.cpp \ qpnghandler.cpp \ - qjpeghandler.cpp \ - qgifhandler.cpp \ qfont.cpp \ qfontengine.cpp \ qfontengineglyphcache.cpp \ @@ -122,25 +119,23 @@ QT_SOURCES += \ qtextlist.cpp \ qtextdocumentwriter.cpp \ qsyntaxhighlighter.cpp \ - qcssparser.cpp \ - qzip.cpp \ - qtextodfwriter.cpp \ qstatictext.cpp \ qrawfont.cpp \ qglyphrun.cpp \ qdistancefield.cpp \ qfontengine_qpf2.cpp \ qplatformfontdatabase.cpp \ + qtextodfwriter.cpp \ + qzip.cpp \ + qcssparser.cpp \ qbackingstore.cpp \ qbezier.cpp \ qblendfunctions.cpp \ qblittable.cpp \ qbrush.cpp \ qcolor.cpp \ - qcolor_p.cpp \ qcompositionfunctions.cpp \ qcosmeticstroker.cpp \ - qcssutil.cpp \ qdrawhelper.cpp \ qemulationpaintengine.cpp \ qgammatables.cpp \ @@ -169,8 +164,11 @@ QT_SOURCES += \ qstroker.cpp \ qtextureglyphcache.cpp \ qtransform.cpp \ + qtriangulatingstroker.cpp \ + qtriangulator.cpp \ qplatformbackingstore.cpp \ qpathsimplifier.cpp \ + qcssutil.cpp \ qdesktopservices.cpp \ qvalidator.cpp \ qgridlayoutengine.cpp \ @@ -194,9 +192,7 @@ QT_SOURCES += \ qopengl2pexvertexarray.cpp \ qopenglpaintengine.cpp \ qopenglcustomshaderstage.cpp \ - qtriangulatingstroker.cpp \ qopengltextureglyphcache.cpp \ - qtriangulator.cpp \ qopenglversionfunctions.cpp \ qopenglversionfunctionsfactory.cpp \ qopenglvertexarrayobject.cpp \ @@ -234,6 +230,7 @@ QT_SOURCES += \ qopengltimerquery.cpp \ qguivariantanimation.cpp \ qstandarditemmodel.cpp \ + qimage_compat.cpp \ qimage_sse2.cpp \ qdrawhelper_sse2.cpp \ moc_qgenericplugin.cpp \ @@ -244,6 +241,7 @@ QT_SOURCES += \ moc_qplatformnativeinterface.cpp \ moc_qplatformmenu.cpp \ moc_qshapedpixmapdndwindow_p.cpp \ + moc_qsurfaceformat.cpp \ moc_qoffscreensurface.cpp \ moc_qclipboard.cpp \ moc_qdrag.cpp \ @@ -310,6 +308,7 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ moc_qplatformnativeinterface.cpp \ moc_qplatformmenu.cpp \ moc_qshapedpixmapdndwindow_p.cpp \ + moc_qsurfaceformat.cpp \ moc_qguiapplication.cpp \ moc_qwindow.cpp \ moc_qoffscreensurface.cpp \ diff --git a/repos/libports/lib/mk/qt5_host_tools.inc b/repos/libports/lib/mk/qt5_host_tools.inc index 034b38230c..3f39f442de 100644 --- a/repos/libports/lib/mk/qt5_host_tools.inc +++ b/repos/libports/lib/mk/qt5_host_tools.inc @@ -6,19 +6,19 @@ QMAKESPEC = $(QT5_CONTRIB_DIR)/qtbase/mkspecs/linux-g++ bootstrap/libQtBootstrap.a: bootstrap/Makefile $(VERBOSE)QMAKESPEC=$(QMAKESPEC) $(MAKE) -C bootstrap \ - DEFINES="-DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_BOOTSTRAPPED -DQT_LITE_UNICODE -DQT_NO_CAST_TO_ASCII -DQT_NO_CODECS -DQT_NO_DATASTREAM -DQT_NO_LIBRARY -DQT_NO_QOBJECT -DQT_NO_SYSTEMLOCALE -DQT_NO_THREAD -DQT_NO_UNICODETABLES -DQT_NO_USING_NAMESPACE -DQT_NO_DEPRECATED -DQT_NO_TRANSLATION -DQT_CRYPTOGRAPHICHASH_ONLY_SHA1 -DQT_NO_FOREACH -DQT_NO_CAST_FROM_ASCII -DQT_BUILD_BOOTSTRAP_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 -DQT_NO_DEBUG" + DEFINES="-DQT_VERSION_STR='\"5.8.0\"' -DQT_VERSION_MAJOR=5 -DQT_VERSION_MINOR=8 -DQT_VERSION_PATCH=0 -DQT_BOOTSTRAPPED -DQT_NO_CAST_TO_ASCII -DQT_NO_FOREACH -DQT_NO_CAST_FROM_ASCII -DQT_BUILD_BOOTSTRAP_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" moc/moc: bootstrap/libQtBootstrap.a moc/Makefile $(VERBOSE)QMAKESPEC=$(QMAKESPEC) $(MAKE) -C moc \ - DEFINES="-DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_MOC -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_COMPRESS -DQT_NO_FOREACH -DQT_USE_QSTRINGBUILDER -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_BOOTSTRAP_LIB -DQT_BOOTSTRAPPED -DQT_LITE_UNICODE -DQT_NO_CAST_TO_ASCII -DQT_NO_CODECS -DQT_NO_DATASTREAM -DQT_NO_LIBRARY -DQT_NO_QOBJECT -DQT_NO_SYSTEMLOCALE -DQT_NO_THREAD -DQT_NO_UNICODETABLES -DQT_NO_USING_NAMESPACE -DQT_NO_DEPRECATED -DQT_NO_TRANSLATION" + DEFINES="-DQT_MOC -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_COMPRESS -DQT_NO_FOREACH -DQT_USE_QSTRINGBUILDER -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_BOOTSTRAP_LIB -DQT_VERSION_STR='\"5.8.0\"' -DQT_VERSION_MAJOR=5 -DQT_VERSION_MINOR=8 -DQT_VERSION_PATCH=0 -DQT_BOOTSTRAPPED -DQT_NO_CAST_TO_ASCII" rcc/rcc: bootstrap/libQtBootstrap.a rcc/Makefile $(VERBOSE)QMAKESPEC=$(QMAKESPEC) $(MAKE) -C rcc \ - DEFINES="-DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_RCC -DQT_NO_CAST_FROM_ASCII -DQT_NO_FOREACH -DQT_USE_QSTRINGBUILDER -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_BOOTSTRAP_LIB -DQT_BOOTSTRAPPED -DQT_LITE_UNICODE -DQT_NO_CAST_TO_ASCII -DQT_NO_CODECS -DQT_NO_DATASTREAM -DQT_NO_LIBRARY -DQT_NO_QOBJECT -DQT_NO_SYSTEMLOCALE -DQT_NO_THREAD -DQT_NO_UNICODETABLES -DQT_NO_USING_NAMESPACE -DQT_NO_DEPRECATED -DQT_NO_TRANSLATION" + DEFINES="-DQT_RCC -DQT_NO_CAST_FROM_ASCII -DQT_NO_FOREACH -DQT_USE_QSTRINGBUILDER -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_BOOTSTRAP_LIB -DQT_VERSION_STR='\"5.8.0\"' -DQT_VERSION_MAJOR=5 -DQT_VERSION_MINOR=8 -DQT_VERSION_PATCH=0 -DQT_BOOTSTRAPPED -DQT_NO_CAST_TO_ASCII" uic/uic: bootstrap/libQtBootstrap.a uic/Makefile $(VERBOSE)QMAKESPEC=$(QMAKESPEC) $(MAKE) -C uic \ - DEFINES="-DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_UIC -DQT_NO_CAST_FROM_ASCII -DQT_NO_FOREACH -DQT_UIC_CPP_GENERATOR -DQT_USE_QSTRINGBUILDER -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_BOOTSTRAP_LIB -DQT_BOOTSTRAPPED -DQT_LITE_UNICODE -DQT_NO_CAST_TO_ASCII -DQT_NO_CODECS -DQT_NO_DATASTREAM -DQT_NO_LIBRARY -DQT_NO_QOBJECT -DQT_NO_SYSTEMLOCALE -DQT_NO_THREAD -DQT_NO_UNICODETABLES -DQT_NO_USING_NAMESPACE -DQT_NO_DEPRECATED -DQT_NO_TRANSLATION" + DEFINES="-DQT_UIC -DQT_NO_CAST_FROM_ASCII -DQT_NO_FOREACH -DQT_UIC_CPP_GENERATOR -DQT_USE_QSTRINGBUILDER -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_CORE_LIB" # # Rule to generate tool Makefiles from the respective pro files via qmake @@ -37,10 +37,10 @@ uic/uic: bootstrap/libQtBootstrap.a uic/Makefile INCLUDEPATH+=$(QT5_CONTRIB_DIR)/qtbase/include \ INCLUDEPATH+=$(QT5_CONTRIB_DIR)/qtbase/include/QtCore \ INCLUDEPATH+=$(REP_DIR)/src/lib/qt5/qtbase/src/corelib/global \ - INCLUDEPATH+=$(QT5_CONTRIB_DIR)/qtbase/include/QtCore/5.7.1 \ - INCLUDEPATH+=$(QT5_CONTRIB_DIR)/qtbase/include/QtCore/5.7.1/QtCore \ + INCLUDEPATH+=$(QT5_CONTRIB_DIR)/qtbase/include/QtCore/5.8.0 \ + INCLUDEPATH+=$(QT5_CONTRIB_DIR)/qtbase/include/QtCore/5.8.0/QtCore \ INCLUDEPATH+=$(QT5_CONTRIB_DIR)/qtbase/include/QtXml \ - INCLUDEPATH+=$(QT5_CONTRIB_DIR)/qtbase/include/QtXml/5.7.1/QtXml \ + INCLUDEPATH+=$(QT5_CONTRIB_DIR)/qtbase/include/QtXml/5.8.0/QtXml \ -after DESTDIR= \ -after "LIBS+=-lQtBootstrap -L../bootstrap" \ $^ diff --git a/repos/libports/lib/mk/qt5_host_tools_qmake.inc b/repos/libports/lib/mk/qt5_host_tools_qmake.inc index 1c65b7cee5..4a692242d5 100644 --- a/repos/libports/lib/mk/qt5_host_tools_qmake.inc +++ b/repos/libports/lib/mk/qt5_host_tools_qmake.inc @@ -15,32 +15,36 @@ ######################################################################## CC = gcc CXX = g++ -QMAKE_CFLAGS = -pipe -QMAKE_CFLAGS_SPLIT_SECTIONS = -ffunction-sections QMAKE_CXXFLAGS = -pipe QMAKE_CXXFLAGS_CXX11 = -std=c++11 QMAKE_CXXFLAGS_SPLIT_SECTIONS = -ffunction-sections QMAKE_LFLAGS = QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections -QMAKE_CFLAGS_RELEASE = -O2 -QMAKE_CXXFLAGS_RELEASE = -O2 - +QMAKE_CXXFLAGS_DEBUG = -g BUILD_PATH = . SOURCE_PATH = $(QT5_CONTRIB_DIR)/qtbase INC_PATH = $(SOURCE_PATH)/include QMAKESPEC = $(SOURCE_PATH)/mkspecs/linux-g++ -QT_VERSION = 5.7.1 +QT_VERSION = 5.8.0 QT_MAJOR_VERSION = 5 -QT_MINOR_VERSION = 7 -QT_PATCH_VERSION = 1 -EXTRA_CFLAGS = $(QMAKE_CFLAGS) $(QMAKE_CFLAGS_SPLIT_SECTIONS) $(QMAKE_CFLAGS_RELEASE) -EXTRA_CXXFLAGS = $(QMAKE_CXXFLAGS) $(QMAKE_CXXFLAGS_CXX11) $(QMAKE_CXXFLAGS_SPLIT_SECTIONS) $(QMAKE_CXXFLAGS_RELEASE) -QTOBJS = qfilesystemengine_unix.o qfilesystemiterator_unix.o qfsfileengine_unix.o qlocale_unix.o -QTSRCS = "$(SOURCE_PATH)/src/corelib/io/qfilesystemengine_unix.cpp" "$(SOURCE_PATH)/src/corelib/io/qfilesystemiterator_unix.cpp" "$(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp" "$(SOURCE_PATH)/src/corelib/tools/qlocale_unix.cpp" -LFLAGS = $(QMAKE_LFLAGS) $(QMAKE_LFLAGS_GCSECTIONS) -EXEEXT = +QT_MINOR_VERSION = 8 +QT_PATCH_VERSION = 0 +CONFIG_CXXFLAGS = $(QMAKE_CXXFLAGS) $(QMAKE_CXXFLAGS_CXX11) $(QMAKE_CXXFLAGS_SPLIT_SECTIONS) $(QMAKE_CXXFLAGS_DEBUG) +CONFIG_LFLAGS = $(QMAKE_LFLAGS) $(QMAKE_LFLAGS_GCSECTIONS) RM_F = rm -f RM_RF = rm -rf +EXEEXT = +QTOBJS = \ + qfilesystemengine_unix.o \ + qfilesystemiterator_unix.o \ + qfsfileengine_unix.o \ + qlocale_unix.o +QTSRCS = \ + $(SOURCE_PATH)/src/corelib/io/qfilesystemengine_unix.cpp \ + $(SOURCE_PATH)/src/corelib/io/qfilesystemiterator_unix.cpp \ + $(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp \ + $(SOURCE_PATH)/src/corelib/tools/qlocale_unix.cpp + QMKSRC = $(SOURCE_PATH)/qmake QMKLIBSRC = $(QMKSRC)/library QMKGENSRC = $(QMKSRC)/generators diff --git a/repos/libports/lib/mk/qt5_jscore_generated.inc b/repos/libports/lib/mk/qt5_jscore_generated.inc index 730734e77b..863f026dfd 100644 --- a/repos/libports/lib/mk/qt5_jscore_generated.inc +++ b/repos/libports/lib/mk/qt5_jscore_generated.inc @@ -1,4 +1,4 @@ -QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -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_QTQUICK=1 -DHAVE_QTPRINTSUPPORT=1 -DHAVE_QSTYLE=1 -DHAVE_QTTESTLIB=1 -DWTF_USE_LIBJPEG=1 -DWTF_USE_LIBPNG=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 -DQT_NO_DEBUG -DQT_CORE_LIB +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_QTQUICK=1 -DHAVE_QTPRINTSUPPORT=1 -DHAVE_QSTYLE=1 -DHAVE_QTTESTLIB=1 -DWTF_USE_LIBJPEG=1 -DWTF_USE_LIBPNG=1 -DHAVE_XRENDER=1 -DHAVE_GLX=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 \ @@ -22,6 +22,7 @@ QT_INCPATH += \ qtwebkit/Source/JavaScriptCore/yarr \ qtwebkit/Source/JavaScriptCore/API \ qtwebkit/Source/JavaScriptCore/ForwardingHeaders \ + qtwebkit/Source/JavaScriptCore/disassembler/udis86 \ qtwebkit/Source \ qtwebkit/Source/WTF \ qtbase/include \ @@ -318,7 +319,15 @@ QT_SOURCES += \ WatchdogNone.cpp \ CodeProfile.cpp \ CodeProfiling.cpp \ - YarrJIT.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 \ @@ -328,6 +337,7 @@ QT_VPATH += \ 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 \ diff --git a/repos/libports/lib/mk/qt5_network.mk b/repos/libports/lib/mk/qt5_network.mk index 2e575e67b4..8f058f5587 100644 --- a/repos/libports/lib/mk/qt5_network.mk +++ b/repos/libports/lib/mk/qt5_network.mk @@ -7,24 +7,18 @@ CC_WARN = include $(REP_DIR)/lib/mk/qt5_network_generated.inc -QT_DEFINES += -DQT_NO_IPV6IFNAME - # remove unneeded files to prevent moc warnings COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT = \ - moc_qftp_p.cpp \ - moc_qnetworkaccessdebugpipebackend_p.cpp \ - moc_qnetworkaccessftpbackend_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_qsslsocket_openssl_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 = \ - qftp.moc include $(REP_DIR)/lib/mk/qt5.inc diff --git a/repos/libports/lib/mk/qt5_network_generated.inc b/repos/libports/lib/mk/qt5_network_generated.inc index b26d83e751..0c5d49dc2e 100644 --- a/repos/libports/lib/mk/qt5_network_generated.inc +++ b/repos/libports/lib/mk/qt5_network_generated.inc @@ -1,14 +1,14 @@ -QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_USING_NAMESPACE -DQT_NO_FOREACH -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 -DQT_NO_DEBUG -DQT_CORE_LIB +QT_DEFINES += -DQT_NO_USING_NAMESPACE -DQT_NO_FOREACH -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.7.1 \ - qtbase/include/QtNetwork/5.7.1/QtNetwork \ - qtbase/include/QtCore/5.7.1 \ - qtbase/include/QtCore/5.7.1/QtCore \ + qtbase/include/QtNetwork/5.8.0 \ + qtbase/include/QtNetwork/5.8.0/QtNetwork \ + qtbase/include/QtCore/5.8.0 \ + qtbase/include/QtCore/5.8.0/QtCore \ qtbase/include/QtCore \ qtbase/mkspecs/genode-g++ @@ -42,6 +42,15 @@ QT_SOURCES += \ qnetworkdiskcache.cpp \ qhttpthreaddelegate.cpp \ qhttpmultipart.cpp \ + qnetworkfile.cpp \ + qhttp2protocolhandler.cpp \ + bitstreams.cpp \ + huffman.cpp \ + hpack.cpp \ + hpacktable.cpp \ + http2frames.cpp \ + http2streams.cpp \ + http2protocol.cpp \ qnetworksession.cpp \ qnetworkconfigmanager.cpp \ qnetworkconfiguration.cpp \ @@ -53,9 +62,10 @@ QT_SOURCES += \ qdnslookup.cpp \ qhostaddress.cpp \ qhostinfo.cpp \ - qurlinfo.cpp \ - qnetworkproxy.cpp \ + qnetworkdatagram.cpp \ qnetworkinterface.cpp \ + qnetworkproxy.cpp \ + qurlinfo.cpp \ qdnslookup_unix.cpp \ qhostinfo_unix.cpp \ qnetworkinterface_unix.cpp \ @@ -78,6 +88,7 @@ QT_SOURCES += \ qsslcertificate.cpp \ qsslconfiguration.cpp \ qsslcipher.cpp \ + qssldiffiehellmanparameters.cpp \ qsslellipticcurve.cpp \ qsslkey_p.cpp \ qsslerror.cpp \ @@ -86,6 +97,7 @@ QT_SOURCES += \ qsslcertificateextension.cpp \ qsslcertificate_openssl.cpp \ qsslcontext_openssl.cpp \ + qssldiffiehellmanparameters_openssl.cpp \ qsslellipticcurve_openssl.cpp \ qsslkey_openssl.cpp \ qsslsocket_openssl.cpp \ @@ -104,6 +116,8 @@ QT_SOURCES += \ moc_qnetworkdiskcache.cpp \ moc_qhttpthreaddelegate_p.cpp \ moc_qhttpmultipart.cpp \ + moc_qnetworkfile_p.cpp \ + moc_qhttp2protocolhandler_p.cpp \ moc_qnetworkconfigmanager_p.cpp \ moc_qnetworksession_p.cpp \ moc_qbearerplugin_p.cpp \ @@ -119,6 +133,7 @@ QT_SOURCES += \ QT_VPATH += \ qtbase/src/network/access \ + qtbase/src/network/access/http2 \ qtbase/src/network/bearer \ qtbase/src/network/kernel \ qtbase/src/network/socket \ @@ -152,6 +167,8 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ moc_qnetworkdiskcache.cpp \ moc_qhttpthreaddelegate_p.cpp \ moc_qhttpmultipart.cpp \ + moc_qnetworkfile_p.cpp \ + moc_qhttp2protocolhandler_p.cpp \ moc_qnetworksession.cpp \ moc_qnetworkconfigmanager.cpp \ moc_qnetworkconfigmanager_p.cpp \ diff --git a/repos/libports/lib/mk/qt5_opengl.mk b/repos/libports/lib/mk/qt5_opengl.mk index e7375b00a9..978cf06126 100644 --- a/repos/libports/lib/mk/qt5_opengl.mk +++ b/repos/libports/lib/mk/qt5_opengl.mk @@ -5,3 +5,5 @@ SHARED_LIB = yes include $(REP_DIR)/lib/mk/qt5_opengl_generated.inc include $(REP_DIR)/lib/mk/qt5.inc + +LIBS += qt5_gui diff --git a/repos/libports/lib/mk/qt5_opengl_generated.inc b/repos/libports/lib/mk/qt5_opengl_generated.inc index 7eef93b968..bc4cc9e362 100644 --- a/repos/libports/lib/mk/qt5_opengl_generated.inc +++ b/repos/libports/lib/mk/qt5_opengl_generated.inc @@ -1,17 +1,17 @@ -QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_USING_NAMESPACE -DQT_NO_FOREACH -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 -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB +QT_DEFINES += -DQT_NO_USING_NAMESPACE -DQT_NO_FOREACH -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.7.1 \ - qtbase/include/QtOpenGL/5.7.1/QtOpenGL \ - qtbase/include/QtWidgets/5.7.1 \ - qtbase/include/QtWidgets/5.7.1/QtWidgets \ - qtbase/include/QtGui/5.7.1 \ - qtbase/include/QtGui/5.7.1/QtGui \ - qtbase/include/QtCore/5.7.1 \ - qtbase/include/QtCore/5.7.1/QtCore \ + qtbase/include/QtOpenGL/5.8.0 \ + qtbase/include/QtOpenGL/5.8.0/QtOpenGL \ + qtbase/include/QtWidgets/5.8.0 \ + qtbase/include/QtWidgets/5.8.0/QtWidgets \ + qtbase/include/QtGui/5.8.0 \ + qtbase/include/QtGui/5.8.0/QtGui \ + qtbase/include/QtCore/5.8.0 \ + qtbase/include/QtCore/5.8.0/QtCore \ qtbase/include/QtWidgets \ qtbase/include/QtGui \ qtbase/include/QtCore \ diff --git a/repos/libports/lib/mk/qt5_printsupport.mk b/repos/libports/lib/mk/qt5_printsupport.mk index 977c583d3e..35be22233b 100644 --- a/repos/libports/lib/mk/qt5_printsupport.mk +++ b/repos/libports/lib/mk/qt5_printsupport.mk @@ -9,18 +9,14 @@ include $(REP_DIR)/lib/mk/qt5_printsupport_generated.inc # remove unneeded files to prevent moc warnings COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT = \ - moc_qabstractprintdialog.cpp \ - moc_qprintpreviewwidget.cpp \ - moc_qpagesetupdialog.cpp \ - moc_qprintdialog.cpp \ - moc_qprintpreviewdialog.cpp \ - moc_qpagesetupdialog_unix_p.cpp \ - COMPILER_MOC_SOURCE_MAKE_ALL_FILES_FILTER_OUT = \ - qprintpreviewwidget.moc \ - qprintdialog_unix.moc \ - qprintpreviewdialog.moc \ + +# 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 @@ -29,4 +25,4 @@ INC_DIR += $(QT5_CONTRIB_DIR)/qtbase/include/QtPrintSupport/$(QT_VERSION)/QtPrin $(QT5_CONTRIB_DIR)/qtbase/include/QtGui/$(QT_VERSION)/QtGui \ $(QT5_CONTRIB_DIR)/qtbase/include/QtCore/$(QT_VERSION)/QtCore \ -LIBS += qt5_core +LIBS += qt5_gui diff --git a/repos/libports/lib/mk/qt5_printsupport_generated.inc b/repos/libports/lib/mk/qt5_printsupport_generated.inc index a3a95b98a3..d93fd2e946 100644 --- a/repos/libports/lib/mk/qt5_printsupport_generated.inc +++ b/repos/libports/lib/mk/qt5_printsupport_generated.inc @@ -1,4 +1,4 @@ -QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_USING_NAMESPACE -DQT_NO_FOREACH -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 -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB +QT_DEFINES += -DQT_NO_USING_NAMESPACE -DQT_NO_FOREACH -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 \ @@ -6,14 +6,14 @@ QT_INCPATH += \ qtbase/src/printsupport/dialogs \ qtbase/include \ qtbase/include/QtPrintSupport \ - qtbase/include/QtPrintSupport/5.7.1 \ - qtbase/include/QtPrintSupport/5.7.1/QtPrintSupport \ - qtbase/include/QtWidgets/5.7.1 \ - qtbase/include/QtWidgets/5.7.1/QtWidgets \ - qtbase/include/QtGui/5.7.1 \ - qtbase/include/QtGui/5.7.1/QtGui \ - qtbase/include/QtCore/5.7.1 \ - qtbase/include/QtCore/5.7.1/QtCore \ + qtbase/include/QtPrintSupport/5.8.0 \ + qtbase/include/QtPrintSupport/5.8.0/QtPrintSupport \ + qtbase/include/QtWidgets/5.8.0 \ + qtbase/include/QtWidgets/5.8.0/QtWidgets \ + qtbase/include/QtGui/5.8.0 \ + qtbase/include/QtGui/5.8.0/QtGui \ + qtbase/include/QtCore/5.8.0 \ + qtbase/include/QtCore/5.8.0/QtCore \ qtbase/include/QtWidgets \ qtbase/include/QtGui \ qtbase/include/QtCore \ diff --git a/repos/libports/lib/mk/qt5_qjpeg.mk b/repos/libports/lib/mk/qt5_qjpeg.mk new file mode 100644 index 0000000000..900a4876ce --- /dev/null +++ b/repos/libports/lib/mk/qt5_qjpeg.mk @@ -0,0 +1,17 @@ +include $(REP_DIR)/lib/import/import-qt5_qjpeg.mk + +SRC_CC = main.cpp \ + moc_main.cpp \ + qjpeghandler.cpp \ + import_plugin.cc + +INC_DIR += $(QT5_CONTRIB_DIR)/qtbase/src/plugins/imageformats/jpeg \ + $(QT5_CONTRIB_DIR)/qtbase/include/QtGui/$(QT_VERSION)/QtGui \ + $(QT5_CONTRIB_DIR)/qtbase/include/QtGui/$(QT_VERSION) \ + $(QT5_CONTRIB_DIR)/qtbase/include/QtCore/$(QT_VERSION)/QtCore \ + $(QT5_CONTRIB_DIR)/qtbase/include/QtCore/$(QT_VERSION) + +LIBS += qt5_gui qt5_core jpeg + +vpath % $(REP_DIR)/src/lib/qt5/qtbase/src/plugins/imageformats/jpeg +vpath % $(QT5_CONTRIB_DIR)/qtbase/src/plugins/imageformats/jpeg diff --git a/repos/libports/lib/mk/qt5_qml.mk b/repos/libports/lib/mk/qt5_qml.mk index 823b688a32..72f1c39917 100644 --- a/repos/libports/lib/mk/qt5_qml.mk +++ b/repos/libports/lib/mk/qt5_qml.mk @@ -19,6 +19,19 @@ $(QT5_PORT_DIR)/src/lib/qt5/qtdeclarative/src/3rdparty/masm/generated.tag: $(HOS 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/debugger + include $(REP_DIR)/lib/mk/qt5.inc LIBS += qt5_network qt5_core libc diff --git a/repos/libports/lib/mk/qt5_qml_generated.inc b/repos/libports/lib/mk/qt5_qml_generated.inc index 098f3c641c..0321433ff3 100644 --- a/repos/libports/lib/mk/qt5_qml_generated.inc +++ b/repos/libports/lib/mk/qt5_qml_generated.inc @@ -1,4 +1,4 @@ -QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_URL_CAST_FROM_STRING -DQT_NO_INTEGER_EVENT_COORDINATES -DWTF_EXPORT_PRIVATE= -DJS_EXPORT_PRIVATE= -DENABLE_ASSEMBLER_WX_EXCLUSIVE=1 -DWTFReportAssertionFailure=qmlWTFReportAssertionFailure -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_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 -DQT_NO_DEBUG -DQT_NETWORK_LIB -DQT_CORE_LIB +QT_DEFINES += -DQT_NO_URL_CAST_FROM_STRING -DQT_NO_INTEGER_EVENT_COORDINATES -DWTF_EXPORT_PRIVATE= -DJS_EXPORT_PRIVATE= -DENABLE_ASSEMBLER_WX_EXCLUSIVE=1 -DWTFReportAssertionFailure=qmlWTFReportAssertionFailure -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_QML_DEBUGGER -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 \ @@ -19,10 +19,10 @@ QT_INCPATH += \ qtdeclarative/src/qml/animations \ qtdeclarative/include \ qtdeclarative/include/QtQml \ - qtdeclarative/include/QtQml/5.7.1 \ - qtdeclarative/include/QtQml/5.7.1/QtQml \ - qtbase/include/QtCore/5.7.1 \ - qtbase/include/QtCore/5.7.1/QtCore \ + qtdeclarative/include/QtQml/5.8.0 \ + qtdeclarative/include/QtQml/5.8.0/QtQml \ + qtbase/include/QtCore/5.8.0 \ + qtbase/include/QtCore/5.8.0/QtCore \ qtbase/include \ qtbase/include/QtNetwork \ qtbase/include/QtCore \ @@ -49,6 +49,10 @@ QT_SOURCES += \ qv4ssa.cpp \ qqmlirbuilder.cpp \ qqmltypecompiler.cpp \ + qqmlpropertycachecreator.cpp \ + qqmlpropertyvalidator.cpp \ + qv4compilationunitmapper.cpp \ + qv4compilationunitmapper_unix.cpp \ qv4instr_moth.cpp \ qv4isel_moth.cpp \ qjsengine.cpp \ @@ -84,7 +88,6 @@ QT_SOURCES += \ qv4engine.cpp \ qv4context.cpp \ qv4persistent.cpp \ - qv4debugging.cpp \ qv4lookup.cpp \ qv4identifier.cpp \ qv4identifiertable.cpp \ @@ -117,11 +120,10 @@ QT_SOURCES += \ qv4sequenceobject.cpp \ qv4include.cpp \ qv4qobjectwrapper.cpp \ - qv4vme_moth.cpp \ - qv4profiling.cpp \ qv4arraybuffer.cpp \ qv4typedarray.cpp \ qv4dataview.cpp \ + qv4vme_moth.cpp \ qv4runtime.cpp \ qv4string.cpp \ qv4value.cpp \ @@ -138,7 +140,6 @@ QT_SOURCES += \ qqmlpropertyvalueinterceptor.cpp \ qqmlproxymetaobject.cpp \ qqmlvme.cpp \ - qqmlcompileddata.cpp \ qqmlboundsignal.cpp \ qqmlmetatype.cpp \ qqmlstringconverters.cpp \ @@ -147,7 +148,6 @@ QT_SOURCES += \ qqmlinfo.cpp \ qqmlerror.cpp \ qqmlvaluetype.cpp \ - qqmlaccessors.cpp \ qqmlxmlhttprequest.cpp \ qqmlcleanup.cpp \ qqmlpropertycache.cpp \ @@ -165,7 +165,6 @@ QT_SOURCES += \ qqmlvaluetypeproxybinding.cpp \ qqmlglobal.cpp \ qqmlfile.cpp \ - qqmlmemoryprofiler.cpp \ qqmlplatform.cpp \ qqmlbinding.cpp \ qqmlabstracturlinterceptor.cpp \ @@ -177,6 +176,8 @@ QT_SOURCES += \ qqmlfileselector.cpp \ qqmlobjectcreator.cpp \ qqmldirparser.cpp \ + qqmldelayedcallqueue.cpp \ + qqmlloggingcategory.cpp \ qintrusivelist.cpp \ qhashedstring.cpp \ qqmlthread.cpp \ @@ -184,12 +185,6 @@ QT_SOURCES += \ qv4domerrors.cpp \ qv4sqlerrors.cpp \ qqmlbuiltinfunctions.cpp \ - qqmldebug.cpp \ - qqmldebugconnector.cpp \ - qqmldebugservice.cpp \ - qqmldebugserviceinterfaces.cpp \ - qqmlabstractprofileradapter.cpp \ - qqmlprofiler.cpp \ qabstractanimationjob.cpp \ qanimationgroupjob.cpp \ qsequentialanimationgroupjob.cpp \ @@ -224,9 +219,10 @@ QT_SOURCES += \ moc_qqmlcomponentattached_p.cpp \ moc_qqmlplatform_p.cpp \ moc_qqmlfileselector.cpp \ + moc_qqmldelayedcallqueue_p.cpp \ + moc_qqmlloggingcategory_p.cpp \ moc_qqmldebugconnector_p.cpp \ moc_qqmldebugservice_p.cpp \ - moc_qqmldebugservicefactory_p.cpp \ moc_qqmldebugserviceinterfaces_p.cpp \ moc_qqmlabstractprofileradapter_p.cpp \ moc_qqmlprofiler_p.cpp \ @@ -255,7 +251,6 @@ QT_VPATH += \ qtdeclarative/src/3rdparty/masm/yarr \ qtdeclarative/src/qml/animations \ qtdeclarative/src/qml/compiler \ - qtdeclarative/src/qml/debugger \ qtdeclarative/src/qml/jit \ qtdeclarative/src/qml/jsapi \ qtdeclarative/src/qml/jsruntime \ @@ -293,9 +288,10 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ moc_qqmlplatform_p.cpp \ moc_qqmlapplicationengine.cpp \ moc_qqmlfileselector.cpp \ + moc_qqmldelayedcallqueue_p.cpp \ + moc_qqmlloggingcategory_p.cpp \ moc_qqmldebugconnector_p.cpp \ moc_qqmldebugservice_p.cpp \ - moc_qqmldebugservicefactory_p.cpp \ moc_qqmldebugserviceinterfaces_p.cpp \ moc_qqmlabstractprofileradapter_p.cpp \ moc_qqmlprofiler_p.cpp \ @@ -322,6 +318,5 @@ COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ qqmltypeloader.moc \ qqmlxmlhttprequest.moc \ qqmlfile.moc \ - qqmldebugservice.moc \ qquickworkerscript.moc diff --git a/repos/libports/lib/mk/qt5_qpa_nitpicker.mk b/repos/libports/lib/mk/qt5_qpa_nitpicker.mk index 0b8f328f25..0fcdf4a70b 100644 --- a/repos/libports/lib/mk/qt5_qpa_nitpicker.mk +++ b/repos/libports/lib/mk/qt5_qpa_nitpicker.mk @@ -27,7 +27,7 @@ SRC_CC += main.cpp \ INC_DIR += $(QT5_CONTRIB_DIR)/qtbase/src/platformsupport/eventdispatchers \ $(QT5_CONTRIB_DIR)/qtbase/src/platformsupport/fontdatabases/basic \ $(QT5_CONTRIB_DIR)/qtbase/src/3rdparty/harfbuzz/src \ - $(QT5_CONTRIB_DIR)/qtbase/include/QtPlatformSupport/$(QT_VERSION) \ + $(QT5_CONTRIB_DIR)/qtbase/include/QtEglSupport/$(QT_VERSION) \ $(QT5_CONTRIB_DIR)/qtbase/include/QtGui/$(QT_VERSION) \ $(QT5_CONTRIB_DIR)/qtbase/include/QtCore/$(QT_VERSION) \ $(QT5_CONTRIB_DIR)/qtbase/include/QtCore/$(QT_VERSION)/QtCore diff --git a/repos/libports/lib/mk/qt5_qtquick2plugin_generated.inc b/repos/libports/lib/mk/qt5_qtquick2plugin_generated.inc index ec962298b5..fd95328c58 100644 --- a/repos/libports/lib/mk/qt5_qtquick2plugin_generated.inc +++ b/repos/libports/lib/mk/qt5_qtquick2plugin_generated.inc @@ -1,19 +1,19 @@ -QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_PLUGIN -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB +QT_DEFINES += -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_PLUGIN -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NO_QML_DEBUGGER -DQT_NETWORK_LIB -DQT_CORE_LIB QT_INCPATH += \ qtdeclarative/src/imports/qtquick2 \ - qtdeclarative/include/QtQuick/5.7.1 \ - qtdeclarative/include/QtQuick/5.7.1/QtQuick \ - qtbase/include/QtGui/5.7.1 \ - qtbase/include/QtGui/5.7.1/QtGui \ + qtdeclarative/include/QtQuick/5.8.0 \ + qtdeclarative/include/QtQuick/5.8.0/QtQuick \ + qtbase/include/QtGui/5.8.0 \ + qtbase/include/QtGui/5.8.0/QtGui \ qtdeclarative/include \ qtdeclarative/include/QtQuick \ qtbase/include \ qtbase/include/QtGui \ - qtdeclarative/include/QtQml/5.7.1 \ - qtdeclarative/include/QtQml/5.7.1/QtQml \ - qtbase/include/QtCore/5.7.1 \ - qtbase/include/QtCore/5.7.1/QtCore \ + qtdeclarative/include/QtQml/5.8.0 \ + qtdeclarative/include/QtQml/5.8.0/QtQml \ + qtbase/include/QtCore/5.8.0 \ + qtbase/include/QtCore/5.8.0/QtCore \ qtdeclarative/include/QtQml \ qtbase/include/QtNetwork \ qtbase/include/QtCore \ diff --git a/repos/libports/lib/mk/qt5_quick.mk b/repos/libports/lib/mk/qt5_quick.mk index ec180d95e1..7f4df0c651 100644 --- a/repos/libports/lib/mk/qt5_quick.mk +++ b/repos/libports/lib/mk/qt5_quick.mk @@ -4,8 +4,13 @@ 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_qml +LIBS += qt5_qml qt5_gui diff --git a/repos/libports/lib/mk/qt5_quick_generated.inc b/repos/libports/lib/mk/qt5_quick_generated.inc index c20abc7906..150b8a1745 100644 --- a/repos/libports/lib/mk/qt5_quick_generated.inc +++ b/repos/libports/lib/mk/qt5_quick_generated.inc @@ -1,18 +1,18 @@ -QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_URL_CAST_FROM_STRING -DQT_NO_INTEGER_EVENT_COORDINATES -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 -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB +QT_DEFINES += -DQT_NO_URL_CAST_FROM_STRING -DQT_NO_INTEGER_EVENT_COORDINATES -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_NO_QML_DEBUGGER -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.7.1 \ - qtdeclarative/include/QtQuick/5.7.1/QtQuick \ - qtbase/include/QtGui/5.7.1 \ - qtbase/include/QtGui/5.7.1/QtGui \ - qtdeclarative/include/QtQml/5.7.1 \ - qtdeclarative/include/QtQml/5.7.1/QtQml \ - qtbase/include/QtCore/5.7.1 \ - qtbase/include/QtCore/5.7.1/QtCore \ + qtdeclarative/include/QtQuick/5.8.0 \ + qtdeclarative/include/QtQuick/5.8.0/QtQuick \ + qtbase/include/QtGui/5.8.0 \ + qtbase/include/QtGui/5.8.0/QtGui \ + qtdeclarative/include/QtQml/5.8.0 \ + qtdeclarative/include/QtQml/5.8.0/QtQml \ + qtbase/include/QtCore/5.8.0 \ + qtbase/include/QtCore/5.8.0/QtCore \ qtbase/include \ qtbase/include/QtGui \ qtdeclarative/include/QtQml \ @@ -39,8 +39,6 @@ QT_SOURCES += \ qquickbehavior.cpp \ qquickfontloader.cpp \ qquickstyledtext.cpp \ - qquickpath.cpp \ - qquickpathinterpolator.cpp \ qquickimageprovider.cpp \ qquicksvgparser.cpp \ qquickvaluetypes.cpp \ @@ -48,49 +46,81 @@ QT_SOURCES += \ qquickanimator.cpp \ qquickanimatorjob.cpp \ qquickanimatorcontroller.cpp \ - qquickprofiler.cpp \ qquickfontmetrics.cpp \ qquicktextmetrics.cpp \ qquickshortcut.cpp \ qquickvalidator.cpp \ + qquickpath.cpp \ + qquickpathinterpolator.cpp \ qsgabstractrenderer.cpp \ - qsgbatchrenderer.cpp \ qsggeometry.cpp \ qsgmaterial.cpp \ qsgnode.cpp \ qsgnodeupdater.cpp \ qsgrenderer.cpp \ qsgrendernode.cpp \ + qsgrendererinterface.cpp \ + qsgbatchrenderer.cpp \ qsgshaderrewriter.cpp \ qsgareaallocator.cpp \ - qsgatlastexture.cpp \ - qsgdepthstencilbuffer.cpp \ qsgengine.cpp \ - qsgflatcolormaterial.cpp \ qsgsimplerectnode.cpp \ qsgsimpletexturenode.cpp \ - qsgtexturematerial.cpp \ - qsgvertexcolormaterial.cpp \ qsgtexture.cpp \ qsgtextureprovider.cpp \ - qsgdefaultpainternode.cpp \ qsgdistancefieldutil.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 \ - qsgdefaultimagenode.cpp \ + qsgdefaultinternalimagenode.cpp \ + qsgdefaultinternalrectanglenode.cpp \ + qsgdefaultrendercontext.cpp \ + qsgdefaultcontext.cpp \ + qsgdefaultpainternode.cpp \ qsgdefaultrectanglenode.cpp \ - qsgrenderloop.cpp \ + qsgdefaultimagenode.cpp \ + qsgdefaultninepatchnode.cpp \ + qsgdefaultlayer.cpp \ qsgthreadedrenderloop.cpp \ qsgwindowsrenderloop.cpp \ - qsgdefaultlayer.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 \ + qsgsoftwarethreadedrenderloop.cpp \ + qsgsoftwarespritenode.cpp \ qquickevents.cpp \ qquickanchors.cpp \ qquickitem.cpp \ @@ -114,41 +144,44 @@ QT_SOURCES += \ qquickmousearea.cpp \ qquickpincharea.cpp \ qquickflickable.cpp \ - qquicklistview.cpp \ qquickrepeater.cpp \ - qquickgridview.cpp \ - qquickpathview.cpp \ - qquickpositioners.cpp \ qquickloader.cpp \ - qquickanimatedimage.cpp \ - qquickflipable.cpp \ qquicktranslate.cpp \ qquickclipnode.cpp \ qquickview.cpp \ qquickitemanimation.cpp \ qquickstateoperations.cpp \ qquickimplicitsizeitem.cpp \ - qquickspriteengine.cpp \ - qquicksprite.cpp \ - qquickspritesequence.cpp \ - qquickanimatedsprite.cpp \ qquickaccessibleattached.cpp \ qquickdrag.cpp \ qquickdroparea.cpp \ qquickmultipointtoucharea.cpp \ - qquickitemview.cpp \ - qquickitemviewtransition.cpp \ qquickwindowmodule.cpp \ qquickscreen.cpp \ qquickwindowattached.cpp \ - qquickframebufferobject.cpp \ - qquickitemgrabresult.cpp \ qquickrendercontrol.cpp \ - qquickopenglinfo.cpp \ - qquickshadereffect.cpp \ - qquickshadereffectmesh.cpp \ - qquickshadereffectnode.cpp \ + qquickgraphicsinfo.cpp \ + qquickitemgrabresult.cpp \ + qquickanimatedimage.cpp \ + qquickgridview.cpp \ + qquickitemview.cpp \ + qquickitemviewtransition.cpp \ + qquicklistview.cpp \ + qquickpathview.cpp \ + qquickpositioners.cpp \ + qquickflipable.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 \ @@ -164,6 +197,7 @@ QT_SOURCES += \ qquickdesignersupportstates.cpp \ qquickdesignerwindowmanager.cpp \ qqmldesignermetaobject.cpp \ + qquickdesignercustomparserobject.cpp \ qtquick2.cpp \ qrc_scenegraph.cpp \ qrc_items.cpp \ @@ -182,8 +216,6 @@ QT_SOURCES += \ moc_qquickpixmapcache_p.cpp \ moc_qquickbehavior_p.cpp \ moc_qquickfontloader_p.cpp \ - moc_qquickpath_p.cpp \ - moc_qquickpathinterpolator_p.cpp \ moc_qquickimageprovider.cpp \ moc_qquickvaluetypes_p.cpp \ moc_qquickanimator_p.cpp \ @@ -194,20 +226,28 @@ QT_SOURCES += \ moc_qquicktextmetrics_p.cpp \ moc_qquickshortcut_p.cpp \ moc_qquickvalidator_p.cpp \ - moc_qsgbatchrenderer_p.cpp \ + moc_qquickpath_p.cpp \ + moc_qquickpathinterpolator_p.cpp \ moc_qsgabstractrenderer.cpp \ - moc_qsgatlastexture_p.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_qsgthreadedrenderloop_p.cpp \ moc_qsgwindowsrenderloop_p.cpp \ - moc_qsgdefaultlayer_p.cpp \ + moc_qsgsoftwarecontext_p.cpp \ + moc_qsgsoftwarepixmaptexture_p.cpp \ + moc_qsgsoftwarerenderloop_p.cpp \ + moc_qsgsoftwarelayer_p.cpp \ + moc_qsgsoftwarethreadedrenderloop_p.cpp \ moc_qquickevents_p_p.cpp \ moc_qquickaccessibleattached_p.cpp \ moc_qquickitem_p.cpp \ @@ -229,42 +269,46 @@ QT_SOURCES += \ moc_qquickpincharea_p.cpp \ moc_qquickflickable_p.cpp \ moc_qquickflickable_p_p.cpp \ - moc_qquicklistview_p.cpp \ moc_qquickrepeater_p.cpp \ - moc_qquickgridview_p.cpp \ - moc_qquickpathview_p.cpp \ - moc_qquickpositioners_p.cpp \ - moc_qquickanimatedimage_p.cpp \ - moc_qquickflipable_p.cpp \ moc_qquicktranslate_p.cpp \ moc_qquickview.cpp \ moc_qquickitemanimation_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_qquickpathview_p.cpp \ + moc_qquickpositioners_p.cpp \ + moc_qquickflipable_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_qquickdrag_p.cpp \ - moc_qquickdroparea_p.cpp \ - moc_qquickmultipointtoucharea_p.cpp \ - moc_qquickitemview_p.cpp \ - moc_qquickitemviewtransition_p.cpp \ - moc_qquickscreen_p.cpp \ - moc_qquickwindowattached_p.cpp \ - moc_qquickwindowmodule_p.cpp \ - moc_qquickframebufferobject.cpp \ - moc_qquickitemgrabresult.cpp \ - moc_qquickrendercontrol.cpp \ moc_qquickopenglinfo_p.cpp \ - moc_qquickshadereffect_p.cpp \ - moc_qquickshadereffectmesh_p.cpp \ - moc_qquickshadereffectnode_p.cpp \ - moc_qquickshadereffectsource_p.cpp \ + moc_qquickframebufferobject.cpp \ moc_qquickcanvasitem_p.cpp \ moc_qquickcanvascontext_p.cpp \ moc_qquickcontext2d_p.cpp \ moc_qquickcontext2dtexture_p.cpp \ - moc_qquickdesignerwindowmanager_p.cpp + moc_qquickdesignerwindowmanager_p.cpp \ + moc_qquickdesignercustomparserobject_p.cpp QT_VPATH += \ qtdeclarative/src/quick \ @@ -272,6 +316,7 @@ QT_VPATH += \ qtdeclarative/src/quick/items \ qtdeclarative/src/quick/items/context2d \ qtdeclarative/src/quick/scenegraph \ + qtdeclarative/src/quick/scenegraph/adaptations/software \ qtdeclarative/src/quick/scenegraph/coreapi \ qtdeclarative/src/quick/scenegraph/util \ qtdeclarative/src/quick/util \ @@ -299,8 +344,6 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ moc_qquickpixmapcache_p.cpp \ moc_qquickbehavior_p.cpp \ moc_qquickfontloader_p.cpp \ - moc_qquickpath_p.cpp \ - moc_qquickpathinterpolator_p.cpp \ moc_qquickimageprovider.cpp \ moc_qquickvaluetypes_p.cpp \ moc_qquickanimator_p.cpp \ @@ -311,20 +354,28 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ moc_qquicktextmetrics_p.cpp \ moc_qquickshortcut_p.cpp \ moc_qquickvalidator_p.cpp \ - moc_qsgbatchrenderer_p.cpp \ + moc_qquickpath_p.cpp \ + moc_qquickpathinterpolator_p.cpp \ moc_qsgabstractrenderer.cpp \ - moc_qsgatlastexture_p.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_qsgthreadedrenderloop_p.cpp \ moc_qsgwindowsrenderloop_p.cpp \ - moc_qsgdefaultlayer_p.cpp \ + moc_qsgsoftwarecontext_p.cpp \ + moc_qsgsoftwarepixmaptexture_p.cpp \ + moc_qsgsoftwarerenderloop_p.cpp \ + moc_qsgsoftwarelayer_p.cpp \ + moc_qsgsoftwarethreadedrenderloop_p.cpp \ moc_qquickevents_p_p.cpp \ moc_qquickanchors_p.cpp \ moc_qquickaccessibleattached_p.cpp \ @@ -350,44 +401,48 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ moc_qquickpincharea_p.cpp \ moc_qquickflickable_p.cpp \ moc_qquickflickable_p_p.cpp \ - moc_qquicklistview_p.cpp \ moc_qquickrepeater_p.cpp \ - moc_qquickgridview_p.cpp \ - moc_qquickpathview_p.cpp \ - moc_qquickpositioners_p.cpp \ moc_qquickloader_p.cpp \ - moc_qquickanimatedimage_p.cpp \ - moc_qquickflipable_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_qquickpathview_p.cpp \ + moc_qquickpositioners_p.cpp \ + moc_qquickflipable_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_qquickdrag_p.cpp \ - moc_qquickdroparea_p.cpp \ - moc_qquickmultipointtoucharea_p.cpp \ - moc_qquickitemview_p.cpp \ - moc_qquickitemviewtransition_p.cpp \ - moc_qquickscreen_p.cpp \ - moc_qquickwindowattached_p.cpp \ - moc_qquickwindowmodule_p.cpp \ - moc_qquickframebufferobject.cpp \ - moc_qquickitemgrabresult.cpp \ - moc_qquickrendercontrol.cpp \ moc_qquickopenglinfo_p.cpp \ - moc_qquickshadereffect_p.cpp \ - moc_qquickshadereffectmesh_p.cpp \ - moc_qquickshadereffectnode_p.cpp \ - moc_qquickshadereffectsource_p.cpp \ + moc_qquickframebufferobject.cpp \ moc_qquickcanvasitem_p.cpp \ moc_qquickcanvascontext_p.cpp \ moc_qquickcontext2d_p.cpp \ moc_qquickcontext2dtexture_p.cpp \ - moc_qquickdesignerwindowmanager_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 @@ -395,14 +450,14 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ qquickpixmapcache.moc \ qquickfontloader.moc \ - qquickprofiler.moc \ qsgcontext.moc \ qsgrenderloop.moc \ qsgthreadedrenderloop.moc \ + qsgsoftwarethreadedrenderloop.moc \ qquickwindow.moc \ qquickimage.moc \ qquickflipable.moc \ - qquickframebufferobject.moc \ - qquickshadereffectnode.moc \ - qquickshadereffectsource.moc + qquickshadereffectsource.moc \ + qquickopenglshadereffectnode.moc \ + qquickframebufferobject.moc diff --git a/repos/libports/lib/mk/qt5_sql_generated.inc b/repos/libports/lib/mk/qt5_sql_generated.inc index 691627b6bc..682898407d 100644 --- a/repos/libports/lib/mk/qt5_sql_generated.inc +++ b/repos/libports/lib/mk/qt5_sql_generated.inc @@ -1,13 +1,13 @@ -QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_USING_NAMESPACE -DQT_NO_CAST_FROM_ASCII -DQT_NO_FOREACH -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 -DQT_NO_DEBUG -DQT_CORE_LIB +QT_DEFINES += -DQT_NO_USING_NAMESPACE -DQT_NO_CAST_FROM_ASCII -DQT_NO_FOREACH -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.7.1 \ - qtbase/include/QtSql/5.7.1/QtSql \ - qtbase/include/QtCore/5.7.1 \ - qtbase/include/QtCore/5.7.1/QtCore \ + qtbase/include/QtSql/5.8.0 \ + qtbase/include/QtSql/5.8.0/QtSql \ + qtbase/include/QtCore/5.8.0 \ + qtbase/include/QtCore/5.8.0/QtCore \ qtbase/include/QtCore \ qtbase/mkspecs/genode-g++ diff --git a/repos/libports/lib/mk/qt5_ui_tools.mk b/repos/libports/lib/mk/qt5_ui_tools.mk index 7abf4454de..01acb9b695 100644 --- a/repos/libports/lib/mk/qt5_ui_tools.mk +++ b/repos/libports/lib/mk/qt5_ui_tools.mk @@ -14,4 +14,4 @@ COMPILER_MOC_SOURCE_MAKE_ALL_FILES_FILTER_OUT = \ include $(REP_DIR)/lib/mk/qt5.inc -LIBS += qt5_widgets qt5_core +LIBS += qt5_gui diff --git a/repos/libports/lib/mk/qt5_ui_tools_generated.inc b/repos/libports/lib/mk/qt5_ui_tools_generated.inc index 6f875bce7f..33fc3b3c6e 100644 --- a/repos/libports/lib/mk/qt5_ui_tools_generated.inc +++ b/repos/libports/lib/mk/qt5_ui_tools_generated.inc @@ -1,12 +1,12 @@ -QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_DESIGNER -DQT_USE_QSTRINGBUILDER -DQFORMINTERNAL_NAMESPACE -DQT_DESIGNER_STATIC -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 -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_DEFINES += -DQT_DESIGNER -DQT_USE_QSTRINGBUILDER -DQFORMINTERNAL_NAMESPACE -DQT_DESIGNER_STATIC -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.7.1 \ - qttools/include/QtUiTools/5.7.1/QtUiTools \ + qttools/include/QtUiTools/5.8.0 \ + qttools/include/QtUiTools/5.8.0/QtUiTools \ qtbase/include \ qtbase/include/QtWidgets \ qtbase/include/QtGui \ diff --git a/repos/libports/lib/mk/qt5_version.inc b/repos/libports/lib/mk/qt5_version.inc index 86c558d84e..d9d5342ee8 100644 --- a/repos/libports/lib/mk/qt5_version.inc +++ b/repos/libports/lib/mk/qt5_version.inc @@ -1,2 +1,2 @@ -QT_VERSION := 5.7.1 +QT_VERSION := 5.8.0 QT5 := qt-everywhere-opensource-src-$(QT_VERSION) diff --git a/repos/libports/lib/mk/qt5_webcore.mk b/repos/libports/lib/mk/qt5_webcore.mk index 4c765884d1..b0d150c048 100644 --- a/repos/libports/lib/mk/qt5_webcore.mk +++ b/repos/libports/lib/mk/qt5_webcore.mk @@ -126,4 +126,4 @@ QT_VPATH += qtwebkit/Source/WebCore include $(REP_DIR)/lib/mk/qt5.inc -LIBS += qt5_angle qt5_wtf qt5_jscore qt5_sql qt5_network qt5_core icu jpeg libpng zlib libc libm +LIBS += qt5_angle qt5_wtf qt5_jscore qt5_sql qt5_network qt5_gui qt5_core icu jpeg libpng zlib libc libm diff --git a/repos/libports/lib/mk/qt5_webcore_generated.inc b/repos/libports/lib/mk/qt5_webcore_generated.inc index 9880824b0e..1b08cec2de 100644 --- a/repos/libports/lib/mk/qt5_webcore_generated.inc +++ b/repos/libports/lib/mk/qt5_webcore_generated.inc @@ -1,4 +1,4 @@ -QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -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_QTQUICK=1 -DHAVE_QTPRINTSUPPORT=1 -DHAVE_QSTYLE=1 -DHAVE_QTTESTLIB=1 -DWTF_USE_LIBJPEG=1 -DWTF_USE_LIBPNG=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 -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_SQL_LIB -DQT_CORE_LIB +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_QTQUICK=1 -DHAVE_QTPRINTSUPPORT=1 -DHAVE_QSTYLE=1 -DHAVE_QTTESTLIB=1 -DWTF_USE_LIBJPEG=1 -DWTF_USE_LIBPNG=1 -DHAVE_XRENDER=1 -DHAVE_GLX=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 \ @@ -122,15 +122,16 @@ QT_INCPATH += \ qtwebkit/Source/JavaScriptCore/yarr \ qtwebkit/Source/JavaScriptCore/API \ qtwebkit/Source/JavaScriptCore/ForwardingHeaders \ + qtwebkit/Source/JavaScriptCore/disassembler/udis86 \ qtwebkit/Source/WTF \ - qtbase/include/QtGui/5.7.1 \ - qtbase/include/QtGui/5.7.1/QtGui \ + qtbase/include/QtGui/5.8.0 \ + qtbase/include/QtGui/5.8.0/QtGui \ qtbase/include \ qtbase/include/QtGui \ qtbase/include/QtNetwork \ qtbase/include/QtSql \ - qtbase/include/QtCore/5.7.1 \ - qtbase/include/QtCore/5.7.1/QtCore \ + qtbase/include/QtCore/5.8.0 \ + qtbase/include/QtCore/5.8.0/QtCore \ qtbase/include/QtCore \ qtbase/mkspecs/genode-g++ diff --git a/repos/libports/lib/mk/qt5_webkit.mk b/repos/libports/lib/mk/qt5_webkit.mk index 804d8c2d4f..1e8b37d005 100644 --- a/repos/libports/lib/mk/qt5_webkit.mk +++ b/repos/libports/lib/mk/qt5_webkit.mk @@ -19,7 +19,7 @@ QT_INCPATH += qtwebkit/Source/WebCore/generated include $(REP_DIR)/lib/mk/qt5.inc -LIBS += qt5_webcore qt5_jscore qt5_network qt5_printsupport qt5_core icu libc libm +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 diff --git a/repos/libports/lib/mk/qt5_webkit_generated.inc b/repos/libports/lib/mk/qt5_webkit_generated.inc index ad56bcf8ad..85fe87fcd4 100644 --- a/repos/libports/lib/mk/qt5_webkit_generated.inc +++ b/repos/libports/lib/mk/qt5_webkit_generated.inc @@ -1,4 +1,4 @@ -QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -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_QTQUICK=1 -DHAVE_QTPRINTSUPPORT=1 -DHAVE_QSTYLE=1 -DHAVE_QTTESTLIB=1 -DWTF_USE_LIBJPEG=1 -DWTF_USE_LIBPNG=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 -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_SQL_LIB -DQT_CORE_LIB +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_QTQUICK=1 -DHAVE_QTPRINTSUPPORT=1 -DHAVE_QSTYLE=1 -DHAVE_QTTESTLIB=1 -DWTF_USE_LIBJPEG=1 -DWTF_USE_LIBPNG=1 -DHAVE_XRENDER=1 -DHAVE_GLX=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 \ @@ -123,15 +123,16 @@ QT_INCPATH += \ qtwebkit/Source/JavaScriptCore/yarr \ qtwebkit/Source/JavaScriptCore/API \ qtwebkit/Source/JavaScriptCore/ForwardingHeaders \ + qtwebkit/Source/JavaScriptCore/disassembler/udis86 \ qtwebkit/Source/WTF \ - qtbase/include/QtGui/5.7.1 \ - qtbase/include/QtGui/5.7.1/QtGui \ + qtbase/include/QtGui/5.8.0 \ + qtbase/include/QtGui/5.8.0/QtGui \ qtbase/include \ qtbase/include/QtGui \ qtbase/include/QtNetwork \ qtbase/include/QtSql \ - qtbase/include/QtCore/5.7.1 \ - qtbase/include/QtCore/5.7.1/QtCore \ + qtbase/include/QtCore/5.8.0 \ + qtbase/include/QtCore/5.8.0/QtCore \ qtbase/include/QtCore \ qtbase/mkspecs/genode-g++ diff --git a/repos/libports/lib/mk/qt5_webkitwidgets.mk b/repos/libports/lib/mk/qt5_webkitwidgets.mk index f5dead52fa..4b9865e285 100644 --- a/repos/libports/lib/mk/qt5_webkitwidgets.mk +++ b/repos/libports/lib/mk/qt5_webkitwidgets.mk @@ -19,4 +19,4 @@ COMPILER_MOC_SOURCE_MAKE_ALL_FILES_FILTER_OUT = \ include $(REP_DIR)/lib/mk/qt5.inc -LIBS += qt5_webkit qt5_widgets qt5_printsupport qt5_core icu +LIBS += qt5_webkit qt5_widgets qt5_printsupport qt5_gui qt5_core icu diff --git a/repos/libports/lib/mk/qt5_webkitwidgets_generated.inc b/repos/libports/lib/mk/qt5_webkitwidgets_generated.inc index ba50260f47..0eb7b88917 100644 --- a/repos/libports/lib/mk/qt5_webkitwidgets_generated.inc +++ b/repos/libports/lib/mk/qt5_webkitwidgets_generated.inc @@ -1,4 +1,4 @@ -QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_BUILD_WEBKITWIDGETS_LIB -DSQLITE_CORE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_OMIT_COMPLETE -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_QTQUICK=1 -DHAVE_QTPRINTSUPPORT=1 -DHAVE_QSTYLE=1 -DHAVE_QTTESTLIB=1 -DWTF_USE_LIBJPEG=1 -DWTF_USE_LIBPNG=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 -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_DEFINES += -DQT_BUILD_WEBKITWIDGETS_LIB -DSQLITE_CORE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_OMIT_COMPLETE -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_QTQUICK=1 -DHAVE_QTPRINTSUPPORT=1 -DHAVE_QSTYLE=1 -DHAVE_QTTESTLIB=1 -DWTF_USE_LIBJPEG=1 -DWTF_USE_LIBPNG=1 -DHAVE_XRENDER=1 -DHAVE_GLX=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 \ @@ -125,11 +125,12 @@ QT_INCPATH += \ qtwebkit/Source/JavaScriptCore/yarr \ qtwebkit/Source/JavaScriptCore/API \ qtwebkit/Source/JavaScriptCore/ForwardingHeaders \ + qtwebkit/Source/JavaScriptCore/disassembler/udis86 \ qtwebkit/Source/WTF \ qtwebkit/include \ qtwebkit/include/QtWebKitWidgets \ - qtwebkit/include/QtWebKitWidgets/5.7.1 \ - qtwebkit/include/QtWebKitWidgets/5.7.1/QtWebKitWidgets \ + qtwebkit/include/QtWebKitWidgets/5.8.0 \ + qtwebkit/include/QtWebKitWidgets/5.8.0/QtWebKitWidgets \ qtwebkit/Source/qt/Api \ qtwebkit/Source/qt/WebCoreSupport \ qtwebkit/Source \ @@ -139,12 +140,12 @@ QT_INCPATH += \ qtbase/include/QtGui \ qtbase/include/QtNetwork \ qtbase/include/QtCore \ - qtbase/include/QtWidgets/5.7.1 \ - qtbase/include/QtWidgets/5.7.1/QtWidgets \ - qtbase/include/QtGui/5.7.1 \ - qtbase/include/QtGui/5.7.1/QtGui \ - qtbase/include/QtCore/5.7.1 \ - qtbase/include/QtCore/5.7.1/QtCore \ + qtbase/include/QtWidgets/5.8.0 \ + qtbase/include/QtWidgets/5.8.0/QtWidgets \ + qtbase/include/QtGui/5.8.0 \ + qtbase/include/QtGui/5.8.0/QtGui \ + qtbase/include/QtCore/5.8.0 \ + qtbase/include/QtCore/5.8.0/QtCore \ qtbase/include/QtPrintSupport \ qtbase/include/QtOpenGL \ qtbase/include/QtSql \ diff --git a/repos/libports/lib/mk/qt5_widgets.mk b/repos/libports/lib/mk/qt5_widgets.mk index 338b46ff44..5f7cf3b4fc 100644 --- a/repos/libports/lib/mk/qt5_widgets.mk +++ b/repos/libports/lib/mk/qt5_widgets.mk @@ -9,11 +9,10 @@ qfiledialog.o: ui_qfiledialog.h include $(REP_DIR)/lib/mk/qt5.inc -INC_DIR += $(REP_DIR)/include/qt5/qtbase/QtWidgets/private \ - $(QT5_CONTRIB_DIR)/qtbase/include/QtWidgets/$(QT_VERSION)/QtWidgets \ +INC_DIR += $(QT5_CONTRIB_DIR)/qtbase/include/QtWidgets/$(QT_VERSION)/QtWidgets \ $(QT5_CONTRIB_DIR)/qtbase/include/QtGui/$(QT_VERSION) \ $(QT5_CONTRIB_DIR)/qtbase/include/QtGui/$(QT_VERSION)/QtGui \ $(QT5_CONTRIB_DIR)/qtbase/include/QtCore/$(QT_VERSION) \ $(QT5_CONTRIB_DIR)/qtbase/include/QtCore/$(QT_VERSION)/QtCore -LIBS += qt5_core libc +LIBS += qt5_gui diff --git a/repos/libports/lib/mk/qt5_widgets_generated.inc b/repos/libports/lib/mk/qt5_widgets_generated.inc index 599a53b3f7..f8ba5f0c71 100644 --- a/repos/libports/lib/mk/qt5_widgets_generated.inc +++ b/repos/libports/lib/mk/qt5_widgets_generated.inc @@ -1,16 +1,16 @@ -QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_USING_NAMESPACE -DQT_NO_STYLE_MAC -DQT_NO_STYLE_WINDOWSVISTA -DQT_NO_STYLE_WINDOWSXP -DQT_NO_STYLE_WINDOWSCE -DQT_NO_STYLE_WINDOWSMOBILE -DQT_NO_STYLE_ANDROID -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 -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB +QT_DEFINES += -DQT_NO_USING_NAMESPACE -DQT_NO_STYLE_MAC -DQT_NO_STYLE_WINDOWSVISTA -DQT_NO_STYLE_WINDOWSXP -DQT_NO_STYLE_ANDROID -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.7.1 \ - qtbase/include/QtWidgets/5.7.1/QtWidgets \ - qtbase/include/QtGui/5.7.1 \ - qtbase/include/QtGui/5.7.1/QtGui \ - qtbase/include/QtCore/5.7.1 \ - qtbase/include/QtCore/5.7.1/QtCore \ + qtbase/include/QtWidgets/5.8.0 \ + qtbase/include/QtWidgets/5.8.0/QtWidgets \ + qtbase/include/QtGui/5.8.0 \ + qtbase/include/QtGui/5.8.0/QtGui \ + qtbase/include/QtCore/5.8.0 \ + qtbase/include/QtCore/5.8.0/QtCore \ qtbase/include/QtGui \ qtbase/include/QtCore \ qtbase/mkspecs/genode-g++ diff --git a/repos/libports/lib/mk/qt5_wtf_generated.inc b/repos/libports/lib/mk/qt5_wtf_generated.inc index 7207e55c6d..18f003074e 100644 --- a/repos/libports/lib/mk/qt5_wtf_generated.inc +++ b/repos/libports/lib/mk/qt5_wtf_generated.inc @@ -1,4 +1,4 @@ -QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -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_QTQUICK=1 -DHAVE_QTPRINTSUPPORT=1 -DHAVE_QSTYLE=1 -DHAVE_QTTESTLIB=1 -DWTF_USE_LIBJPEG=1 -DWTF_USE_LIBPNG=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 -DQT_NO_DEBUG -DQT_CORE_LIB +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_QTQUICK=1 -DHAVE_QTPRINTSUPPORT=1 -DHAVE_QSTYLE=1 -DHAVE_QTTESTLIB=1 -DWTF_USE_LIBJPEG=1 -DWTF_USE_LIBPNG=1 -DHAVE_XRENDER=1 -DHAVE_GLX=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 \ diff --git a/repos/libports/lib/mk/qt5_xml.mk b/repos/libports/lib/mk/qt5_xml.mk index 9d6add82e8..d7d44bd387 100644 --- a/repos/libports/lib/mk/qt5_xml.mk +++ b/repos/libports/lib/mk/qt5_xml.mk @@ -6,7 +6,4 @@ include $(REP_DIR)/lib/mk/qt5_xml_generated.inc include $(REP_DIR)/lib/mk/qt5.inc -INC_DIR += $(REP_DIR)/include/qt5/qtbase/QtXml/private \ - $(QT5_CONTRIB_DIR)/qtbase/include/QtCore/$(QT_VERSION)/QtCore \ - -LIBS += qt5_core libc +INC_DIR += $(QT5_CONTRIB_DIR)/qtbase/include/QtCore/$(QT_VERSION)/QtCore \ diff --git a/repos/libports/lib/mk/qt5_xml_generated.inc b/repos/libports/lib/mk/qt5_xml_generated.inc index a8a51e6fdc..301430272b 100644 --- a/repos/libports/lib/mk/qt5_xml_generated.inc +++ b/repos/libports/lib/mk/qt5_xml_generated.inc @@ -1,13 +1,13 @@ -QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_USING_NAMESPACE -DQT_NO_FOREACH -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 -DQT_NO_DEBUG -DQT_CORE_LIB +QT_DEFINES += -DQT_NO_USING_NAMESPACE -DQT_NO_FOREACH -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.7.1 \ - qtbase/include/QtXml/5.7.1/QtXml \ - qtbase/include/QtCore/5.7.1 \ - qtbase/include/QtCore/5.7.1/QtCore \ + qtbase/include/QtXml/5.8.0 \ + qtbase/include/QtXml/5.8.0/QtXml \ + qtbase/include/QtCore/5.8.0 \ + qtbase/include/QtCore/5.8.0/QtCore \ qtbase/include/QtCore \ qtbase/mkspecs/genode-g++ diff --git a/repos/libports/ports/qt5.hash b/repos/libports/ports/qt5.hash index 00721d6ed2..fca186b71e 100644 --- a/repos/libports/ports/qt5.hash +++ b/repos/libports/ports/qt5.hash @@ -1 +1 @@ -fc3b60857d3d492f166712c8ac018df9b880acb1 +bd7410b31ae57d778d9da6599c0a4e887fa44fa8 diff --git a/repos/libports/ports/qt5.port b/repos/libports/ports/qt5.port index 98e6ddda95..09ed44308b 100644 --- a/repos/libports/ports/qt5.port +++ b/repos/libports/ports/qt5.port @@ -1,5 +1,5 @@ LICENSE := GPL -VERSION := 5.7.1 +VERSION := 5.8.0 QT5 := qt-everywhere-opensource-src-${VERSION} QT5_WEBKIT := qtwebkit-opensource-src-$(VERSION) @@ -7,12 +7,12 @@ QTSCRIPTCLASSIC := qtscriptclassic-1.0_1-opensource DOWNLOADS := ${QT5}.archive ${QT5_WEBKIT}.archive ${QTSCRIPTCLASSIC}.archive -URL(${QT5}) := http://download.qt.io/archive/qt/5.7/$(VERSION)/single/$(QT5).tar.xz -SHA(${QT5}) := bedd61b2767239bad01fa9ce3d1e2e63ecf721bd +URL(${QT5}) := http://download.qt.io/archive/qt/5.8/$(VERSION)/single/$(QT5).tar.xz +SHA(${QT5}) := 1a056ca4f731798e4142a691d0448c2c853228ca DIR(${QT5}) := src/lib/qt5/${QT5} -URL(${QT5_WEBKIT}) := http://download.qt.io/community_releases/5.7/$(VERSION)/${QT5_WEBKIT}.tar.xz -SHA(${QT5_WEBKIT}) := cd44a529cf24cf6f9eda93ac88c7d65dc2de3359 +URL(${QT5_WEBKIT}) := http://download.qt.io/community_releases/5.8/$(VERSION)-final/${QT5_WEBKIT}.tar.xz +SHA(${QT5_WEBKIT}) := 79d898f0e447039fb9f12b2f798a0aedf071ea82 DIR(${QT5_WEBKIT}) := src/lib/qt5/${QT5}/qtwebkit URL(${QTSCRIPTCLASSIC}) := ftp://ftp.informatik.hu-berlin.de/pub/Mirrors/ftp.troll.no/QT/qt/solutions/lgpl/${QTSCRIPTCLASSIC}.tar.gz @@ -22,8 +22,8 @@ DIR(${QTSCRIPTCLASSIC}) := src/lib/qt5/${QTSCRIPTCLASSIC} PATCHES_DIR := $(REP_DIR)/src/lib/qt5/patches QT5_PATCHES := $(shell cat $(PATCHES_DIR)/series) -QT5_WEBKIT_PATCHES := qt5_qtwebkit_configuration.patch qt5_qtwebkit_generated_headers.patch qt5_qtwebkit.patch -QTSCRIPTCLASSIC_PATCHES := qtscriptclassic_qt5.patch qtscriptclassic_qt5_7.patch +QT5_WEBKIT_PATCHES := $(shell cat $(PATCHES_DIR)/series.qtwebkit) +QTSCRIPTCLASSIC_PATCHES := $(shell cat $(PATCHES_DIR)/series.qtscriptclassic) PATCHES := $(addprefix src/lib/qt5/patches/, ${QT5_PATCHES} ${QT5_WEBKIT_PATCHES} ${QTSCRIPTCLASSIC_PATCHES}) diff --git a/repos/libports/run/qt5.run b/repos/libports/run/qt5.run index 57d853ee2f..c402c84426 100644 --- a/repos/libports/run/qt5.run +++ b/repos/libports/run/qt5.run @@ -85,7 +85,6 @@ append boot_modules { qt_launchpad freetype.lib.so gallium.lib.so - icu.lib.so ld.lib.so libc.lib.so libc_pipe.lib.so diff --git a/repos/libports/run/qt5_avplay.run b/repos/libports/run/qt5_avplay.run index e7f04185dc..ca00879c91 100644 --- a/repos/libports/run/qt5_avplay.run +++ b/repos/libports/run/qt5_avplay.run @@ -77,7 +77,6 @@ append boot_modules { qt_avplay freetype.lib.so gallium.lib.so - icu.lib.so ld.lib.so libc.lib.so posix.lib.so diff --git a/repos/libports/run/qt5_calculatorform.run b/repos/libports/run/qt5_calculatorform.run index b88cd552b9..1a2bfb5e7c 100644 --- a/repos/libports/run/qt5_calculatorform.run +++ b/repos/libports/run/qt5_calculatorform.run @@ -64,7 +64,6 @@ append boot_modules { calculatorform freetype.lib.so gallium.lib.so - icu.lib.so ld.lib.so libc.lib.so libc_pipe.lib.so diff --git a/repos/libports/run/qt5_openglwindow.run b/repos/libports/run/qt5_openglwindow.run index b1bc3bf6a7..527bd08138 100644 --- a/repos/libports/run/qt5_openglwindow.run +++ b/repos/libports/run/qt5_openglwindow.run @@ -63,7 +63,6 @@ append boot_modules { openglwindow freetype.lib.so gallium.lib.so - icu.lib.so ld.lib.so libc.lib.so libc_pipe.lib.so diff --git a/repos/libports/run/qt5_qpluginwidget.run b/repos/libports/run/qt5_qpluginwidget.run index 5a872a2dbf..03c06bae50 100644 --- a/repos/libports/run/qt5_qpluginwidget.run +++ b/repos/libports/run/qt5_qpluginwidget.run @@ -83,7 +83,6 @@ append boot_modules { test-qpluginwidget freetype.lib.so gallium.lib.so - icu.lib.so ld.lib.so libc.lib.so libc_pipe.lib.so diff --git a/repos/libports/run/qt5_quicktest.run b/repos/libports/run/qt5_quicktest.run index 23a7cd44ca..911f0cb730 100644 --- a/repos/libports/run/qt5_quicktest.run +++ b/repos/libports/run/qt5_quicktest.run @@ -67,7 +67,6 @@ append boot_modules { qt_quicktest freetype.lib.so gallium.lib.so - icu.lib.so ld.lib.so libc.lib.so libc_pipe.lib.so diff --git a/repos/libports/run/qt5_samegame.run b/repos/libports/run/qt5_samegame.run index 514ffae6ad..7535e67a6f 100644 --- a/repos/libports/run/qt5_samegame.run +++ b/repos/libports/run/qt5_samegame.run @@ -67,7 +67,6 @@ append boot_modules { samegame freetype.lib.so gallium.lib.so - icu.lib.so ld.lib.so libc.lib.so libc_pipe.lib.so diff --git a/repos/libports/run/qt5_tetrix.run b/repos/libports/run/qt5_tetrix.run index f7a5ac94bb..fa227567cc 100644 --- a/repos/libports/run/qt5_tetrix.run +++ b/repos/libports/run/qt5_tetrix.run @@ -63,7 +63,6 @@ append boot_modules { tetrix freetype.lib.so gallium.lib.so - icu.lib.so ld.lib.so libc.lib.so libc_pipe.lib.so diff --git a/repos/libports/run/qt5_textedit.run b/repos/libports/run/qt5_textedit.run index 86d3582e59..aeed2ffc0f 100644 --- a/repos/libports/run/qt5_textedit.run +++ b/repos/libports/run/qt5_textedit.run @@ -89,7 +89,7 @@ append_if [expr ![have_spec linux]] config { append config { - + @@ -101,7 +101,7 @@ append config { - + @@ -125,7 +125,6 @@ append boot_modules { textedit freetype.lib.so gallium.lib.so - icu.lib.so ld.lib.so libc.lib.so libc_pipe.lib.so @@ -137,6 +136,7 @@ append boot_modules { qt5_component.lib.so qt5_core.lib.so qt5_gui.lib.so + qt5_printsupport.lib.so qt5_widgets.lib.so qt5_xml.lib.so zlib.lib.so diff --git a/repos/libports/src/app/qt5/examples/textedit/target.mk b/repos/libports/src/app/qt5/examples/textedit/target.mk index 5bbe3bde6a..499664357d 100644 --- a/repos/libports/src/app/qt5/examples/textedit/target.mk +++ b/repos/libports/src/app/qt5/examples/textedit/target.mk @@ -16,4 +16,4 @@ include $(QT5_REP_DIR)/src/app/qt5/tmpl/target_defaults.inc include $(QT5_REP_DIR)/src/app/qt5/tmpl/target_final.inc -LIBS += qt5_component +LIBS += qt5_printsupport qt5_component diff --git a/repos/libports/src/app/qt5/qt_avplay/main.cpp b/repos/libports/src/app/qt5/qt_avplay/main.cpp index c71f5784ab..360a40f81e 100644 --- a/repos/libports/src/app/qt5/qt_avplay/main.cpp +++ b/repos/libports/src/app/qt5/qt_avplay/main.cpp @@ -34,13 +34,15 @@ static inline void load_stylesheet() qApp->setStyleSheet(QLatin1String(file.readAll())); } -extern void initialize_qpa_plugin(Genode::Env &); +extern void initialize_qt_core(Genode::Env &); +extern void initialize_qt_gui(Genode::Env &); void Libc::Component::construct(Libc::Env &env) { Libc::with_libc([&] { - initialize_qpa_plugin(env); + initialize_qt_core(env); + initialize_qt_gui(env); int argc = 1; char const *argv[] = { "qt_avplay", 0 }; diff --git a/repos/libports/src/app/qt5/qt_launchpad/main.cpp b/repos/libports/src/app/qt5/qt_launchpad/main.cpp index 4468193735..518f379fed 100644 --- a/repos/libports/src/app/qt5/qt_launchpad/main.cpp +++ b/repos/libports/src/app/qt5/qt_launchpad/main.cpp @@ -63,13 +63,15 @@ struct Qt_launchpad_namespace::Local_env : Genode::Env } }; -extern void initialize_qpa_plugin(Genode::Env &); +extern void initialize_qt_core(Genode::Env &); +extern void initialize_qt_gui(Genode::Env &); void Libc::Component::construct(Libc::Env &env) { Libc::with_libc([&] { - initialize_qpa_plugin(env); + initialize_qt_core(env); + initialize_qt_gui(env); Qt_launchpad_namespace::Local_env local_env(env); diff --git a/repos/libports/src/app/qt5/tmpl/target_final.inc b/repos/libports/src/app/qt5/tmpl/target_final.inc index 454310925c..692c49ec7f 100644 --- a/repos/libports/src/app/qt5/tmpl/target_final.inc +++ b/repos/libports/src/app/qt5/tmpl/target_final.inc @@ -5,14 +5,6 @@ LIBS += libc # set the stack size of the main thread CC_CXX_OPT += -DQT_MAIN_STACK_SIZE=$(QT_MAIN_STACK_SIZE) -# static Qt plugins -#ifeq ($(findstring qgif, $(QT_PLUGIN)), qgif) -#LIBS += qgif -#endif -#ifeq ($(findstring qjpeg, $(QT_PLUGIN)), qjpeg) -#LIBS += qjpeg -#endif - # QtCore ifeq ($(findstring core, $(QT)), core) QT_DEFINES += -DQT_CORE_LIB @@ -22,7 +14,7 @@ endif # QtGui ifeq ($(findstring gui, $(QT)), gui) QT_DEFINES += -DQT_GUI_LIB -LIBS += qt5_gui qt5_qpa_nitpicker qt5_widgets +LIBS += qt5_gui qt5_qpa_nitpicker qt5_widgets qt5_qjpeg endif # QtNetwork @@ -30,6 +22,11 @@ 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 @@ -45,16 +42,6 @@ LIBS += qt5_scriptclassic endif endif -# QtScriptTools -ifeq ($(findstring scripttools, $(QT)), scripttools) -LIBS += qt5_scripttools -endif - -# QtSvg -ifeq ($(findstring svg, $(QT)), svg) -LIBS += qt5_svg -endif - # QtXml ifeq ($(findstring xml, $(QT)), xml) LIBS += qt5_xml diff --git a/repos/libports/src/lib/qt5/patches/qt5_tools.patch b/repos/libports/src/lib/qt5/patches/host_tools.patch similarity index 86% rename from repos/libports/src/lib/qt5/patches/qt5_tools.patch rename to repos/libports/src/lib/qt5/patches/host_tools.patch index f1c2c197f0..4b8ac92846 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_tools.patch +++ b/repos/libports/src/lib/qt5/patches/host_tools.patch @@ -1,4 +1,4 @@ -qt5_tools.patch +host_tools.patch From: Christian Prochaska @@ -13,10 +13,10 @@ This patch should not be applied when running the Qt 'configure' script. 5 files changed, 61 insertions(+), 61 deletions(-) diff --git a/qtbase/mkspecs/features/qt.prf b/qtbase/mkspecs/features/qt.prf -index bb52f23..78fc527 100644 +index 98f794c..f4ec688 100644 --- a/qtbase/mkspecs/features/qt.prf +++ b/qtbase/mkspecs/features/qt.prf -@@ -151,7 +151,7 @@ for(ever) { +@@ -153,7 +153,7 @@ for(ever) { WINRT_MANIFEST.capabilities_device_default += $$MODULE_WINRT_CAPABILITIES_DEVICE } } @@ -26,32 +26,30 @@ index bb52f23..78fc527 100644 !isEmpty(var_sfx): break() var_sfx = _PRIVATE diff --git a/qtbase/mkspecs/features/qt_build_config.prf b/qtbase/mkspecs/features/qt_build_config.prf -index 1e2d5c2..4f7e611 100644 +index 3762c14..a19d0ce 100644 --- a/qtbase/mkspecs/features/qt_build_config.prf +++ b/qtbase/mkspecs/features/qt_build_config.prf -@@ -12,7 +12,7 @@ - !contains(QMAKE_INTERNAL_INCLUDED_FILES, .*qmodule\\.pri) { - QMAKE_QT_MODULE = $$[QT_HOST_DATA/get]/mkspecs/qmodule.pri - !exists($$QMAKE_QT_MODULE)|!include($$QMAKE_QT_MODULE, "", true) { -- error("Cannot load qmodule.pri!") -+ debug(1, "Cannot load qmodule.pri!") - } else { - debug(1, "Loaded qmodule.pri from ($$QMAKE_QT_MODULE)") +@@ -132,5 +132,5 @@ defineTest(qtConfig) { + contains(QT.$${module}.disabled_features, $$1): \ + return(false) } +- error("Could not find feature $${1}.") ++ debug(1, "Could not find feature $${1}.") + } diff --git a/qtbase/mkspecs/features/qt_module.prf b/qtbase/mkspecs/features/qt_module.prf -index d9011f5..51c0900 100644 +index 31d6285..eec9850 100644 --- a/qtbase/mkspecs/features/qt_module.prf +++ b/qtbase/mkspecs/features/qt_module.prf -@@ -21,7 +21,7 @@ load(qt_build_config) # loads qmodule.pri if hasn't been loaded already +@@ -11,7 +11,7 @@ isEmpty(MODULE):MODULE = $$section($$list($$basename(_PRO_FILE_)), ., 0, 0) isEmpty(VERSION): VERSION = $$MODULE_VERSION -isEmpty(VERSION): error("Module does not define version.") +isEmpty(VERSION): debug(1, "Module does not define version.") - # Compile as shared/DLL or static according to the option given to configure - # unless overridden. Host builds are always static -@@ -82,7 +82,7 @@ QMAKE_DOCS_TARGETDIR = qt$${MODULE} + exists($$OUT_PWD/qt$${MODULE}-config.pri) { + include($$OUT_PWD/qt$${MODULE}-config.pri) +@@ -83,7 +83,7 @@ QMAKE_DOCS_TARGETDIR = qt$${MODULE} load(qt_common) !no_module_headers: load(qt_module_headers) @@ -61,10 +59,10 @@ index d9011f5..51c0900 100644 INCLUDEPATH *= $$eval(QT.$${MODULE}.includes) $$eval(QT.$${MODULE}_private.includes) diff --git a/qtbase/mkspecs/features/qt_tool.prf b/qtbase/mkspecs/features/qt_tool.prf -index bdeb59c..bdf4b5f 100644 +index 4b73b4b..a4f4a12 100644 --- a/qtbase/mkspecs/features/qt_tool.prf +++ b/qtbase/mkspecs/features/qt_tool.prf -@@ -17,61 +17,61 @@ DEFINES *= QT_USE_QSTRINGBUILDER +@@ -18,61 +18,61 @@ DEFINES *= QT_USE_QSTRINGBUILDER # If we are doing a prefix build, create a "module" pri which enables # qtPrepareTool() to work with the non-installed build. # Non-bootstrapped tools always need this because of the environment setup. @@ -111,7 +109,7 @@ index bdeb59c..bdf4b5f 100644 - "QT_TOOL.$${MODULE}.binary = $$val_escape(bin)" \ - "QT_TOOL.$${MODULE}.depends =$$join(MODULE_DEPENDS, " ", " ")" \ - $$module_envvars -- write_file($$TOOL_PRI, TOOL_PRI_CONT)|error("Aborting.") +- write_file($$TOOL_PRI, TOOL_PRI_CONT)|error() - - # Then, inject the new tool into the current cache state - !contains(QMAKE_INTERNAL_INCLUDED_FILES, $$TOOL_PRI) { # before the actual include()! @@ -167,7 +165,7 @@ index bdeb59c..bdf4b5f 100644 +# "QT_TOOL.$${MODULE}.binary = $$val_escape(bin)" \ +# "QT_TOOL.$${MODULE}.depends =$$join(MODULE_DEPENDS, " ", " ")" \ +# $$module_envvars -+# write_file($$TOOL_PRI, TOOL_PRI_CONT)|error("Aborting.") ++# write_file($$TOOL_PRI, TOOL_PRI_CONT)|error() +# +# # Then, inject the new tool into the current cache state +# !contains(QMAKE_INTERNAL_INCLUDED_FILES, $$TOOL_PRI) { # before the actual include()! @@ -183,10 +181,10 @@ index bdeb59c..bdf4b5f 100644 # The variable is re-used by qtPrepareTool(), and we really don't want that. unset(QT_TOOL_ENV) diff --git a/qtbase/qmake/Makefile.unix b/qtbase/qmake/Makefile.unix -index 9d3ddab..a5875a5 100644 +index 808a6d8..720c82b 100644 --- a/qtbase/qmake/Makefile.unix +++ b/qtbase/qmake/Makefile.unix -@@ -230,7 +230,7 @@ qsettings.o: $(SOURCE_PATH)/src/corelib/io/qsettings.cpp +@@ -225,7 +225,7 @@ qsettings.o: $(SOURCE_PATH)/src/corelib/io/qsettings.cpp qsystemerror.o: $(SOURCE_PATH)/src/corelib/kernel/qsystemerror.cpp $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/kernel/qsystemerror.cpp diff --git a/repos/libports/src/lib/qt5/patches/qt5_configuration.patch b/repos/libports/src/lib/qt5/patches/qt5_configuration.patch deleted file mode 100644 index f30e0253a2..0000000000 --- a/repos/libports/src/lib/qt5/patches/qt5_configuration.patch +++ /dev/null @@ -1,711 +0,0 @@ -qt5_configuration.patch - -From: Christian Prochaska - - ---- - qtbase/configure | 98 +++--- - qtbase/mkspecs/genode-g++/qmake.conf | 10 + - qtbase/mkspecs/genode-g++/qplatformdefs.h | 87 ++++++ - qtbase/src/corelib/global/qconfig-genode.h | 426 ++++++++++++++++++++++++++++ - qtdeclarative/tools/tools.pro | 4 - 5 files changed, 573 insertions(+), 52 deletions(-) - create mode 100644 qtbase/mkspecs/genode-g++/qmake.conf - create mode 100644 qtbase/mkspecs/genode-g++/qplatformdefs.h - create mode 100644 qtbase/src/corelib/global/qconfig-genode.h - -diff --git a/qtbase/configure b/qtbase/configure -index ba94d08..b11fb4c 100755 ---- a/qtbase/configure -+++ b/qtbase/configure -@@ -636,10 +636,10 @@ CFG_MTDEV=auto - CFG_JOURNALD=no - CFG_SYSLOG=no - CFG_SQLITE=qt --CFG_GIF=auto -+CFG_GIF=yes - CFG_PNG=yes - CFG_LIBPNG=auto --CFG_JPEG=auto -+CFG_JPEG=yes - CFG_LIBJPEG=auto - CFG_XCURSOR=runtime - CFG_XRANDR=runtime -@@ -748,7 +748,7 @@ CFG_GETADDRINFO=auto - CFG_IPV6IFNAME=auto - CFG_GETIFADDRS=auto - CFG_INOTIFY=auto --CFG_EVENTFD=auto -+CFG_EVENTFD=no - CFG_CLOEXEC=no - CFG_POLL=auto - CFG_RPATH=yes -@@ -5418,16 +5418,16 @@ elif [ "$CFG_OPENGL" = "es2" ]; then - echo " ${XQMAKESPEC}." - exit 1 - fi --elif [ "$CFG_OPENGL" = "desktop" ]; then -- # Desktop OpenGL support -- compileTestWithPkgConfig gl unix/opengldesktop "OpenGL" OPENGL -- if [ $? != "0" ]; then -- echo "The OpenGL functionality test failed!" -- echo " You might need to modify the include and library search paths by editing" -- echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in" -- echo " ${XQMAKESPEC}." -- exit 1 -- fi -+#elif [ "$CFG_OPENGL" = "desktop" ]; then -+# # Desktop OpenGL support -+# compileTestWithPkgConfig gl unix/opengldesktop "OpenGL" OPENGL -+# if [ $? != "0" ]; then -+# echo "The OpenGL functionality test failed!" -+# echo " You might need to modify the include and library search paths by editing" -+# echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in" -+# echo " ${XQMAKESPEC}." -+# exit 1 -+# fi - fi - - # If OpenGL ES 2.0 is enabled, check for 3.0 and higher. This is used to allow -@@ -5840,39 +5840,39 @@ else - fi - - # EGL Support --if [ "$CFG_EGL" != "no" ]; then -- if [ "$CFG_EGL" = "yes" ] && [ "$CFG_OPENGL" = "no" ]; then -- echo "EGL support was requested but OpenGL support is disabled." -- echo "Either disable EGL support or enable OpenGL support." -- exit 101 -- fi -- -- if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists egl 2>/dev/null; then -- QMAKE_INCDIR_EGL=`$PKG_CONFIG --cflags-only-I egl 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'` -- QMAKE_LIBS_EGL=`$PKG_CONFIG --libs egl 2>/dev/null` -- QMAKE_CFLAGS_EGL=`$PKG_CONFIG --cflags egl 2>/dev/null` -- QMakeVar set QMAKE_INCDIR_EGL "$QMAKE_INCDIR_EGL" -- QMakeVar set QMAKE_LIBS_EGL "$QMAKE_LIBS_EGL" -- QMakeVar set QMAKE_CFLAGS_EGL "`echo " $QMAKE_CFLAGS_EGL " | sed -e 's, -I[^ ]* , ,g;s,^ ,,;s, $,,'`" -- fi # detect EGL support -- if compileTest qpa/egl "EGL" $QMAKE_CFLAGS_EGL $QMAKE_LIBS_EGL; then -- CFG_EGL=yes -- if compileTest qpa/egl-x11 "EGL-X11" $QMAKE_CFLAGS_EGL $QMAKE_LIBS_EGL; then -- CFG_EGL_X=yes -- else -- CFG_EGL_X=no -- fi -- elif [ "$CFG_EGL" = "yes" ]; then -- echo " The EGL functionality test failed; EGL is required by some QPA plugins to manage contexts & surfaces." -- [ -z "$PKG_CONFIG" ] && echo " Use of pkg-config is not enabled, maybe you want to pass -pkg-config?" -- echo " You might need to modify the include and library search paths by editing" -- echo " QMAKE_INCDIR_EGL, QMAKE_LIBDIR_EGL and QMAKE_LIBS_EGL in ${XQMAKESPEC}." -- exit 1 -- else -- CFG_EGL=no -- CFG_EGL_X=no -- fi --fi -+#if [ "$CFG_EGL" != "no" ]; then -+# if [ "$CFG_EGL" = "yes" ] && [ "$CFG_OPENGL" = "no" ]; then -+# echo "EGL support was requested but OpenGL support is disabled." -+# echo "Either disable EGL support or enable OpenGL support." -+# exit 101 -+# fi -+# -+# if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists egl 2>/dev/null; then -+# QMAKE_INCDIR_EGL=`$PKG_CONFIG --cflags-only-I egl 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'` -+# QMAKE_LIBS_EGL=`$PKG_CONFIG --libs egl 2>/dev/null` -+# QMAKE_CFLAGS_EGL=`$PKG_CONFIG --cflags egl 2>/dev/null` -+# QMakeVar set QMAKE_INCDIR_EGL "$QMAKE_INCDIR_EGL" -+# QMakeVar set QMAKE_LIBS_EGL "$QMAKE_LIBS_EGL" -+# QMakeVar set QMAKE_CFLAGS_EGL "`echo " $QMAKE_CFLAGS_EGL " | sed -e 's, -I[^ ]* , ,g;s,^ ,,;s, $,,'`" -+# fi # detect EGL support -+# if compileTest qpa/egl "EGL" $QMAKE_CFLAGS_EGL $QMAKE_LIBS_EGL; then -+# CFG_EGL=yes -+# if compileTest qpa/egl-x11 "EGL-X11" $QMAKE_CFLAGS_EGL $QMAKE_LIBS_EGL; then -+# CFG_EGL_X=yes -+# else -+# CFG_EGL_X=no -+# fi -+# elif [ "$CFG_EGL" = "yes" ]; then -+# echo " The EGL functionality test failed; EGL is required by some QPA plugins to manage contexts & surfaces." -+# [ -z "$PKG_CONFIG" ] && echo " Use of pkg-config is not enabled, maybe you want to pass -pkg-config?" -+# echo " You might need to modify the include and library search paths by editing" -+# echo " QMAKE_INCDIR_EGL, QMAKE_LIBDIR_EGL and QMAKE_LIBS_EGL in ${XQMAKESPEC}." -+# exit 1 -+# else -+# CFG_EGL=no -+# CFG_EGL_X=no -+# fi -+#fi - - if [ "$CFG_EGLFS" != "no" ]; then - if [ "$XPLATFORM_QNX" = "no" ] && [ "$CFG_OPENGL" != "no" ]; then -@@ -6170,9 +6170,9 @@ if [ "$CFG_GETIFADDRS" != "no" ]; then - fi - - # find if the platform provides thread-safe CLOEXEC support --if compileTest unix/cloexec "cloexec"; then -- CFG_CLOEXEC=yes --fi -+#if compileTest unix/cloexec "cloexec"; then -+# CFG_CLOEXEC=yes -+#fi - - if compileTest unix/ppoll "ppoll"; then - CFG_POLL="ppoll" -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/qconfig-genode.h b/qtbase/src/corelib/global/qconfig-genode.h -new file mode 100644 -index 0000000..56a0b73 ---- /dev/null -+++ b/qtbase/src/corelib/global/qconfig-genode.h -@@ -0,0 +1,426 @@ -+/* Data structures */ -+//#ifndef QT_NO_TEXTDATE -+//# define QT_NO_TEXTDATE -+//#endif -+//#ifndef QT_NO_DATESTRING -+//# define QT_NO_DATESTRING -+//#endif -+ -+/* Dialogs */ -+//#ifndef QT_NO_COLORDIALOG -+//# define QT_NO_COLORDIALOG -+//#endif -+//#ifndef QT_NO_ERRORMESSAGE -+//# define QT_NO_ERRORMESSAGE -+//#endif -+//#ifndef QT_NO_FILEDIALOG -+//# define QT_NO_FILEDIALOG -+//#endif -+//#ifndef QT_NO_FONTDIALOG -+//# define QT_NO_FONTDIALOG -+//#endif -+//#ifndef QT_NO_INPUTDIALOG -+//# define QT_NO_INPUTDIALOG -+//#endif -+//#ifndef QT_NO_MESSAGEBOX -+//# define QT_NO_MESSAGEBOX -+//#endif -+#ifndef QT_NO_PRINTDIALOG -+# define QT_NO_PRINTDIALOG -+#endif -+#ifndef QT_NO_PRINTPREVIEWDIALOG -+# define QT_NO_PRINTPREVIEWDIALOG -+#endif -+//#ifndef QT_NO_PROGRESSDIALOG -+//# define QT_NO_PROGRESSDIALOG -+//#endif -+//#ifndef QT_NO_WIZARD -+//# define QT_NO_WIZARD -+//#endif -+ -+/* File I/O */ -+//#ifndef QT_NO_DOM -+//# define QT_NO_DOM -+//#endif -+//#ifndef QT_NO_FILESYSTEMWATCHER -+//# define QT_NO_FILESYSTEMWATCHER -+//#endif -+//#ifndef QT_NO_FILESYSTEMMODEL -+//# define QT_NO_FILESYSTEMMODEL -+//#endif -+#ifndef QT_NO_PROCESS -+# define QT_NO_PROCESS -+#endif -+//#ifndef QT_NO_TEMPORARYFILE -+//# define QT_NO_TEMPORARYFILE -+//#endif -+//#ifndef QT_NO_SETTINGS -+//# define QT_NO_SETTINGS -+//#endif -+//#ifndef QT_NO_LIBRARY -+//# define QT_NO_LIBRARY -+//#endif -+ -+/* Fonts */ -+//#ifndef QT_NO_FREETYPE -+//# define QT_NO_FREETYPE -+//#endif -+ -+/* Images */ -+//#ifndef QT_NO_IMAGEFORMATPLUGIN -+//# define QT_NO_IMAGEFORMATPLUGIN -+//#endif -+//#ifndef QT_NO_IMAGEFORMAT_BMP -+//# define QT_NO_IMAGEFORMAT_BMP -+//#endif -+//#ifndef QT_NO_IMAGEFORMAT_JPEG -+//# define QT_NO_IMAGEFORMAT_JPEG -+//#endif -+//#ifndef QT_NO_IMAGEFORMAT_PNG -+//# define QT_NO_IMAGEFORMAT_PNG -+//#endif -+//#ifndef QT_NO_IMAGEFORMAT_PPM -+//# define QT_NO_IMAGEFORMAT_PPM -+//#endif -+//#ifndef QT_NO_IMAGEFORMAT_XBM -+//# define QT_NO_IMAGEFORMAT_XBM -+//#endif -+//#ifndef QT_NO_IMAGEFORMAT_XPM -+//# define QT_NO_IMAGEFORMAT_XPM -+//#endif -+//#ifndef QT_NO_IMAGE_HEURISTIC_MASK -+//# define QT_NO_IMAGE_HEURISTIC_MASK -+//#endif -+//#ifndef QT_NO_MOVIE -+//# define QT_NO_MOVIE -+//#endif -+ -+/* Internationalization */ -+//#ifndef QT_NO_BIG_CODECS -+//# define QT_NO_BIG_CODECS -+//#endif -+//#ifndef QT_NO_TEXTCODEC -+//# define QT_NO_TEXTCODEC -+//#endif -+//#ifndef QT_NO_CODECS -+//# define QT_NO_CODECS -+//#endif -+//#ifndef QT_NO_TRANSLATION -+//# define QT_NO_TRANSLATION -+//#endif -+ -+/* ItemViews */ -+//#ifndef QT_NO_ITEMVIEWS -+//# define QT_NO_ITEMVIEWS -+//#endif -+//#ifndef QT_NO_DATAWIDGETMAPPER -+//# define QT_NO_DATAWIDGETMAPPER -+//#endif -+//#ifndef QT_NO_DIRMODEL -+//# define QT_NO_DIRMODEL -+//#endif -+//#ifndef QT_NO_LISTVIEW -+//# define QT_NO_LISTVIEW -+//#endif -+//#ifndef QT_NO_COLUMNVIEW -+//# define QT_NO_COLUMNVIEW -+//#endif -+//#ifndef QT_NO_PROXYMODEL -+//# define QT_NO_PROXYMODEL -+//#endif -+//#ifndef QT_NO_SORTFILTERPROXYMODEL -+//# define QT_NO_SORTFILTERPROXYMODEL -+//#endif -+//#ifndef QT_NO_STANDARDITEMMODEL -+//# define QT_NO_STANDARDITEMMODEL -+//#endif -+//#ifndef QT_NO_STRINGLISTMODEL -+//# define QT_NO_STRINGLISTMODEL -+//#endif -+//#ifndef QT_NO_TABLEVIEW -+//# define QT_NO_TABLEVIEW -+//#endif -+//#ifndef QT_NO_TREEVIEW -+//# define QT_NO_TREEVIEW -+//#endif -+ -+/* Kernel */ -+//#ifndef QT_NO_ACTION -+//# define QT_NO_ACTION -+//#endif -+//#ifndef QT_NO_CLIPBOARD -+//# define QT_NO_CLIPBOARD -+//#endif -+//#ifndef QT_NO_CSSPARSER -+//# define QT_NO_CSSPARSER -+//#endif -+//#ifndef QT_NO_CURSOR -+//# define QT_NO_CURSOR -+//#endif -+//#ifndef QT_NO_DRAGANDDROP -+//# define QT_NO_DRAGANDDROP -+//#endif -+//#ifndef QT_NO_EFFECTS -+//# define QT_NO_EFFECTS -+//#endif -+//#ifndef QT_NO_PROPERTIES -+//# define QT_NO_PROPERTIES -+//#endif -+#ifndef QT_NO_SESSIONMANAGER -+# define QT_NO_SESSIONMANAGER -+#endif -+#ifndef QT_NO_SHAREDMEMORY -+# define QT_NO_SHAREDMEMORY -+#endif -+//#ifndef QT_NO_SHORTCUT -+//# define QT_NO_SHORTCUT -+//#endif -+#ifndef QT_NO_SYSTEMSEMAPHORE -+# define QT_NO_SYSTEMSEMAPHORE -+#endif -+//#ifndef QT_NO_TABLETEVENT -+//# define QT_NO_TABLETEVENT -+//#endif -+//#ifndef QT_NO_TEXTHTMLPARSER -+//# define QT_NO_TEXTHTMLPARSER -+//#endif -+#ifndef QT_NO_CONCURRENT -+# define QT_NO_CONCURRENT -+#endif -+//#ifndef QT_NO_WHEELEVENT -+//# define QT_NO_WHEELEVENT -+//#endif -+//#ifndef QT_NO_XMLSTREAM -+//# define QT_NO_XMLSTREAM -+//#endif -+//#ifndef QT_NO_XMLSTREAMREADER -+//# define QT_NO_XMLSTREAMREADER -+//#endif -+//#ifndef QT_NO_XMLSTREAMWRITER -+//# define QT_NO_XMLSTREAMWRITER -+//#endif -+ -+/* Networking */ -+//#ifndef QT_NO_HTTP -+//# define QT_NO_HTTP -+//#endif -+//#ifndef QT_NO_NETWORKPROXY -+//# define QT_NO_NETWORKPROXY -+//#endif -+//#ifndef QT_NO_SOCKS5 -+//# define QT_NO_SOCKS5 -+//#endif -+//#ifndef QT_NO_UDPSOCKET -+//# define QT_NO_UDPSOCKET -+//#endif -+#ifndef QT_NO_FTP -+# define QT_NO_FTP -+#endif -+ -+/* Added for Genode */ -+#ifndef QT_NO_NETWORKINTERFACE -+# define QT_NO_NETWORKINTERFACE -+#endif -+ -+/* Painting */ -+//#ifndef QT_NO_COLORNAMES -+//# define QT_NO_COLORNAMES -+//#endif -+//#ifndef QT_NO_PAINT_DEBUG -+//# define QT_NO_PAINT_DEBUG -+//#endif -+//#ifndef QT_NO_PICTURE -+//# define QT_NO_PICTURE -+//#endif -+#ifndef QT_NO_PRINTER -+# define QT_NO_PRINTER -+#endif -+#ifndef QT_NO_CUPS -+# define QT_NO_CUPS -+#endif -+ -+/* Styles */ -+//#ifndef QT_NO_STYLE_FUSION -+//# define QT_NO_STYLE_FUSION -+//#endif -+//#ifndef QT_NO_STYLE_STYLESHEET -+//# define QT_NO_STYLE_STYLESHEET -+//#endif -+//#ifndef QT_NO_STYLE_WINDOWSCE -+//# define QT_NO_STYLE_WINDOWSCE -+//#endif -+//#ifndef QT_NO_STYLE_WINDOWSMOBILE -+//# define QT_NO_STYLE_WINDOWSMOBILE -+//#endif -+//#ifndef QT_NO_STYLE_WINDOWSVISTA -+//# define QT_NO_STYLE_WINDOWSVISTA -+//#endif -+//#ifndef QT_NO_STYLE_WINDOWSXP -+//# define QT_NO_STYLE_WINDOWSXP -+//#endif -+ -+/* Utilities */ -+//#ifndef QT_NO_ACCESSIBILITY -+//# define QT_NO_ACCESSIBILITY -+//#endif -+//#ifndef QT_NO_COMPLETER -+//# define QT_NO_COMPLETER -+//#endif -+//#ifndef QT_NO_DESKTOPSERVICES -+//# define QT_NO_DESKTOPSERVICES -+//#endif -+//#ifndef QT_NO_SYSTEMTRAYICON -+//# define QT_NO_SYSTEMTRAYICON -+//#endif -+//#ifndef QT_NO_UNDOCOMMAND -+//# define QT_NO_UNDOCOMMAND -+//#endif -+//#ifndef QT_NO_UNDOGROUP -+//# define QT_NO_UNDOGROUP -+//#endif -+//#ifndef QT_NO_UNDOSTACK -+//# define QT_NO_UNDOSTACK -+//#endif -+//#ifndef QT_NO_UNDOVIEW -+//# define QT_NO_UNDOVIEW -+//#endif -+//#ifndef QT_NO_GESTURES -+//# define QT_NO_GESTURES -+//#endif -+ -+/* Widgets */ -+//#ifndef QT_NO_GROUPBOX -+//# define QT_NO_GROUPBOX -+//#endif -+//#ifndef QT_NO_BUTTONGROUP -+//# define QT_NO_BUTTONGROUP -+//#endif -+//#ifndef QT_NO_LCDNUMBER -+//# define QT_NO_LCDNUMBER -+//#endif -+//#ifndef QT_NO_LINEEDIT -+//# define QT_NO_LINEEDIT -+//#endif -+//#ifndef QT_NO_COMBOBOX -+//# define QT_NO_COMBOBOX -+//#endif -+//#ifndef QT_NO_FONTCOMBOBOX -+//# define QT_NO_FONTCOMBOBOX -+//#endif -+//#ifndef QT_NO_SPINBOX -+//# define QT_NO_SPINBOX -+//#endif -+//#ifndef QT_NO_CALENDARWIDGET -+//# define QT_NO_CALENDARWIDGET -+//#endif -+//#ifndef QT_NO_DATETIMEEDIT -+//# define QT_NO_DATETIMEEDIT -+//#endif -+//#ifndef QT_NO_LISTWIDGET -+//# define QT_NO_LISTWIDGET -+//#endif -+//#ifndef QT_NO_MENU -+//# define QT_NO_MENU -+//#endif -+//#ifndef QT_NO_CONTEXTMENU -+//# define QT_NO_CONTEXTMENU -+//#endif -+//#ifndef QT_NO_MAINWINDOW -+//# define QT_NO_MAINWINDOW -+//#endif -+//#ifndef QT_NO_DOCKWIDGET -+//# define QT_NO_DOCKWIDGET -+//#endif -+//#ifndef QT_NO_TOOLBAR -+//# define QT_NO_TOOLBAR -+//#endif -+//#ifndef QT_NO_MENUBAR -+//# define QT_NO_MENUBAR -+//#endif -+//#ifndef QT_NO_PROGRESSBAR -+//# define QT_NO_PROGRESSBAR -+//#endif -+//#ifndef QT_NO_RESIZEHANDLER -+//# define QT_NO_RESIZEHANDLER -+//#endif -+//#ifndef QT_NO_RUBBERBAND -+//# define QT_NO_RUBBERBAND -+//#endif -+//#ifndef QT_NO_SPLITTER -+//# define QT_NO_SPLITTER -+//#endif -+//#ifndef QT_NO_SIZEGRIP -+//# define QT_NO_SIZEGRIP -+//#endif -+//#ifndef QT_NO_SLIDER -+//# define QT_NO_SLIDER -+//#endif -+//#ifndef QT_NO_DIAL -+//# define QT_NO_DIAL -+//#endif -+//#ifndef QT_NO_SCROLLBAR -+//# define QT_NO_SCROLLBAR -+//#endif -+//#ifndef QT_NO_SCROLLAREA -+//# define QT_NO_SCROLLAREA -+//#endif -+//#ifndef QT_NO_GRAPHICSVIEW -+//# define QT_NO_GRAPHICSVIEW -+//#endif -+//#ifndef QT_NO_PRINTPREVIEWWIDGET -+//# define QT_NO_PRINTPREVIEWWIDGET -+//#endif -+//#ifndef QT_NO_MDIAREA -+//# define QT_NO_MDIAREA -+//#endif -+//#ifndef QT_NO_TEXTEDIT -+//# define QT_NO_TEXTEDIT -+//#endif -+//#ifndef QT_NO_SYNTAXHIGHLIGHTER -+//# define QT_NO_SYNTAXHIGHLIGHTER -+//#endif -+//#ifndef QT_NO_TEXTBROWSER -+//# define QT_NO_TEXTBROWSER -+//#endif -+//#ifndef QT_NO_SPINWIDGET -+//# define QT_NO_SPINWIDGET -+//#endif -+//#ifndef QT_NO_SPLASHSCREEN -+//# define QT_NO_SPLASHSCREEN -+//#endif -+//#ifndef QT_NO_STACKEDWIDGET -+//# define QT_NO_STACKEDWIDGET -+//#endif -+//#ifndef QT_NO_TABWIDGET -+//# define QT_NO_TABWIDGET -+//#endif -+//#ifndef QT_NO_STATUSBAR -+//# define QT_NO_STATUSBAR -+//#endif -+//#ifndef QT_NO_STATUSTIP -+//# define QT_NO_STATUSTIP -+//#endif -+//#ifndef QT_NO_TABLEWIDGET -+//# define QT_NO_TABLEWIDGET -+//#endif -+//#ifndef QT_NO_TOOLBUTTON -+//# define QT_NO_TOOLBUTTON -+//#endif -+//#ifndef QT_NO_TABBAR -+//# define QT_NO_TABBAR -+//#endif -+//#ifndef QT_NO_TOOLBOX -+//# define QT_NO_TOOLBOX -+//#endif -+//#ifndef QT_NO_WHATSTHIS -+//# define QT_NO_WHATSTHIS -+//#endif -+//#ifndef QT_NO_TOOLTIP -+//# define QT_NO_TOOLTIP -+//#endif -+//#ifndef QT_NO_TREEWIDGET -+//# define QT_NO_TREEWIDGET -+//#endif -+//#ifndef QT_NO_VALIDATOR -+//# define QT_NO_VALIDATOR -+//#endif -diff --git a/qtdeclarative/tools/tools.pro b/qtdeclarative/tools/tools.pro -index 18bfe28..ba3e5d4 100644 ---- a/qtdeclarative/tools/tools.pro -+++ b/qtdeclarative/tools/tools.pro -@@ -16,9 +16,7 @@ qmlimportscanner.CONFIG = host_build - qtHaveModule(quick) { - !static: { - SUBDIRS += \ -- qmlscene \ -- qmlplugindump \ -- qmltime -+ qmlscene - } - qtHaveModule(widgets): SUBDIRS += qmleasing - } diff --git a/repos/libports/src/lib/qt5/patches/qt5_generated_headers.patch b/repos/libports/src/lib/qt5/patches/qt5_generated_headers.patch deleted file mode 100644 index 18c988a306..0000000000 --- a/repos/libports/src/lib/qt5/patches/qt5_generated_headers.patch +++ /dev/null @@ -1,162 +0,0 @@ -qt5_generated_headers.patch - -From: Christian Prochaska - - ---- - qtbase/include/QtCore/QtConfig | 1 + - qtbase/include/QtCore/QtCoreDepends | 1 + - qtbase/include/QtCore/qconfig.h | 1 + - qtbase/include/QtCore/qfeatures.h | 1 + - qtbase/include/QtGui/QtGuiDepends | 2 ++ - qtbase/include/QtNetwork/QtNetworkDepends | 2 ++ - qtbase/include/QtOpenGL/QtOpenGLDepends | 4 ++++ - .../include/QtPrintSupport/QtPrintSupportDepends | 4 ++++ - qtbase/include/QtSql/QtSqlDepends | 2 ++ - qtbase/include/QtWidgets/QtWidgetsDepends | 3 +++ - qtbase/include/QtXml/QtXmlDepends | 2 ++ - qtscript/include/QtScript/QtScriptDepends | 2 ++ - qtsvg/include/QtSvg/QtSvgDepends | 4 ++++ - qttools/include/QtUiTools/QtUiToolsDepends | 2 ++ - .../include/QtXmlPatterns/QtXmlPatternsDepends | 3 +++ - 15 files changed, 34 insertions(+) - create mode 100644 qtbase/include/QtCore/QtConfig - create mode 100644 qtbase/include/QtCore/QtCoreDepends - create mode 100644 qtbase/include/QtCore/qconfig.h - create mode 100644 qtbase/include/QtCore/qfeatures.h - create mode 100644 qtbase/include/QtGui/QtGuiDepends - create mode 100644 qtbase/include/QtNetwork/QtNetworkDepends - create mode 100644 qtbase/include/QtOpenGL/QtOpenGLDepends - create mode 100644 qtbase/include/QtPrintSupport/QtPrintSupportDepends - create mode 100644 qtbase/include/QtSql/QtSqlDepends - create mode 100644 qtbase/include/QtWidgets/QtWidgetsDepends - create mode 100644 qtbase/include/QtXml/QtXmlDepends - create mode 100644 qtscript/include/QtScript/QtScriptDepends - create mode 100644 qtsvg/include/QtSvg/QtSvgDepends - create mode 100644 qttools/include/QtUiTools/QtUiToolsDepends - create mode 100644 qtxmlpatterns/include/QtXmlPatterns/QtXmlPatternsDepends - -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..f6a4430 ---- /dev/null -+++ b/qtbase/include/QtCore/QtCoreDepends -@@ -0,0 +1 @@ -+/* This file was generated by qmake with the info from /src/corelib/corelib.pro. */ -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/qfeatures.h b/qtbase/include/QtCore/qfeatures.h -new file mode 100644 -index 0000000..2501992 ---- /dev/null -+++ b/qtbase/include/QtCore/qfeatures.h -@@ -0,0 +1 @@ -+#include "../../src/corelib/global/qfeatures.h" -diff --git a/qtbase/include/QtGui/QtGuiDepends b/qtbase/include/QtGui/QtGuiDepends -new file mode 100644 -index 0000000..52697ae ---- /dev/null -+++ b/qtbase/include/QtGui/QtGuiDepends -@@ -0,0 +1,2 @@ -+/* This file was generated by qmake with the info from /src/gui/gui.pro. */ -+#include -diff --git a/qtbase/include/QtNetwork/QtNetworkDepends b/qtbase/include/QtNetwork/QtNetworkDepends -new file mode 100644 -index 0000000..cb2c29d ---- /dev/null -+++ b/qtbase/include/QtNetwork/QtNetworkDepends -@@ -0,0 +1,2 @@ -+/* This file was generated by qmake with the info from /src/network/network.pro. */ -+#include -diff --git a/qtbase/include/QtOpenGL/QtOpenGLDepends b/qtbase/include/QtOpenGL/QtOpenGLDepends -new file mode 100644 -index 0000000..e15843d ---- /dev/null -+++ b/qtbase/include/QtOpenGL/QtOpenGLDepends -@@ -0,0 +1,4 @@ -+/* This file was generated by qmake with the info from /src/opengl/opengl.pro. */ -+#include -+#include -+#include -diff --git a/qtbase/include/QtPrintSupport/QtPrintSupportDepends b/qtbase/include/QtPrintSupport/QtPrintSupportDepends -new file mode 100644 -index 0000000..520b700 ---- /dev/null -+++ b/qtbase/include/QtPrintSupport/QtPrintSupportDepends -@@ -0,0 +1,4 @@ -+/* This file was generated by qmake with the info from /src/printsupport/printsupport.pro. */ -+#include -+#include -+#include -diff --git a/qtbase/include/QtSql/QtSqlDepends b/qtbase/include/QtSql/QtSqlDepends -new file mode 100644 -index 0000000..42eb220 ---- /dev/null -+++ b/qtbase/include/QtSql/QtSqlDepends -@@ -0,0 +1,2 @@ -+/* This file was generated by qmake with the info from /src/sql/sql.pro. */ -+#include -diff --git a/qtbase/include/QtWidgets/QtWidgetsDepends b/qtbase/include/QtWidgets/QtWidgetsDepends -new file mode 100644 -index 0000000..03776b6 ---- /dev/null -+++ b/qtbase/include/QtWidgets/QtWidgetsDepends -@@ -0,0 +1,3 @@ -+/* This file was generated by qmake with the info from /src/widgets/widgets.pro. */ -+#include -+#include -diff --git a/qtbase/include/QtXml/QtXmlDepends b/qtbase/include/QtXml/QtXmlDepends -new file mode 100644 -index 0000000..39dd8ec ---- /dev/null -+++ b/qtbase/include/QtXml/QtXmlDepends -@@ -0,0 +1,2 @@ -+/* This file was generated by qmake with the info from /src/xml/xml.pro. */ -+#include -diff --git a/qtscript/include/QtScript/QtScriptDepends b/qtscript/include/QtScript/QtScriptDepends -new file mode 100644 -index 0000000..b88d662 ---- /dev/null -+++ b/qtscript/include/QtScript/QtScriptDepends -@@ -0,0 +1,2 @@ -+/* This file was generated by qmake with the info from /src/script/script.pro. */ -+#include -diff --git a/qtsvg/include/QtSvg/QtSvgDepends b/qtsvg/include/QtSvg/QtSvgDepends -new file mode 100644 -index 0000000..549510d ---- /dev/null -+++ b/qtsvg/include/QtSvg/QtSvgDepends -@@ -0,0 +1,4 @@ -+/* This file was generated by qmake with the info from /src/svg/svg.pro. */ -+#include -+#include -+#include -diff --git a/qttools/include/QtUiTools/QtUiToolsDepends b/qttools/include/QtUiTools/QtUiToolsDepends -new file mode 100644 -index 0000000..2c0063e ---- /dev/null -+++ b/qttools/include/QtUiTools/QtUiToolsDepends -@@ -0,0 +1,2 @@ -+/* This file was generated by qmake with the info from /src/designer/src/uitools/uitools.pro. */ -+#include -diff --git a/qtxmlpatterns/include/QtXmlPatterns/QtXmlPatternsDepends b/qtxmlpatterns/include/QtXmlPatterns/QtXmlPatternsDepends -new file mode 100644 -index 0000000..60615c7 ---- /dev/null -+++ b/qtxmlpatterns/include/QtXmlPatterns/QtXmlPatternsDepends -@@ -0,0 +1,3 @@ -+/* This file was generated by qmake with the info from /src/xmlpatterns/xmlpatterns.pro. */ -+#include -+#include diff --git a/repos/libports/src/lib/qt5/patches/qt5_qarraydata.patch b/repos/libports/src/lib/qt5/patches/qt5_qarraydata.patch deleted file mode 100644 index d2474d4a92..0000000000 --- a/repos/libports/src/lib/qt5/patches/qt5_qarraydata.patch +++ /dev/null @@ -1,24 +0,0 @@ -qt5_qarraydata.patch - -From: Christian Prochaska - - ---- - qtbase/src/corelib/tools/qarraydata.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/qtbase/src/corelib/tools/qarraydata.cpp b/qtbase/src/corelib/tools/qarraydata.cpp -index 55af725..5a7ae60 100644 ---- a/qtbase/src/corelib/tools/qarraydata.cpp -+++ b/qtbase/src/corelib/tools/qarraydata.cpp -@@ -105,8 +105,8 @@ QArrayData *QArrayData::allocate(size_t objectSize, size_t alignment, - - QArrayData *header = static_cast(::malloc(allocSize)); - if (header) { -- quintptr data = (quintptr(header) + sizeof(QArrayData) + alignment - 1) -- & ~(alignment - 1); -+ quintptr data = (quintptr(header) + sizeof(QArrayData) + /*alignment*/4 - 1) -+ & ~(/*alignment*/4 - 1); - - #if !defined(QT_NO_UNSHARABLE_CONTAINERS) - header->ref.atomic.store(bool(!(options & Unsharable))); diff --git a/repos/libports/src/lib/qt5/patches/qt5_qpa.patch b/repos/libports/src/lib/qt5/patches/qt5_qpa.patch deleted file mode 100644 index 540d3953e2..0000000000 --- a/repos/libports/src/lib/qt5/patches/qt5_qpa.patch +++ /dev/null @@ -1,149 +0,0 @@ -qt5_qpa.patch - -From: Christian Prochaska - - ---- - .../fontdatabases/basic/qbasicfontdatabase.cpp | 9 +++++++++ - .../evdevkeyboard/qevdevkeyboard_defaultmap_p.h | 4 ++++ - .../input/evdevkeyboard/qevdevkeyboardhandler.cpp | 17 +++++++++++++++++ - .../input/evdevkeyboard/qevdevkeyboardhandler_p.h | 2 ++ - 4 files changed, 32 insertions(+) - -diff --git a/qtbase/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp b/qtbase/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp -index 4b9d469..ebf447a 100644 ---- a/qtbase/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp -+++ b/qtbase/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp -@@ -79,7 +79,16 @@ void QBasicFontDatabase::populateFontDatabase() - - foreach (const QFileInfo &fi, dir.entryInfoList(nameFilters, QDir::Files)) { - const QByteArray file = QFile::encodeName(fi.absoluteFilePath()); -+#ifdef Q_OS_GENODE -+ QByteArray data; -+ QFile f(file); -+ if (!f.open(QIODevice::ReadOnly)) -+ continue; -+ data = f.readAll(); -+ QBasicFontDatabase::addTTFile(data, file); -+#else - QBasicFontDatabase::addTTFile(QByteArray(), file); -+#endif - } - } - -diff --git a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h -index bc04852..8394318 100644 ---- a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h -+++ b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h -@@ -52,7 +52,9 @@ - // - - #include "qnamespace.h" -+#ifndef Q_OS_GENODE - #include "linux/input.h" -+#endif /* Q_OS_GENODE */ - - // no QT_BEGIN_NAMESPACE, since we include it internally... - -@@ -644,6 +646,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 }, -@@ -672,6 +675,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 0eb6fc0..cf19fec 100644 ---- a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp -+++ b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp -@@ -49,7 +49,9 @@ - #include - #include - -+#ifndef Q_OS_GENODE - #include -+#endif /* Q_OS_GENODE */ - - QT_BEGIN_NAMESPACE - -@@ -81,9 +83,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, SIGNAL(activated(int)), this, SLOT(readKeycode())); -+#endif /* Q_OS_GENODE */ - } - - QEvdevKeyboardHandler::~QEvdevKeyboardHandler() -@@ -91,6 +95,7 @@ QEvdevKeyboardHandler::~QEvdevKeyboardHandler() - unloadKeymap(); - } - -+#ifndef Q_OS_GENODE - QEvdevKeyboardHandler *QEvdevKeyboardHandler::create(const QString &device, - const QString &specification, - const QString &defaultKeymapFile) -@@ -214,10 +219,20 @@ 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 - QWindowSystemInterface::handleExtendedKeyEvent(0, (isPress ? QEvent::KeyPress : QEvent::KeyRelease), - qtcode, modifiers, nativecode + 8, 0, int(modifiers), - (unicode != 0xffff ) ? QString(unicode) : QString(), autoRepeat); -@@ -477,6 +492,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)); -@@ -497,6 +513,7 @@ void QEvdevKeyboardHandler::unloadKeymap() - m_locks[2] = 1; - qCDebug(qLcEvdevKey, "numlock=%d , capslock=%d, scrolllock=%d", m_locks[1], m_locks[0], m_locks[2]); - } -+#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 1ec4915..fed7024 100644 ---- a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h -+++ b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h -@@ -190,8 +190,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); - - private: diff --git a/repos/libports/src/lib/qt5/patches/qt5_qtbase_lwip_connect_semantics_adaption.patch b/repos/libports/src/lib/qt5/patches/qt5_qtbase_lwip_connect_semantics_adaption.patch deleted file mode 100644 index f922a9ae55..0000000000 --- a/repos/libports/src/lib/qt5/patches/qt5_qtbase_lwip_connect_semantics_adaption.patch +++ /dev/null @@ -1,36 +0,0 @@ -qt5_qtbase_lwip_connect_semantics_adaption.patch - -From: Christian Prochaska - - ---- - .../network/socket/qnativesocketengine_unix.cpp | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/qtbase/src/network/socket/qnativesocketengine_unix.cpp b/qtbase/src/network/socket/qnativesocketengine_unix.cpp -index 2d50cc1..7825be5 100644 ---- a/qtbase/src/network/socket/qnativesocketengine_unix.cpp -+++ b/qtbase/src/network/socket/qnativesocketengine_unix.cpp -@@ -389,6 +389,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/repos/libports/src/lib/qt5/patches/qt5_qtbase_qconfig.patch b/repos/libports/src/lib/qt5/patches/qt5_qtbase_qconfig.patch deleted file mode 100644 index a52ed34b0e..0000000000 --- a/repos/libports/src/lib/qt5/patches/qt5_qtbase_qconfig.patch +++ /dev/null @@ -1,501 +0,0 @@ -qt5_qtbase_qconfig.patch - -From: Christian Prochaska - - ---- - qtbase/src/corelib/global/qconfig.cpp | 59 +++++++ - qtbase/src/corelib/global/qconfig.h | 147 ++++++++++++++++++ - qtbase/src/corelib/global/qfeatures.h | 263 +++++++++++++++++++++++++++++++++ - 3 files changed, 469 insertions(+) - create mode 100644 qtbase/src/corelib/global/qconfig.cpp - create mode 100644 qtbase/src/corelib/global/qconfig.h - create mode 100644 qtbase/src/corelib/global/qfeatures.h - -diff --git a/qtbase/src/corelib/global/qconfig.cpp b/qtbase/src/corelib/global/qconfig.cpp -new file mode 100644 -index 0000000..0c319a6 ---- /dev/null -+++ b/qtbase/src/corelib/global/qconfig.cpp -@@ -0,0 +1,59 @@ -+/* License Info */ -+static const char qt_configure_licensee_str [256 + 12] = "qt_lcnsuser=Open Source"; -+static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=OpenSource"; -+ -+/* 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 [256 + 12] = "qt_prfxpath=/qt"; -+#ifdef QT_BUILD_QMAKE -+static const char qt_configure_ext_prefix_path_str [256 + 12] = "qt_epfxpath=/qt"; -+static const char qt_configure_host_prefix_path_str [256 + 12] = "qt_hpfxpath=/qt"; -+#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, 85, 89, 91, 102, -+#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" -+ "bin\0" -+ "lib\0" -+ ".\0" -+ "genode-g++\0" -+ "linux-g++\0" -+#endif -+; -+ -+#define QT_CONFIGURE_SETTINGS_PATH "etc/xdg" -+ -+#ifdef QT_BUILD_QMAKE -+# define QT_CONFIGURE_SYSROOTIFY_PREFIX false -+#endif -+ -+/* strlen( "qt_lcnsxxxx" ) == 12 */ -+#define QT_CONFIGURE_LICENSEE qt_configure_licensee_str + 12 -+#define QT_CONFIGURE_LICENSED_PRODUCTS qt_configure_licensed_products_str + 12 -+ -+#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..57d990f ---- /dev/null -+++ b/qtbase/src/corelib/global/qconfig.h -@@ -0,0 +1,147 @@ -+#define QT_VERSION_MAJOR 5 -+#define QT_VERSION_MINOR 7 -+#define QT_VERSION_PATCH 1 -+#define QT_VERSION_STR "5.7.1" -+ -+#ifndef QT_BOOTSTRAPPED -+#include "qconfig-genode.h" -+#endif -+ -+/* Compile time features */ -+//#define QT_REDUCE_RELOCATIONS -+ -+// Compiler sub-arch support -+//#define QT_COMPILER_SUPPORTS_SSE2 1 -+ -+#ifndef QT_BOOTSTRAPPED -+ -+#if defined(QT_BUILTIN_GIF_READER) && defined(QT_NO_BUILTIN_GIF_READER) -+# undef QT_BUILTIN_GIF_READER -+#elif !defined(QT_BUILTIN_GIF_READER) && !defined(QT_NO_BUILTIN_GIF_READER) -+# define QT_BUILTIN_GIF_READER 1 -+#endif -+ -+#if defined(QT_LINKED_OPENSSL) && defined(QT_NO_LINKED_OPENSSL) -+# undef QT_LINKED_OPENSSL -+#elif !defined(QT_LINKED_OPENSSL) && !defined(QT_NO_LINKED_OPENSSL) -+# define QT_LINKED_OPENSSL -+#endif -+ -+#if defined(QT_NO_ACCESSIBILITY) && defined(QT_ACCESSIBILITY) -+# undef QT_NO_ACCESSIBILITY -+#elif !defined(QT_NO_ACCESSIBILITY) && !defined(QT_ACCESSIBILITY) -+# define QT_NO_ACCESSIBILITY -+#endif -+ -+#if defined(QT_NO_CUPS) && defined(QT_CUPS) -+# undef QT_NO_CUPS -+#elif !defined(QT_NO_CUPS) && !defined(QT_CUPS) -+# define QT_NO_CUPS -+#endif -+ -+#if defined(QT_NO_DBUS) && defined(QT_DBUS) -+# undef QT_NO_DBUS -+#elif !defined(QT_NO_DBUS) && !defined(QT_DBUS) -+# define QT_NO_DBUS -+#endif -+ -+#if defined(QT_NO_EVENTFD) && defined(QT_EVENTFD) -+# undef QT_NO_EVENTFD -+#elif !defined(QT_NO_EVENTFD) && !defined(QT_EVENTFD) -+# define QT_NO_EVENTFD -+#endif -+ -+#if defined(QT_NO_FONTCONFIG) && defined(QT_FONTCONFIG) -+# undef QT_NO_FONTCONFIG -+#elif !defined(QT_NO_FONTCONFIG) && !defined(QT_FONTCONFIG) -+# define QT_NO_FONTCONFIG -+#endif -+ -+#if defined(QT_NO_GLIB) && defined(QT_GLIB) -+# undef QT_NO_GLIB -+#elif !defined(QT_NO_GLIB) && !defined(QT_GLIB) -+# define QT_NO_GLIB -+#endif -+ -+#if defined(QT_NO_HARFBUZZ) && defined(QT_HARFBUZZ) -+# undef QT_NO_HARFBUZZ -+#elif !defined(QT_NO_HARFBUZZ) && !defined(QT_HARFBUZZ) -+# define QT_NO_HARFBUZZ -+#endif -+ -+#if defined(QT_NO_ICONV) && defined(QT_ICONV) -+# undef QT_NO_ICONV -+#elif !defined(QT_NO_ICONV) && !defined(QT_ICONV) -+# define QT_NO_ICONV -+#endif -+ -+#if defined(QT_NO_LIBPROXY) && defined(QT_LIBPROXY) -+# undef QT_NO_LIBPROXY -+#elif !defined(QT_NO_LIBPROXY) && !defined(QT_LIBPROXY) -+# define QT_NO_LIBPROXY -+#endif -+ -+#if defined(QT_NO_OPENVG) && defined(QT_OPENVG) -+# undef QT_NO_OPENVG -+#elif !defined(QT_NO_OPENVG) && !defined(QT_OPENVG) -+# define QT_NO_OPENVG -+#endif -+ -+#if defined(QT_NO_PULSEAUDIO) && defined(QT_PULSEAUDIO) -+# undef QT_NO_PULSEAUDIO -+#elif !defined(QT_NO_PULSEAUDIO) && !defined(QT_PULSEAUDIO) -+# define QT_NO_PULSEAUDIO -+#endif -+ -+#if defined(QT_NO_TSLIB) && defined(QT_TSLIB) -+# undef QT_NO_TSLIB -+#elif !defined(QT_NO_TSLIB) && !defined(QT_TSLIB) -+# define QT_NO_TSLIB -+#endif -+ -+#if defined(QT_NO_ZLIB) && defined(QT_ZLIB) -+# undef QT_NO_ZLIB -+#elif !defined(QT_NO_ZLIB) && !defined(QT_ZLIB) -+# define QT_NO_ZLIB -+#endif -+ -+#if defined(QT_RUNTIME_XCURSOR) && defined(QT_NO_RUNTIME_XCURSOR) -+# undef QT_RUNTIME_XCURSOR -+#elif !defined(QT_RUNTIME_XCURSOR) && !defined(QT_NO_RUNTIME_XCURSOR) -+# define QT_RUNTIME_XCURSOR -+#endif -+ -+#if defined(QT_RUNTIME_XFIXES) && defined(QT_NO_RUNTIME_XFIXES) -+# undef QT_RUNTIME_XFIXES -+#elif !defined(QT_RUNTIME_XFIXES) && !defined(QT_NO_RUNTIME_XFIXES) -+# define QT_RUNTIME_XFIXES -+#endif -+ -+#if defined(QT_RUNTIME_XRANDR) && defined(QT_NO_RUNTIME_XRANDR) -+# undef QT_RUNTIME_XRANDR -+#elif !defined(QT_RUNTIME_XRANDR) && !defined(QT_NO_RUNTIME_XRANDR) -+# define QT_RUNTIME_XRANDR -+#endif -+ -+#endif // QT_BOOTSTRAPPED -+ -+#define QT_VISIBILITY_AVAILABLE -+ -+#define QT_QPA_DEFAULT_PLATFORM_NAME "nitpicker" -+ -+/* needed for QtScript classic */ -+#ifndef QT_STATIC -+# if defined(QT_BUILD_SCRIPT_LIB) -+# define Q_SCRIPT_EXPORT Q_DECL_EXPORT -+# else -+# define Q_SCRIPT_EXPORT Q_DECL_IMPORT -+# endif -+# if defined(QT_BUILD_SCRIPTTOOLS_LIB) -+# define Q_SCRIPTTOOLS_EXPORT Q_DECL_EXPORT -+# else -+# define Q_SCRIPTTOOLS_EXPORT Q_DECL_IMPORT -+# endif -+#else -+# define Q_SCRIPT_EXPORT -+# define Q_SCRIPTTOOLS_EXPORT -+#endif -diff --git a/qtbase/src/corelib/global/qfeatures.h b/qtbase/src/corelib/global/qfeatures.h -new file mode 100644 -index 0000000..20db0bf ---- /dev/null -+++ b/qtbase/src/corelib/global/qfeatures.h -@@ -0,0 +1,263 @@ -+/* -+ * All feature dependencies. -+ * -+ * This list is generated by qmake from /src/corelib/global/qfeatures.txt -+ */ -+#if !defined(QT_NO_DBUS) && (defined(QT_NO_PROPERTIES) || defined(QT_NO_XMLSTREAMREADER)) -+# define QT_NO_DBUS -+#endif -+#if !defined(QT_NO_ACCESSIBILITY) && (defined(QT_NO_PROPERTIES) || defined(QT_NO_MENUBAR)) -+# define QT_NO_ACCESSIBILITY -+#endif -+#if !defined(QT_NO_UNDOVIEW) && (defined(QT_NO_UNDOSTACK) || defined(QT_NO_LISTVIEW)) -+# define QT_NO_UNDOVIEW -+#endif -+#if !defined(QT_NO_UNDOSTACK) && (defined(QT_NO_UNDOCOMMAND)) -+# define QT_NO_UNDOSTACK -+#endif -+#if !defined(QT_NO_UNDOGROUP) && (defined(QT_NO_UNDOSTACK)) -+# define QT_NO_UNDOGROUP -+#endif -+#if !defined(QT_NO_FSCOMPLETER) && (defined(QT_NO_FILESYSTEMMODEL) || defined(QT_NO_COMPLETER)) -+# define QT_NO_FSCOMPLETER -+#endif -+#if !defined(QT_NO_BEARERMANAGEMENT) && (defined(QT_NO_LIBRARY) || defined(QT_NO_NETWORKINTERFACE) || defined(QT_NO_PROPERTIES)) -+# define QT_NO_BEARERMANAGEMENT -+#endif -+#if !defined(QT_NO_SOCKS5) && (defined(QT_NO_NETWORKPROXY)) -+# define QT_NO_SOCKS5 -+#endif -+#if !defined(QT_NO_ICONV) && (defined(QT_NO_TEXTCODEC)) -+# define QT_NO_ICONV -+#endif -+#if !defined(QT_NO_BIG_CODECS) && (defined(QT_NO_TEXTCODEC)) -+# define QT_NO_BIG_CODECS -+#endif -+#if !defined(QT_NO_CODECS) && (defined(QT_NO_TEXTCODEC)) -+# define QT_NO_CODECS -+#endif -+#if !defined(QT_NO_CUPS) && (defined(QT_NO_PRINTER) || defined(QT_NO_LIBRARY)) -+# define QT_NO_CUPS -+#endif -+#if !defined(QT_NO_PRINTER) && (defined(QT_NO_PICTURE) || defined(QT_NO_TEMPORARYFILE) || defined(QT_NO_PDF)) -+# define QT_NO_PRINTER -+#endif -+#if !defined(QT_NO_STYLE_STYLESHEET) && (defined(QT_NO_STYLE_WINDOWS) || defined(QT_NO_PROPERTIES) || defined(QT_NO_CSSPARSER)) -+# define QT_NO_STYLE_STYLESHEET -+#endif -+#if !defined(QT_NO_STYLE_WINDOWSMOBILE) && (defined(QT_NO_STYLE_WINDOWS) || defined(QT_NO_IMAGEFORMAT_XPM)) -+# define QT_NO_STYLE_WINDOWSMOBILE -+#endif -+#if !defined(QT_NO_STYLE_WINDOWSCE) && (defined(QT_NO_STYLE_WINDOWS) || defined(QT_NO_IMAGEFORMAT_XPM)) -+# define QT_NO_STYLE_WINDOWSCE -+#endif -+#if !defined(QT_NO_STYLE_WINDOWSXP) && (defined(QT_NO_STYLE_WINDOWS)) -+# define QT_NO_STYLE_WINDOWSXP -+#endif -+#if !defined(QT_NO_STYLE_WINDOWSVISTA) && (defined(QT_NO_STYLE_WINDOWSXP)) -+# define QT_NO_STYLE_WINDOWSVISTA -+#endif -+#if !defined(QT_NO_DATAWIDGETMAPPER) && (defined(QT_NO_ITEMVIEWS) || defined(QT_NO_PROPERTIES)) -+# define QT_NO_DATAWIDGETMAPPER -+#endif -+#if !defined(QT_NO_DIRMODEL) && (defined(QT_NO_ITEMVIEWS) || defined(QT_NO_FILESYSTEMMODEL)) -+# define QT_NO_DIRMODEL -+#endif -+#if !defined(QT_NO_INPUTDIALOG) && (defined(QT_NO_COMBOBOX) || defined(QT_NO_SPINBOX) || defined(QT_NO_STACKEDWIDGET)) -+# define QT_NO_INPUTDIALOG -+#endif -+#if !defined(QT_NO_PRINTPREVIEWDIALOG) && (defined(QT_NO_PRINTPREVIEWWIDGET) || defined(QT_NO_PRINTDIALOG) || defined(QT_NO_TOOLBAR)) -+# define QT_NO_PRINTPREVIEWDIALOG -+#endif -+#if !defined(QT_NO_PRINTDIALOG) && (defined(QT_NO_PRINTER) || defined(QT_NO_COMBOBOX) || defined(QT_NO_BUTTONGROUP) || defined(QT_NO_SPINBOX) || defined(QT_NO_TREEVIEW) || defined(QT_NO_TABWIDGET)) -+# define QT_NO_PRINTDIALOG -+#endif -+#if !defined(QT_NO_FONTDIALOG) && (defined(QT_NO_STRINGLISTMODEL) || defined(QT_NO_COMBOBOX) || defined(QT_NO_VALIDATOR) || defined(QT_NO_GROUPBOX)) -+# define QT_NO_FONTDIALOG -+#endif -+#if !defined(QT_NO_FILEDIALOG) && (defined(QT_NO_DIRMODEL) || defined(QT_NO_TREEVIEW) || defined(QT_NO_COMBOBOX) || defined(QT_NO_TOOLBUTTON) || defined(QT_NO_BUTTONGROUP) || defined(QT_NO_TOOLTIP) || defined(QT_NO_SPLITTER) || defined(QT_NO_STACKEDWIDGET) || defined(QT_NO_PROXYMODEL)) -+# define QT_NO_FILEDIALOG -+#endif -+#if !defined(QT_NO_KEYSEQUENCEEDIT) && (defined(QT_NO_LINEEDIT) || defined(QT_NO_SHORTCUT)) -+# define QT_NO_KEYSEQUENCEEDIT -+#endif -+#if !defined(QT_NO_PRINTPREVIEWWIDGET) && (defined(QT_NO_GRAPHICSVIEW) || defined(QT_NO_PRINTER) || defined(QT_NO_MAINWINDOW)) -+# define QT_NO_PRINTPREVIEWWIDGET -+#endif -+#if !defined(QT_NO_CALENDARWIDGET) && (defined(QT_NO_TABLEVIEW) || defined(QT_NO_MENU) || defined(QT_NO_TEXTDATE) || defined(QT_NO_SPINBOX) || defined(QT_NO_TOOLBUTTON)) -+# define QT_NO_CALENDARWIDGET -+#endif -+#if !defined(QT_NO_PROGRESSDIALOG) && (defined(QT_NO_PROGRESSBAR)) -+# define QT_NO_PROGRESSDIALOG -+#endif -+#if !defined(QT_NO_MENUBAR) && (defined(QT_NO_MENU) || defined(QT_NO_TOOLBUTTON)) -+# define QT_NO_MENUBAR -+#endif -+#if !defined(QT_NO_DIAL) && (defined(QT_NO_SLIDER)) -+# define QT_NO_DIAL -+#endif -+#if !defined(QT_NO_SCROLLBAR) && (defined(QT_NO_SLIDER)) -+# define QT_NO_SCROLLBAR -+#endif -+#if !defined(QT_NO_SCROLLAREA) && (defined(QT_NO_SCROLLBAR)) -+# define QT_NO_SCROLLAREA -+#endif -+#if !defined(QT_NO_GRAPHICSVIEW) && (defined(QT_NO_SCROLLAREA)) -+# define QT_NO_GRAPHICSVIEW -+#endif -+#if !defined(QT_NO_GRAPHICSEFFECT) && (defined(QT_NO_GRAPHICSVIEW)) -+# define QT_NO_GRAPHICSEFFECT -+#endif -+#if !defined(QT_NO_MDIAREA) && (defined(QT_NO_SCROLLAREA)) -+# define QT_NO_MDIAREA -+#endif -+#if !defined(QT_NO_DOCKWIDGET) && (defined(QT_NO_RUBBERBAND) || defined(QT_NO_MAINWINDOW)) -+# define QT_NO_DOCKWIDGET -+#endif -+#if !defined(QT_NO_BUTTONGROUP) && (defined(QT_NO_GROUPBOX)) -+# define QT_NO_BUTTONGROUP -+#endif -+#if !defined(QT_NO_TOOLBOX) && (defined(QT_NO_TOOLBUTTON) || defined(QT_NO_SCROLLAREA)) -+# define QT_NO_TOOLBOX -+#endif -+#if !defined(QT_NO_MAINWINDOW) && (defined(QT_NO_MENU) || defined(QT_NO_RESIZEHANDLER) || defined(QT_NO_TOOLBUTTON)) -+# define QT_NO_MAINWINDOW -+#endif -+#if !defined(QT_NO_TOOLBAR) && (defined(QT_NO_MAINWINDOW)) -+# define QT_NO_TOOLBAR -+#endif -+#if !defined(QT_NO_FONTCOMBOBOX) && (defined(QT_NO_COMBOBOX) || defined(QT_NO_STRINGLISTMODEL)) -+# define QT_NO_FONTCOMBOBOX -+#endif -+#if !defined(QT_NO_COMBOBOX) && (defined(QT_NO_LINEEDIT) || defined(QT_NO_STANDARDITEMMODEL) || defined(QT_NO_LISTVIEW)) -+# define QT_NO_COMBOBOX -+#endif -+#if !defined(QT_NO_TABWIDGET) && (defined(QT_NO_TABBAR) || defined(QT_NO_STACKEDWIDGET)) -+# define QT_NO_TABWIDGET -+#endif -+#if !defined(QT_NO_SPINBOX) && (defined(QT_NO_SPINWIDGET) || defined(QT_NO_LINEEDIT) || defined(QT_NO_VALIDATOR)) -+# define QT_NO_SPINBOX -+#endif -+#if !defined(QT_NO_COLORDIALOG) && (defined(QT_NO_SPINBOX)) -+# define QT_NO_COLORDIALOG -+#endif -+#if !defined(QT_NO_SPLITTER) && (defined(QT_NO_RUBBERBAND)) -+# define QT_NO_SPLITTER -+#endif -+#if !defined(QT_NO_TEXTEDIT) && (defined(QT_NO_SCROLLAREA) || defined(QT_NO_PROPERTIES)) -+# define QT_NO_TEXTEDIT -+#endif -+#if !defined(QT_NO_ERRORMESSAGE) && (defined(QT_NO_TEXTEDIT)) -+# define QT_NO_ERRORMESSAGE -+#endif -+#if !defined(QT_NO_SYNTAXHIGHLIGHTER) && (defined(QT_NO_TEXTEDIT)) -+# define QT_NO_SYNTAXHIGHLIGHTER -+#endif -+#if !defined(QT_NO_TEXTBROWSER) && (defined(QT_NO_TEXTEDIT)) -+# define QT_NO_TEXTBROWSER -+#endif -+#if !defined(QT_NO_DATETIMEEDIT) && (defined(QT_NO_CALENDARWIDGET) || defined(QT_NO_DATESTRING)) -+# define QT_NO_DATETIMEEDIT -+#endif -+#if !defined(QT_NO_ITEMVIEWS) && (defined(QT_NO_RUBBERBAND) || defined(QT_NO_SCROLLAREA)) -+# define QT_NO_ITEMVIEWS -+#endif -+#if !defined(QT_NO_STRINGLISTMODEL) && (defined(QT_NO_ITEMVIEWS)) -+# define QT_NO_STRINGLISTMODEL -+#endif -+#if !defined(QT_NO_PROXYMODEL) && (defined(QT_NO_ITEMVIEWS)) -+# define QT_NO_PROXYMODEL -+#endif -+#if !defined(QT_NO_COMPLETER) && (defined(QT_NO_PROXYMODEL)) -+# define QT_NO_COMPLETER -+#endif -+#if !defined(QT_NO_IDENTITYPROXYMODEL) && (defined(QT_NO_PROXYMODEL)) -+# define QT_NO_IDENTITYPROXYMODEL -+#endif -+#if !defined(QT_NO_SORTFILTERPROXYMODEL) && (defined(QT_NO_PROXYMODEL)) -+# define QT_NO_SORTFILTERPROXYMODEL -+#endif -+#if !defined(QT_NO_STANDARDITEMMODEL) && (defined(QT_NO_ITEMVIEWS)) -+# define QT_NO_STANDARDITEMMODEL -+#endif -+#if !defined(QT_NO_TABLEVIEW) && (defined(QT_NO_ITEMVIEWS)) -+# define QT_NO_TABLEVIEW -+#endif -+#if !defined(QT_NO_TABLEWIDGET) && (defined(QT_NO_TABLEVIEW)) -+# define QT_NO_TABLEWIDGET -+#endif -+#if !defined(QT_NO_LISTVIEW) && (defined(QT_NO_ITEMVIEWS)) -+# define QT_NO_LISTVIEW -+#endif -+#if !defined(QT_NO_COLUMNVIEW) && (defined(QT_NO_LISTVIEW)) -+# define QT_NO_COLUMNVIEW -+#endif -+#if !defined(QT_NO_LISTWIDGET) && (defined(QT_NO_LISTVIEW)) -+# define QT_NO_LISTWIDGET -+#endif -+#if !defined(QT_NO_TREEVIEW) && (defined(QT_NO_ITEMVIEWS)) -+# define QT_NO_TREEVIEW -+#endif -+#if !defined(QT_NO_TREEWIDGET) && (defined(QT_NO_TREEVIEW)) -+# define QT_NO_TREEWIDGET -+#endif -+#if !defined(QT_NO_LOCALSERVER) && (defined(QT_NO_TEMPORARYFILE)) -+# define QT_NO_LOCALSERVER -+#endif -+#if !defined(QT_NO_NETWORKDISKCACHE) && (defined(QT_NO_TEMPORARYFILE)) -+# define QT_NO_NETWORKDISKCACHE -+#endif -+#if !defined(QT_NO_PDF) && (defined(QT_NO_TEMPORARYFILE)) -+# define QT_NO_PDF -+#endif -+#if !defined(QT_NO_FTP) && (defined(QT_NO_TEXTDATE)) -+# define QT_NO_FTP -+#endif -+#if !defined(QT_NO_DATESTRING) && (defined(QT_NO_TEXTDATE)) -+# define QT_NO_DATESTRING -+#endif -+#if !defined(QT_NO_IMAGEFORMATPLUGIN) && (defined(QT_NO_LIBRARY)) -+# define QT_NO_IMAGEFORMATPLUGIN -+#endif -+#if !defined(QT_NO_IM) && (defined(QT_NO_LIBRARY)) -+# define QT_NO_IM -+#endif -+#if !defined(QT_NO_TOOLBUTTON) && (defined(QT_NO_ACTION)) -+# define QT_NO_TOOLBUTTON -+#endif -+#if !defined(QT_NO_WHATSTHIS) && (defined(QT_NO_TOOLBUTTON)) -+# define QT_NO_WHATSTHIS -+#endif -+#if !defined(QT_NO_TABBAR) && (defined(QT_NO_TOOLBUTTON)) -+# define QT_NO_TABBAR -+#endif -+#if !defined(QT_NO_MENU) && (defined(QT_NO_ACTION)) -+# define QT_NO_MENU -+#endif -+#if !defined(QT_NO_CONTEXTMENU) && (defined(QT_NO_MENU)) -+# define QT_NO_CONTEXTMENU -+#endif -+#if !defined(QT_NO_STYLE_FUSION) && (defined(QT_NO_IMAGEFORMAT_XPM)) -+# define QT_NO_STYLE_FUSION -+#endif -+#if !defined(QT_NO_DRAGANDDROP) && (defined(QT_NO_IMAGEFORMAT_XPM)) -+# define QT_NO_DRAGANDDROP -+#endif -+#if !defined(QT_NO_XMLSTREAMREADER) && (defined(QT_NO_XMLSTREAM)) -+# define QT_NO_XMLSTREAMREADER -+#endif -+#if !defined(QT_NO_XMLSTREAMWRITER) && (defined(QT_NO_XMLSTREAM)) -+# define QT_NO_XMLSTREAMWRITER -+#endif -+#if !defined(QT_NO_TEXTODFWRITER) && (defined(QT_NO_XMLSTREAMWRITER)) -+# define QT_NO_TEXTODFWRITER -+#endif -+#if !defined(QT_NO_STATEMACHINE) && (defined(QT_NO_PROPERTIES)) -+# define QT_NO_STATEMACHINE -+#endif -+#if !defined(QT_NO_ANIMATION) && (defined(QT_NO_PROPERTIES)) -+# define QT_NO_ANIMATION -+#endif -+#if !defined(QT_NO_WIZARD) && (defined(QT_NO_PROPERTIES)) -+# define QT_NO_WIZARD -+#endif diff --git a/repos/libports/src/lib/qt5/patches/qt5_qtbase_virtual_deletelater.patch b/repos/libports/src/lib/qt5/patches/qt5_qtbase_virtual_deletelater.patch deleted file mode 100644 index 49cd7fd9ed..0000000000 --- a/repos/libports/src/lib/qt5/patches/qt5_qtbase_virtual_deletelater.patch +++ /dev/null @@ -1,22 +0,0 @@ -qt5_qtbase_virtual_deletelater.patch - -From: Christian Prochaska - - ---- - qtbase/src/corelib/kernel/qobject.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/qtbase/src/corelib/kernel/qobject.h b/qtbase/src/corelib/kernel/qobject.h -index c06f702..2cbb61b 100644 ---- a/qtbase/src/corelib/kernel/qobject.h -+++ b/qtbase/src/corelib/kernel/qobject.h -@@ -397,7 +397,7 @@ public: - { return const_cast(this)->qt_metacast(classname) != Q_NULLPTR; } - - public Q_SLOTS: -- void deleteLater(); -+ virtual void deleteLater(); - - protected: - QObject *sender() const; diff --git a/repos/libports/src/lib/qt5/patches/qt5_qtnetwork.patch b/repos/libports/src/lib/qt5/patches/qt5_qtnetwork.patch deleted file mode 100644 index 414229f628..0000000000 --- a/repos/libports/src/lib/qt5/patches/qt5_qtnetwork.patch +++ /dev/null @@ -1,147 +0,0 @@ -qt5_qtnetwork.patch - -From: Christian Prochaska - - ---- - qtbase/src/network/access/qhttpnetworkreply.cpp | 8 ++++++++ - qtbase/src/network/socket/qnativesocketengine_p.h | 4 ++++ - .../network/socket/qnativesocketengine_unix.cpp | 2 ++ - qtbase/src/network/socket/qnet_unix_p.h | 10 ++++++++++ - qtbase/src/network/ssl/qsslconfiguration_p.h | 9 +++++++++ - qtbase/src/network/ssl/qsslsocket_openssl.cpp | 3 +++ - 6 files changed, 36 insertions(+) - -diff --git a/qtbase/src/network/access/qhttpnetworkreply.cpp b/qtbase/src/network/access/qhttpnetworkreply.cpp -index 3601c36..00b1632 100644 ---- a/qtbase/src/network/access/qhttpnetworkreply.cpp -+++ b/qtbase/src/network/access/qhttpnetworkreply.cpp -@@ -251,8 +251,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/socket/qnativesocketengine_p.h b/qtbase/src/network/socket/qnativesocketengine_p.h -index 19e9e1d..b972ff0 100644 ---- a/qtbase/src/network/socket/qnativesocketengine_p.h -+++ b/qtbase/src/network/socket/qnativesocketengine_p.h -@@ -286,8 +286,10 @@ public: - bool checkProxy(const QHostAddress &address); - bool fetchConnectionParameters(); - -+#ifndef QT_NO_NETWORKINTERFACE - static uint scopeIdFromString(const QString &scopeid) - { return QNetworkInterface::interfaceIndexFromName(scopeid); } -+#endif - - /*! \internal - Sets \a address and \a port in the \a aa sockaddr structure and the size in \a sockAddrSize. -@@ -301,7 +303,9 @@ public: - || socketProtocol == QAbstractSocket::AnyIPProtocol) { - memset(&aa->a6, 0, sizeof(sockaddr_in6)); - aa->a6.sin6_family = AF_INET6; -+#ifndef QT_NO_NETWORKINTERFACE - aa->a6.sin6_scope_id = scopeIdFromString(address.scopeId()); -+#endif - aa->a6.sin6_port = htons(port); - Q_IPV6ADDR tmp = address.toIPv6Address(); - memcpy(&aa->a6.sin6_addr, &tmp, sizeof(tmp)); -diff --git a/qtbase/src/network/socket/qnativesocketengine_unix.cpp b/qtbase/src/network/socket/qnativesocketengine_unix.cpp -index 7825be5..3270415 100644 ---- a/qtbase/src/network/socket/qnativesocketengine_unix.cpp -+++ b/qtbase/src/network/socket/qnativesocketengine_unix.cpp -@@ -116,8 +116,10 @@ static inline void qt_socket_getPortAndAddress(const qt_sockaddr *s, quint16 *po - QHostAddress tmpAddress; - tmpAddress.setAddress(tmp); - *addr = tmpAddress; -+#ifndef QT_NO_NETWORKINTERFACE - if (s->a6.sin6_scope_id) - addr->setScopeId(QNetworkInterface::interfaceNameFromIndex(s->a6.sin6_scope_id)); -+#endif - } - if (port) - *port = ntohs(s->a6.sin6_port); -diff --git a/qtbase/src/network/socket/qnet_unix_p.h b/qtbase/src/network/socket/qnet_unix_p.h -index 8d2a4ae..c73f2db 100644 ---- a/qtbase/src/network/socket/qnet_unix_p.h -+++ b/qtbase/src/network/socket/qnet_unix_p.h -@@ -185,6 +185,10 @@ static inline in_addr_t qt_safe_inet_addr(const char *cp) - - 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 -@@ -194,14 +198,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 364bba9..b45a8cc 100644 ---- a/qtbase/src/network/ssl/qsslconfiguration_p.h -+++ b/qtbase/src/network/ssl/qsslconfiguration_p.h -@@ -82,7 +82,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_openssl.cpp b/qtbase/src/network/ssl/qsslsocket_openssl.cpp -index b3820ae..141f57b 100644 ---- a/qtbase/src/network/ssl/qsslsocket_openssl.cpp -+++ b/qtbase/src/network/ssl/qsslsocket_openssl.cpp -@@ -491,7 +491,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(); -+#endif - - #if OPENSSL_VERSION_NUMBER >= 0x10001000L - if (q_SSLeay() >= 0x10001000L) diff --git a/repos/libports/src/lib/qt5/patches/qt5_qtscript.patch b/repos/libports/src/lib/qt5/patches/qt5_qtscript.patch deleted file mode 100644 index db14f62c1f..0000000000 --- a/repos/libports/src/lib/qt5/patches/qt5_qtscript.patch +++ /dev/null @@ -1,148 +0,0 @@ -qt5_qtscript.patch - -From: Christian Prochaska - - ---- - qtbase/src/corelib/global/qglobal.h | 6 +++++- - qtbase/src/corelib/kernel/qvariant_p.h | 3 +++ - .../JavaScriptCore/runtime/Collector.cpp | 20 ++++++++++++++++++++ - .../javascriptcore/JavaScriptCore/wtf/Assertions.h | 11 +++++++++++ - .../javascriptcore/JavaScriptCore/wtf/Platform.h | 5 +++++ - 5 files changed, 44 insertions(+), 1 deletion(-) - -diff --git a/qtbase/src/corelib/global/qglobal.h b/qtbase/src/corelib/global/qglobal.h -index 118203f..79fb45e 100644 ---- a/qtbase/src/corelib/global/qglobal.h -+++ b/qtbase/src/corelib/global/qglobal.h -@@ -886,13 +886,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 d01f386..2b09fab 100644 ---- a/qtbase/src/corelib/kernel/qvariant_p.h -+++ b/qtbase/src/corelib/kernel/qvariant_p.h -@@ -350,7 +350,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/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp b/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp -index 1b2fd1d..d1b454a 100644 ---- a/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp -+++ b/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp -@@ -64,6 +64,12 @@ - - #include - -+#elif OS(GENODE) -+ -+#include -+#include -+#include -+ - #elif OS(UNIX) - - #include -@@ -209,6 +215,15 @@ NEVER_INLINE CollectorBlock* Heap::allocateBlock() - void* address = _aligned_malloc(BLOCK_SIZE, BLOCK_SIZE); - #endif - memset(address, 0, BLOCK_SIZE); -+#elif OS(GENODE) -+ void* real_address = malloc(sizeof(Genode::addr_t) + BLOCK_SIZE + BLOCK_SIZE); -+ Genode::addr_t address = reinterpret_cast(real_address); -+ address += sizeof(Genode::addr_t); -+ address = Genode::align_addr(address, Genode::log2(BLOCK_SIZE)); -+ address -= sizeof(Genode::addr_t); -+ *(Genode::addr_t*)address = (Genode::addr_t)real_address; -+ address += sizeof(Genode::addr_t); -+ memset(reinterpret_cast(address), 0, BLOCK_SIZE); - #elif HAVE(POSIX_MEMALIGN) - void* address; - posix_memalign(&address, BLOCK_SIZE, BLOCK_SIZE); -@@ -299,6 +314,9 @@ NEVER_INLINE void Heap::freeBlockPtr(CollectorBlock* block) - #else - _aligned_free(block); - #endif -+#elif OS(GENODE) -+ void *real_address = (void*)*(Genode::addr_t*)((Genode::addr_t)block - sizeof(Genode::addr_t)); -+ free(real_address); - #elif HAVE(POSIX_MEMALIGN) - free(block); - #else -@@ -649,6 +667,8 @@ static inline void* currentThreadStackBase() - thread_info threadInfo; - get_thread_info(find_thread(NULL), &threadInfo); - return threadInfo.stack_end; -+#elif OS(GENODE) -+ return Genode::Thread_qt::myself()->stack_top(); - #elif OS(UNIX) - AtomicallyInitializedStatic(Mutex&, mutex = *new Mutex); - MutexLocker locker(mutex); -diff --git a/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Assertions.h b/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Assertions.h -index 74b0172..50121f6 100644 ---- a/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Assertions.h -+++ b/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Assertions.h -@@ -44,6 +44,10 @@ - - #include "Platform.h" - -+#if OS(GENODE) -+#include -+#endif -+ - #if COMPILER(MSVC) - #include - #else -@@ -156,6 +160,13 @@ void WTFLogVerbose(const char* file, int line, const char* function, WTFLogChann - __DEBUGGER(); \ - User::Panic(_L("Webkit CRASH"),0); \ - } while(false) -+#elif OS(GENODE) -+#define CRASH() ( \ -+ Genode::error("QtScript CRASH in '", WTF_PRETTY_FUNCTION, "'"), \ -+ Genode::error(" in ", __FILE__, ":", __LINE__), \ -+ *(int *)(uintptr_t)0xbbadbeef = 0, \ -+ ((void(*)())0)() /* More reliable, but doesn't say BBADBEEF */ \ -+) - #else - #define CRASH() do { \ - *(int *)(uintptr_t)0xbbadbeef = 0; \ -diff --git a/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -index 00caa6d..67d0855 100644 ---- a/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -+++ b/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -@@ -400,6 +400,11 @@ - /* ==== OS() - underlying operating system; only to be used for mandated low-level services like - virtual memory, not to choose a GUI toolkit ==== */ - -+/* OS(GENODE) - Genode */ -+#ifdef __GENODE__ -+#define WTF_OS_GENODE 1 -+#endif -+ - /* OS(ANDROID) - Android */ - #ifdef ANDROID - #define WTF_OS_ANDROID 1 diff --git a/repos/libports/src/lib/qt5/patches/qt5_qwidgetanimator.patch b/repos/libports/src/lib/qt5/patches/qt5_qwidgetanimator.patch deleted file mode 100644 index 63dbfd7e3b..0000000000 --- a/repos/libports/src/lib/qt5/patches/qt5_qwidgetanimator.patch +++ /dev/null @@ -1,23 +0,0 @@ -qt5_qwidgetanimator.patch - -From: Christian Prochaska - - ---- - qtbase/src/widgets/widgets/qwidgetanimator.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/qtbase/src/widgets/widgets/qwidgetanimator.cpp b/qtbase/src/widgets/widgets/qwidgetanimator.cpp -index d46d655..5ef6967 100644 ---- a/qtbase/src/widgets/widgets/qwidgetanimator.cpp -+++ b/qtbase/src/widgets/widgets/qwidgetanimator.cpp -@@ -73,7 +73,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 //QT_NO_ANIMATION - diff --git a/repos/libports/src/lib/qt5/patches/qt5_qwidgetwindow.patch b/repos/libports/src/lib/qt5/patches/qt5_qwidgetwindow.patch deleted file mode 100644 index 0327ac8865..0000000000 --- a/repos/libports/src/lib/qt5/patches/qt5_qwidgetwindow.patch +++ /dev/null @@ -1,23 +0,0 @@ -qt5_qwidgetwindow.patch - -From: Christian Prochaska - - ---- - qtbase/src/widgets/kernel/qwidgetwindow.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/qtbase/src/widgets/kernel/qwidgetwindow.cpp b/qtbase/src/widgets/kernel/qwidgetwindow.cpp -index f3fbe13..c990b33 100644 ---- a/qtbase/src/widgets/kernel/qwidgetwindow.cpp -+++ b/qtbase/src/widgets/kernel/qwidgetwindow.cpp -@@ -324,6 +324,9 @@ bool QWidgetWindow::event(QEvent *event) - m_widget->repaint(); - return true; - -+ case QEvent::MetaCall: -+ return QWindow::event(event); -+ - default: - break; - } diff --git a/repos/libports/src/lib/qt5/patches/qt5_textedit_example.patch b/repos/libports/src/lib/qt5/patches/qt5_textedit_example.patch deleted file mode 100644 index 5a0142abad..0000000000 --- a/repos/libports/src/lib/qt5/patches/qt5_textedit_example.patch +++ /dev/null @@ -1,70 +0,0 @@ -qt5_textedit_example.patch - -From: Christian Prochaska - - ---- - qtbase/examples/widgets/richtext/textedit/main.cpp | 20 ++++++++++++++++---- - .../widgets/richtext/textedit/textedit.pro | 4 ---- - 2 files changed, 16 insertions(+), 8 deletions(-) - -diff --git a/qtbase/examples/widgets/richtext/textedit/main.cpp b/qtbase/examples/widgets/richtext/textedit/main.cpp -index aef186a..246f517 100644 ---- a/qtbase/examples/widgets/richtext/textedit/main.cpp -+++ b/qtbase/examples/widgets/richtext/textedit/main.cpp -@@ -48,6 +48,10 @@ - ** - ****************************************************************************/ - -+/* Genode includes */ -+#include -+ -+/* Qt includes */ - #include "textedit.h" - - #include -@@ -59,6 +63,16 @@ int main(int argc, char *argv[]) - { - Q_INIT_RESOURCE(textedit); - -+ unsigned int x = 300; -+ unsigned int y = 0; -+ unsigned int w = 700; -+ unsigned int h = 700; -+ -+ try { Genode::config()->xml_node().attribute("xpos").value(&x); } catch (...) { } -+ try { Genode::config()->xml_node().attribute("ypos").value(&y); } catch (...) { } -+ try { Genode::config()->xml_node().attribute("width").value(&w); } catch (...) { } -+ try { Genode::config()->xml_node().attribute("height").value(&h); } catch (...) { } -+ - QApplication a(argc, argv); - QCoreApplication::setOrganizationName("QtProject"); - QCoreApplication::setApplicationName("Rich Text"); -@@ -72,10 +86,8 @@ int main(int argc, char *argv[]) - - TextEdit mw; - -- const QRect availableGeometry = QApplication::desktop()->availableGeometry(&mw); -- mw.resize(availableGeometry.width() / 2, (availableGeometry.height() * 2) / 3); -- mw.move((availableGeometry.width() - mw.width()) / 2, -- (availableGeometry.height() - mw.height()) / 2); -+ mw.move(x, y); -+ mw.resize(w, h); - - if (!mw.load(parser.positionalArguments().value(0, QLatin1String(":/example.html")))) - mw.fileNew(); -diff --git a/qtbase/examples/widgets/richtext/textedit/textedit.pro b/qtbase/examples/widgets/richtext/textedit/textedit.pro -index c32bf68..704f738 100644 ---- a/qtbase/examples/widgets/richtext/textedit/textedit.pro -+++ b/qtbase/examples/widgets/richtext/textedit/textedit.pro -@@ -9,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_configuration.patch b/repos/libports/src/lib/qt5/patches/qtbase_configuration.patch new file mode 100644 index 0000000000..a3b7c38c54 --- /dev/null +++ b/repos/libports/src/lib/qt5/patches/qtbase_configuration.patch @@ -0,0 +1,170 @@ +qtbase_configuration.patch + +From: Christian Prochaska + + +--- + qtbase/configure | 1 + qtbase/mkspecs/genode-g++/qmake.conf | 10 +++ + qtbase/mkspecs/genode-g++/qplatformdefs.h | 87 +++++++++++++++++++++++++++++ + qtbase/src/corelib/global/global.pri | 10 ++- + qtbase/src/corelib/io/io.pri | 2 - + 5 files changed, 104 insertions(+), 6 deletions(-) + create mode 100644 qtbase/mkspecs/genode-g++/qmake.conf + create mode 100644 qtbase/mkspecs/genode-g++/qplatformdefs.h + +diff --git a/qtbase/configure b/qtbase/configure +index bc18e61..a901fa0 100755 +--- a/qtbase/configure ++++ b/qtbase/configure +@@ -945,6 +945,7 @@ if [ -z "$PLATFORM" ]; then + - Also available for UnixWare: unixware-g++ + " + ;; ++ + SCO_SV:*) + #PLATFORM=sco-g++ + PLATFORM=sco-cc +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 f74662b..391df22 100644 +--- a/qtbase/src/corelib/global/global.pri ++++ b/qtbase/src/corelib/global/global.pri +@@ -41,11 +41,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\')\\\" ++#} + + slog2 { + LIBS_PRIVATE += -lslog2 +diff --git a/qtbase/src/corelib/io/io.pri b/qtbase/src/corelib/io/io.pri +index 0414ae9..fdbd1af 100644 +--- a/qtbase/src/corelib/io/io.pri ++++ b/qtbase/src/corelib/io/io.pri +@@ -166,7 +166,7 @@ win32 { + } else { + SOURCES += \ + io/qstandardpaths_unix.cpp \ +- io/qstorageinfo_unix.cpp ++ io/qstorageinfo_stub.cpp + } + + linux|if(qnx:qtConfig(inotify)) { diff --git a/repos/libports/src/lib/qt5/patches/qtbase_fixes.patch b/repos/libports/src/lib/qt5/patches/qtbase_fixes.patch new file mode 100644 index 0000000000..2d1af8232e --- /dev/null +++ b/repos/libports/src/lib/qt5/patches/qtbase_fixes.patch @@ -0,0 +1,80 @@ +qtbase_fixes.patch + +From: Christian Prochaska + + +--- + qtbase/src/network/socket/qnativesocketengine_p.h | 4 ++++ + .../network/socket/qnativesocketengine_unix.cpp | 2 ++ + qtbase/src/widgets/kernel/qwidgetwindow.cpp | 3 +++ + qtbase/src/widgets/widgets/qwidgetanimator.cpp | 3 ++- + 4 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/qtbase/src/network/socket/qnativesocketengine_p.h b/qtbase/src/network/socket/qnativesocketengine_p.h +index 46c7ae5..b6c4378 100644 +--- a/qtbase/src/network/socket/qnativesocketengine_p.h ++++ b/qtbase/src/network/socket/qnativesocketengine_p.h +@@ -286,8 +286,10 @@ public: + bool checkProxy(const QHostAddress &address); + bool fetchConnectionParameters(); + ++#ifndef QT_NO_NETWORKINTERFACE + static uint scopeIdFromString(const QString &scopeid) + { return QNetworkInterface::interfaceIndexFromName(scopeid); } ++#endif + + /*! \internal + Sets \a address and \a port in the \a aa sockaddr structure and the size in \a sockAddrSize. +@@ -301,7 +303,9 @@ public: + || socketProtocol == QAbstractSocket::AnyIPProtocol) { + memset(&aa->a6, 0, sizeof(sockaddr_in6)); + aa->a6.sin6_family = AF_INET6; ++#ifndef QT_NO_NETWORKINTERFACE + aa->a6.sin6_scope_id = scopeIdFromString(address.scopeId()); ++#endif + aa->a6.sin6_port = htons(port); + Q_IPV6ADDR tmp = address.toIPv6Address(); + memcpy(&aa->a6.sin6_addr, &tmp, sizeof(tmp)); +diff --git a/qtbase/src/network/socket/qnativesocketengine_unix.cpp b/qtbase/src/network/socket/qnativesocketengine_unix.cpp +index d1efc21..d981675 100644 +--- a/qtbase/src/network/socket/qnativesocketengine_unix.cpp ++++ b/qtbase/src/network/socket/qnativesocketengine_unix.cpp +@@ -121,8 +121,10 @@ static inline void qt_socket_getPortAndAddress(const qt_sockaddr *s, quint16 *po + QHostAddress tmpAddress; + tmpAddress.setAddress(tmp); + *addr = tmpAddress; ++#ifndef QT_NO_NETWORKINTERFACE + if (s->a6.sin6_scope_id) + addr->setScopeId(QNetworkInterface::interfaceNameFromIndex(s->a6.sin6_scope_id)); ++#endif + } + if (port) + *port = ntohs(s->a6.sin6_port); +diff --git a/qtbase/src/widgets/kernel/qwidgetwindow.cpp b/qtbase/src/widgets/kernel/qwidgetwindow.cpp +index 3e15b69..b91fbcf 100644 +--- a/qtbase/src/widgets/kernel/qwidgetwindow.cpp ++++ b/qtbase/src/widgets/kernel/qwidgetwindow.cpp +@@ -324,6 +324,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 d46d655..5ef6967 100644 +--- a/qtbase/src/widgets/widgets/qwidgetanimator.cpp ++++ b/qtbase/src/widgets/widgets/qwidgetanimator.cpp +@@ -73,7 +73,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 //QT_NO_ANIMATION + diff --git a/repos/libports/src/lib/qt5/patches/qtbase_generated.patch b/repos/libports/src/lib/qt5/patches/qtbase_generated.patch new file mode 100644 index 0000000000..1544f0d534 --- /dev/null +++ b/repos/libports/src/lib/qt5/patches/qtbase_generated.patch @@ -0,0 +1,675 @@ +qtbase_generated.patch + +From: Christian Prochaska + + +--- + .../QtCore/5.8.0/QtCore/private/qconfig_p.h | 1 + .../QtCore/5.8.0/QtCore/private/qtcore-config_p.h | 1 + qtbase/include/QtCore/QtConfig | 1 + qtbase/include/QtCore/QtCoreDepends | 1 + qtbase/include/QtCore/qconfig.h | 1 + qtbase/include/QtCore/qfeatures.h | 1 + qtbase/include/QtCore/qtcore-config.h | 1 + .../QtGui/5.8.0/QtGui/private/qtgui-config_p.h | 1 + qtbase/include/QtGui/QtGuiDepends | 2 + + qtbase/include/QtGui/qtgui-config.h | 1 + .../5.8.0/QtNetwork/private/qtnetwork-config_p.h | 1 + qtbase/include/QtNetwork/QtNetworkDepends | 2 + + qtbase/include/QtNetwork/qtnetwork-config.h | 1 + qtbase/include/QtOpenGL/QtOpenGLDepends | 4 + + .../private/qtprintsupport-config_p.h | 1 + .../include/QtPrintSupport/QtPrintSupportDepends | 4 + + .../include/QtPrintSupport/qtprintsupport-config.h | 1 + qtbase/include/QtSql/QtSqlDepends | 2 + + .../5.8.0/QtWidgets/private/qtwidgets-config_p.h | 1 + qtbase/include/QtWidgets/QtWidgetsDepends | 3 + + qtbase/include/QtWidgets/qtwidgets-config.h | 1 + .../QtXml/5.8.0/QtXml/private/qtxml-config_p.h | 1 + qtbase/include/QtXml/QtXmlDepends | 2 + + qtbase/include/QtXml/qtxml-config.h | 1 + qtbase/src/corelib/global/qconfig.cpp | 51 +++++++++++++++ + qtbase/src/corelib/global/qconfig.h | 24 +++++++ + qtbase/src/corelib/global/qconfig_p.h | 12 ++++ + qtbase/src/corelib/qtcore-config.h | 39 +++++++++++ + qtbase/src/corelib/qtcore-config_p.h | 16 +++++ + qtbase/src/gui/qtgui-config.h | 43 +++++++++++++ + qtbase/src/gui/qtgui-config_p.h | 40 ++++++++++++ + qtbase/src/network/qtnetwork-config.h | 16 +++++ + qtbase/src/network/qtnetwork-config_p.h | 5 + + qtbase/src/printsupport/qtprintsupport-config.h | 5 + + qtbase/src/printsupport/qtprintsupport-config_p.h | 1 + qtbase/src/widgets/qtwidgets-config.h | 68 ++++++++++++++++++++ + qtbase/src/widgets/qtwidgets-config_p.h | 1 + qtbase/src/xml/qtxml-config.h | 1 + qtbase/src/xml/qtxml-config_p.h | 0 + 39 files changed, 358 insertions(+) + create mode 100644 qtbase/include/QtCore/5.8.0/QtCore/private/qconfig_p.h + create mode 100644 qtbase/include/QtCore/5.8.0/QtCore/private/qtcore-config_p.h + create mode 100644 qtbase/include/QtCore/QtConfig + create mode 100644 qtbase/include/QtCore/QtCoreDepends + create mode 100644 qtbase/include/QtCore/qconfig.h + create mode 100644 qtbase/include/QtCore/qfeatures.h + create mode 100644 qtbase/include/QtCore/qtcore-config.h + create mode 100644 qtbase/include/QtGui/5.8.0/QtGui/private/qtgui-config_p.h + create mode 100644 qtbase/include/QtGui/QtGuiDepends + create mode 100644 qtbase/include/QtGui/qtgui-config.h + create mode 100644 qtbase/include/QtNetwork/5.8.0/QtNetwork/private/qtnetwork-config_p.h + create mode 100644 qtbase/include/QtNetwork/QtNetworkDepends + create mode 100644 qtbase/include/QtNetwork/qtnetwork-config.h + create mode 100644 qtbase/include/QtOpenGL/QtOpenGLDepends + create mode 100644 qtbase/include/QtPrintSupport/5.8.0/QtPrintSupport/private/qtprintsupport-config_p.h + create mode 100644 qtbase/include/QtPrintSupport/QtPrintSupportDepends + create mode 100644 qtbase/include/QtPrintSupport/qtprintsupport-config.h + create mode 100644 qtbase/include/QtSql/QtSqlDepends + create mode 100644 qtbase/include/QtWidgets/5.8.0/QtWidgets/private/qtwidgets-config_p.h + create mode 100644 qtbase/include/QtWidgets/QtWidgetsDepends + create mode 100644 qtbase/include/QtWidgets/qtwidgets-config.h + create mode 100644 qtbase/include/QtXml/5.8.0/QtXml/private/qtxml-config_p.h + create mode 100644 qtbase/include/QtXml/QtXmlDepends + create mode 100644 qtbase/include/QtXml/qtxml-config.h + create mode 100644 qtbase/src/corelib/global/qconfig.cpp + create mode 100644 qtbase/src/corelib/global/qconfig.h + create mode 100644 qtbase/src/corelib/global/qconfig_p.h + create mode 100644 qtbase/src/corelib/qtcore-config.h + create mode 100644 qtbase/src/corelib/qtcore-config_p.h + create mode 100644 qtbase/src/gui/qtgui-config.h + create mode 100644 qtbase/src/gui/qtgui-config_p.h + create mode 100644 qtbase/src/network/qtnetwork-config.h + create mode 100644 qtbase/src/network/qtnetwork-config_p.h + create mode 100644 qtbase/src/printsupport/qtprintsupport-config.h + create mode 100644 qtbase/src/printsupport/qtprintsupport-config_p.h + create mode 100644 qtbase/src/widgets/qtwidgets-config.h + create mode 100644 qtbase/src/widgets/qtwidgets-config_p.h + create mode 100644 qtbase/src/xml/qtxml-config.h + create mode 100644 qtbase/src/xml/qtxml-config_p.h + +diff --git a/qtbase/include/QtCore/5.8.0/QtCore/private/qconfig_p.h b/qtbase/include/QtCore/5.8.0/QtCore/private/qconfig_p.h +new file mode 100644 +index 0000000..aedf7fa +--- /dev/null ++++ b/qtbase/include/QtCore/5.8.0/QtCore/private/qconfig_p.h +@@ -0,0 +1 @@ ++#include "../../../../../src/corelib/global/qconfig_p.h" +diff --git a/qtbase/include/QtCore/5.8.0/QtCore/private/qtcore-config_p.h b/qtbase/include/QtCore/5.8.0/QtCore/private/qtcore-config_p.h +new file mode 100644 +index 0000000..53f2212 +--- /dev/null ++++ b/qtbase/include/QtCore/5.8.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..f6a4430 +--- /dev/null ++++ b/qtbase/include/QtCore/QtCoreDepends +@@ -0,0 +1 @@ ++/* This file was generated by qmake with the info from /src/corelib/corelib.pro. */ +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/qfeatures.h b/qtbase/include/QtCore/qfeatures.h +new file mode 100644 +index 0000000..2501992 +--- /dev/null ++++ b/qtbase/include/QtCore/qfeatures.h +@@ -0,0 +1 @@ ++#include "../../src/corelib/global/qfeatures.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.8.0/QtGui/private/qtgui-config_p.h b/qtbase/include/QtGui/5.8.0/QtGui/private/qtgui-config_p.h +new file mode 100644 +index 0000000..fa5bd06 +--- /dev/null ++++ b/qtbase/include/QtGui/5.8.0/QtGui/private/qtgui-config_p.h +@@ -0,0 +1 @@ ++#include "../../../../../src/gui/qtgui-config_p.h" +diff --git a/qtbase/include/QtGui/QtGuiDepends b/qtbase/include/QtGui/QtGuiDepends +new file mode 100644 +index 0000000..52697ae +--- /dev/null ++++ b/qtbase/include/QtGui/QtGuiDepends +@@ -0,0 +1,2 @@ ++/* This file was generated by qmake with the info from /src/gui/gui.pro. */ ++#include +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/QtNetwork/5.8.0/QtNetwork/private/qtnetwork-config_p.h b/qtbase/include/QtNetwork/5.8.0/QtNetwork/private/qtnetwork-config_p.h +new file mode 100644 +index 0000000..cbf4749 +--- /dev/null ++++ b/qtbase/include/QtNetwork/5.8.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..cb2c29d +--- /dev/null ++++ b/qtbase/include/QtNetwork/QtNetworkDepends +@@ -0,0 +1,2 @@ ++/* This file was generated by qmake with the info from /src/network/network.pro. */ ++#include +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..e15843d +--- /dev/null ++++ b/qtbase/include/QtOpenGL/QtOpenGLDepends +@@ -0,0 +1,4 @@ ++/* This file was generated by qmake with the info from /src/opengl/opengl.pro. */ ++#include ++#include ++#include +diff --git a/qtbase/include/QtPrintSupport/5.8.0/QtPrintSupport/private/qtprintsupport-config_p.h b/qtbase/include/QtPrintSupport/5.8.0/QtPrintSupport/private/qtprintsupport-config_p.h +new file mode 100644 +index 0000000..7833b12 +--- /dev/null ++++ b/qtbase/include/QtPrintSupport/5.8.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..520b700 +--- /dev/null ++++ b/qtbase/include/QtPrintSupport/QtPrintSupportDepends +@@ -0,0 +1,4 @@ ++/* This file was generated by qmake with the info from /src/printsupport/printsupport.pro. */ ++#include ++#include ++#include +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/QtSqlDepends b/qtbase/include/QtSql/QtSqlDepends +new file mode 100644 +index 0000000..42eb220 +--- /dev/null ++++ b/qtbase/include/QtSql/QtSqlDepends +@@ -0,0 +1,2 @@ ++/* This file was generated by qmake with the info from /src/sql/sql.pro. */ ++#include +diff --git a/qtbase/include/QtWidgets/5.8.0/QtWidgets/private/qtwidgets-config_p.h b/qtbase/include/QtWidgets/5.8.0/QtWidgets/private/qtwidgets-config_p.h +new file mode 100644 +index 0000000..9a6332d +--- /dev/null ++++ b/qtbase/include/QtWidgets/5.8.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..03776b6 +--- /dev/null ++++ b/qtbase/include/QtWidgets/QtWidgetsDepends +@@ -0,0 +1,3 @@ ++/* This file was generated by qmake with the info from /src/widgets/widgets.pro. */ ++#include ++#include +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.8.0/QtXml/private/qtxml-config_p.h b/qtbase/include/QtXml/5.8.0/QtXml/private/qtxml-config_p.h +new file mode 100644 +index 0000000..d567490 +--- /dev/null ++++ b/qtbase/include/QtXml/5.8.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..39dd8ec +--- /dev/null ++++ b/qtbase/include/QtXml/QtXmlDepends +@@ -0,0 +1,2 @@ ++/* This file was generated by qmake with the info from /src/xml/xml.pro. */ ++#include +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..5dc56fe +--- /dev/null ++++ b/qtbase/src/corelib/global/qconfig.cpp +@@ -0,0 +1,51 @@ ++/* 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 [256 + 12] = "qt_prfxpath=/qt"; ++#ifdef QT_BUILD_QMAKE ++static const char qt_configure_ext_prefix_path_str [256 + 12] = "qt_epfxpath=/qt"; ++static const char qt_configure_host_prefix_path_str [256 + 12] = "qt_hpfxpath=/qt"; ++#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, 85, 89, 91, 101, ++#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" ++ "bin\0" ++ "lib\0" ++ ".\0" ++ "genode-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..8a37dbf +--- /dev/null ++++ b/qtbase/src/corelib/global/qconfig.h +@@ -0,0 +1,24 @@ ++#define QT_FEATURE_framework -1 ++#define QT_FEATURE_shared 1 ++#define QT_FEATURE_rpath 1 ++#define QT_FEATURE_accessibility -1 ++# define QT_NO_ACCESSIBILITY ++#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_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_VISIBILITY_AVAILABLE true ++#define QT_FEATURE_separate_debug_info -1 ++#define QT_COMPILER_SUPPORTS_SSE2 1 ++#define QT_FEATURE_static -1 ++#define QT_VERSION_STR "5.8.0" ++#define QT_VERSION_MAJOR 5 ++#define QT_VERSION_MINOR 8 ++#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..f5f76cf +--- /dev/null ++++ b/qtbase/src/corelib/global/qconfig_p.h +@@ -0,0 +1,12 @@ ++#define QT_FEATURE_private_tests -1 ++#define QT_FEATURE_dbus -1 ++#define QT_FEATURE_dbus_linked -1 ++#define QT_FEATURE_gui 1 ++#define QT_FEATURE_libudev -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_sse2 1 ++#define QT_FEATURE_system_zlib 1 ++#define QT_FEATURE_widgets 1 +diff --git a/qtbase/src/corelib/qtcore-config.h b/qtbase/src/corelib/qtcore-config.h +new file mode 100644 +index 0000000..9fda215 +--- /dev/null ++++ b/qtbase/src/corelib/qtcore-config.h +@@ -0,0 +1,39 @@ ++#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_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_itemmodel 1 ++#define QT_FEATURE_proxymodel 1 ++#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_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_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_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..67468d2 +--- /dev/null ++++ b/qtbase/src/corelib/qtcore-config_p.h +@@ -0,0 +1,16 @@ ++#define QT_FEATURE_clock_gettime 1 ++#define QT_FEATURE_doubleconversion 1 ++#define QT_FEATURE_glib -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_libatomic -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_sha3_fast 1 ++#define QT_FEATURE_system_doubleconversion -1 ++#define QT_FEATURE_system_pcre -1 +diff --git a/qtbase/src/gui/qtgui-config.h b/qtbase/src/gui/qtgui-config.h +new file mode 100644 +index 0000000..608c641 +--- /dev/null ++++ b/qtbase/src/gui/qtgui-config.h +@@ -0,0 +1,43 @@ ++#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_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_FONTCONFIG ++#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_imageformatplugin 1 ++#define QT_FEATURE_movie 1 ++#define QT_FEATURE_opengles3 -1 ++#define QT_FEATURE_opengles31 -1 ++#define QT_FEATURE_pdf 1 ++#define QT_FEATURE_picture 1 ++#define QT_QPA_DEFAULT_PLATFORM_NAME "nitpicker" ++#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_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..937a626 +--- /dev/null ++++ b/qtbase/src/gui/qtgui-config_p.h +@@ -0,0 +1,40 @@ ++#define QT_FEATURE_accessibility_atspi_bridge -1 ++#define QT_FEATURE_android_style_assets -1 ++#define QT_FEATURE_direct2d -1 ++#define QT_FEATURE_directfb -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_viv -1 ++#define QT_FEATURE_eglfs_viv_wl -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_jpeg 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_system_xcb -1 ++#define QT_FEATURE_tslib -1 ++#define QT_FEATURE_xcb -1 ++#define QT_FEATURE_xinput2 -1 ++#define QT_FEATURE_xkb -1 ++#define QT_FEATURE_xkbcommon_evdev -1 ++#define QT_FEATURE_xlib 1 ++#define QT_FEATURE_xrender 1 +diff --git a/qtbase/src/network/qtnetwork-config.h b/qtbase/src/network/qtnetwork-config.h +new file mode 100644 +index 0000000..347fdb2 +--- /dev/null ++++ b/qtbase/src/network/qtnetwork-config.h +@@ -0,0 +1,16 @@ ++#define QT_FEATURE_networkinterface -1 ++#define QT_NO_NETWORKINTERFACE ++#define QT_FEATURE_bearermanagement -1 ++#define QT_NO_BEARERMANAGEMENT ++#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_LINKED_OPENSSL true ++#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..a0676fb +--- /dev/null ++++ b/qtbase/src/network/qtnetwork-config_p.h +@@ -0,0 +1,5 @@ ++#define QT_FEATURE_libproxy -1 ++#define QT_FEATURE_securetransport -1 ++#define QT_FEATURE_openssl 1 ++#define QT_FEATURE_openssl_linked 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..31472cc +--- /dev/null ++++ b/qtbase/src/printsupport/qtprintsupport-config.h +@@ -0,0 +1,5 @@ ++#define QT_NO_CUPS ++#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..ab4f4dd +--- /dev/null ++++ b/qtbase/src/printsupport/qtprintsupport-config_p.h +@@ -0,0 +1 @@ ++#define QT_FEATURE_cups -1 +diff --git a/qtbase/src/widgets/qtwidgets-config.h b/qtbase/src/widgets/qtwidgets-config.h +new file mode 100644 +index 0000000..dd8ef6e +--- /dev/null ++++ b/qtbase/src/widgets/qtwidgets-config.h +@@ -0,0 +1,68 @@ ++#define QT_FEATURE_groupbox 1 ++#define QT_FEATURE_buttongroup 1 ++#define QT_FEATURE_rubberband 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_menu 1 ++#define QT_FEATURE_spinbox 1 ++#define QT_FEATURE_toolbutton 1 ++#define QT_FEATURE_calendarwidget 1 ++#define QT_FEATURE_colordialog 1 ++#define QT_FEATURE_listview 1 ++#define QT_FEATURE_columnview 1 ++#define QT_FEATURE_lineedit 1 ++#define QT_FEATURE_combobox 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_treeview 1 ++#define QT_FEATURE_tooltip 1 ++#define QT_FEATURE_splitter 1 ++#define QT_FEATURE_stackedwidget 1 ++#define QT_FEATURE_filedialog 1 ++#define QT_FEATURE_fontcombobox 1 ++#define QT_FEATURE_fontdialog 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_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_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_whatsthis 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..85a8761 +--- /dev/null ++++ b/qtbase/src/widgets/qtwidgets-config_p.h +@@ -0,0 +1 @@ ++#define QT_FEATURE_gtk3 -1 +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/qt5_qtbase_genode.patch b/repos/libports/src/lib/qt5/patches/qtbase_genode.patch similarity index 51% rename from repos/libports/src/lib/qt5/patches/qt5_qtbase_genode.patch rename to repos/libports/src/lib/qt5/patches/qtbase_genode.patch index 83398f1048..90e92a677f 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_qtbase_genode.patch +++ b/repos/libports/src/lib/qt5/patches/qtbase_genode.patch @@ -1,4 +1,4 @@ -qt5_qtbase_genode.patch +qtbase_genode.patch From: Christian Prochaska @@ -11,20 +11,30 @@ Genode-specific adaptations qtbase/src/corelib/io/qresource.cpp | 2 - qtbase/src/corelib/kernel/qcoreapplication.cpp | 2 - .../src/corelib/kernel/qeventdispatcher_unix.cpp | 7 +++ + qtbase/src/corelib/kernel/qobject.h | 2 - qtbase/src/corelib/kernel/qtranslator.cpp | 2 - qtbase/src/corelib/thread/qthread.cpp | 4 + - qtbase/src/corelib/thread/qthread_p.h | 55 ++++++++++++++++++++ + qtbase/src/corelib/thread/qthread_p.h | 56 ++++++++++++++++++++ qtbase/src/corelib/tools/qdatetime.cpp | 3 + qtbase/src/gui/image/qxpmhandler.cpp | 8 +++ + qtbase/src/network/access/qhttpnetworkreply.cpp | 8 +++ .../network/access/qnetworkaccessfilebackend.cpp | 5 ++ qtbase/src/network/kernel/qhostinfo.cpp | 5 ++ qtbase/src/network/kernel/qhostinfo_unix.cpp | 7 ++- + .../network/socket/qnativesocketengine_unix.cpp | 16 ++++++ + qtbase/src/network/socket/qnet_unix_p.h | 10 ++++ + qtbase/src/network/ssl/qsslconfiguration_p.h | 9 +++ + qtbase/src/network/ssl/qsslsocket_openssl.cpp | 3 + + .../fontdatabases/basic/qbasicfontdatabase.cpp | 9 +++ + .../evdevkeyboard/qevdevkeyboard_defaultmap_p.h | 4 + + .../input/evdevkeyboard/qevdevkeyboardhandler.cpp | 17 ++++++ + .../input/evdevkeyboard/qevdevkeyboardhandler_p.h | 2 + qtbase/src/widgets/dialogs/qfiledialog.cpp | 2 - qtbase/src/widgets/styles/qstylefactory.cpp | 7 +++ - 17 files changed, 116 insertions(+), 8 deletions(-) + 27 files changed, 196 insertions(+), 9 deletions(-) diff --git a/qtbase/src/corelib/codecs/qtextcodec.cpp b/qtbase/src/corelib/codecs/qtextcodec.cpp -index edb03af..1008447 100644 +index 0c9036a..0dac7c1 100644 --- a/qtbase/src/corelib/codecs/qtextcodec.cpp +++ b/qtbase/src/corelib/codecs/qtextcodec.cpp @@ -204,7 +204,11 @@ static QTextCodec *setupLocaleMapper() @@ -40,10 +50,10 @@ index edb03af..1008447 100644 // 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 d0eb2af..66364fd 100644 +index 4142c17..2526e00 100644 --- a/qtbase/src/corelib/global/qcompilerdetection.h +++ b/qtbase/src/corelib/global/qcompilerdetection.h -@@ -889,7 +889,9 @@ +@@ -881,7 +881,9 @@ # define Q_COMPILER_ALIGNAS # define Q_COMPILER_ALIGNOF # define Q_COMPILER_INHERITING_CONSTRUCTORS @@ -55,7 +65,7 @@ index d0eb2af..66364fd 100644 # define Q_COMPILER_REF_QUALIFIERS # endif diff --git a/qtbase/src/corelib/global/qsystemdetection.h b/qtbase/src/corelib/global/qsystemdetection.h -index 1e852ae..99394de 100644 +index 3b486b8..fdd57df 100644 --- a/qtbase/src/corelib/global/qsystemdetection.h +++ b/qtbase/src/corelib/global/qsystemdetection.h @@ -47,6 +47,7 @@ @@ -63,10 +73,10 @@ index 1e852ae..99394de 100644 The operating system, must be one of: (Q_OS_x) + GENODE - Genode - DARWIN - Any Darwin system (OS X, iOS, watchOS, tvOS) + DARWIN - Any Darwin system (macOS, iOS, watchOS, tvOS) MACOS - macOS IOS - iOS -@@ -92,7 +93,9 @@ +@@ -91,7 +92,9 @@ - Q_OS_FREEBSD_KERNEL is always defined on FreeBSD, even if the userland is from GNU */ @@ -91,10 +101,10 @@ index e3d4037..7e57df5 100644 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 96957ac..ff82f21 100644 +index febf226..0903322 100644 --- a/qtbase/src/corelib/io/qresource.cpp +++ b/qtbase/src/corelib/io/qresource.cpp -@@ -928,7 +928,7 @@ public: +@@ -943,7 +943,7 @@ public: } }; @@ -104,7 +114,7 @@ index 96957ac..ff82f21 100644 #endif diff --git a/qtbase/src/corelib/kernel/qcoreapplication.cpp b/qtbase/src/corelib/kernel/qcoreapplication.cpp -index 2179a0d..71617cc 100644 +index 3796df5..e0a8ddf 100644 --- a/qtbase/src/corelib/kernel/qcoreapplication.cpp +++ b/qtbase/src/corelib/kernel/qcoreapplication.cpp @@ -575,7 +575,7 @@ void QCoreApplicationPrivate::initLocale() @@ -141,8 +151,21 @@ index 802962d..be1803c 100644 #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 69b70ad..c2c8827 100644 +--- a/qtbase/src/corelib/kernel/qobject.h ++++ b/qtbase/src/corelib/kernel/qobject.h +@@ -401,7 +401,7 @@ public: + { return const_cast(this)->qt_metacast(classname) != Q_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 2c813b5..3fb323e 100644 +index 04a5e7e..9ec503b 100644 --- a/qtbase/src/corelib/kernel/qtranslator.cpp +++ b/qtbase/src/corelib/kernel/qtranslator.cpp @@ -57,7 +57,7 @@ @@ -155,7 +178,7 @@ index 2c813b5..3fb323e 100644 #include "private/qcore_unix_p.h" #endif diff --git a/qtbase/src/corelib/thread/qthread.cpp b/qtbase/src/corelib/thread/qthread.cpp -index 4aac24f..76ba470 100644 +index 7118ad5..316aa27 100644 --- a/qtbase/src/corelib/thread/qthread.cpp +++ b/qtbase/src/corelib/thread/qthread.cpp @@ -149,6 +149,10 @@ QThreadPrivate::QThreadPrivate(QThreadData *d) @@ -170,7 +193,7 @@ index 4aac24f..76ba470 100644 handle = 0; # ifndef Q_OS_WINRT diff --git a/qtbase/src/corelib/thread/qthread_p.h b/qtbase/src/corelib/thread/qthread_p.h -index 37eca9c..a55b27d 100644 +index 37eca9c..ed05801 100644 --- a/qtbase/src/corelib/thread/qthread_p.h +++ b/qtbase/src/corelib/thread/qthread_p.h @@ -53,6 +53,10 @@ @@ -178,19 +201,21 @@ index 37eca9c..a55b27d 100644 // +#ifdef Q_OS_GENODE -+#include ++#include +#endif + #include "qplatformdefs.h" #include "QtCore/qthread.h" #include "QtCore/qmutex.h" -@@ -176,11 +180,62 @@ public: +@@ -176,6 +180,58 @@ public: static QThread *threadForId(int id); #ifdef Q_OS_UNIX +#ifdef Q_OS_GENODE + -+ class Genode_thread : public Genode::Thread_qt ++ enum { DEFAULT_STACK_SIZE = 4096*100 }; ++ ++ class Genode_thread : public Genode::Thread + { + private: + @@ -205,8 +230,9 @@ index 37eca9c..a55b27d 100644 + + public: + -+ Genode_thread(QThread *qthread) -+ : _finished_lock(Genode::Lock::LOCKED), ++ Genode_thread(Genode::Env &env, QThread *qthread) ++ : Genode::Thread(env, qthread->objectName().toLatin1().constData(), DEFAULT_STACK_SIZE), ++ _finished_lock(Genode::Lock::LOCKED), + _qthread(qthread) { } + + virtual void entry() @@ -225,33 +251,26 @@ index 37eca9c..a55b27d 100644 + Genode_thread *genode_thread; + + struct tls_struct { -+ QThreadData *data; -+ bool termination_enabled; ++ QThreadData *data; ++ bool termination_enabled; + }; + ++ static Genode::Env *_env; ++ static void env(Genode::Env &env) { _env = &env; } ++ + static QHash tls; + + Qt::HANDLE thread_id; -+ QWaitCondition thread_done; ++#endif // Q_OS_GENODE + -+ static void *start(void *arg); -+ static void finish(void *arg); -+ -+#else // Q_OS_UNIX && !Q_OS_GENODE QWaitCondition thread_done; static void *start(void *arg); - static void finish(void *); - -+#endif // Q_OS_GENODE - #endif // Q_OS_UNIX - - #ifdef Q_OS_WIN diff --git a/qtbase/src/corelib/tools/qdatetime.cpp b/qtbase/src/corelib/tools/qdatetime.cpp -index bfc7e1c..eac18c9 100644 +index a642358..419d051 100644 --- a/qtbase/src/corelib/tools/qdatetime.cpp +++ b/qtbase/src/corelib/tools/qdatetime.cpp -@@ -2170,6 +2170,9 @@ static int qt_timezone() +@@ -2160,6 +2160,9 @@ static int qt_timezone() long offset; _get_timezone(&offset); return offset; @@ -262,11 +281,11 @@ index bfc7e1c..eac18c9 100644 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 c8c8f99..714016a 100644 +index 1f1f6b3..7e67700 100644 --- a/qtbase/src/gui/image/qxpmhandler.cpp +++ b/qtbase/src/gui/image/qxpmhandler.cpp @@ -848,8 +848,16 @@ static bool read_xpm_header( - #if defined(_MSC_VER) && _MSC_VER >= 1400 && !defined(Q_OS_WINCE) + #ifdef Q_CC_MSVC if (sscanf_s(buf, "%d %d %d %d", w, h, ncols, cpp) < 4) #else +#ifdef Q_OS_GENODE @@ -282,6 +301,27 @@ index c8c8f99..714016a 100644 return false; // < 4 numbers parsed return true; +diff --git a/qtbase/src/network/access/qhttpnetworkreply.cpp b/qtbase/src/network/access/qhttpnetworkreply.cpp +index 24ada3a..35364b2 100644 +--- a/qtbase/src/network/access/qhttpnetworkreply.cpp ++++ b/qtbase/src/network/access/qhttpnetworkreply.cpp +@@ -251,8 +251,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 6043943..291df77 100644 --- a/qtbase/src/network/access/qnetworkaccessfilebackend.cpp @@ -347,11 +387,247 @@ index 7af8db7..1f40ad1 100644 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 d981675..ae80a59 100644 +--- a/qtbase/src/network/socket/qnativesocketengine_unix.cpp ++++ b/qtbase/src/network/socket/qnativesocketengine_unix.cpp +@@ -442,6 +442,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 46fbc97..c9d8261 100644 +--- a/qtbase/src/network/socket/qnet_unix_p.h ++++ b/qtbase/src/network/socket/qnet_unix_p.h +@@ -186,6 +186,10 @@ static inline in_addr_t qt_safe_inet_addr(const char *cp) + + 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 +@@ -195,14 +199,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 6adf2c9..e080563 100644 +--- a/qtbase/src/network/ssl/qsslconfiguration_p.h ++++ b/qtbase/src/network/ssl/qsslconfiguration_p.h +@@ -84,7 +84,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_openssl.cpp b/qtbase/src/network/ssl/qsslsocket_openssl.cpp +index aca7507..8318a10 100644 +--- a/qtbase/src/network/ssl/qsslsocket_openssl.cpp ++++ b/qtbase/src/network/ssl/qsslsocket_openssl.cpp +@@ -504,7 +504,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(); ++#endif + + #if OPENSSL_VERSION_NUMBER >= 0x10001000L + if (q_SSLeay() >= 0x10001000L) +diff --git a/qtbase/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp b/qtbase/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp +index 60ddc9f..0cc2f0b 100644 +--- a/qtbase/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp ++++ b/qtbase/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp +@@ -80,7 +80,16 @@ void QBasicFontDatabase::populateFontDatabase() + const auto fis = dir.entryInfoList(nameFilters, QDir::Files); + for (const QFileInfo &fi : fis) { + const QByteArray file = QFile::encodeName(fi.absoluteFilePath()); ++#ifdef Q_OS_GENODE ++ QByteArray data; ++ QFile f(file); ++ if (!f.open(QIODevice::ReadOnly)) ++ continue; ++ data = f.readAll(); ++ QBasicFontDatabase::addTTFile(data, file); ++#else + QBasicFontDatabase::addTTFile(QByteArray(), file); ++#endif + } + } + +diff --git a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h +index bc04852..8394318 100644 +--- a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h ++++ b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h +@@ -52,7 +52,9 @@ + // + + #include "qnamespace.h" ++#ifndef Q_OS_GENODE + #include "linux/input.h" ++#endif /* Q_OS_GENODE */ + + // no QT_BEGIN_NAMESPACE, since we include it internally... + +@@ -644,6 +646,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 }, +@@ -672,6 +675,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 0eb6fc0..cf19fec 100644 +--- a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp ++++ b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp +@@ -49,7 +49,9 @@ + #include + #include + ++#ifndef Q_OS_GENODE + #include ++#endif /* Q_OS_GENODE */ + + QT_BEGIN_NAMESPACE + +@@ -81,9 +83,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, SIGNAL(activated(int)), this, SLOT(readKeycode())); ++#endif /* Q_OS_GENODE */ + } + + QEvdevKeyboardHandler::~QEvdevKeyboardHandler() +@@ -91,6 +95,7 @@ QEvdevKeyboardHandler::~QEvdevKeyboardHandler() + unloadKeymap(); + } + ++#ifndef Q_OS_GENODE + QEvdevKeyboardHandler *QEvdevKeyboardHandler::create(const QString &device, + const QString &specification, + const QString &defaultKeymapFile) +@@ -214,10 +219,20 @@ 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 + QWindowSystemInterface::handleExtendedKeyEvent(0, (isPress ? QEvent::KeyPress : QEvent::KeyRelease), + qtcode, modifiers, nativecode + 8, 0, int(modifiers), + (unicode != 0xffff ) ? QString(unicode) : QString(), autoRepeat); +@@ -477,6 +492,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)); +@@ -497,6 +513,7 @@ void QEvdevKeyboardHandler::unloadKeymap() + m_locks[2] = 1; + qCDebug(qLcEvdevKey, "numlock=%d , capslock=%d, scrolllock=%d", m_locks[1], m_locks[0], m_locks[2]); + } ++#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 1ec4915..fed7024 100644 +--- a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h ++++ b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h +@@ -190,8 +190,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); + + private: diff --git a/qtbase/src/widgets/dialogs/qfiledialog.cpp b/qtbase/src/widgets/dialogs/qfiledialog.cpp -index fc360d8..6b0fd42 100644 +index 74875fa..2f6410e 100644 --- a/qtbase/src/widgets/dialogs/qfiledialog.cpp +++ b/qtbase/src/widgets/dialogs/qfiledialog.cpp -@@ -1111,7 +1111,7 @@ Q_AUTOTEST_EXPORT QString qt_tildeExpansion(const QString &path) +@@ -1106,7 +1106,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(); @@ -361,10 +637,10 @@ index fc360d8..6b0fd42 100644 passwd *tmpPw; char buf[200]; diff --git a/qtbase/src/widgets/styles/qstylefactory.cpp b/qtbase/src/widgets/styles/qstylefactory.cpp -index bebd322..d0e2ebb 100644 +index 09cccff..d24fecb 100644 --- a/qtbase/src/widgets/styles/qstylefactory.cpp +++ b/qtbase/src/widgets/styles/qstylefactory.cpp -@@ -176,6 +176,13 @@ QStringList QStyleFactory::keys() +@@ -160,6 +160,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()); diff --git a/repos/libports/src/lib/qt5/patches/qt5_openglwindow_example.patch b/repos/libports/src/lib/qt5/patches/qtbase_genode_openglwindow_example.patch similarity index 94% rename from repos/libports/src/lib/qt5/patches/qt5_openglwindow_example.patch rename to repos/libports/src/lib/qt5/patches/qtbase_genode_openglwindow_example.patch index 9c8a0faf25..58be0c9429 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_openglwindow_example.patch +++ b/repos/libports/src/lib/qt5/patches/qtbase_genode_openglwindow_example.patch @@ -1,4 +1,4 @@ -qt5_openglwindow_example.patch +qtbase_genode_openglwindow_example.patch From: Christian Prochaska diff --git a/repos/libports/src/lib/qt5/patches/qtbase_genode_qtscriptclassic.patch b/repos/libports/src/lib/qt5/patches/qtbase_genode_qtscriptclassic.patch new file mode 100644 index 0000000000..01aeab108b --- /dev/null +++ b/repos/libports/src/lib/qt5/patches/qtbase_genode_qtscriptclassic.patch @@ -0,0 +1,48 @@ +qtbase_genode_qtscriptclassic.patch + +From: Christian Prochaska + + +--- + qtbase/src/corelib/global/qglobal.h | 6 +++++- + qtbase/src/corelib/kernel/qvariant_p.h | 3 +++ + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/qtbase/src/corelib/global/qglobal.h b/qtbase/src/corelib/global/qglobal.h +index 3217691..570158a 100644 +--- a/qtbase/src/corelib/global/qglobal.h ++++ b/qtbase/src/corelib/global/qglobal.h +@@ -866,13 +866,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 bf88def..d6c2b0c 100644 +--- a/qtbase/src/corelib/kernel/qvariant_p.h ++++ b/qtbase/src/corelib/kernel/qvariant_p.h +@@ -350,7 +350,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 new file mode 100644 index 0000000000..0776c48779 --- /dev/null +++ b/repos/libports/src/lib/qt5/patches/qtbase_genode_textedit_example.patch @@ -0,0 +1,24 @@ +qtbase_genode_textedit_example.patch + +From: Christian Prochaska + + +--- + .../widgets/richtext/textedit/textedit.pro | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/qtbase/examples/widgets/richtext/textedit/textedit.pro b/qtbase/examples/widgets/richtext/textedit/textedit.pro +index c32bf68..704f738 100644 +--- a/qtbase/examples/widgets/richtext/textedit/textedit.pro ++++ b/qtbase/examples/widgets/richtext/textedit/textedit.pro +@@ -9,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/qtdeclarative_configuration.patch b/repos/libports/src/lib/qt5/patches/qtdeclarative_configuration.patch new file mode 100644 index 0000000000..b01050ee31 --- /dev/null +++ b/repos/libports/src/lib/qt5/patches/qtdeclarative_configuration.patch @@ -0,0 +1,24 @@ +qtdeclarative_configuration.patch + +From: Christian Prochaska + + +--- + qtdeclarative/tools/tools.pro | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/qtdeclarative/tools/tools.pro b/qtdeclarative/tools/tools.pro +index 3952ec4..86257a7 100644 +--- a/qtdeclarative/tools/tools.pro ++++ b/qtdeclarative/tools/tools.pro +@@ -17,9 +17,7 @@ qmlimportscanner.CONFIG = host_build + qtHaveModule(quick) { + !static: { + SUBDIRS += \ +- qmlscene \ +- qmlplugindump \ +- qmltime ++ qmlscene + } + qtHaveModule(widgets): SUBDIRS += qmleasing + } diff --git a/repos/libports/src/lib/qt5/patches/qtdeclarative_generated.patch b/repos/libports/src/lib/qt5/patches/qtdeclarative_generated.patch new file mode 100644 index 0000000000..7a1fae9520 --- /dev/null +++ b/repos/libports/src/lib/qt5/patches/qtdeclarative_generated.patch @@ -0,0 +1,92 @@ +qtdeclarative_generated.patch + +From: Christian Prochaska + + +--- + .../QtQml/5.8.0/QtQml/private/qtqml-config_p.h | 1 + + qtdeclarative/include/QtQml/qtqml-config.h | 1 + + .../5.8.0/QtQuick/private/qtquick-config_p.h | 1 + + qtdeclarative/include/QtQuick/qtquick-config.h | 1 + + qtdeclarative/src/qml/qtqml-config.h | 1 + + qtdeclarative/src/qml/qtqml-config_p.h | 1 + + qtdeclarative/src/quick/qtquick-config.h | 1 + + qtdeclarative/src/quick/qtquick-config_p.h | 13 +++++++++++++ + 8 files changed, 20 insertions(+) + create mode 100644 qtdeclarative/include/QtQml/5.8.0/QtQml/private/qtqml-config_p.h + create mode 100644 qtdeclarative/include/QtQml/qtqml-config.h + create mode 100644 qtdeclarative/include/QtQuick/5.8.0/QtQuick/private/qtquick-config_p.h + create mode 100644 qtdeclarative/include/QtQuick/qtquick-config.h + create mode 100644 qtdeclarative/src/qml/qtqml-config.h + create mode 100644 qtdeclarative/src/qml/qtqml-config_p.h + create mode 100644 qtdeclarative/src/quick/qtquick-config.h + create mode 100644 qtdeclarative/src/quick/qtquick-config_p.h + +diff --git a/qtdeclarative/include/QtQml/5.8.0/QtQml/private/qtqml-config_p.h b/qtdeclarative/include/QtQml/5.8.0/QtQml/private/qtqml-config_p.h +new file mode 100644 +index 0000000..1fdbd71 +--- /dev/null ++++ b/qtdeclarative/include/QtQml/5.8.0/QtQml/private/qtqml-config_p.h +@@ -0,0 +1 @@ ++#include "../../../../../src/qml/qtqml-config_p.h" +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.8.0/QtQuick/private/qtquick-config_p.h b/qtdeclarative/include/QtQuick/5.8.0/QtQuick/private/qtquick-config_p.h +new file mode 100644 +index 0000000..fcdf423 +--- /dev/null ++++ b/qtdeclarative/include/QtQuick/5.8.0/QtQuick/private/qtquick-config_p.h +@@ -0,0 +1 @@ ++#include "../../../../../src/quick/qtquick-config_p.h" +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/src/qml/qtqml-config.h b/qtdeclarative/src/qml/qtqml-config.h +new file mode 100644 +index 0000000..299465e +--- /dev/null ++++ b/qtdeclarative/src/qml/qtqml-config.h +@@ -0,0 +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..d5578b9 +--- /dev/null ++++ b/qtdeclarative/src/qml/qtqml-config_p.h +@@ -0,0 +1 @@ ++#define QT_FEATURE_qml_interpreter 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..6f3febe +--- /dev/null ++++ b/qtdeclarative/src/quick/qtquick-config_p.h +@@ -0,0 +1,13 @@ ++#define QT_FEATURE_quick_animatedimage 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_path 1 ++#define QT_FEATURE_quick_pathview 1 ++#define QT_FEATURE_quick_positioners 1 ++#define QT_FEATURE_quick_shadereffect 1 ++#define QT_FEATURE_quick_sprite 1 ++#define QT_FEATURE_quick_viewtransitions 1 diff --git a/repos/libports/src/lib/qt5/patches/qt5_qml.patch b/repos/libports/src/lib/qt5/patches/qtdeclarative_genode.patch similarity index 54% rename from repos/libports/src/lib/qt5/patches/qt5_qml.patch rename to repos/libports/src/lib/qt5/patches/qtdeclarative_genode.patch index fa3ca7ef27..46a28d4b9a 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_qml.patch +++ b/repos/libports/src/lib/qt5/patches/qtdeclarative_genode.patch @@ -1,4 +1,4 @@ -qt5_qml.patch +qtdeclarative_genode.patch From: Christian Prochaska @@ -7,9 +7,8 @@ From: Christian Prochaska qtdeclarative/src/qml/jsruntime/qv4alloca_p.h | 4 ++++ qtdeclarative/src/qml/jsruntime/qv4engine.cpp | 4 ++++ qtdeclarative/src/qml/jsruntime/qv4global_p.h | 2 +- - qtdeclarative/src/qml/qml/qqmlaccessors_p.h | 2 +- - qtdeclarative/src/qml/qml/qqmlimport.cpp | 9 +++++++++ - 5 files changed, 19 insertions(+), 2 deletions(-) + qtdeclarative/src/qml/qml/qqmlimport.cpp | 3 +++ + 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/qtdeclarative/src/qml/jsruntime/qv4alloca_p.h b/qtdeclarative/src/qml/jsruntime/qv4alloca_p.h index 2f48698..5c153bd 100644 @@ -34,10 +33,10 @@ index 2f48698..5c153bd 100644 #endif diff --git a/qtdeclarative/src/qml/jsruntime/qv4engine.cpp b/qtdeclarative/src/qml/jsruntime/qv4engine.cpp -index 26f473a..d588abe 100644 +index a9284f2..6f8be87 100644 --- a/qtdeclarative/src/qml/jsruntime/qv4engine.cpp +++ b/qtdeclarative/src/qml/jsruntime/qv4engine.cpp -@@ -100,6 +100,10 @@ +@@ -102,6 +102,10 @@ #include #endif @@ -61,43 +60,17 @@ index 184375a..597c680 100644 # undef V4_ENABLE_JIT #endif #endif -diff --git a/qtdeclarative/src/qml/qml/qqmlaccessors_p.h b/qtdeclarative/src/qml/qml/qqmlaccessors_p.h -index 55562a5..c831908 100644 ---- a/qtdeclarative/src/qml/qml/qqmlaccessors_p.h -+++ b/qtdeclarative/src/qml/qml/qqmlaccessors_p.h -@@ -57,7 +57,7 @@ - #include - #include - --#if defined(Q_OS_QNX) || defined(Q_OS_LINUX) -+#if defined(Q_OS_QNX) || defined(Q_OS_LINUX) || defined(Q_OS_GENODE) - #include - #endif - diff --git a/qtdeclarative/src/qml/qml/qqmlimport.cpp b/qtdeclarative/src/qml/qml/qqmlimport.cpp -index c1f5e75..5476249 100644 +index 98e2f9e..89bd563 100644 --- a/qtdeclarative/src/qml/qml/qqmlimport.cpp +++ b/qtdeclarative/src/qml/qml/qqmlimport.cpp -@@ -1738,6 +1738,14 @@ QString QQmlImportDatabase::resolvePlugin(QQmlTypeLoader *typeLoader, - const QString &qmldirPath, const QString &qmldirPluginPath, - const QString &baseName) - { -+#if defined(Q_OS_GENODE) -+ -+ return resolvePlugin(typeLoader, qmldirPath, qmldirPluginPath, baseName, -+ QStringList() << QLatin1String(".lib.so"), -+ QLatin1String("qt5_")); -+ -+#else -+ - #if defined(Q_OS_WIN) - return resolvePlugin(typeLoader, qmldirPath, qmldirPluginPath, baseName, - QStringList() -@@ -1762,6 +1770,7 @@ QString QQmlImportDatabase::resolvePlugin(QQmlTypeLoader *typeLoader, +@@ -1747,6 +1747,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 - return resolvePlugin(typeLoader, qmldirPath, qmldirPluginPath, baseName, QStringList() << QLatin1String(".so"), QLatin1String("lib")); - #endif -+#endif - } - - /*! + static const QString prefix = QLatin1String("lib"); + static const QStringList suffixes = { QLatin1String(".so") }; diff --git a/repos/libports/src/lib/qt5/patches/qttools_configuration.patch b/repos/libports/src/lib/qt5/patches/qttools_configuration.patch new file mode 100644 index 0000000000..b1a9799e85 --- /dev/null +++ b/repos/libports/src/lib/qt5/patches/qttools_configuration.patch @@ -0,0 +1,54 @@ +qttools_configuration.patch + +From: Christian Prochaska + + +--- + qttools/src/designer/src/lib/lib.pro | 4 ++-- + qttools/src/designer/src/src.pro | 4 +--- + qttools/src/src.pro | 2 +- + 3 files changed, 4 insertions(+), 6 deletions(-) + +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 6915e34..8a3fcc2 100644 +--- a/qttools/src/designer/src/src.pro ++++ b/qttools/src/designer/src/src.pro +@@ -3,9 +3,7 @@ TEMPLATE = subdirs + SUBDIRS = \ + uiplugin \ + uitools \ +- lib \ +- components \ +- designer ++ lib + + contains(QT_CONFIG, shared): SUBDIRS += plugins + +diff --git a/qttools/src/src.pro b/qttools/src/src.pro +index db6fe0c..bc5c5dd 100644 +--- a/qttools/src/src.pro ++++ b/qttools/src/src.pro +@@ -12,7 +12,7 @@ qtHaveModule(widgets) { + } + } + +-SUBDIRS += linguist \ ++SUBDIRS += \ + qdoc \ + qtattributionsscanner + diff --git a/repos/libports/src/lib/qt5/patches/qttools_generated.patch b/repos/libports/src/lib/qt5/patches/qttools_generated.patch new file mode 100644 index 0000000000..ccf4d1dfeb --- /dev/null +++ b/repos/libports/src/lib/qt5/patches/qttools_generated.patch @@ -0,0 +1,18 @@ +qttools_generated.patch + +From: Christian Prochaska + + +--- + qttools/include/QtUiTools/QtUiToolsDepends | 2 ++ + 1 file changed, 2 insertions(+) + create mode 100644 qttools/include/QtUiTools/QtUiToolsDepends + +diff --git a/qttools/include/QtUiTools/QtUiToolsDepends b/qttools/include/QtUiTools/QtUiToolsDepends +new file mode 100644 +index 0000000..2c0063e +--- /dev/null ++++ b/qttools/include/QtUiTools/QtUiToolsDepends +@@ -0,0 +1,2 @@ ++/* This file was generated by qmake with the info from /src/designer/src/uitools/uitools.pro. */ ++#include diff --git a/repos/libports/src/lib/qt5/patches/qt5_qtwebkit_configuration.patch b/repos/libports/src/lib/qt5/patches/qtwebkit_configuration.patch similarity index 78% rename from repos/libports/src/lib/qt5/patches/qt5_qtwebkit_configuration.patch rename to repos/libports/src/lib/qt5/patches/qtwebkit_configuration.patch index f8a0ca797b..ff635f0b3d 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_qtwebkit_configuration.patch +++ b/repos/libports/src/lib/qt5/patches/qtwebkit_configuration.patch @@ -1,16 +1,16 @@ -qt5_qtwebkit_configuration.patch +qtwebkit_configuration.patch From: Christian Prochaska --- .../Tools/qmake/mkspecs/features/configure.prf | 1 - - qtwebkit/Tools/qmake/mkspecs/features/features.prf | 16 ++++++++-------- + qtwebkit/Tools/qmake/mkspecs/features/features.prf | 22 ++++++++++---------- qtwebkit/Tools/qmake/mkspecs/features/features.pri | 2 +- - 3 files changed, 9 insertions(+), 10 deletions(-) + 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/qtwebkit/Tools/qmake/mkspecs/features/configure.prf b/qtwebkit/Tools/qmake/mkspecs/features/configure.prf -index b5fb2ae..40e9aec 100644 +index 9eeac75..8e8259c 100644 --- a/qtwebkit/Tools/qmake/mkspecs/features/configure.prf +++ b/qtwebkit/Tools/qmake/mkspecs/features/configure.prf @@ -49,7 +49,6 @@ defineTest(runConfigure) { @@ -22,10 +22,10 @@ index b5fb2ae..40e9aec 100644 $$WEBKIT_TOOLS_CONFIG diff --git a/qtwebkit/Tools/qmake/mkspecs/features/features.prf b/qtwebkit/Tools/qmake/mkspecs/features/features.prf -index 21286be..5c04376 100644 +index 328a8be..096d8ef 100644 --- a/qtwebkit/Tools/qmake/mkspecs/features/features.prf +++ b/qtwebkit/Tools/qmake/mkspecs/features/features.prf -@@ -37,13 +37,13 @@ defineTest(detectFeatures) { +@@ -37,14 +37,14 @@ defineTest(detectFeatures) { qtHaveModule(printsupport): WEBKIT_CONFIG += have_qtprintsupport qtHaveModule(widgets): WEBKIT_CONFIG += have_qstyle qtHaveModule(testlib): WEBKIT_CONFIG += have_qttestlib @@ -34,16 +34,20 @@ index 21286be..5c04376 100644 + #qtHaveModule(positioning): WEBKIT_CONFIG += have_qtpositioning + #qtHaveModule(sensors): WEBKIT_CONFIG += have_qtsensors - config_libxml2: WEBKIT_CONFIG += use_libxml2 - config_libxslt: WEBKIT_CONFIG += xslt +- 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 ++ #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 -@@ -108,9 +108,9 @@ defineTest(detectFeatures) { + # is using the system libraries, use them to take advantage of the WebCore image decoders as well. +@@ -109,9 +109,9 @@ defineTest(detectFeatures) { use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video } @@ -56,7 +60,7 @@ index 21286be..5c04376 100644 !enable?(video) { CONFIGURE_WARNINGS += "Missing GStreamer or QtMultimedia, disabling HTML5 media element support" -@@ -125,7 +125,7 @@ defineTest(detectFeatures) { +@@ -126,7 +126,7 @@ defineTest(detectFeatures) { } # Gamepad API Support (depends on udev and linux/joystick.h) diff --git a/repos/libports/src/lib/qt5/patches/qtwebkit_fixes.patch b/repos/libports/src/lib/qt5/patches/qtwebkit_fixes.patch new file mode 100644 index 0000000000..29758335f4 --- /dev/null +++ b/repos/libports/src/lib/qt5/patches/qtwebkit_fixes.patch @@ -0,0 +1,61 @@ +qtwebkit_fixes.patch + +From: Christian Prochaska + + +--- + .../platform/network/NetworkStateNotifier.h | 4 ++-- + .../platform/network/qt/NetworkStateNotifierQt.cpp | 3 +++ + qtwebkit/Source/WebKit/qt/Api/qwebsettings.cpp | 3 ++- + 3 files changed, 7 insertions(+), 3 deletions(-) + +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/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/qt5_qtwebkit_generated_headers.patch b/repos/libports/src/lib/qt5/patches/qtwebkit_generated.patch similarity index 97% rename from repos/libports/src/lib/qt5/patches/qt5_qtwebkit_generated_headers.patch rename to repos/libports/src/lib/qt5/patches/qtwebkit_generated.patch index 34e2dd37b4..93556b6854 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_qtwebkit_generated_headers.patch +++ b/repos/libports/src/lib/qt5/patches/qtwebkit_generated.patch @@ -1,4 +1,4 @@ -qt5_qtwebkit_generated_headers.patch +qtwebkit_generated.patch From: Christian Prochaska diff --git a/repos/libports/src/lib/qt5/patches/qt5_qtwebkit.patch b/repos/libports/src/lib/qt5/patches/qtwebkit_genode.patch similarity index 99% rename from repos/libports/src/lib/qt5/patches/qt5_qtwebkit.patch rename to repos/libports/src/lib/qt5/patches/qtwebkit_genode.patch index f9db91b3cd..39c7d439f7 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_qtwebkit.patch +++ b/repos/libports/src/lib/qt5/patches/qtwebkit_genode.patch @@ -1,4 +1,4 @@ -qt5_qtwebkit.patch +qtwebkit_genode.patch From: Christian Prochaska diff --git a/repos/libports/src/lib/qt5/patches/series b/repos/libports/src/lib/qt5/patches/series index dc0b8ff7b9..515175884d 100644 --- a/repos/libports/src/lib/qt5/patches/series +++ b/repos/libports/src/lib/qt5/patches/series @@ -1,16 +1,13 @@ -qt5_configuration.patch -qt5_generated_headers.patch -qt5_qtbase_qconfig.patch -qt5_qtbase_genode.patch -qt5_qtbase_virtual_deletelater.patch -qt5_qtbase_lwip_connect_semantics_adaption.patch -qt5_qpa.patch -qt5_qarraydata.patch -qt5_qwidgetanimator.patch -qt5_qwidgetwindow.patch -qt5_qtscript.patch -qt5_qtnetwork.patch -qt5_textedit_example.patch -qt5_openglwindow_example.patch -qt5_qml.patch -qt5_tools.patch +qtbase_fixes.patch +qtbase_configuration.patch +qtdeclarative_configuration.patch +qttools_configuration.patch +qtbase_generated.patch +qtdeclarative_generated.patch +qttools_generated.patch +qtbase_genode.patch +qtbase_genode_qtscriptclassic.patch +qtbase_genode_textedit_example.patch +qtbase_genode_openglwindow_example.patch +qtdeclarative_genode.patch +host_tools.patch diff --git a/repos/libports/src/lib/qt5/patches/series.qtscriptclassic b/repos/libports/src/lib/qt5/patches/series.qtscriptclassic new file mode 100644 index 0000000000..13e61816a2 --- /dev/null +++ b/repos/libports/src/lib/qt5/patches/series.qtscriptclassic @@ -0,0 +1,2 @@ +qtscriptclassic_qt5.patch +qtscriptclassic_qt5_7.patch diff --git a/repos/libports/src/lib/qt5/patches/series.qtwebkit b/repos/libports/src/lib/qt5/patches/series.qtwebkit new file mode 100644 index 0000000000..087f72d1f7 --- /dev/null +++ b/repos/libports/src/lib/qt5/patches/series.qtwebkit @@ -0,0 +1,4 @@ +qtwebkit_fixes.patch +qtwebkit_configuration.patch +qtwebkit_generated.patch +qtwebkit_genode.patch diff --git a/repos/libports/src/lib/qt5/qt_component.cc b/repos/libports/src/lib/qt5/qt_component.cc index 20bad90986..bb8bb54e3d 100644 --- a/repos/libports/src/lib/qt5/qt_component.cc +++ b/repos/libports/src/lib/qt5/qt_component.cc @@ -20,14 +20,17 @@ /* provided by the application */ extern "C" int main(int argc, char const **argv); -void initialize_qpa_plugin(Genode::Env &env) __attribute__((weak)); -void initialize_qpa_plugin(Genode::Env &) { } +void initialize_qt_core(Genode::Env &); + +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_qpa_plugin(env); + initialize_qt_core(env); + initialize_qt_gui(env); int argc = 1; char const *argv[] = { "qt5_app", 0 }; diff --git a/repos/libports/src/lib/qt5/qtbase/src/corelib/thread/qthread_genode.cpp b/repos/libports/src/lib/qt5/qtbase/src/corelib/thread/qthread_genode.cpp index a634581041..764db9e04d 100644 --- a/repos/libports/src/lib/qt5/qtbase/src/corelib/thread/qthread_genode.cpp +++ b/repos/libports/src/lib/qt5/qtbase/src/corelib/thread/qthread_genode.cpp @@ -117,8 +117,13 @@ QT_BEGIN_NAMESPACE #include #include +#include + +Genode::Env *QThreadPrivate::_env = nullptr; QHash QThreadPrivate::tls; +void initialize_qt_core(Genode::Env &env) { QThreadPrivate::env(env); } + #else Q_STATIC_ASSERT(sizeof(pthread_t) <= sizeof(Qt::HANDLE)); @@ -669,7 +674,9 @@ void QThread::start(Priority priority) #ifdef Q_OS_GENODE - d->genode_thread = new QThreadPrivate::Genode_thread(this); + assert(d->_env != nullptr); + + d->genode_thread = new QThreadPrivate::Genode_thread(*d->_env, this); if (d->genode_thread) { 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 new file mode 100644 index 0000000000..06150fe565 --- /dev/null +++ b/repos/libports/src/lib/qt5/qtbase/src/plugins/imageformats/jpeg/import_plugin.cc @@ -0,0 +1,16 @@ +/* + * \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/nitpicker/main.cpp b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/main.cpp index 518d72f032..d06d27afe5 100644 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/main.cpp +++ b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/main.cpp @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE Genode::Env *QNitpickerIntegrationPlugin::_env = nullptr; -void initialize_qpa_plugin(Genode::Env &env) +void initialize_qt_gui(Genode::Env &env) { QNitpickerIntegrationPlugin::env(env); } diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerglcontext.cpp b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerglcontext.cpp index 5f790d487b..f7223a8fd0 100644 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerglcontext.cpp +++ b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerglcontext.cpp @@ -21,7 +21,7 @@ #include /* Qt includes */ -#include +#include #include /* local includes */ 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 index e21a4b1bbd..8a9ad42a37 100644 --- a/repos/libports/src/lib/qt5/tools/lib_mk_file_generator/README +++ b/repos/libports/src/lib/qt5/tools/lib_mk_file_generator/README @@ -3,8 +3,8 @@ The scripts in this directory have been used to generate the Usage: -- download and extract the Qt5 source archive -- apply 'qt5_configuration.patch' from the 'src/lib/qt5/patches' directory +- 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 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 index 3eabbb5665..d233e64672 100755 --- 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 @@ -21,6 +21,7 @@ function extract_incpath() sed -e '/\/qt-everywhere-opensource-src.*\//!d' \ -e 's/.*\/qt-everywhere-opensource-src-[^\/]*\// /' \ + -e 's/linux-g++/genode-g++/' \ incpath.inc.tmp >> incpath.inc echo -e "" >> incpath.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 index f7e9a20365..3c7f8a19af 100755 --- 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 @@ -1,10 +1,10 @@ #!/bin/sh -QT_VERSION=5.7.1 +QT_VERSION=5.8.0 ./genode_qt5_configure -qtbase/bin/qmake -r ../qt-everywhere-opensource-src-${QT_VERSION} +make -j8 # qtbase @@ -25,9 +25,6 @@ cd qtdeclarative/src/imports/qtquick2 && ../../../../create_generated_inc # qtwebkit -make -C qtbase/src/tools/bootstrap -make -C qtbase/src/tools/moc - make -C qtwebkit/Source/JavaScriptCore -f Makefile.JavaScriptCore sub-DerivedSources-pri > JavaScriptCore.log cd qtwebkit/Source/JavaScriptCore ../../../qtbase/bin/qmake ../../../../qt-everywhere-opensource-src-${QT_VERSION}/qtwebkit/Source/JavaScriptCore/Target.pri -o Makefile 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 index 1a826e69af..e2f910b6db 100755 --- 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 @@ -1,31 +1,60 @@ #!/bin/sh -../qt-everywhere-opensource-src-5.7.1/configure \ +# command line arguments are grouped: +# general +# QtCore +# QtNetwork +# QtGui +# QtSql + +../qt-everywhere-opensource-src-5.8.0/configure \ -opensource \ -confirm-license \ - -qconfig genode \ - -xplatform genode-g++ \ - -no-qpa-platform-guard \ - -qpa minimal \ -no-separate-debug-info \ - --enable-egl \ - -opengl desktop \ - -openssl-linked \ - -no-accessibility \ - -no-cups \ - -no-dbus \ - -no-harfbuzz \ - -no-iconv \ - -no-largefile \ - -no-pkg-config \ - -no-xcb \ -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-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 \ - -make tools \ - -nomake examples + -no-feature-sessionmanager \ + \ + -qt-sqlite diff --git a/repos/libports/src/test/qt5/qpluginwidget/main.cpp b/repos/libports/src/test/qt5/qpluginwidget/main.cpp index a59990e4be..dc5515394d 100644 --- a/repos/libports/src/test/qt5/qpluginwidget/main.cpp +++ b/repos/libports/src/test/qt5/qpluginwidget/main.cpp @@ -12,13 +12,15 @@ /* Qoost includes */ #include -extern void initialize_qpa_plugin(Genode::Env &); +extern void initialize_qt_core(Genode::Env &); +extern void initialize_qt_gui(Genode::Env &); void Libc::Component::construct(Libc::Env &env) { Libc::with_libc([&] { - initialize_qpa_plugin(env); + initialize_qt_core(env); + initialize_qt_gui(env); QPluginWidget::env(env); int argc = 1; diff --git a/repos/ports/src/app/arora/arora_component.cc b/repos/ports/src/app/arora/arora_component.cc index 1c32a84531..3df9ed3344 100644 --- a/repos/ports/src/app/arora/arora_component.cc +++ b/repos/ports/src/app/arora/arora_component.cc @@ -23,14 +23,15 @@ /* provided by the application */ extern "C" int main(int argc, char const **argv); -/* provided by the QPA plugin */ -extern void initialize_qpa_plugin(Genode::Env &); +extern void initialize_qt_core(Genode::Env &); +extern void initialize_qt_gui(Genode::Env &); void Libc::Component::construct(Libc::Env &env) { Libc::with_libc([&] { - initialize_qpa_plugin(env); + initialize_qt_core(env); + initialize_qt_gui(env); QPluginWidget::env(env); int argc = 1;