From 85919d29e22ade8e45d90380f2f490e95050c815 Mon Sep 17 00:00:00 2001 From: Christian Prochaska Date: Mon, 22 May 2017 14:50:09 +0200 Subject: [PATCH] qt5: update to version 5.6.2 Issue #2424 --- repos/gems/run/mixer_gui_qt_test.run | 1 + .../{import-qt5_v8.mk => import-qt5_angle.mk} | 2 - .../libports/lib/import/import-qt5_opengl.mk | 3 + .../libports/lib/import/import-qt5_script.mk | 6 - repos/libports/lib/mk/pcre.mk | 7 +- repos/libports/lib/mk/pcre16.mk | 38 + repos/libports/lib/mk/qt5_angle.mk | 41 + repos/libports/lib/mk/qt5_angle_generated.inc | 97 +++ repos/libports/lib/mk/qt5_core.mk | 10 +- repos/libports/lib/mk/qt5_core_generated.inc | 79 +- repos/libports/lib/mk/qt5_gui.mk | 4 + repos/libports/lib/mk/qt5_gui_generated.inc | 81 +- repos/libports/lib/mk/qt5_host_tools.inc | 22 +- .../libports/lib/mk/qt5_host_tools_qmake.inc | 25 +- repos/libports/lib/mk/qt5_jscore.mk | 13 +- .../libports/lib/mk/qt5_jscore_generated.inc | 78 +- repos/libports/lib/mk/qt5_network.mk | 3 +- .../libports/lib/mk/qt5_network_generated.inc | 35 +- repos/libports/lib/mk/qt5_opengl.mk | 7 + .../libports/lib/mk/qt5_opengl_generated.inc | 64 ++ .../lib/mk/qt5_printsupport_generated.inc | 34 +- repos/libports/lib/mk/qt5_qml.mk | 20 +- repos/libports/lib/mk/qt5_qml_generated.inc | 259 ++++-- .../lib/mk/qt5_qtquick2plugin_generated.inc | 30 +- repos/libports/lib/mk/qt5_quick_generated.inc | 142 ++- repos/libports/lib/mk/qt5_script.mk | 25 - .../libports/lib/mk/qt5_script_generated.inc | 266 ------ repos/libports/lib/mk/qt5_sql_generated.inc | 18 +- .../lib/mk/qt5_ui_tools_generated.inc | 31 +- repos/libports/lib/mk/qt5_v8.mk | 103 --- repos/libports/lib/mk/qt5_v8_generated.inc | 161 ---- repos/libports/lib/mk/qt5_version.inc | 2 +- repos/libports/lib/mk/qt5_webcore.mk | 637 ++------------ .../libports/lib/mk/qt5_webcore_generated.inc | 748 ++++++---------- .../libports/lib/mk/qt5_webkit_generated.inc | 108 +-- .../lib/mk/qt5_webkitwidgets_generated.inc | 148 ++-- .../libports/lib/mk/qt5_widgets_generated.inc | 125 +-- repos/libports/lib/mk/qt5_wtf_generated.inc | 19 +- repos/libports/lib/mk/qt5_xml_generated.inc | 18 +- repos/libports/ports/qt5.hash | 2 +- repos/libports/ports/qt5.port | 26 +- repos/libports/run/qt5.run | 7 +- repos/libports/run/qt5_avplay.run | 1 + repos/libports/run/qt5_calculatorform.run | 3 +- repos/libports/run/qt5_openglwindow.run | 1 + repos/libports/run/qt5_previewer.run | 99 --- repos/libports/run/qt5_qpluginwidget.run | 1 + repos/libports/run/qt5_quicktest.run | 4 +- repos/libports/run/qt5_samegame.run | 4 +- repos/libports/run/qt5_tetrix.run | 1 + repos/libports/run/qt5_textedit.run | 5 +- .../src/app/qt5/examples/previewer/target.mk | 19 - .../libports/src/app/qt5/qt_avplay/target.mk | 3 +- repos/libports/src/lib/pcre/include/config.h | 8 +- .../src/lib/qt5/dejavusans/dejavusans.qrc | 6 - .../src/lib/qt5/patches/qt5_arm.patch | 77 -- .../lib/qt5/patches/qt5_configuration.patch | 532 ++++-------- .../src/lib/qt5/patches/qt5_gcc5.patch | 33 - .../qt5/patches/qt5_generated_headers.patch | 55 +- .../src/lib/qt5/patches/qt5_qarraydata.patch | 6 +- .../src/lib/qt5/patches/qt5_qml.patch | 820 ++---------------- .../src/lib/qt5/patches/qt5_qpa.patch | 122 ++- .../lib/qt5/patches/qt5_qtbase_genode.patch | 210 ++--- ...base_lwip_connect_semantics_adaption.patch | 4 +- .../lib/qt5/patches/qt5_qtbase_qconfig.patch | 421 +++++++-- .../qt5_qtbase_virtual_deletelater.patch | 6 +- .../src/lib/qt5/patches/qt5_qtnetwork.patch | 59 +- .../src/lib/qt5/patches/qt5_qtscript.patch | 16 +- .../src/lib/qt5/patches/qt5_qtwebkit.patch | 263 ++++-- .../patches/qt5_qtwebkit_configuration.patch | 80 ++ .../qt5_qtwebkit_generated_headers.patch | 35 + .../qt5_qtwebkit_socketstreamhandle.patch | 54 -- .../lib/qt5/patches/qt5_qwidgetanimator.patch | 17 +- .../lib/qt5/patches/qt5_qwidgetwindow.patch | 8 +- .../qt5/patches/qt5_textedit_example.patch | 60 +- .../src/lib/qt5/patches/qt5_tools.patch | 124 ++- repos/libports/src/lib/qt5/patches/series | 4 - .../src/corelib/thread/qthread_genode.cpp | 168 ++-- .../src/plugins/platforms/nitpicker/main.cpp | 1 + .../nitpicker/qnitpickerintegration.cpp | 17 +- .../nitpicker/qnitpickerintegration.h | 17 +- .../nitpicker/qnitpickerintegrationplugin.h | 2 +- .../lib/qt5/qtwebkit/Source/WebCore/idl_files | 81 +- .../create_generated_inc | 4 +- .../create_generated_incs | 34 +- .../genode_qt5_configure | 21 +- repos/ports/ports/arora.hash | 2 +- repos/ports/run/arora.run | 10 +- .../src/app/arora/patches/arora_qt5_cpp.patch | 23 +- 89 files changed, 2874 insertions(+), 4212 deletions(-) rename repos/libports/lib/import/{import-qt5_v8.mk => import-qt5_angle.mk} (62%) create mode 100644 repos/libports/lib/import/import-qt5_opengl.mk delete mode 100644 repos/libports/lib/import/import-qt5_script.mk create mode 100644 repos/libports/lib/mk/pcre16.mk create mode 100644 repos/libports/lib/mk/qt5_angle.mk create mode 100644 repos/libports/lib/mk/qt5_angle_generated.inc create mode 100644 repos/libports/lib/mk/qt5_opengl.mk create mode 100644 repos/libports/lib/mk/qt5_opengl_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_script.mk delete mode 100644 repos/libports/lib/mk/qt5_script_generated.inc delete mode 100644 repos/libports/lib/mk/qt5_v8.mk delete mode 100644 repos/libports/lib/mk/qt5_v8_generated.inc delete mode 100644 repos/libports/run/qt5_previewer.run delete mode 100644 repos/libports/src/app/qt5/examples/previewer/target.mk delete mode 100644 repos/libports/src/lib/qt5/dejavusans/dejavusans.qrc delete mode 100644 repos/libports/src/lib/qt5/patches/qt5_arm.patch delete mode 100644 repos/libports/src/lib/qt5/patches/qt5_gcc5.patch create mode 100644 repos/libports/src/lib/qt5/patches/qt5_qtwebkit_configuration.patch create mode 100644 repos/libports/src/lib/qt5/patches/qt5_qtwebkit_generated_headers.patch delete mode 100644 repos/libports/src/lib/qt5/patches/qt5_qtwebkit_socketstreamhandle.patch diff --git a/repos/gems/run/mixer_gui_qt_test.run b/repos/gems/run/mixer_gui_qt_test.run index 83dd75a8f..159c49f55 100644 --- a/repos/gems/run/mixer_gui_qt_test.run +++ b/repos/gems/run/mixer_gui_qt_test.run @@ -252,6 +252,7 @@ set boot_modules { zlib.lib.so stdcxx.lib.so pthread.lib.so + pcre16.lib.so mixer_gui_qt qt5_fs_mixer_gui_qt.tar nitpicker diff --git a/repos/libports/lib/import/import-qt5_v8.mk b/repos/libports/lib/import/import-qt5_angle.mk similarity index 62% rename from repos/libports/lib/import/import-qt5_v8.mk rename to repos/libports/lib/import/import-qt5_angle.mk index 7f7d12c7e..5602c0bec 100644 --- a/repos/libports/lib/import/import-qt5_v8.mk +++ b/repos/libports/lib/import/import-qt5_angle.mk @@ -1,5 +1,3 @@ IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) include $(IMPORT_QT5_INC) - -QT5_INC_DIR += $(QT5_CONTRIB_DIR)/qtjsbackend/include/QtV8 diff --git a/repos/libports/lib/import/import-qt5_opengl.mk b/repos/libports/lib/import/import-qt5_opengl.mk new file mode 100644 index 000000000..5602c0bec --- /dev/null +++ b/repos/libports/lib/import/import-qt5_opengl.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_script.mk b/repos/libports/lib/import/import-qt5_script.mk deleted file mode 100644 index 6679798db..000000000 --- a/repos/libports/lib/import/import-qt5_script.mk +++ /dev/null @@ -1,6 +0,0 @@ -IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) - -include $(IMPORT_QT5_INC) - -QT5_INC_DIR += $(QT5_CONTRIB_DIR)/qtscript/include \ - $(QT5_CONTRIB_DIR)/qtscript/include/QtScript \ diff --git a/repos/libports/lib/mk/pcre.mk b/repos/libports/lib/mk/pcre.mk index 1f625b885..91a4363a6 100644 --- a/repos/libports/lib/mk/pcre.mk +++ b/repos/libports/lib/mk/pcre.mk @@ -1,3 +1,5 @@ +include $(REP_DIR)/lib/import/import-pcre.mk + PCRE_PORT_DIR := $(call select_from_ports,pcre) SRC_C = pcre_byte_order.c \ @@ -21,13 +23,12 @@ SRC_C = pcre_byte_order.c \ pcre_version.c \ pcre_xclass.c -INC_DIR += $(PCRE_PORT_DIR)/include/pcre \ - $(PCRE_PORT_DIR)/src/lib/pcre \ +INC_DIR += $(PCRE_PORT_DIR)/src/lib/pcre \ $(REP_DIR)/src/lib/pcre/include CC_OPT += -DHAVE_CONFIG_H -LIBS += libc zlib readline +LIBS += libc SHARED_LIB = yes diff --git a/repos/libports/lib/mk/pcre16.mk b/repos/libports/lib/mk/pcre16.mk new file mode 100644 index 000000000..bebb1736f --- /dev/null +++ b/repos/libports/lib/mk/pcre16.mk @@ -0,0 +1,38 @@ +include $(REP_DIR)/lib/import/import-pcre.mk + +PCRE_PORT_DIR := $(call select_from_ports,pcre) + +SRC_C = pcre16_byte_order.c \ + pcre16_chartables.c \ + pcre16_compile.c \ + pcre16_config.c \ + pcre16_dfa_exec.c \ + pcre16_exec.c \ + pcre16_fullinfo.c \ + pcre16_get.c \ + pcre16_globals.c \ + pcre16_jit_compile.c \ + pcre16_maketables.c \ + pcre16_newline.c \ + pcre16_ord2utf16.c \ + pcre16_refcount.c \ + pcre16_string_utils.c \ + pcre16_study.c \ + pcre16_tables.c \ + pcre16_ucd.c \ + pcre16_utf16_utils.c \ + pcre16_valid_utf16.c \ + pcre16_version.c \ + pcre16_xclass.c + +INC_DIR += $(PCRE_PORT_DIR)/src/lib/pcre \ + $(REP_DIR)/src/lib/pcre \ + $(REP_DIR)/src/lib/pcre/include + +CC_OPT += -DHAVE_CONFIG_H + +LIBS += libc + +SHARED_LIB = yes + +vpath %.c $(PCRE_PORT_DIR)/src/lib/pcre diff --git a/repos/libports/lib/mk/qt5_angle.mk b/repos/libports/lib/mk/qt5_angle.mk new file mode 100644 index 000000000..e4cb7ad7a --- /dev/null +++ b/repos/libports/lib/mk/qt5_angle.mk @@ -0,0 +1,41 @@ +include $(REP_DIR)/lib/import/import-qt5_angle.mk + +SHARED_LIB = yes + +# +# Generated files +# +# some of the following lines have been extracted from the console output +# of the 'configure' script (with modifications), that's why they can be +# quite long +# + +ifneq ($(call select_from_ports,qt5),) +all: $(QT5_PORT_DIR)/src/lib/qt5/qtwebkit/Source/ThirdParty/ANGLE/generated/generated.tag +endif + +ANGLE_DIR = $(QT5_CONTRIB_DIR)/qtwebkit/Source/ThirdParty/ANGLE + +# make the 'HOST_TOOLS' variable known +include $(REP_DIR)/lib/mk/qt5_host_tools.mk + +$(QT5_PORT_DIR)/src/lib/qt5/qtwebkit/Source/ThirdParty/ANGLE/generated/generated.tag: $(HOST_TOOLS) + + $(VERBOSE)mkdir -p $(dir $@) + + $(VERBOSE)flex --noline --nounistd --outfile=$(dir $@)/glslang_lex.cpp $(ANGLE_DIR)/src/compiler/glslang.l + $(VERBOSE)flex --noline --nounistd --outfile=$(dir $@)/Tokenizer_lex.cpp $(ANGLE_DIR)/src/compiler/preprocessor/Tokenizer.l + $(VERBOSE)bison --no-lines --skeleton=yacc.c --defines=$(dir $@)/glslang_tab.h --output=$(dir $@)/glslang_tab.cpp $(ANGLE_DIR)/src/compiler/glslang.y + $(VERBOSE)bison --no-lines --skeleton=yacc.c --defines=$(dir $@)/ExpressionParser_tab.h --output=$(dir $@)/ExpressionParser_tab.cpp $(ANGLE_DIR)/src/compiler/preprocessor/ExpressionParser.y + + $(VERBOSE)touch $@ + +include $(REP_DIR)/lib/mk/qt5_angle_generated.inc + +QT_INCPATH += qtwebkit/Source/ThirdParty/ANGLE/generated + +QT_VPATH += qtwebkit/Source/ThirdParty/ANGLE/generated + +include $(REP_DIR)/lib/mk/qt5.inc + +LIBS += qt5_opengl diff --git a/repos/libports/lib/mk/qt5_angle_generated.inc b/repos/libports/lib/mk/qt5_angle_generated.inc new file mode 100644 index 000000000..639fb68e2 --- /dev/null +++ b/repos/libports/lib/mk/qt5_angle_generated.inc @@ -0,0 +1,97 @@ +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_INCPATH += \ + qtwebkit/Source/ThirdParty/ANGLE \ + qtwebkit/Source/ThirdParty/ANGLE/include/GLSLANG \ + qtwebkit/Source/ThirdParty/ANGLE/include/KHR \ + qtwebkit/Source/ThirdParty/ANGLE/src \ + qtwebkit/Source/ThirdParty/ANGLE/src/compiler/preprocessor \ + qtwebkit/Source/ThirdParty/ANGLE/include \ + qtwebkit/Source/ThirdParty/ANGLE/include \ + qtwebkit/Source/ThirdParty/ANGLE/include/GLSLANG \ + qtwebkit/Source/ThirdParty/ANGLE/include/KHR \ + qtwebkit/Source/ThirdParty/ANGLE/src \ + qtwebkit/Source/ThirdParty/ANGLE/src/compiler/preprocessor \ + qtwebkit/Source \ + qtbase/mkspecs/genode-g++ + +QT_SOURCES += \ + BuiltInFunctionEmulator.cpp \ + CodeGenGLSL.cpp \ + Compiler.cpp \ + debug.cpp \ + DependencyGraph.cpp \ + DependencyGraphBuilder.cpp \ + DependencyGraphOutput.cpp \ + DependencyGraphTraverse.cpp \ + DetectCallDepth.cpp \ + DetectDiscontinuity.cpp \ + Diagnostics.cpp \ + DirectiveHandler.cpp \ + ForLoopUnroll.cpp \ + InfoSink.cpp \ + Initialize.cpp \ + InitializeDll.cpp \ + InitializeParseContext.cpp \ + Intermediate.cpp \ + intermOut.cpp \ + IntermTraverse.cpp \ + MapLongVariableNames.cpp \ + OutputESSL.cpp \ + OutputGLSL.cpp \ + OutputGLSLBase.cpp \ + OutputHLSL.cpp \ + parseConst.cpp \ + ParseHelper.cpp \ + PoolAlloc.cpp \ + QualifierAlive.cpp \ + RemoveTree.cpp \ + SearchSymbol.cpp \ + ShaderLang.cpp \ + SymbolTable.cpp \ + RestrictFragmentShaderTiming.cpp \ + RestrictVertexShaderTiming.cpp \ + TranslatorESSL.cpp \ + TranslatorGLSL.cpp \ + TranslatorHLSL.cpp \ + Uniform.cpp \ + UnfoldShortCircuit.cpp \ + util.cpp \ + ValidateLimitations.cpp \ + VariableInfo.cpp \ + VariablePacker.cpp \ + VersionGLSL.cpp \ + DiagnosticsBase.cpp \ + DirectiveHandlerBase.cpp \ + DirectiveParser.cpp \ + Input.cpp \ + Lexer.cpp \ + Macro.cpp \ + MacroExpander.cpp \ + Preprocessor.cpp \ + Token.cpp \ + ArrayBoundsClamper.cpp \ + ossource_posix.cpp \ + glslang_lex.cpp \ + Tokenizer_lex.cpp \ + glslang_tab.cpp \ + ExpressionParser_tab.cpp + +QT_VPATH += \ + qtwebkit/Source/ThirdParty/ANGLE/src/compiler \ + qtwebkit/Source/ThirdParty/ANGLE/src/compiler/depgraph \ + qtwebkit/Source/ThirdParty/ANGLE/src/compiler/preprocessor \ + qtwebkit/Source/ThirdParty/ANGLE/src/compiler/timing \ + qtwebkit/Source/ThirdParty/ANGLE/src/third_party/compiler \ + +# some source files need to be generated by moc from other source/header files before +# they get #included again by the original source file in the compiling stage + +# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) +# extracted from 'compiler_moc_header_make_all' target + + +# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) +# extracted from 'compiler_moc_source_make_all' rule + + diff --git a/repos/libports/lib/mk/qt5_core.mk b/repos/libports/lib/mk/qt5_core.mk index ab5851f5a..370202f5e 100644 --- a/repos/libports/lib/mk/qt5_core.mk +++ b/repos/libports/lib/mk/qt5_core.mk @@ -12,15 +12,13 @@ QT_SOURCES += qthread_genode.cpp # remove unsupported UNIX-specific files QT_SOURCES_FILTER_OUT = \ + forkfd_qt.cpp \ qprocess_unix.cpp \ - qthread_unix.cpp \ - qfilesystemwatcher_inotify.cpp \ - moc_qfilesystemwatcher_inotify_p.cpp \ + qthread_unix.cpp # remove unneeded files to prevent moc warnings COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT = \ - moc_qsharedmemory.cpp \ - moc_qfilesystemwatcher_inotify_p.cpp \ + moc_qsharedmemory.cpp include $(REP_DIR)/lib/mk/qt5.inc @@ -34,4 +32,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 zlib icu libc libm alarm libc_pipe pthread +LIBS += qt5_host_tools pcre16 zlib icu libc libm alarm libc_pipe pthread diff --git a/repos/libports/lib/mk/qt5_core_generated.inc b/repos/libports/lib/mk/qt5_core_generated.inc index 5422bcb0a..9c5d7066d 100644 --- a/repos/libports/lib/mk/qt5_core_generated.inc +++ b/repos/libports/lib/mk/qt5_core_generated.inc @@ -1,17 +1,18 @@ -QT_DEFINES += -DQT_NO_LIBUDEV -DQT_NO_XCB -DQT_NO_XKBCOMMON -DQT_NO_USING_NAMESPACE -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_USE_ICU -DPCRE_HAVE_CONFIG_H -DQT_CORE_LIB -DQT_NO_DEBUG +QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_USING_NAMESPACE -DQT_USE_ICU -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_INCPATH += \ + qtbase/src/corelib \ + qtbase/src/3rdparty/pcre \ + qtbase/src/3rdparty/harfbuzz/src \ + qtbase/src/3rdparty/md5 \ + qtbase/src/3rdparty/md4 \ + qtbase/src/3rdparty/sha3 \ + qtbase/src/3rdparty/forkfd \ qtbase/include \ qtbase/include/QtCore \ - qtbase/include/QtCore/5.1.0 \ - qtbase/include/QtCore/5.1.0/QtCore \ - qtbase/mkspecs/genode-g++ \ - qtbase/src/3rdparty/harfbuzz/src \ - qtbase/src/3rdparty/md4 \ - qtbase/src/3rdparty/md5 \ - qtbase/src/3rdparty/pcre \ - qtbase/src/3rdparty/sha3 \ - qtbase/src/corelib \ + qtbase/include/QtCore/5.6.2 \ + qtbase/include/QtCore/5.6.2/QtCore \ + qtbase/mkspecs/genode-g++ QT_SOURCES += \ qabstractanimation.cpp \ @@ -28,6 +29,8 @@ QT_SOURCES += \ qmalloc.cpp \ qnumeric.cpp \ qlogging.cpp \ + qhooks.cpp \ + qversiontagging.cpp \ qatomic.cpp \ qexception.cpp \ qresultstore.cpp \ @@ -46,10 +49,14 @@ QT_SOURCES += \ qarraydata.cpp \ qbitarray.cpp \ qbytearray.cpp \ + qbytearraylist.cpp \ qbytearraymatcher.cpp \ qcollator.cpp \ + qcommandlineoption.cpp \ + qcommandlineparser.cpp \ qcryptographichash.cpp \ qdatetime.cpp \ + qdatetimeparser.cpp \ qeasingcurve.cpp \ qelapsedtimer.cpp \ qfreelist.cpp \ @@ -66,8 +73,8 @@ QT_SOURCES += \ qcontiguouscache.cpp \ qrect.cpp \ qregexp.cpp \ - qregularexpression.cpp \ qrefcount.cpp \ + qringbuffer.cpp \ qshareddata.cpp \ qsharedpointer.cpp \ qsimd.cpp \ @@ -77,34 +84,19 @@ 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 \ + qtimezoneprivate_tz.cpp \ qlocale_icu.cpp \ - pcre16_byte_order.c \ - pcre16_chartables.c \ - pcre16_compile.c \ - pcre16_config.c \ - pcre16_dfa_exec.c \ - pcre16_exec.c \ - pcre16_fullinfo.c \ - pcre16_get.c \ - pcre16_globals.c \ - pcre16_jit_compile.c \ - pcre16_maketables.c \ - pcre16_newline.c \ - pcre16_ord2utf16.c \ - pcre16_refcount.c \ - pcre16_string_utils.c \ - pcre16_study.c \ - pcre16_tables.c \ - pcre16_ucd.c \ - pcre16_utf16_utils.c \ - pcre16_valid_utf16.c \ - pcre16_version.c \ - pcre16_xclass.c \ + qcollator_icu.cpp \ + qtimezoneprivate_icu.cpp \ + qregularexpression.cpp \ harfbuzz-buffer.c \ harfbuzz-gdef.c \ harfbuzz-gsub.c \ @@ -130,6 +122,7 @@ QT_SOURCES += \ qlockfile.cpp \ qnoncontiguousbytedevice.cpp \ qprocess.cpp \ + qstorageinfo.cpp \ qtextstream.cpp \ qtemporarydir.cpp \ qtemporaryfile.cpp \ @@ -148,13 +141,17 @@ QT_SOURCES += \ qfilesystemwatcher_polling.cpp \ qfilesystementry.cpp \ qfilesystemengine.cpp \ + qfileselector.cpp \ + qloggingcategory.cpp \ + qloggingregistry.cpp \ qfsfileengine_unix.cpp \ qfilesystemengine_unix.cpp \ qlockfile_unix.cpp \ qprocess_unix.cpp \ qfilesystemiterator_unix.cpp \ + forkfd_qt.cpp \ qstandardpaths_unix.cpp \ - qfilesystemwatcher_inotify.cpp \ + qstorageinfo_unix.cpp \ qabstractitemmodel.cpp \ qabstractproxymodel.cpp \ qitemselectionmodel.cpp \ @@ -168,11 +165,13 @@ QT_SOURCES += \ qjsonvalue.cpp \ qjsonwriter.cpp \ qjsonparser.cpp \ + qfactoryinterface.cpp \ qpluginloader.cpp \ qfactoryloader.cpp \ quuid.cpp \ qlibrary.cpp \ qelfparser_p.cpp \ + qmachparser.cpp \ qlibrary_unix.cpp \ qabstracteventdispatcher.cpp \ qabstractnativeeventfilter.cpp \ @@ -201,10 +200,15 @@ QT_SOURCES += \ qcrashhandler.cpp \ qeventdispatcher_unix.cpp \ qtimerinfo_unix.cpp \ + qsharedmemory_posix.cpp \ + qsharedmemory_systemv.cpp \ qsharedmemory_unix.cpp \ + qsystemsemaphore_posix.cpp \ + qsystemsemaphore_systemv.cpp \ qsystemsemaphore_unix.cpp \ qisciicodec.cpp \ qlatincodec.cpp \ + qsimplecodec.cpp \ qtextcodec.cpp \ qtsciicodec.cpp \ qutfcodec.cpp \ @@ -245,7 +249,6 @@ QT_SOURCES += \ 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 \ @@ -266,13 +269,13 @@ QT_SOURCES += \ moc_qstate.cpp \ moc_qfinalstate.cpp \ moc_qhistorystate.cpp \ + moc_qhistorystate_p.cpp \ moc_qabstracttransition.cpp \ moc_qsignaltransition.cpp \ moc_qeventtransition.cpp QT_VPATH += \ qtbase/src/3rdparty/harfbuzz/src \ - qtbase/src/3rdparty/pcre \ qtbase/src/corelib/animation \ qtbase/src/corelib/arch \ qtbase/src/corelib/codecs \ @@ -323,7 +326,7 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ moc_qfilesystemwatcher.cpp \ moc_qfilesystemwatcher_p.cpp \ moc_qfilesystemwatcher_polling_p.cpp \ - moc_qfilesystemwatcher_inotify_p.cpp \ + moc_qfileselector.cpp \ moc_qabstractitemmodel.cpp \ moc_qabstractproxymodel.cpp \ moc_qitemselectionmodel.cpp \ @@ -351,6 +354,7 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ moc_qstate.cpp \ moc_qfinalstate.cpp \ moc_qhistorystate.cpp \ + moc_qhistorystate_p.cpp \ moc_qabstracttransition.cpp \ moc_qsignaltransition.cpp \ moc_qeventtransition.cpp @@ -359,7 +363,6 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ # extracted from 'compiler_moc_source_make_all' rule COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - qprocess_unix.moc \ qtimer.moc \ qstatemachine.moc diff --git a/repos/libports/lib/mk/qt5_gui.mk b/repos/libports/lib/mk/qt5_gui.mk index 0c63b3f8a..a438b507b 100644 --- a/repos/libports/lib/mk/qt5_gui.mk +++ b/repos/libports/lib/mk/qt5_gui.mk @@ -2,6 +2,10 @@ include $(REP_DIR)/lib/import/import-qt5_gui.mk SHARED_LIB = yes +ifeq ($(filter-out $(SPECS),x86),) +CC_OPT += -mno-sse2 +endif + # use default warning level to avoid noise when compiling contrib code CC_WARN = -Wno-unused-but-set-variable -Wno-deprecated-declarations diff --git a/repos/libports/lib/mk/qt5_gui_generated.inc b/repos/libports/lib/mk/qt5_gui_generated.inc index 1970f7288..8ef404619 100644 --- a/repos/libports/lib/mk/qt5_gui_generated.inc +++ b/repos/libports/lib/mk/qt5_gui_generated.inc @@ -1,20 +1,17 @@ -QT_DEFINES += -DQT_NO_LIBUDEV -DQT_NO_XCB -DQT_NO_XKBCOMMON -DQT_NO_USING_NAMESPACE -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_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_INCPATH += \ - qtbase/include \ - qtbase/include/QtCore \ - qtbase/include/QtCore/5.1.0 \ - qtbase/include/QtCore/5.1.0/QtCore \ - qtbase/include/QtGui \ - qtbase/include/QtGui/5.1.0 \ - qtbase/include/QtGui/5.1.0/QtGui \ - qtbase/mkspecs/genode-g++ \ qtbase/src/gui \ - qtbase/src/gui/image \ + qtbase/include \ + qtbase/include/QtGui \ + qtbase/include/QtGui/5.6.2 \ + qtbase/include/QtGui/5.6.2/QtGui \ + qtbase/include/QtCore/5.6.2 \ + qtbase/include/QtCore/5.6.2/QtCore \ + qtbase/include/QtCore \ + qtbase/mkspecs/genode-g++ QT_SOURCES += \ - qclipboard_qpa.cpp \ - qcursor_qpa.cpp \ qgenericpluginfactory.cpp \ qgenericplugin.cpp \ qwindowsysteminterface.cpp \ @@ -51,7 +48,6 @@ QT_SOURCES += \ qinputmethod.cpp \ qkeysequence.cpp \ qkeymapper.cpp \ - qkeymapper_qpa.cpp \ qpalette.cpp \ qguivariant.cpp \ qscreen.cpp \ @@ -61,12 +57,22 @@ QT_SOURCES += \ qplatformsharedgraphicscache.cpp \ qplatformdialoghelper.cpp \ qplatformservices.cpp \ - qplatformscreenpageflipper.cpp \ - qplatformsystemtrayicon_qpa.cpp \ + qplatformsystemtrayicon.cpp \ + qplatformsessionmanager.cpp \ + qplatformmenu.cpp \ + qpixelformat.cpp \ + qpaintdevicewindow.cpp \ + qrasterwindow.cpp \ + qplatformgraphicsbuffer.cpp \ + qplatformgraphicsbufferhelper.cpp \ + qinputdevicemanager.cpp \ + qhighdpiscaling.cpp \ qplatformopenglcontext.cpp \ qopenglcontext.cpp \ + qopenglwindow.cpp \ qbitmap.cpp \ qimage.cpp \ + qimage_conversions.cpp \ qimageiohandler.cpp \ qimagereader.cpp \ qimagewriter.cpp \ @@ -94,6 +100,7 @@ QT_SOURCES += \ qgifhandler.cpp \ qfont.cpp \ qfontengine.cpp \ + qfontengineglyphcache.cpp \ qfontsubset.cpp \ qfontmetrics.cpp \ qfontdatabase.cpp \ @@ -122,10 +129,8 @@ QT_SOURCES += \ qrawfont.cpp \ qglyphrun.cpp \ qdistancefield.cpp \ - qfont_qpa.cpp \ - qfontengine_qpa.cpp \ + qfontengine_qpf2.cpp \ qplatformfontdatabase.cpp \ - qrawfont_qpa.cpp \ qbackingstore.cpp \ qbezier.cpp \ qblendfunctions.cpp \ @@ -133,6 +138,7 @@ QT_SOURCES += \ qbrush.cpp \ qcolor.cpp \ qcolor_p.cpp \ + qcompositionfunctions.cpp \ qcosmeticstroker.cpp \ qcssutil.cpp \ qdrawhelper.cpp \ @@ -144,6 +150,8 @@ QT_SOURCES += \ qmemrotate.cpp \ qoutlinemapper.cpp \ qpagedpaintdevice.cpp \ + qpagelayout.cpp \ + qpagesize.cpp \ qpaintdevice.cpp \ qpaintengine.cpp \ qpaintengineex.cpp \ @@ -162,10 +170,12 @@ QT_SOURCES += \ qtextureglyphcache.cpp \ qtransform.cpp \ qplatformbackingstore.cpp \ - qpaintbuffer.cpp \ qpathsimplifier.cpp \ qdesktopservices.cpp \ qvalidator.cpp \ + qgridlayoutengine.cpp \ + qabstractlayoutstyleinfo.cpp \ + qlayoutpolicy.cpp \ qgenericmatrix.cpp \ qmatrix4x4.cpp \ qquaternion.cpp \ @@ -191,6 +201,10 @@ QT_SOURCES += \ qopenglversionfunctionsfactory.cpp \ qopenglvertexarrayobject.cpp \ qopengldebug.cpp \ + qopengltextureblitter.cpp \ + qopengltexture.cpp \ + qopengltexturehelper.cpp \ + qopenglpixeltransferoptions.cpp \ qopenglfunctions_1_0.cpp \ qopenglfunctions_1_1.cpp \ qopenglfunctions_1_2.cpp \ @@ -207,15 +221,21 @@ QT_SOURCES += \ qopenglfunctions_4_1_core.cpp \ qopenglfunctions_4_2_core.cpp \ qopenglfunctions_4_3_core.cpp \ + qopenglfunctions_4_4_core.cpp \ + qopenglfunctions_4_5_core.cpp \ qopenglfunctions_3_2_compatibility.cpp \ qopenglfunctions_3_3_compatibility.cpp \ qopenglfunctions_4_0_compatibility.cpp \ qopenglfunctions_4_1_compatibility.cpp \ qopenglfunctions_4_2_compatibility.cpp \ qopenglfunctions_4_3_compatibility.cpp \ + qopenglfunctions_4_4_compatibility.cpp \ + qopenglfunctions_4_5_compatibility.cpp \ qopengltimerquery.cpp \ qguivariantanimation.cpp \ qstandarditemmodel.cpp \ + qimage_sse2.cpp \ + qdrawhelper_sse2.cpp \ moc_qgenericplugin.cpp \ moc_qplatforminputcontext.cpp \ moc_qplatforminputcontextplugin_p.cpp \ @@ -228,21 +248,26 @@ QT_SOURCES += \ moc_qclipboard.cpp \ moc_qdrag.cpp \ moc_qdnd_p.cpp \ + moc_qevent.cpp \ + moc_qkeysequence.cpp \ moc_qkeymapper_p.cpp \ moc_qpalette.cpp \ moc_qsessionmanager.cpp \ moc_qscreen.cpp \ moc_qstylehints.cpp \ + moc_qtouchdevice.cpp \ moc_qplatformsharedgraphicscache.cpp \ moc_qplatformdialoghelper.cpp \ - moc_qplatformscreenpageflipper.cpp \ - moc_qopenglcontext.cpp \ + moc_qpaintdevicewindow.cpp \ + moc_qrasterwindow.cpp \ + moc_qplatformgraphicsbuffer.cpp \ + moc_qinputdevicemanager_p.cpp \ + moc_qopenglwindow.cpp \ moc_qimageiohandler.cpp \ moc_qpictureformatplugin.cpp \ moc_qiconengineplugin.cpp \ moc_qfont.cpp \ moc_qfontdatabase.cpp \ - moc_qfontengine_p.cpp \ moc_qtextformat.cpp \ moc_qtextobject.cpp \ moc_qtextdocument.cpp \ @@ -252,6 +277,7 @@ QT_SOURCES += \ moc_qbrush.cpp \ moc_qpainter.cpp \ moc_qpdfwriter.cpp \ + moc_qplatformbackingstore.cpp \ moc_qvalidator.cpp \ moc_qopenglshaderprogram.cpp \ moc_qopenglengineshadermanager_p.cpp \ @@ -289,24 +315,30 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ moc_qclipboard.cpp \ moc_qdrag.cpp \ moc_qdnd_p.cpp \ + moc_qevent.cpp \ moc_qinputmethod.cpp \ + moc_qkeysequence.cpp \ moc_qkeymapper_p.cpp \ moc_qpalette.cpp \ moc_qsessionmanager.cpp \ moc_qscreen.cpp \ moc_qstylehints.cpp \ + moc_qtouchdevice.cpp \ moc_qplatformsharedgraphicscache.cpp \ moc_qplatformdialoghelper.cpp \ - moc_qplatformscreenpageflipper.cpp \ moc_qplatformsystemtrayicon.cpp \ + moc_qpaintdevicewindow.cpp \ + moc_qrasterwindow.cpp \ + moc_qplatformgraphicsbuffer.cpp \ + moc_qinputdevicemanager_p.cpp \ moc_qopenglcontext.cpp \ + moc_qopenglwindow.cpp \ moc_qimageiohandler.cpp \ moc_qmovie.cpp \ moc_qpictureformatplugin.cpp \ moc_qiconengineplugin.cpp \ moc_qfont.cpp \ moc_qfontdatabase.cpp \ - moc_qfontengine_p.cpp \ moc_qtextformat.cpp \ moc_qtextobject.cpp \ moc_qtextdocument.cpp \ @@ -319,6 +351,7 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ moc_qbrush.cpp \ moc_qpainter.cpp \ moc_qpdfwriter.cpp \ + moc_qplatformbackingstore.cpp \ moc_qvalidator.cpp \ moc_qopenglshaderprogram.cpp \ moc_qopenglengineshadermanager_p.cpp \ diff --git a/repos/libports/lib/mk/qt5_host_tools.inc b/repos/libports/lib/mk/qt5_host_tools.inc index 4c936e91d..931e5541b 100644 --- a/repos/libports/lib/mk/qt5_host_tools.inc +++ b/repos/libports/lib/mk/qt5_host_tools.inc @@ -5,16 +5,20 @@ QMAKESPEC = $(QT5_CONTRIB_DIR)/qtbase/mkspecs/linux-g++ bootstrap/libQtBootstrap.a: bootstrap/Makefile - $(VERBOSE)QMAKESPEC=$(QMAKESPEC) $(MAKE) -C bootstrap + $(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_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" moc/moc: bootstrap/libQtBootstrap.a moc/Makefile - $(VERBOSE)QMAKESPEC=$(QMAKESPEC) $(MAKE) -C moc + $(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_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" rcc/rcc: bootstrap/libQtBootstrap.a rcc/Makefile - $(VERBOSE)QMAKESPEC=$(QMAKESPEC) $(MAKE) -C rcc + $(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_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" uic/uic: bootstrap/libQtBootstrap.a uic/Makefile - $(VERBOSE)QMAKESPEC=$(QMAKESPEC) $(MAKE) -C uic + $(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_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" # # Rule to generate tool Makefiles from the respective pro files via qmake @@ -24,20 +28,18 @@ uic/uic: bootstrap/libQtBootstrap.a uic/Makefile # '#include'. So we have to make its location known to the 'INCLUDEPATH'. # %/Makefile: %.pro + $(VERBOSE)mkdir -p $*/.out $(VERBOSE)QMAKESPEC=$(QMAKESPEC) qmake/bin/qmake -o $*/Makefile \ QT_BUILD_TREE=$(QT5_CONTRIB_DIR)/qtbase \ QT_CONFIG+=zlib \ - INCLUDEPATH+=$(REP_DIR)/include/qt5 \ INCLUDEPATH+=$(QT5_CONTRIB_DIR)/qtbase/include \ - INCLUDEPATH+=$(REP_DIR)/include/qt5/qtbase \ INCLUDEPATH+=$(QT5_CONTRIB_DIR)/qtbase/include \ - INCLUDEPATH+=$(REP_DIR)/include/qt5/qtbase/QtCore \ 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.1.0 \ - INCLUDEPATH+=$(QT5_CONTRIB_DIR)/qtbase/include/QtCore/5.1.0/QtCore \ - INCLUDEPATH+=$(REP_DIR)/include/qt5/qtbase/QtXml \ + INCLUDEPATH+=$(QT5_CONTRIB_DIR)/qtbase/include/QtCore/5.6.2 \ + INCLUDEPATH+=$(QT5_CONTRIB_DIR)/qtbase/include/QtCore/5.6.2/QtCore \ INCLUDEPATH+=$(QT5_CONTRIB_DIR)/qtbase/include/QtXml \ + INCLUDEPATH+=$(QT5_CONTRIB_DIR)/qtbase/include/QtXml/5.6.2/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 9d585f131..735554f56 100644 --- a/repos/libports/lib/mk/qt5_host_tools_qmake.inc +++ b/repos/libports/lib/mk/qt5_host_tools_qmake.inc @@ -16,24 +16,33 @@ CC = gcc CXX = g++ QMAKE_CFLAGS = -pipe +QMAKE_CFLAGS_SPLIT_SECTIONS = -ffunction-sections QMAKE_CXXFLAGS = -pipe +QMAKE_CXXFLAGS_SPLIT_SECTIONS = -ffunction-sections QMAKE_LFLAGS = +QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections +QMAKE_CFLAGS_RELEASE = -O2 +QMAKE_CXXFLAGS_RELEASE = -O2 BUILD_PATH = . SOURCE_PATH = $(QT5_CONTRIB_DIR)/qtbase INC_PATH = $(SOURCE_PATH)/include QMAKESPEC = $(SOURCE_PATH)/mkspecs/linux-g++ -QT_VERSION = 5.1.0 -EXTRA_CFLAGS = $(QMAKE_CFLAGS) -EXTRA_CXXFLAGS = $(QMAKE_CXXFLAGS) -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/qlocal_unix.cpp" -LFLAGS = $(QMAKE_LFLAGS) -QT_INSTALL_BINS = $(INSTALL_ROOT)/usr/local/Qt-5.1.0/bin -QT_INSTALL_DATA = $(INSTALL_ROOT)/usr/local/Qt-5.1.0 +QT_VERSION = 5.6.2 +QT_MAJOR_VERSION = 5 +QT_MINOR_VERSION = 6 +QT_PATCH_VERSION = 2 +EXTRA_CFLAGS = $(QMAKE_CFLAGS) $(QMAKE_CFLAGS_SPLIT_SECTIONS) $(QMAKE_CFLAGS_RELEASE) +EXTRA_CXXFLAGS = $(QMAKE_CXXFLAGS) $(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 = RM_F = rm -f RM_RF = rm -rf +QMKSRC = $(SOURCE_PATH)/qmake +QMKLIBSRC = $(QMKSRC)/library +QMKGENSRC = $(QMKSRC)/generators EXTRA_CPPFLAGS = -DQMAKE_OPENSOURCE_EDITION include $(QT5_CONTRIB_DIR)/qtbase/qmake/Makefile.unix diff --git a/repos/libports/lib/mk/qt5_jscore.mk b/repos/libports/lib/mk/qt5_jscore.mk index 08318c3ea..562182612 100644 --- a/repos/libports/lib/mk/qt5_jscore.mk +++ b/repos/libports/lib/mk/qt5_jscore.mk @@ -14,8 +14,9 @@ CC_WARN = # # Generated files # -# some of the following lines have been extracted from Makefiles (and modified afterwards), -# that's why they can be quite long +# some of the following lines have been extracted from the console output +# of the 'configure' script (with modifications), that's why they can be +# quite long # ifneq ($(call select_from_ports,qt5),) @@ -42,20 +43,18 @@ $(QT5_PORT_DIR)/src/lib/qt5/qtwebkit/Source/JavaScriptCore/generated/generated.t $(VERBOSE)perl $(JAVASCRIPTCORE_DIR)/create_hash_table $(JAVASCRIPTCORE_DIR)/runtime/NumberConstructor.cpp -i > $(dir $@)/NumberConstructor.lut.h $(VERBOSE)perl $(JAVASCRIPTCORE_DIR)/create_hash_table $(JAVASCRIPTCORE_DIR)/runtime/NumberPrototype.cpp -i > $(dir $@)/NumberPrototype.lut.h $(VERBOSE)perl $(JAVASCRIPTCORE_DIR)/create_hash_table $(JAVASCRIPTCORE_DIR)/runtime/ObjectConstructor.cpp -i > $(dir $@)/ObjectConstructor.lut.h - $(VERBOSE)perl $(JAVASCRIPTCORE_DIR)/create_hash_table $(JAVASCRIPTCORE_DIR)/runtime/ObjectPrototype.cpp -i > $(dir $@)/ObjectPrototype.lut.h $(VERBOSE)perl $(JAVASCRIPTCORE_DIR)/create_hash_table $(JAVASCRIPTCORE_DIR)/runtime/RegExpConstructor.cpp -i > $(dir $@)/RegExpConstructor.lut.h $(VERBOSE)perl $(JAVASCRIPTCORE_DIR)/create_hash_table $(JAVASCRIPTCORE_DIR)/runtime/RegExpObject.cpp -i > $(dir $@)/RegExpObject.lut.h $(VERBOSE)perl $(JAVASCRIPTCORE_DIR)/create_hash_table $(JAVASCRIPTCORE_DIR)/runtime/RegExpPrototype.cpp -i > $(dir $@)/RegExpPrototype.lut.h $(VERBOSE)perl $(JAVASCRIPTCORE_DIR)/create_hash_table $(JAVASCRIPTCORE_DIR)/runtime/StringConstructor.cpp -i > $(dir $@)/StringConstructor.lut.h - $(VERBOSE)perl $(JAVASCRIPTCORE_DIR)/create_hash_table $(JAVASCRIPTCORE_DIR)/runtime/StringPrototype.cpp -i > $(dir $@)/StringPrototype.lut.h $(VERBOSE)perl $(JAVASCRIPTCORE_DIR)/create_hash_table $(JAVASCRIPTCORE_DIR)/parser/Keywords.table -i > $(dir $@)/Lexer.lut.h - @# KeywordLookupGenerator.py - $(VERBOSE)python $(JAVASCRIPTCORE_DIR)/KeywordLookupGenerator.py $(JAVASCRIPTCORE_DIR)/parser/Keywords.table > $(dir $@)/KeywordLookup.h - @# create_regex_tables $(VERBOSE)python $(JAVASCRIPTCORE_DIR)/create_regex_tables > $(dir $@)/RegExpJitTables.h + @# KeywordLookupGenerator.py + $(VERBOSE)python $(JAVASCRIPTCORE_DIR)/KeywordLookupGenerator.py $(JAVASCRIPTCORE_DIR)/parser/Keywords.table > $(dir $@)/KeywordLookup.h + $(VERBOSE)touch $@ diff --git a/repos/libports/lib/mk/qt5_jscore_generated.inc b/repos/libports/lib/mk/qt5_jscore_generated.inc index d43116bce..730734e77 100644 --- a/repos/libports/lib/mk/qt5_jscore_generated.inc +++ b/repos/libports/lib/mk/qt5_jscore_generated.inc @@ -1,22 +1,17 @@ -QT_DEFINES += -DQT_NO_LIBUDEV -DQT_NO_XCB -DQT_NO_XKBCOMMON -DBUILDING_QT__=1 -DNDEBUG -DENABLE_3D_RENDERING=1 -DENABLE_BLOB=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_STICKY_POSITION=1 -DENABLE_DATALIST_ELEMENT=1 -DENABLE_DETAILS_ELEMENT=1 -DENABLE_FAST_MOBILE_SCROLLING=1 -DENABLE_FILTERS=1 -DENABLE_FTPDIR=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_LINK_PREFETCH=1 -DENABLE_METER_ELEMENT=1 -DENABLE_MHTML=1 -DENABLE_MUTATION_OBSERVERS=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_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_TOUCH_ADJUSTMENT=1 -DENABLE_TOUCH_EVENTS=1 -DENABLE_WEB_SOCKETS=1 -DENABLE_WEB_TIMING=1 -DENABLE_WORKERS=1 -DENABLE_XHR_TIMEOUT=1 -DWTF_USE_TILED_BACKING_STORE=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 -DENABLE_TOUCH_SLIDER=1 -DENABLE_ACCELERATED_2D_CANVAS=0 -DENABLE_ANIMATION_API=0 -DENABLE_BATTERY_STATUS=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_BACKGROUND=0 -DENABLE_CSS3_CONDITIONAL_RULES=0 -DENABLE_CSS3_TEXT=0 -DENABLE_DASHBOARD_SUPPORT=0 -DENABLE_DATAGRID=0 -DENABLE_DATA_TRANSFER_ITEMS=0 -DENABLE_DEVICE_ORIENTATION=0 -DENABLE_DIRECTORY_UPLOAD=0 -DENABLE_DOWNLOAD_ATTRIBUTE=0 -DENABLE_FILE_SYSTEM=0 -DENABLE_FULLSCREEN_API=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=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_LINK_PRERENDER=0 -DENABLE_MATHML=0 -DENABLE_MEDIA_SOURCE=0 -DENABLE_MEDIA_STATISTICS=0 -DENABLE_MEDIA_STREAM=0 -DENABLE_MICRODATA=0 -DENABLE_NAVIGATOR_CONTENT_UTILS=0 -DENABLE_NETSCAPE_PLUGIN_API=0 -DENABLE_NETWORK_INFO=0 -DENABLE_ORIENTATION_EVENTS=0 -DENABLE_PROXIMITY_EVENTS=0 -DENABLE_QUOTA=0 -DENABLE_SCRIPTED_SPEECH=0 -DENABLE_SHADOW_DOM=0 -DENABLE_STYLE_SCOPED=0 -DENABLE_SVG_DOM_OBJC_BINDINGS=0 -DENABLE_TEXT_AUTOSIZING=0 -DENABLE_TEXT_NOTIFICATIONS_ONLY=0 -DENABLE_TOUCH_ICON_LOADING=0 -DENABLE_VIBRATION=0 -DENABLE_VIDEO=0 -DENABLE_VIDEO_TRACK=0 -DENABLE_WEBGL=0 -DENABLE_WEB_AUDIO=0 -DENABLE_XSLT=0 -DBUILDING_JavaScriptCore -DBUILDING_WEBKIT -DQT_ASCII_CAST_WARNINGS -DSTATICALLY_LINKED_WITH_WTF -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_CORE_LIB +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_INCPATH += \ - qtbase/include \ - qtbase/include/QtCore \ - qtbase/mkspecs/genode-g++ \ - qtscript/include \ - qtscript/include/QtScript \ - qtwebkit/Source \ qtwebkit/Source/JavaScriptCore \ - qtwebkit/Source/JavaScriptCore/API \ + qtwebkit/Source/JavaScriptCore \ + qtwebkit/Source \ + qtwebkit/Source/WTF \ qtwebkit/Source/JavaScriptCore/assembler \ qtwebkit/Source/JavaScriptCore/bytecode \ qtwebkit/Source/JavaScriptCore/bytecompiler \ - qtwebkit/Source/JavaScriptCore/debugger \ - qtwebkit/Source/JavaScriptCore/dfg \ - qtwebkit/Source/JavaScriptCore/disassembler \ - qtwebkit/Source/JavaScriptCore/ForwardingHeaders \ qtwebkit/Source/JavaScriptCore/heap \ + qtwebkit/Source/JavaScriptCore/dfg \ + qtwebkit/Source/JavaScriptCore/debugger \ + qtwebkit/Source/JavaScriptCore/disassembler \ qtwebkit/Source/JavaScriptCore/interpreter \ qtwebkit/Source/JavaScriptCore/jit \ qtwebkit/Source/JavaScriptCore/llint \ @@ -25,7 +20,13 @@ QT_INCPATH += \ qtwebkit/Source/JavaScriptCore/runtime \ qtwebkit/Source/JavaScriptCore/tools \ qtwebkit/Source/JavaScriptCore/yarr \ + qtwebkit/Source/JavaScriptCore/API \ + qtwebkit/Source/JavaScriptCore/ForwardingHeaders \ + qtwebkit/Source \ qtwebkit/Source/WTF \ + qtbase/include \ + qtbase/include/QtCore \ + qtbase/mkspecs/genode-g++ QT_SOURCES += \ YarrInterpreter.cpp \ @@ -39,7 +40,9 @@ QT_SOURCES += \ JSClassRef.cpp \ JSContextRef.cpp \ JSObjectRef.cpp \ + JSScriptRef.cpp \ JSStringRef.cpp \ + JSStringRefQt.cpp \ JSValueRef.cpp \ JSWeakObjectMapRefPrivate.cpp \ OpaqueJSString.cpp \ @@ -48,7 +51,6 @@ QT_SOURCES += \ LinkBuffer.cpp \ MacroAssembler.cpp \ MacroAssemblerARM.cpp \ - MacroAssemblerSH4.cpp \ ArrayAllocationProfile.cpp \ ArrayProfile.cpp \ CallLinkInfo.cpp \ @@ -59,13 +61,16 @@ QT_SOURCES += \ CodeType.cpp \ DFGExitProfile.cpp \ ExecutionCounter.cpp \ + ExitKind.cpp \ GetByIdStatus.cpp \ JumpTable.cpp \ LazyOperandValueProfile.cpp \ MethodOfGettingAValueProfile.cpp \ Opcode.cpp \ PolymorphicPutByIdList.cpp \ + PreciseJumpTargets.cpp \ PutByIdStatus.cpp \ + ReduceWhitespace.cpp \ ResolveGlobalStatus.cpp \ SamplingTool.cpp \ SpecialPointer.cpp \ @@ -80,9 +85,10 @@ QT_SOURCES += \ CopyVisitor.cpp \ ConservativeRoots.cpp \ DFGCodeBlocks.cpp \ - WeakSet.cpp \ - WeakHandleOwner.cpp \ + Weak.cpp \ WeakBlock.cpp \ + WeakHandleOwner.cpp \ + WeakSet.cpp \ HandleSet.cpp \ HandleStack.cpp \ BlockAllocator.cpp \ @@ -99,6 +105,7 @@ QT_SOURCES += \ MarkedBlock.cpp \ MarkedSpace.cpp \ SlotVisitor.cpp \ + SuperRegion.cpp \ VTableSpectrum.cpp \ WriteBarrierSupport.cpp \ DebuggerActivation.cpp \ @@ -108,20 +115,26 @@ QT_SOURCES += \ DFGArgumentsSimplificationPhase.cpp \ DFGArrayMode.cpp \ DFGAssemblyHelpers.cpp \ + DFGBackwardsPropagationPhase.cpp \ DFGByteCodeParser.cpp \ DFGCapabilities.cpp \ + DFGCommon.cpp \ DFGCFAPhase.cpp \ DFGCFGSimplificationPhase.cpp \ + DFGCPSRethreadingPhase.cpp \ DFGConstantFoldingPhase.cpp \ - DFGCorrectableJumpPoint.cpp \ DFGCSEPhase.cpp \ + DFGDCEPhase.cpp \ DFGDisassembler.cpp \ DFGDominators.cpp \ DFGDriver.cpp \ + DFGEdge.cpp \ DFGFixupPhase.cpp \ DFGGraph.cpp \ DFGJITCompiler.cpp \ + DFGLongLivedState.cpp \ DFGMinifiedNode.cpp \ + DFGNode.cpp \ DFGNodeFlags.cpp \ DFGOperations.cpp \ DFGOSREntry.cpp \ @@ -129,14 +142,18 @@ QT_SOURCES += \ DFGOSRExitCompiler.cpp \ DFGOSRExitCompiler64.cpp \ DFGOSRExitCompiler32_64.cpp \ + DFGOSRExitJumpPlaceholder.cpp \ DFGPhase.cpp \ DFGPredictionPropagationPhase.cpp \ + DFGPredictionInjectionPhase.cpp \ DFGRepatch.cpp \ DFGSpeculativeJIT.cpp \ DFGSpeculativeJIT32_64.cpp \ DFGSpeculativeJIT64.cpp \ - DFGStructureCheckHoistingPhase.cpp \ + DFGTypeCheckHoistingPhase.cpp \ DFGThunks.cpp \ + DFGUnificationPhase.cpp \ + DFGUseKind.cpp \ DFGValueSource.cpp \ DFGVariableAccessDataDump.cpp \ DFGVariableEvent.cpp \ @@ -167,6 +184,7 @@ QT_SOURCES += \ JITPropertyAccess32_64.cpp \ JITStubRoutine.cpp \ JITStubs.cpp \ + JITThunks.cpp \ JumpReplacementWatchpoint.cpp \ ThunkGenerators.cpp \ LLIntCLoop.cpp \ @@ -180,11 +198,24 @@ QT_SOURCES += \ Nodes.cpp \ ParserArena.cpp \ Parser.cpp \ + SourceProvider.cpp \ SourceProviderCache.cpp \ + ProfilerBytecode.cpp \ + ProfilerBytecodeSequence.cpp \ + ProfilerBytecodes.cpp \ + ProfilerCompilation.cpp \ + ProfilerCompilationKind.cpp \ + ProfilerCompiledBytecode.cpp \ + ProfilerDatabase.cpp \ + ProfilerOrigin.cpp \ + ProfilerOriginStack.cpp \ + ProfilerOSRExit.cpp \ + ProfilerOSRExitSite.cpp \ + ProfilerProfiledBytecodes.cpp \ Profile.cpp \ ProfileGenerator.cpp \ ProfileNode.cpp \ - Profiler.cpp \ + LegacyProfiler.cpp \ ArgList.cpp \ Arguments.cpp \ ArrayConstructor.cpp \ @@ -209,6 +240,7 @@ QT_SOURCES += \ ExceptionHelpers.cpp \ Executable.cpp \ FunctionConstructor.cpp \ + FunctionExecutableDump.cpp \ FunctionPrototype.cpp \ GCActivityCallback.cpp \ GetterSetter.cpp \ @@ -224,7 +256,7 @@ QT_SOURCES += \ JSDateMath.cpp \ JSFunction.cpp \ JSBoundFunction.cpp \ - JSGlobalData.cpp \ + VM.cpp \ JSGlobalObject.cpp \ JSGlobalObjectFunctions.cpp \ JSProxy.cpp \ @@ -240,7 +272,7 @@ QT_SOURCES += \ JSString.cpp \ JSStringJoiner.cpp \ JSSymbolTableObject.cpp \ - JSValue.cpp \ + JSCJSValue.cpp \ JSVariableObject.cpp \ JSWrapperObject.cpp \ LiteralParser.cpp \ @@ -261,6 +293,8 @@ QT_SOURCES += \ PropertyDescriptor.cpp \ PropertyNameArray.cpp \ PropertySlot.cpp \ + PropertyTable.cpp \ + PrototypeMap.cpp \ RegExpConstructor.cpp \ RegExpCachedResult.cpp \ RegExpMatchesArray.cpp \ @@ -278,8 +312,10 @@ QT_SOURCES += \ StringRecursionChecker.cpp \ StructureChain.cpp \ Structure.cpp \ + StructureRareData.cpp \ SymbolTable.cpp \ - TimeoutChecker.cpp \ + Watchdog.cpp \ + WatchdogNone.cpp \ CodeProfile.cpp \ CodeProfiling.cpp \ YarrJIT.cpp diff --git a/repos/libports/lib/mk/qt5_network.mk b/repos/libports/lib/mk/qt5_network.mk index e25316e44..2e575e67b 100644 --- a/repos/libports/lib/mk/qt5_network.mk +++ b/repos/libports/lib/mk/qt5_network.mk @@ -7,6 +7,8 @@ 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 \ @@ -18,7 +20,6 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT = \ moc_qnetworksession_p.cpp \ moc_qbearerengine_p.cpp \ moc_qbearerplugin_p.cpp \ - moc_qudpsocket.cpp \ moc_qsslsocket_openssl_p.cpp \ diff --git a/repos/libports/lib/mk/qt5_network_generated.inc b/repos/libports/lib/mk/qt5_network_generated.inc index 29b018c82..4c932040c 100644 --- a/repos/libports/lib/mk/qt5_network_generated.inc +++ b/repos/libports/lib/mk/qt5_network_generated.inc @@ -1,16 +1,16 @@ -QT_DEFINES += -DQT_NO_LIBUDEV -DQT_NO_XCB -DQT_NO_XKBCOMMON -DQT_NO_USING_NAMESPACE -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_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_USING_NAMESPACE -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_INCPATH += \ - qtbase/include \ - qtbase/include/QtCore \ - qtbase/include/QtCore/5.1.0 \ - qtbase/include/QtCore/5.1.0/QtCore \ - qtbase/include/QtNetwork \ - qtbase/include/QtNetwork/5.1.0 \ - qtbase/include/QtNetwork/5.1.0/QtNetwork \ - qtbase/mkspecs/genode-g++ \ qtbase/src/network \ qtbase/src/network/kernel \ + qtbase/include \ + qtbase/include/QtNetwork \ + qtbase/include/QtNetwork/5.6.2 \ + qtbase/include/QtNetwork/5.6.2/QtNetwork \ + qtbase/include/QtCore/5.6.2 \ + qtbase/include/QtCore/5.6.2/QtCore \ + qtbase/include/QtCore \ + qtbase/mkspecs/genode-g++ QT_SOURCES += \ qftp.cpp \ @@ -19,6 +19,9 @@ QT_SOURCES += \ qhttpnetworkreply.cpp \ qhttpnetworkconnection.cpp \ qhttpnetworkconnectionchannel.cpp \ + qabstractprotocolhandler.cpp \ + qhttpprotocolhandler.cpp \ + qspdyprotocolhandler.cpp \ qnetworkaccessauthenticationmanager.cpp \ qnetworkaccessmanager.cpp \ qnetworkaccesscache.cpp \ @@ -70,18 +73,25 @@ QT_SOURCES += \ qnativesocketengine_unix.cpp \ qlocalsocket_unix.cpp \ qlocalserver_unix.cpp \ + qasn1element.cpp \ qssl.cpp \ qsslcertificate.cpp \ qsslconfiguration.cpp \ qsslcipher.cpp \ + qsslellipticcurve.cpp \ + qsslkey_p.cpp \ qsslerror.cpp \ - qsslkey.cpp \ qsslsocket.cpp \ + qsslpresharedkeyauthenticator.cpp \ + qsslcertificateextension.cpp \ + qsslcertificate_openssl.cpp \ + qsslcontext_openssl.cpp \ + qsslellipticcurve_openssl.cpp \ + qsslkey_openssl.cpp \ qsslsocket_openssl.cpp \ qsslsocket_openssl_symbols.cpp \ - qsslcertificateextension.cpp \ - qsslcontext.cpp \ moc_qhttpnetworkreply_p.cpp \ + moc_qspdyprotocolhandler_p.cpp \ moc_qnetworkaccesscache_p.cpp \ moc_qnetworkaccessbackend_p.cpp \ moc_qnetworkaccessdebugpipebackend_p.cpp \ @@ -125,6 +135,7 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ moc_qhttpnetworkreply_p.cpp \ moc_qhttpnetworkconnection_p.cpp \ moc_qhttpnetworkconnectionchannel_p.cpp \ + moc_qspdyprotocolhandler_p.cpp \ moc_qnetworkaccessmanager.cpp \ moc_qnetworkaccesscache_p.cpp \ moc_qnetworkaccessbackend_p.cpp \ diff --git a/repos/libports/lib/mk/qt5_opengl.mk b/repos/libports/lib/mk/qt5_opengl.mk new file mode 100644 index 000000000..e7375b00a --- /dev/null +++ b/repos/libports/lib/mk/qt5_opengl.mk @@ -0,0 +1,7 @@ +include $(REP_DIR)/lib/import/import-qt5_xml.mk + +SHARED_LIB = yes + +include $(REP_DIR)/lib/mk/qt5_opengl_generated.inc + +include $(REP_DIR)/lib/mk/qt5.inc diff --git a/repos/libports/lib/mk/qt5_opengl_generated.inc b/repos/libports/lib/mk/qt5_opengl_generated.inc new file mode 100644 index 000000000..75bc583f5 --- /dev/null +++ b/repos/libports/lib/mk/qt5_opengl_generated.inc @@ -0,0 +1,64 @@ +QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_USING_NAMESPACE -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_INCPATH += \ + qtbase/src/opengl \ + qtbase/include \ + qtbase/include/QtOpenGL \ + qtbase/include/QtOpenGL/5.6.2 \ + qtbase/include/QtOpenGL/5.6.2/QtOpenGL \ + qtbase/include/QtWidgets/5.6.2 \ + qtbase/include/QtWidgets/5.6.2/QtWidgets \ + qtbase/include/QtGui/5.6.2 \ + qtbase/include/QtGui/5.6.2/QtGui \ + qtbase/include/QtCore/5.6.2 \ + qtbase/include/QtCore/5.6.2/QtCore \ + qtbase/include/QtWidgets \ + qtbase/include/QtGui \ + qtbase/include/QtCore \ + qtbase/mkspecs/genode-g++ + +QT_SOURCES += \ + qgl.cpp \ + qglcolormap.cpp \ + qglfunctions.cpp \ + qglpixelbuffer.cpp \ + qglframebufferobject.cpp \ + qglpaintdevice.cpp \ + qglbuffer.cpp \ + qglshaderprogram.cpp \ + qgraphicsshadereffect.cpp \ + qglgradientcache.cpp \ + qglengineshadermanager.cpp \ + qgl2pexvertexarray.cpp \ + qpaintengineex_opengl2.cpp \ + qglcustomshaderstage.cpp \ + qtextureglyphcache_gl.cpp \ + moc_qgl.cpp \ + moc_qgl_p.cpp \ + moc_qglshaderprogram.cpp \ + moc_qgraphicsshadereffect_p.cpp \ + moc_qglengineshadermanager_p.cpp + +QT_VPATH += \ + qtbase/src/opengl \ + qtbase/src/opengl/gl2paintengineex \ + +# some source files need to be generated by moc from other source/header files before +# they get #included again by the original source file in the compiling stage + +# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) +# extracted from 'compiler_moc_header_make_all' target + +COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ + moc_qgl.cpp \ + moc_qgl_p.cpp \ + moc_qglshaderprogram.cpp \ + moc_qgraphicsshadereffect_p.cpp \ + moc_qglengineshadermanager_p.cpp + +# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) +# extracted from 'compiler_moc_source_make_all' rule + +COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ + + diff --git a/repos/libports/lib/mk/qt5_printsupport_generated.inc b/repos/libports/lib/mk/qt5_printsupport_generated.inc index 9b2d7d7d9..28a15d6ba 100644 --- a/repos/libports/lib/mk/qt5_printsupport_generated.inc +++ b/repos/libports/lib/mk/qt5_printsupport_generated.inc @@ -1,30 +1,32 @@ -QT_DEFINES += -DQT_NO_LIBUDEV -DQT_NO_XCB -DQT_NO_XKBCOMMON -DQT_NO_USING_NAMESPACE -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_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_USING_NAMESPACE -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_INCPATH += \ - qtbase/include \ - qtbase/include/QtCore \ - qtbase/include/QtCore/5.1.0 \ - qtbase/include/QtCore/5.1.0/QtCore \ - qtbase/include/QtGui \ - qtbase/include/QtGui/5.1.0 \ - qtbase/include/QtGui/5.1.0/QtGui \ - qtbase/include/QtPrintSupport \ - qtbase/include/QtPrintSupport/5.1.0 \ - qtbase/include/QtPrintSupport/5.1.0/QtPrintSupport \ - qtbase/include/QtWidgets \ - qtbase/include/QtWidgets/5.1.0 \ - qtbase/include/QtWidgets/5.1.0/QtWidgets \ - qtbase/mkspecs/genode-g++ \ - qtbase/src/plugins/printsupport/cups \ qtbase/src/printsupport \ + qtbase/src/plugins/printsupport/cups \ qtbase/src/printsupport/dialogs \ + qtbase/include \ + qtbase/include/QtPrintSupport \ + qtbase/include/QtPrintSupport/5.6.2 \ + qtbase/include/QtPrintSupport/5.6.2/QtPrintSupport \ + qtbase/include/QtWidgets/5.6.2 \ + qtbase/include/QtWidgets/5.6.2/QtWidgets \ + qtbase/include/QtGui/5.6.2 \ + qtbase/include/QtGui/5.6.2/QtGui \ + qtbase/include/QtCore/5.6.2 \ + qtbase/include/QtCore/5.6.2/QtCore \ + qtbase/include/QtWidgets \ + qtbase/include/QtGui \ + qtbase/include/QtCore \ + qtbase/mkspecs/genode-g++ QT_SOURCES += \ qpaintengine_alpha.cpp \ qpaintengine_preview.cpp \ + qprintdevice.cpp \ qprintengine_pdf.cpp \ qprinter.cpp \ qprinterinfo.cpp \ + qplatformprintdevice.cpp \ qplatformprintplugin.cpp \ qplatformprintersupport.cpp \ qprintpreviewwidget.cpp \ diff --git a/repos/libports/lib/mk/qt5_qml.mk b/repos/libports/lib/mk/qt5_qml.mk index e7c42aa1a..823b688a3 100644 --- a/repos/libports/lib/mk/qt5_qml.mk +++ b/repos/libports/lib/mk/qt5_qml.mk @@ -2,11 +2,23 @@ include $(REP_DIR)/lib/import/import-qt5_qml.mk SHARED_LIB = yes +ifneq ($(call select_from_ports,qt5),) +all: $(QT5_PORT_DIR)/src/lib/qt5/qtdeclarative/src/3rdparty/masm/generated.tag +endif + +# make the 'HOST_TOOLS' variable known +include $(REP_DIR)/lib/mk/qt5_host_tools.mk + +$(QT5_PORT_DIR)/src/lib/qt5/qtdeclarative/src/3rdparty/masm/generated.tag: $(HOST_TOOLS) + + $(VERBOSE)mkdir -p $(dir $@) + + python $(QT5_CONTRIB_DIR)/qtdeclarative/src/3rdparty/masm/create_regex_tables > $(dir $@)/RegExpJitTables.h + + $(VERBOSE)touch $@ + include $(REP_DIR)/lib/mk/qt5_qml_generated.inc include $(REP_DIR)/lib/mk/qt5.inc -#INC_DIR += $(REP_DIR)/include/qt5/qtbase/QtXml/private \ -# $(REP_DIR)/contrib/$(QT5)/qtbase/include/QtCore/$(QT_VERSION)/QtCore \ - -LIBS += qt5_v8 qt5_core libc +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 34b03928e..a0b071135 100644 --- a/repos/libports/lib/mk/qt5_qml_generated.inc +++ b/repos/libports/lib/mk/qt5_qml_generated.inc @@ -1,22 +1,33 @@ -QT_DEFINES += -DQT_NO_LIBUDEV -DQT_NO_XCB -DQT_NO_XKBCOMMON -DQT_NO_URL_CAST_FROM_STRING -DQT_NO_INTEGER_EVENT_COORDINATES -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 -DQT_V8_LIB -DV8_SHARED -DUSING_V8_SHARED +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= -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_INCPATH += \ - qtbase/include \ - qtbase/include/QtCore \ - qtbase/include/QtCore/5.1.0 \ - qtbase/include/QtCore/5.1.0/QtCore \ - qtbase/include/QtNetwork \ - qtbase/mkspecs/genode-g++ \ + qtdeclarative/src/qml \ + qtdeclarative/src/qml/memory \ + qtdeclarative/src/qml/compiler \ + qtdeclarative/src/3rdparty/masm/jit \ + qtdeclarative/src/3rdparty/masm/assembler \ + qtdeclarative/src/3rdparty/masm/runtime \ + qtdeclarative/src/3rdparty/masm/wtf \ + qtdeclarative/src/3rdparty/masm/stubs \ + qtdeclarative/src/3rdparty/masm/stubs/wtf \ + qtdeclarative/src/3rdparty/masm \ + qtdeclarative/src/3rdparty/masm/disassembler \ + qtdeclarative/src/3rdparty/masm/disassembler/udis86 \ + qtdeclarative/src/qml/jit \ + qtdeclarative/src/qml/jsruntime \ + qtdeclarative/src/3rdparty/double-conversion \ + qtdeclarative/src/qml/debugger \ + qtdeclarative/src/qml/animations \ qtdeclarative/include \ qtdeclarative/include/QtQml \ - qtdeclarative/include/QtQml/5.1.0 \ - qtdeclarative/include/QtQml/5.1.0/QtQml \ - qtdeclarative/src/qml \ - qtdeclarative/src/qml/animations \ - qtjsbackend/include \ - qtjsbackend/include/QtV8 \ - qtjsbackend/include/QtV8/5.1.0 \ - qtjsbackend/include/QtV8/5.1.0/QtV8 \ + qtdeclarative/include/QtQml/5.6.2 \ + qtdeclarative/include/QtQml/5.6.2/QtQml \ + qtbase/include/QtCore/5.6.2 \ + qtbase/include/QtCore/5.6.2/QtCore \ + qtbase/include \ + qtbase/include/QtNetwork \ + qtbase/include/QtCore \ + qtbase/mkspecs/genode-g++ QT_SOURCES += \ qqmlchangeset.cpp \ @@ -24,7 +35,103 @@ QT_SOURCES += \ qqmllistcompositor.cpp \ qqmladaptormodel.cpp \ qqmlpropertymap.cpp \ - qqmlinstruction.cpp \ + qv4mm.cpp \ + qqmljsast.cpp \ + qqmljsastvisitor.cpp \ + qqmljsengine_p.cpp \ + qqmljsgrammar.cpp \ + qqmljslexer.cpp \ + qqmljsparser.cpp \ + qv4compileddata.cpp \ + qv4compiler.cpp \ + qv4codegen.cpp \ + qv4isel_p.cpp \ + qv4jsir.cpp \ + qv4ssa.cpp \ + qqmlirbuilder.cpp \ + qqmltypecompiler.cpp \ + qv4instr_moth.cpp \ + qv4isel_moth.cpp \ + qjsengine.cpp \ + qjsvalue.cpp \ + qjsvalueiterator.cpp \ + qv4assembler.cpp \ + qv4regalloc.cpp \ + qv4isel_masm.cpp \ + qv4binop.cpp \ + qv4unop.cpp \ + ARMv7Assembler.cpp \ + LinkBuffer.cpp \ + PrintStream.cpp \ + FilePrintStream.cpp \ + OSAllocatorPosix.cpp \ + PageAllocationAligned.cpp \ + PageBlock.cpp \ + WTFStubs.cpp \ + Options.cpp \ + Disassembler.cpp \ + UDis86Disassembler.cpp \ + ARMv7Disassembler.cpp \ + ARMv7DOpcode.cpp \ + Mips32Disassembler.cpp \ + Mips32Opcode.cpp \ + YarrCanonicalizeUCS2.cpp \ + YarrInterpreter.cpp \ + YarrJIT.cpp \ + YarrPattern.cpp \ + YarrSyntaxChecker.cpp \ + qv4engine.cpp \ + qv4context.cpp \ + qv4persistent.cpp \ + qv4debugging.cpp \ + qv4lookup.cpp \ + qv4identifier.cpp \ + qv4identifiertable.cpp \ + qv4managed.cpp \ + qv4internalclass.cpp \ + qv4sparsearray.cpp \ + qv4arraydata.cpp \ + qv4arrayobject.cpp \ + qv4argumentsobject.cpp \ + qv4booleanobject.cpp \ + qv4dateobject.cpp \ + qv4errorobject.cpp \ + qv4function.cpp \ + qv4functionobject.cpp \ + qv4globalobject.cpp \ + qv4jsonobject.cpp \ + qv4mathobject.cpp \ + qv4memberdata.cpp \ + qv4numberobject.cpp \ + qv4object.cpp \ + qv4objectproto.cpp \ + qv4regexpobject.cpp \ + qv4stringobject.cpp \ + qv4variantobject.cpp \ + qv4objectiterator.cpp \ + qv4regexp.cpp \ + qv4serialize.cpp \ + qv4script.cpp \ + qv4executableallocator.cpp \ + qv4sequenceobject.cpp \ + qv4include.cpp \ + qv4qobjectwrapper.cpp \ + qv4vme_moth.cpp \ + qv4profiling.cpp \ + qv4arraybuffer.cpp \ + qv4typedarray.cpp \ + qv4dataview.cpp \ + qv4runtime.cpp \ + qv4string.cpp \ + qv4value.cpp \ + bignum.cc \ + bignum-dtoa.cc \ + cached-powers.cc \ + diy-fp.cc \ + double-conversion.cc \ + fast-dtoa.cc \ + fixed-dtoa.cc \ + strtod.cc \ qqmlopenmetaobject.cpp \ qqmlvmemetaobject.cpp \ qqmlengine.cpp \ @@ -38,7 +145,6 @@ QT_SOURCES += \ qqmlpropertyvalueinterceptor.cpp \ qqmlproxymetaobject.cpp \ qqmlvme.cpp \ - qqmlcompiler.cpp \ qqmlcompileddata.cpp \ qqmlboundsignal.cpp \ qqmlmetatype.cpp \ @@ -47,85 +153,55 @@ QT_SOURCES += \ qqmltypeloader.cpp \ qqmlinfo.cpp \ qqmlerror.cpp \ - qqmlscript.cpp \ - qqmlrewrite.cpp \ qqmlvaluetype.cpp \ qqmlaccessors.cpp \ qqmlxmlhttprequest.cpp \ - qqmlwatcher.cpp \ qqmlcleanup.cpp \ qqmlpropertycache.cpp \ qqmlnotifier.cpp \ - qqmlintegercache.cpp \ qqmltypenotavailable.cpp \ qqmltypenamecache.cpp \ qqmlscriptstring.cpp \ qqmlnetworkaccessmanagerfactory.cpp \ - qqmldirparser.cpp \ qqmlextensionplugin.cpp \ qqmlimport.cpp \ qqmllist.cpp \ qqmllocale.cpp \ - qqmlabstractexpression.cpp \ qqmljavascriptexpression.cpp \ qqmlabstractbinding.cpp \ qqmlvaluetypeproxybinding.cpp \ qqmlglobal.cpp \ qqmlfile.cpp \ - qqmlbundle.cpp \ qqmlmemoryprofiler.cpp \ qqmlplatform.cpp \ qqmlbinding.cpp \ qqmlabstracturlinterceptor.cpp \ qqmlapplicationengine.cpp \ - qqmljsast.cpp \ - qqmljsastvisitor.cpp \ - qqmljsengine_p.cpp \ - qqmljsgrammar.cpp \ - qqmljslexer.cpp \ - qqmljsparser.cpp \ - textwriter.cpp \ + qqmllistwrapper.cpp \ + qqmlcontextwrapper.cpp \ + qqmlvaluetypewrapper.cpp \ + qqmltypewrapper.cpp \ + qqmlfileselector.cpp \ + qqmlobjectcreator.cpp \ + qqmldirparser.cpp \ qintrusivelist.cpp \ qhashedstring.cpp \ - qqmlpool.cpp \ qqmlthread.cpp \ - qqmltrace.cpp \ - qv4compiler.cpp \ - qv4ir.cpp \ - qv4irbuilder.cpp \ - qv4instruction.cpp \ - qv4bindings.cpp \ - qjsengine.cpp \ - qjsvalue.cpp \ - qjsvalueiterator.cpp \ - qv8stringwrapper.cpp \ qv8engine.cpp \ - qv8sequencewrapper.cpp \ - qv8contextwrapper.cpp \ - qv8qobjectwrapper.cpp \ - qv8typewrapper.cpp \ - qv8listwrapper.cpp \ - qv8variantwrapper.cpp \ - qv8valuetypewrapper.cpp \ - qv8jsonwrapper.cpp \ - qv8include.cpp \ - qv8worker.cpp \ - qv8bindings.cpp \ - qv8domerrors.cpp \ - qv8sqlerrors.cpp \ + qv4domerrors.cpp \ + qv4sqlerrors.cpp \ qqmlbuiltinfunctions.cpp \ + qqmldebug.cpp \ + qqmldebugconnector.cpp \ qqmldebugservice.cpp \ - qqmlprofilerservice.cpp \ - qqmldebugserver.cpp \ - qqmlinspectorservice.cpp \ - qv8debugservice.cpp \ - qv8profilerservice.cpp \ - qqmlenginedebugservice.cpp \ - qdebugmessageservice.cpp \ + qqmldebugserviceinterfaces.cpp \ + qqmlabstractprofileradapter.cpp \ + qqmlprofiler.cpp \ qabstractanimationjob.cpp \ qanimationgroupjob.cpp \ qsequentialanimationgroupjob.cpp \ qparallelanimationgroupjob.cpp \ + qcontinuinganimationgroupjob.cpp \ qpauseanimationjob.cpp \ qqmlbind.cpp \ qqmlconnections.cpp \ @@ -133,30 +209,34 @@ QT_SOURCES += \ qqmllistmodel.cpp \ qqmllistmodelworkeragent.cpp \ qqmlmodelsmodule.cpp \ + qqmlmodelindexvaluetype.cpp \ qqmlobjectmodel.cpp \ qqmltimer.cpp \ qquickpackage.cpp \ qquickworkerscript.cpp \ qqmlinstantiator.cpp \ moc_qqmlpropertymap.cpp \ + moc_qv4debugging_p.cpp \ + moc_qv4include_p.cpp \ + moc_qv4qobjectwrapper_p.cpp \ + moc_qv4profiling_p.cpp \ moc_qqmlglobal_p.cpp \ moc_qqmlcomponent.cpp \ moc_qqmlengine.cpp \ moc_qqmlcontext.cpp \ moc_qqmlvaluetype_p.cpp \ - moc_qqmlwatcher_p.cpp \ moc_qqmltypenotavailable_p.cpp \ moc_qqmlextensionplugin.cpp \ moc_qqmllocale_p.cpp \ moc_qqmlcomponentattached_p.cpp \ moc_qqmlplatform_p.cpp \ - moc_qv8include_p.cpp \ + moc_qqmlfileselector.cpp \ + moc_qqmldebugconnector_p.cpp \ moc_qqmldebugservice_p.cpp \ - moc_qqmlinspectorservice_p.cpp \ - moc_qv8debugservice_p.cpp \ - moc_qv8profilerservice_p.cpp \ - moc_qqmlenginedebugservice_p.cpp \ - moc_qdebugmessageservice_p.cpp \ + moc_qqmldebugservicefactory_p.cpp \ + moc_qqmldebugserviceinterfaces_p.cpp \ + moc_qqmlabstractprofileradapter_p.cpp \ + moc_qqmlprofiler_p.cpp \ moc_qabstractanimationjob_p.cpp \ moc_qqmlbind_p.cpp \ moc_qqmlconnections_p.cpp \ @@ -165,19 +245,31 @@ QT_SOURCES += \ moc_qqmllistmodel_p.cpp \ moc_qqmllistmodel_p_p.cpp \ moc_qqmllistmodelworkeragent_p.cpp \ + moc_qqmlmodelindexvaluetype_p.cpp \ moc_qqmlobjectmodel_p.cpp \ moc_qqmltimer_p.cpp \ moc_qquickpackage_p.cpp \ moc_qquickworkerscript_p.cpp QT_VPATH += \ + qtdeclarative/src/3rdparty/double-conversion \ + qtdeclarative/src/3rdparty/masm/assembler \ + qtdeclarative/src/3rdparty/masm/disassembler \ + qtdeclarative/src/3rdparty/masm/disassembler/ARMv7 \ + qtdeclarative/src/3rdparty/masm/disassembler/mips32 \ + qtdeclarative/src/3rdparty/masm/stubs \ + qtdeclarative/src/3rdparty/masm/wtf \ + 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 \ + qtdeclarative/src/qml/memory \ + qtdeclarative/src/qml/parser \ qtdeclarative/src/qml/qml \ qtdeclarative/src/qml/qml/ftw \ - qtdeclarative/src/qml/qml/parser \ - qtdeclarative/src/qml/qml/rewriter \ - qtdeclarative/src/qml/qml/v4 \ qtdeclarative/src/qml/qml/v8 \ qtdeclarative/src/qml/types \ qtdeclarative/src/qml/util \ @@ -190,28 +282,30 @@ QT_VPATH += \ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ moc_qqmlpropertymap.cpp \ + moc_qjsengine.cpp \ + moc_qv4debugging_p.cpp \ + moc_qv4include_p.cpp \ + moc_qv4qobjectwrapper_p.cpp \ + moc_qv4profiling_p.cpp \ moc_qqmlglobal_p.cpp \ moc_qqmlcomponent.cpp \ moc_qqmlengine.cpp \ moc_qqmlcontext.cpp \ moc_qqmlexpression.cpp \ moc_qqmlvaluetype_p.cpp \ - moc_qqmlwatcher_p.cpp \ moc_qqmltypenotavailable_p.cpp \ moc_qqmlextensionplugin.cpp \ moc_qqmllocale_p.cpp \ moc_qqmlcomponentattached_p.cpp \ moc_qqmlplatform_p.cpp \ moc_qqmlapplicationengine.cpp \ - moc_qjsengine.cpp \ - moc_qv8include_p.cpp \ + moc_qqmlfileselector.cpp \ + moc_qqmldebugconnector_p.cpp \ moc_qqmldebugservice_p.cpp \ - moc_qqmldebugserver_p.cpp \ - moc_qqmlinspectorservice_p.cpp \ - moc_qv8debugservice_p.cpp \ - moc_qv8profilerservice_p.cpp \ - moc_qqmlenginedebugservice_p.cpp \ - moc_qdebugmessageservice_p.cpp \ + moc_qqmldebugservicefactory_p.cpp \ + moc_qqmldebugserviceinterfaces_p.cpp \ + moc_qqmlabstractprofileradapter_p.cpp \ + moc_qqmlprofiler_p.cpp \ moc_qabstractanimationjob_p.cpp \ moc_qqmlbind_p.cpp \ moc_qqmlconnections_p.cpp \ @@ -220,6 +314,7 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ moc_qqmllistmodel_p.cpp \ moc_qqmllistmodel_p_p.cpp \ moc_qqmllistmodelworkeragent_p.cpp \ + moc_qqmlmodelindexvaluetype_p.cpp \ moc_qqmlobjectmodel_p.cpp \ moc_qqmltimer_p.cpp \ moc_qquickpackage_p.cpp \ @@ -233,7 +328,7 @@ COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ qqmladaptormodel.moc \ qqmltypeloader.moc \ qqmlxmlhttprequest.moc \ - qqmlwatcher.moc \ qqmlfile.moc \ + qqmldebugservice.moc \ qquickworkerscript.moc diff --git a/repos/libports/lib/mk/qt5_qtquick2plugin_generated.inc b/repos/libports/lib/mk/qt5_qtquick2plugin_generated.inc index 828baa974..06a566a54 100644 --- a/repos/libports/lib/mk/qt5_qtquick2plugin_generated.inc +++ b/repos/libports/lib/mk/qt5_qtquick2plugin_generated.inc @@ -1,19 +1,23 @@ -QT_DEFINES += -DQT_NO_LIBUDEV -DQT_NO_XCB -DQT_NO_XKBCOMMON -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_PLUGIN -DQT_QUICK_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_GUI_LIB -DQT_CORE_LIB +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_INCPATH += \ - qtbase/include \ - qtbase/include/QtCore \ - qtbase/include/QtGui \ - qtbase/include/QtNetwork \ - qtbase/mkspecs/genode-g++ \ - qtdeclarative/include \ - qtdeclarative/include/QtQml \ - qtdeclarative/include/QtQml/5.1.0 \ - qtdeclarative/include/QtQml/5.1.0/QtQml \ - qtdeclarative/include/QtQuick \ - qtdeclarative/include/QtQuick/5.1.0 \ - qtdeclarative/include/QtQuick/5.1.0/QtQuick \ qtdeclarative/src/imports/qtquick2 \ + qtdeclarative/include/QtQuick/5.6.2 \ + qtdeclarative/include/QtQuick/5.6.2/QtQuick \ + qtbase/include/QtGui/5.6.2 \ + qtbase/include/QtGui/5.6.2/QtGui \ + qtdeclarative/include \ + qtdeclarative/include/QtQuick \ + qtbase/include \ + qtbase/include/QtGui \ + qtdeclarative/include/QtQml/5.6.2 \ + qtdeclarative/include/QtQml/5.6.2/QtQml \ + qtbase/include/QtCore/5.6.2 \ + qtbase/include/QtCore/5.6.2/QtCore \ + qtdeclarative/include/QtQml \ + qtbase/include/QtNetwork \ + qtbase/include/QtCore \ + qtbase/mkspecs/genode-g++ QT_SOURCES += \ plugin.cpp diff --git a/repos/libports/lib/mk/qt5_quick_generated.inc b/repos/libports/lib/mk/qt5_quick_generated.inc index 1f59c2c2f..f6c47f8b5 100644 --- a/repos/libports/lib/mk/qt5_quick_generated.inc +++ b/repos/libports/lib/mk/qt5_quick_generated.inc @@ -1,27 +1,24 @@ -QT_DEFINES += -DQT_NO_LIBUDEV -DQT_NO_XCB -DQT_NO_XKBCOMMON -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_QML_LIB -DQT_NETWORK_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_V8_LIB -DV8_SHARED -DUSING_V8_SHARED +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_INCPATH += \ - qtbase/include \ - qtbase/include/QtCore \ - qtbase/include/QtCore/5.1.0 \ - qtbase/include/QtCore/5.1.0/QtCore \ - qtbase/include/QtGui \ - qtbase/include/QtGui/5.1.0 \ - qtbase/include/QtGui/5.1.0/QtGui \ - qtbase/include/QtNetwork \ - qtbase/mkspecs/genode-g++ \ - qtdeclarative/include \ - qtdeclarative/include/QtQml \ - qtdeclarative/include/QtQml/5.1.0 \ - qtdeclarative/include/QtQml/5.1.0/QtQml \ - qtdeclarative/include/QtQuick \ - qtdeclarative/include/QtQuick/5.1.0 \ - qtdeclarative/include/QtQuick/5.1.0/QtQuick \ qtdeclarative/src/quick \ - qtjsbackend/include \ - qtjsbackend/include/QtV8 \ - qtjsbackend/include/QtV8/5.1.0 \ - qtjsbackend/include/QtV8/5.1.0/QtV8 \ + qtdeclarative/src/quick \ + qtdeclarative/include \ + qtdeclarative/include/QtQuick \ + qtdeclarative/include/QtQuick/5.6.2 \ + qtdeclarative/include/QtQuick/5.6.2/QtQuick \ + qtbase/include/QtGui/5.6.2 \ + qtbase/include/QtGui/5.6.2/QtGui \ + qtdeclarative/include/QtQml/5.6.2 \ + qtdeclarative/include/QtQml/5.6.2/QtQml \ + qtbase/include/QtCore/5.6.2 \ + qtbase/include/QtCore/5.6.2/QtCore \ + qtbase/include \ + qtbase/include/QtGui \ + qtdeclarative/include/QtQml \ + qtbase/include/QtNetwork \ + qtbase/include/QtCore \ + qtbase/mkspecs/genode-g++ QT_SOURCES += \ qquickapplication.cpp \ @@ -48,16 +45,27 @@ QT_SOURCES += \ qquicksvgparser.cpp \ qquickvaluetypes.cpp \ qquickglobal.cpp \ - qsgdefaultrenderer.cpp \ + qquickanimator.cpp \ + qquickanimatorjob.cpp \ + qquickanimatorcontroller.cpp \ + qquickprofiler.cpp \ + qquickfontmetrics.cpp \ + qquicktextmetrics.cpp \ + qquickshortcut.cpp \ + qquickvalidator.cpp \ + qsgabstractrenderer.cpp \ + qsgbatchrenderer.cpp \ qsggeometry.cpp \ qsgmaterial.cpp \ qsgnode.cpp \ qsgnodeupdater.cpp \ qsgrenderer.cpp \ qsgrendernode.cpp \ - qsgsimplematerial.cpp \ + qsgshaderrewriter.cpp \ qsgareaallocator.cpp \ + qsgatlastexture.cpp \ qsgdepthstencilbuffer.cpp \ + qsgengine.cpp \ qsgflatcolormaterial.cpp \ qsgsimplerectnode.cpp \ qsgsimpletexturenode.cpp \ @@ -65,8 +73,10 @@ QT_SOURCES += \ qsgvertexcolormaterial.cpp \ qsgtexture.cpp \ qsgtextureprovider.cpp \ - qsgpainternode.cpp \ + qsgdefaultpainternode.cpp \ qsgdistancefieldutil.cpp \ + qsgsimplematerial.cpp \ + qsgshadersourcebuilder.cpp \ qsgadaptationlayer.cpp \ qsgcontext.cpp \ qsgcontextplugin.cpp \ @@ -77,11 +87,10 @@ QT_SOURCES += \ qsgdistancefieldglyphnode_p.cpp \ qsgdefaultimagenode.cpp \ qsgdefaultrectanglenode.cpp \ - qsgflashnode.cpp \ - qsgshareddistancefieldglyphcache.cpp \ qsgrenderloop.cpp \ qsgthreadedrenderloop.cpp \ qsgwindowsrenderloop.cpp \ + qsgdefaultlayer.cpp \ qquickevents.cpp \ qquickanchors.cpp \ qquickitem.cpp \ @@ -131,6 +140,11 @@ QT_SOURCES += \ qquickitemviewtransition.cpp \ qquickwindowmodule.cpp \ qquickscreen.cpp \ + qquickwindowattached.cpp \ + qquickframebufferobject.cpp \ + qquickitemgrabresult.cpp \ + qquickrendercontrol.cpp \ + qquickopenglinfo.cpp \ qquickshadereffect.cpp \ qquickshadereffectmesh.cpp \ qquickshadereffectnode.cpp \ @@ -141,9 +155,18 @@ QT_SOURCES += \ qquickcontext2dtile.cpp \ qquickcontext2dtexture.cpp \ qquickcontext2dcommandbuffer.cpp \ - designersupport.cpp \ - designerwindowmanager.cpp \ + qquickdesignercustomobjectdata.cpp \ + qquickdesignersupport.cpp \ + qquickdesignersupportitems.cpp \ + qquickdesignersupportmetainfo.cpp \ + qquickdesignersupportproperties.cpp \ + qquickdesignersupportpropertychanges.cpp \ + qquickdesignersupportstates.cpp \ + qquickdesignerwindowmanager.cpp \ + qqmldesignermetaobject.cpp \ qtquick2.cpp \ + qrc_scenegraph.cpp \ + qrc_items.cpp \ moc_qquickapplication_p.cpp \ moc_qquickanimation_p.cpp \ moc_qquicksystempalette_p.cpp \ @@ -161,18 +184,30 @@ QT_SOURCES += \ moc_qquickfontloader_p.cpp \ moc_qquickpath_p.cpp \ moc_qquickpathinterpolator_p.cpp \ + moc_qquickimageprovider.cpp \ moc_qquickvaluetypes_p.cpp \ - moc_qsgdefaultrenderer_p.cpp \ - moc_qsgrenderer_p.cpp \ + moc_qquickanimator_p.cpp \ + moc_qquickanimatorjob_p.cpp \ + moc_qquickanimatorcontroller_p.cpp \ + moc_qquickprofiler_p.cpp \ + moc_qquickfontmetrics_p.cpp \ + moc_qquicktextmetrics_p.cpp \ + moc_qquickshortcut_p.cpp \ + moc_qquickvalidator_p.cpp \ + moc_qsgbatchrenderer_p.cpp \ + moc_qsgabstractrenderer.cpp \ + moc_qsgatlastexture_p.cpp \ + moc_qsgengine.cpp \ moc_qsgtexture.cpp \ moc_qsgtexture_p.cpp \ moc_qsgtextureprovider.cpp \ + moc_qsgadaptationlayer_p.cpp \ moc_qsgcontext_p.cpp \ moc_qsgcontextplugin_p.cpp \ - moc_qsgshareddistancefieldglyphcache_p.cpp \ moc_qsgrenderloop_p.cpp \ moc_qsgthreadedrenderloop_p.cpp \ moc_qsgwindowsrenderloop_p.cpp \ + moc_qsgdefaultlayer_p.cpp \ moc_qquickevents_p_p.cpp \ moc_qquickaccessibleattached_p.cpp \ moc_qquickitem_p.cpp \ @@ -181,9 +216,9 @@ QT_SOURCES += \ moc_qquickfocusscope_p.cpp \ moc_qquickpainteditem.cpp \ moc_qquicktext_p.cpp \ - moc_qquicktext_p_p.cpp \ moc_qquicktextinput_p.cpp \ moc_qquicktextdocument.cpp \ + moc_qquicktextdocument_p.cpp \ moc_qquicktextedit_p.cpp \ moc_qquicktextutil_p.cpp \ moc_qquickimagebase_p.cpp \ @@ -215,14 +250,21 @@ QT_SOURCES += \ 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_qquickcanvasitem_p.cpp \ moc_qquickcanvascontext_p.cpp \ + moc_qquickcontext2d_p.cpp \ moc_qquickcontext2dtexture_p.cpp \ - moc_designerwindowmanager_p.cpp + moc_qquickdesignerwindowmanager_p.cpp QT_VPATH += \ qtdeclarative/src/quick \ @@ -259,18 +301,30 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ moc_qquickfontloader_p.cpp \ moc_qquickpath_p.cpp \ moc_qquickpathinterpolator_p.cpp \ + moc_qquickimageprovider.cpp \ moc_qquickvaluetypes_p.cpp \ - moc_qsgdefaultrenderer_p.cpp \ - moc_qsgrenderer_p.cpp \ + moc_qquickanimator_p.cpp \ + moc_qquickanimatorjob_p.cpp \ + moc_qquickanimatorcontroller_p.cpp \ + moc_qquickprofiler_p.cpp \ + moc_qquickfontmetrics_p.cpp \ + moc_qquicktextmetrics_p.cpp \ + moc_qquickshortcut_p.cpp \ + moc_qquickvalidator_p.cpp \ + moc_qsgbatchrenderer_p.cpp \ + moc_qsgabstractrenderer.cpp \ + moc_qsgatlastexture_p.cpp \ + moc_qsgengine.cpp \ moc_qsgtexture.cpp \ moc_qsgtexture_p.cpp \ moc_qsgtextureprovider.cpp \ + moc_qsgadaptationlayer_p.cpp \ moc_qsgcontext_p.cpp \ moc_qsgcontextplugin_p.cpp \ - moc_qsgshareddistancefieldglyphcache_p.cpp \ moc_qsgrenderloop_p.cpp \ moc_qsgthreadedrenderloop_p.cpp \ moc_qsgwindowsrenderloop_p.cpp \ + moc_qsgdefaultlayer_p.cpp \ moc_qquickevents_p_p.cpp \ moc_qquickanchors_p.cpp \ moc_qquickaccessibleattached_p.cpp \ @@ -282,10 +336,10 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ moc_qquickfocusscope_p.cpp \ moc_qquickpainteditem.cpp \ moc_qquicktext_p.cpp \ - moc_qquicktext_p_p.cpp \ moc_qquicktextinput_p.cpp \ moc_qquicktextcontrol_p.cpp \ moc_qquicktextdocument.cpp \ + moc_qquicktextdocument_p.cpp \ moc_qquicktextedit_p.cpp \ moc_qquicktextutil_p.cpp \ moc_qquickimagebase_p.cpp \ @@ -319,14 +373,21 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ 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_qquickcanvasitem_p.cpp \ moc_qquickcanvascontext_p.cpp \ + moc_qquickcontext2d_p.cpp \ moc_qquickcontext2dtexture_p.cpp \ - moc_designerwindowmanager_p.cpp + moc_qquickdesignerwindowmanager_p.cpp # source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) # extracted from 'compiler_moc_source_make_all' rule @@ -334,11 +395,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 \ qquickwindow.moc \ qquickimage.moc \ qquickflipable.moc \ - qquickwindowmodule.moc \ + qquickframebufferobject.moc \ + qquickshadereffectnode.moc \ qquickshadereffectsource.moc diff --git a/repos/libports/lib/mk/qt5_script.mk b/repos/libports/lib/mk/qt5_script.mk deleted file mode 100644 index 42814c1ff..000000000 --- a/repos/libports/lib/mk/qt5_script.mk +++ /dev/null @@ -1,25 +0,0 @@ -include $(REP_DIR)/lib/import/import-qt5_script.mk - -SHARED_LIB = yes - -# use default warning level to avoid noise when compiling contrib code -CC_WARN = - -include $(REP_DIR)/lib/mk/qt5_script_generated.inc - -QT_INCPATH += qtscript/src/script/api \ - -# remove unneeded files to prevent moc warnings -COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT = \ - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES_FILTER_OUT = \ - -include $(REP_DIR)/lib/mk/qt5.inc - -INC_DIR += $(QT5_CONTRIB_DIR)/qtscript/include/QtScript/$(QT_VERSION)/QtScript \ - $(QT5_CONTRIB_DIR)/qtbase/include/QtCore/$(QT_VERSION)/QtCore \ - -LIBS += qt5_core pthread - -# see https://github.com/genodelabs/genode/issues/890 -REQUIRES += cxx11_fix diff --git a/repos/libports/lib/mk/qt5_script_generated.inc b/repos/libports/lib/mk/qt5_script_generated.inc deleted file mode 100644 index cd81bac2d..000000000 --- a/repos/libports/lib/mk/qt5_script_generated.inc +++ /dev/null @@ -1,266 +0,0 @@ -QT_DEFINES += -DQT_NO_LIBUDEV -DQT_NO_XCB -DQT_NO_XKBCOMMON -DJSC=QTJSC -Djscyyparse=qtjscyyparse -Djscyylex=qtjscyylex -Djscyyerror=qtjscyyerror -DWTF=QTWTF -DQT_NO_USING_NAMESPACE -DQLALR_NO_QSCRIPTGRAMMAR_DEBUG_INFO -DQT_BUILD_SCRIPT_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 -DLOG_DISABLED=1 -DBUILDING_QT__ -DBUILDING_JavaScriptCore -DBUILDING_WTF -DWTF_USE_JAVASCRIPTCORE_BINDINGS=1 -DWTF_CHANGES=1 -DNDEBUG -DJS_NO_EXPORT -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_CORE_LIB - -QT_INCPATH += \ - qtbase/include \ - qtbase/include/QtCore \ - qtbase/include/QtCore/5.1.0 \ - qtbase/include/QtCore/5.1.0/QtCore \ - qtbase/mkspecs/genode-g++ \ - qtscript/include \ - qtscript/include/QtScript \ - qtscript/include/QtScript/5.1.0 \ - qtscript/include/QtScript/5.1.0/QtScript \ - qtscript/src/3rdparty/javascriptcore \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/API \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/assembler \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/bytecode \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/debugger \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/ForwardingHeaders \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/generated \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/interpreter \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/jit \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/parser \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/pcre \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/profiler \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/runtime \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/tmp \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wrec \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/yarr \ - qtscript/src/3rdparty/javascriptcore/WebKit/qt/Api \ - qtscript/src/script \ - qtscript/src/script/../3rdparty/javascriptcore/JavaScriptCore/unicode \ - qtscript/src/script/parser \ - -QT_SOURCES += \ - pcre_compile.cpp \ - pcre_exec.cpp \ - pcre_tables.cpp \ - pcre_ucp_searchfuncs.cpp \ - pcre_xclass.cpp \ - JSBase.cpp \ - JSCallbackConstructor.cpp \ - JSCallbackFunction.cpp \ - JSCallbackObject.cpp \ - JSClassRef.cpp \ - JSContextRef.cpp \ - JSObjectRef.cpp \ - JSStringRef.cpp \ - JSValueRef.cpp \ - OpaqueJSString.cpp \ - ARMAssembler.cpp \ - MacroAssemblerARM.cpp \ - CodeBlock.cpp \ - JumpTable.cpp \ - Opcode.cpp \ - SamplingTool.cpp \ - StructureStubInfo.cpp \ - BytecodeGenerator.cpp \ - NodesCodegen.cpp \ - DebuggerActivation.cpp \ - DebuggerCallFrame.cpp \ - Debugger.cpp \ - CallFrame.cpp \ - Interpreter.cpp \ - RegisterFile.cpp \ - ExecutableAllocatorFixedVMPool.cpp \ - ExecutableAllocatorPosix.cpp \ - ExecutableAllocatorSymbian.cpp \ - ExecutableAllocatorWin.cpp \ - ExecutableAllocator.cpp \ - JITArithmetic.cpp \ - JITCall.cpp \ - JIT.cpp \ - JITOpcodes.cpp \ - JITPropertyAccess.cpp \ - JITStubs.cpp \ - Lexer.cpp \ - Nodes.cpp \ - ParserArena.cpp \ - Parser.cpp \ - Profile.cpp \ - ProfileGenerator.cpp \ - ProfileNode.cpp \ - Profiler.cpp \ - ArgList.cpp \ - Arguments.cpp \ - ArrayConstructor.cpp \ - ArrayPrototype.cpp \ - BooleanConstructor.cpp \ - BooleanObject.cpp \ - BooleanPrototype.cpp \ - CallData.cpp \ - Collector.cpp \ - CommonIdentifiers.cpp \ - Completion.cpp \ - ConstructData.cpp \ - DateConstructor.cpp \ - DateConversion.cpp \ - DateInstance.cpp \ - DatePrototype.cpp \ - ErrorConstructor.cpp \ - Error.cpp \ - ErrorInstance.cpp \ - ErrorPrototype.cpp \ - ExceptionHelpers.cpp \ - Executable.cpp \ - FunctionConstructor.cpp \ - FunctionPrototype.cpp \ - GetterSetter.cpp \ - GlobalEvalFunction.cpp \ - Identifier.cpp \ - InitializeThreading.cpp \ - InternalFunction.cpp \ - JSActivation.cpp \ - JSAPIValueWrapper.cpp \ - JSArray.cpp \ - JSByteArray.cpp \ - JSCell.cpp \ - JSFunction.cpp \ - JSGlobalData.cpp \ - JSGlobalObject.cpp \ - JSGlobalObjectFunctions.cpp \ - JSImmediate.cpp \ - JSLock.cpp \ - JSNotAnObject.cpp \ - JSNumberCell.cpp \ - JSObject.cpp \ - JSONObject.cpp \ - JSPropertyNameIterator.cpp \ - JSStaticScopeObject.cpp \ - JSString.cpp \ - JSValue.cpp \ - JSVariableObject.cpp \ - JSWrapperObject.cpp \ - LiteralParser.cpp \ - Lookup.cpp \ - MarkStackPosix.cpp \ - MarkStackSymbian.cpp \ - MarkStackWin.cpp \ - MarkStack.cpp \ - MathObject.cpp \ - NativeErrorConstructor.cpp \ - NativeErrorPrototype.cpp \ - NumberConstructor.cpp \ - NumberObject.cpp \ - NumberPrototype.cpp \ - ObjectConstructor.cpp \ - ObjectPrototype.cpp \ - Operations.cpp \ - PropertyDescriptor.cpp \ - PropertyNameArray.cpp \ - PropertySlot.cpp \ - PrototypeFunction.cpp \ - RegExpConstructor.cpp \ - RegExp.cpp \ - RegExpObject.cpp \ - RegExpPrototype.cpp \ - ScopeChain.cpp \ - SmallStrings.cpp \ - StringConstructor.cpp \ - StringObject.cpp \ - StringPrototype.cpp \ - StructureChain.cpp \ - Structure.cpp \ - TimeoutChecker.cpp \ - UString.cpp \ - UStringImpl.cpp \ - Assertions.cpp \ - ByteArray.cpp \ - CurrentTime.cpp \ - DateMath.cpp \ - dtoa.cpp \ - FastMalloc.cpp \ - HashTable.cpp \ - MainThread.cpp \ - MainThreadQt.cpp \ - ThreadingQt.cpp \ - RandomNumber.cpp \ - RefCountedLeakCounter.cpp \ - BlockAllocatorSymbian.cpp \ - RegisterFileAllocatorSymbian.cpp \ - ThreadingNone.cpp \ - Threading.cpp \ - TypeTraits.cpp \ - CollatorDefault.cpp \ - CollatorICU.cpp \ - UTF8.cpp \ - RegexCompiler.cpp \ - RegexInterpreter.cpp \ - RegexJIT.cpp \ - Grammar.cpp \ - TCSystemAlloc.cpp \ - qscriptclass.cpp \ - qscriptclasspropertyiterator.cpp \ - qscriptcontext.cpp \ - qscriptcontextinfo.cpp \ - qscriptengine.cpp \ - qscriptengineagent.cpp \ - qscriptextensionplugin.cpp \ - qscriptprogram.cpp \ - qscriptstring.cpp \ - qscriptvalue.cpp \ - qscriptvalueiterator.cpp \ - qscriptable.cpp \ - qscriptfunction.cpp \ - qscriptobject.cpp \ - qscriptclassobject.cpp \ - qscriptvariant.cpp \ - qscriptqobject.cpp \ - qscriptglobalobject.cpp \ - qscriptactivationobject.cpp \ - qscriptstaticscopeobject.cpp \ - qscriptdeclarativeobject.cpp \ - qscriptdeclarativeclass.cpp \ - qscriptast.cpp \ - qscriptastvisitor.cpp \ - qscriptgrammar.cpp \ - qscriptsyntaxchecker.cpp \ - qscriptlexer.cpp \ - moc_qscriptextensionplugin.cpp - -QT_VPATH += \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/API \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/assembler \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/bytecode \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/debugger \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/generated \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/interpreter \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/jit \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/parser \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/pcre \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/profiler \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/runtime \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode/icu \ - qtscript/src/3rdparty/javascriptcore/JavaScriptCore/yarr \ - qtscript/src/script/api \ - qtscript/src/script/bridge \ - qtscript/src/script/parser \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - moc_qscriptengine.cpp \ - moc_qscriptextensionplugin.cpp \ - moc_qscriptqobject_p.cpp - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - MainThreadQt.moc \ - ThreadingQt.moc - diff --git a/repos/libports/lib/mk/qt5_sql_generated.inc b/repos/libports/lib/mk/qt5_sql_generated.inc index a336ad8e9..6c7f77c57 100644 --- a/repos/libports/lib/mk/qt5_sql_generated.inc +++ b/repos/libports/lib/mk/qt5_sql_generated.inc @@ -1,15 +1,15 @@ -QT_DEFINES += -DQT_NO_LIBUDEV -DQT_NO_XCB -DQT_NO_XKBCOMMON -DQT_NO_USING_NAMESPACE -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_CAST_FROM_ASCII -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_CORE_LIB +QT_DEFINES += -DQT_NO_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_USING_NAMESPACE -DQT_NO_CAST_FROM_ASCII -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_INCPATH += \ - qtbase/include \ - qtbase/include/QtCore \ - qtbase/include/QtCore/5.1.0 \ - qtbase/include/QtCore/5.1.0/QtCore \ - qtbase/include/QtSql \ - qtbase/include/QtSql/5.1.0 \ - qtbase/include/QtSql/5.1.0/QtSql \ - qtbase/mkspecs/genode-g++ \ qtbase/src/sql \ + qtbase/include \ + qtbase/include/QtSql \ + qtbase/include/QtSql/5.6.2 \ + qtbase/include/QtSql/5.6.2/QtSql \ + qtbase/include/QtCore/5.6.2 \ + qtbase/include/QtCore/5.6.2/QtCore \ + qtbase/include/QtCore \ + qtbase/mkspecs/genode-g++ QT_SOURCES += \ qsqlquery.cpp \ diff --git a/repos/libports/lib/mk/qt5_ui_tools_generated.inc b/repos/libports/lib/mk/qt5_ui_tools_generated.inc index 37cc8de2c..14fb81620 100644 --- a/repos/libports/lib/mk/qt5_ui_tools_generated.inc +++ b/repos/libports/lib/mk/qt5_ui_tools_generated.inc @@ -1,20 +1,20 @@ -QT_DEFINES += -DQT_NO_LIBUDEV -DQT_NO_XCB -DQT_NO_XKBCOMMON -DQT_BUILD_UITOOLS_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 -DQFORMINTERNAL_NAMESPACE -DQT_DESIGNER_STATIC -DQT_DESIGNER -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB +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_INCPATH += \ - qtbase/include \ - qtbase/include/QtCore \ - qtbase/include/QtGui \ - qtbase/include/QtWidgets \ - qtbase/mkspecs/genode-g++ \ + qttools/src/designer/src/uitools \ + qttools/src/designer/src/lib/uilib \ qttools/include \ qttools/include/QtUiTools \ - qttools/include/QtUiTools/5.1.0 \ - qttools/include/QtUiTools/5.1.0/QtUiTools \ - qttools/src/designer/src/lib/uilib \ - qttools/src/designer/src/uitools \ + qttools/include/QtUiTools/5.6.2 \ + qttools/include/QtUiTools/5.6.2/QtUiTools \ + qtbase/include \ + qtbase/include/QtWidgets \ + qtbase/include/QtGui \ + qtbase/include/QtCore \ + qttools/include/QtUiPlugin \ + qtbase/mkspecs/genode-g++ QT_SOURCES += \ - quiloader.cpp \ abstractformbuilder.cpp \ formbuilder.cpp \ ui4.cpp \ @@ -22,8 +22,9 @@ QT_SOURCES += \ formbuilderextra.cpp \ resourcebuilder.cpp \ textbuilder.cpp \ - moc_quiloader.cpp \ - moc_properties_p.cpp + quiloader.cpp \ + moc_properties_p.cpp \ + moc_quiloader.cpp QT_VPATH += \ qttools/src/designer/src/lib/uilib \ @@ -36,8 +37,8 @@ QT_VPATH += \ # extracted from 'compiler_moc_header_make_all' target COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - moc_quiloader.cpp \ - moc_properties_p.cpp + moc_properties_p.cpp \ + moc_quiloader.cpp # source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) # extracted from 'compiler_moc_source_make_all' rule diff --git a/repos/libports/lib/mk/qt5_v8.mk b/repos/libports/lib/mk/qt5_v8.mk deleted file mode 100644 index 31c79fa75..000000000 --- a/repos/libports/lib/mk/qt5_v8.mk +++ /dev/null @@ -1,103 +0,0 @@ -include $(REP_DIR)/lib/import/import-qt5_v8.mk - -SHARED_LIB = yes - -# -# Generated files -# - -ifneq ($(call select_from_ports,qt5),) -all: $(QT5_PORT_DIR)/src/lib/qt5/qtjsbackend/generated/generated.tag -endif - -V8_DIR = $(QT5_CONTRIB_DIR)/qtjsbackend/src/v8/../3rdparty/v8 - -$(QT5_PORT_DIR)/src/lib/qt5/qtjsbackend/generated/generated.tag: - $(VERBOSE)mkdir -p $(dir $@) - $(VERBOSE)python $(V8_DIR)/tools/js2c.py $(dir $@)/experimental-libraries.cpp EXPERIMENTAL off $(V8_DIR)/src/macros.py $(V8_DIR)/src/proxy.js - $(VERBOSE)python $(V8_DIR)/tools/js2c.py $(dir $@)/libraries.cpp CORE off $(V8_DIR)/src/macros.py $(V8_DIR)/src/runtime.js $(V8_DIR)/src/v8natives.js $(V8_DIR)/src/array.js $(V8_DIR)/src/string.js $(V8_DIR)/src/uri.js $(V8_DIR)/src/math.js $(V8_DIR)/src/messages.js $(V8_DIR)/src/apinatives.js $(V8_DIR)/src/date.js $(V8_DIR)/src/regexp.js $(V8_DIR)/src/json.js $(V8_DIR)/src/liveedit-debugger.js $(V8_DIR)/src/mirror-debugger.js $(V8_DIR)/src/debug-debugger.js - - -include $(REP_DIR)/lib/mk/qt5_v8_generated.inc - -CC_OPT += -fpermissive - -CC_WARN = -Wno-unused-local-typedefs -Wno-maybe-uninitialized - -# -# Qt was configured for x86_64. -# If the Genode target architecture differs, the x86_64-files need to get removed first. -# -ifneq ($(filter-out $(SPECS),x86_64),) -QT_DEFINES += -UV8_TARGET_ARCH_X64 -QT_SOURCES_FILTER_OUT = \ - assembler-x64.cc \ - builtins-x64.cc \ - code-stubs-x64.cc \ - codegen-x64.cc \ - cpu-x64.cc \ - debug-x64.cc \ - deoptimizer-x64.cc \ - disasm-x64.cc \ - frames-x64.cc \ - full-codegen-x64.cc \ - ic-x64.cc \ - lithium-codegen-x64.cc \ - lithium-gap-resolver-x64.cc \ - lithium-x64.cc \ - macro-assembler-x64.cc \ - regexp-macro-assembler-x64.cc \ - stub-cache-x64.cc -ifeq ($(filter-out $(SPECS),x86_32),) -QT_DEFINES += -DV8_TARGET_ARCH_IA32 -QT_SOURCES += \ - assembler-ia32.cc \ - builtins-ia32.cc \ - code-stubs-ia32.cc \ - codegen-ia32.cc \ - cpu-ia32.cc \ - debug-ia32.cc \ - deoptimizer-ia32.cc \ - disasm-ia32.cc \ - frames-ia32.cc \ - full-codegen-ia32.cc \ - ic-ia32.cc \ - lithium-codegen-ia32.cc \ - lithium-gap-resolver-ia32.cc \ - lithium-ia32.cc \ - macro-assembler-ia32.cc \ - regexp-macro-assembler-ia32.cc \ - stub-cache-ia32.cc -QT_VPATH += qtjsbackend/src/3rdparty/v8/src/ia32 -else -ifeq ($(filter-out $(SPECS),arm),) -QT_DEFINES += -DV8_TARGET_ARCH_ARM -QT_SOURCES += \ - assembler-arm.cc \ - builtins-arm.cc \ - code-stubs-arm.cc \ - codegen-arm.cc \ - constants-arm.cc \ - cpu-arm.cc \ - debug-arm.cc \ - deoptimizer-arm.cc \ - disasm-arm.cc \ - frames-arm.cc \ - full-codegen-arm.cc \ - ic-arm.cc \ - lithium-codegen-arm.cc \ - lithium-gap-resolver-arm.cc \ - lithium-arm.cc \ - macro-assembler-arm.cc \ - regexp-macro-assembler-arm.cc \ - stub-cache-arm.cc -QT_VPATH += qtjsbackend/src/3rdparty/v8/src/arm -endif -endif -endif - -QT_VPATH += qtjsbackend/generated - -include $(REP_DIR)/lib/mk/qt5.inc - -LIBS += qt5_network diff --git a/repos/libports/lib/mk/qt5_v8_generated.inc b/repos/libports/lib/mk/qt5_v8_generated.inc deleted file mode 100644 index 14fdc5df2..000000000 --- a/repos/libports/lib/mk/qt5_v8_generated.inc +++ /dev/null @@ -1,161 +0,0 @@ -QT_DEFINES += -DQT_NO_LIBUDEV -DQT_NO_XCB -DQT_NO_XKBCOMMON -DQT_BUILD_V8_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 -DV8_SHARED -DBUILDING_V8_SHARED -DENABLE_DEBUGGER_SUPPORT -DENABLE_VMSTATE_TRACKING -DENABLE_LOGGING_AND_PROFILING -DNDEBUG -DV8_TARGET_ARCH_X64 -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG - -QT_INCPATH += \ - qtbase/mkspecs/genode-g++ \ - qtjsbackend/include \ - qtjsbackend/include/QtV8 \ - qtjsbackend/include/QtV8/5.1.0 \ - qtjsbackend/include/QtV8/5.1.0/QtV8 \ - qtjsbackend/src/3rdparty/v8/src \ - qtjsbackend/src/v8 \ - -QT_SOURCES += \ - accessors.cc \ - allocation.cc \ - api.cc \ - assembler.cc \ - ast.cc \ - atomicops_internals_x86_gcc.cc \ - bignum.cc \ - bignum-dtoa.cc \ - bootstrapper.cc \ - builtins.cc \ - cached-powers.cc \ - checks.cc \ - circular-queue.cc \ - code-stubs.cc \ - codegen.cc \ - compilation-cache.cc \ - compiler.cc \ - contexts.cc \ - conversions.cc \ - counters.cc \ - cpu-profiler.cc \ - data-flow.cc \ - date.cc \ - dateparser.cc \ - debug-agent.cc \ - debug.cc \ - deoptimizer.cc \ - disassembler.cc \ - diy-fp.cc \ - dtoa.cc \ - elements.cc \ - elements-kind.cc \ - execution.cc \ - factory.cc \ - flags.cc \ - frames.cc \ - full-codegen.cc \ - func-name-inferrer.cc \ - gdb-jit.cc \ - global-handles.cc \ - fast-dtoa.cc \ - fixed-dtoa.cc \ - handles.cc \ - heap-profiler.cc \ - heap.cc \ - hydrogen.cc \ - hydrogen-instructions.cc \ - ic.cc \ - incremental-marking.cc \ - inspector.cc \ - interface.cc \ - interpreter-irregexp.cc \ - isolate.cc \ - jsregexp.cc \ - lithium-allocator.cc \ - lithium.cc \ - liveedit.cc \ - liveobjectlist.cc \ - log-utils.cc \ - log.cc \ - mark-compact.cc \ - messages.cc \ - objects.cc \ - objects-printer.cc \ - objects-visiting.cc \ - once.cc \ - optimizing-compiler-thread.cc \ - parser.cc \ - preparser.cc \ - preparse-data.cc \ - profile-generator.cc \ - property.cc \ - regexp-macro-assembler-irregexp.cc \ - regexp-macro-assembler.cc \ - regexp-stack.cc \ - rewriter.cc \ - runtime.cc \ - runtime-profiler.cc \ - safepoint-table.cc \ - scanner.cc \ - scanner-character-streams.cc \ - scopeinfo.cc \ - scopes.cc \ - serialize.cc \ - snapshot-common.cc \ - spaces.cc \ - string-search.cc \ - string-stream.cc \ - strtod.cc \ - stub-cache.cc \ - token.cc \ - transitions.cc \ - type-info.cc \ - unicode.cc \ - utils.cc \ - v8-counters.cc \ - v8.cc \ - v8conversions.cc \ - v8threads.cc \ - v8utils.cc \ - variables.cc \ - version.cc \ - store-buffer.cc \ - zone.cc \ - externalize-string-extension.cc \ - gc-extension.cc \ - statistics-extension.cc \ - assembler-x64.cc \ - builtins-x64.cc \ - code-stubs-x64.cc \ - codegen-x64.cc \ - cpu-x64.cc \ - debug-x64.cc \ - deoptimizer-x64.cc \ - disasm-x64.cc \ - frames-x64.cc \ - full-codegen-x64.cc \ - ic-x64.cc \ - lithium-codegen-x64.cc \ - lithium-gap-resolver-x64.cc \ - lithium-x64.cc \ - macro-assembler-x64.cc \ - regexp-macro-assembler-x64.cc \ - stub-cache-x64.cc \ - platform-genode.cc \ - platform-posix.cc \ - objects-debug.cc \ - prettyprinter.cc \ - regexp-macro-assembler-tracer.cc \ - snapshot-empty.cc \ - libraries.cpp \ - experimental-libraries.cpp - -QT_VPATH += \ - qtjsbackend/src/3rdparty/v8/src \ - qtjsbackend/src/3rdparty/v8/src/extensions \ - qtjsbackend/src/3rdparty/v8/src/x64 \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) -# extracted from 'compiler_moc_header_make_all' target - - -# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) -# extracted from 'compiler_moc_source_make_all' rule - - diff --git a/repos/libports/lib/mk/qt5_version.inc b/repos/libports/lib/mk/qt5_version.inc index a1671738c..c8fdaf5b4 100644 --- a/repos/libports/lib/mk/qt5_version.inc +++ b/repos/libports/lib/mk/qt5_version.inc @@ -1,2 +1,2 @@ -QT_VERSION := 5.1.0 +QT_VERSION := 5.6.2 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 0e3b0fb6c..4c765884d 100644 --- a/repos/libports/lib/mk/qt5_webcore.mk +++ b/repos/libports/lib/mk/qt5_webcore.mk @@ -19,8 +19,9 @@ QT_INCPATH := qtwebkit/Source/WebCore/dom # # Generated files # -# some of the following lines have been extracted from Makefiles (and modified afterwards), -# that's why they can be quite long +# some of the following lines have been extracted from the console output +# of the 'configure' script (with modifications), that's why they can be +# quite long # ifneq ($(call select_from_ports,qt5),) @@ -31,12 +32,15 @@ endif DEL_FILE := rm MOVE := mv -DEFINES = "LANGUAGE_JAVASCRIPT=1 ENABLE_3D_RENDERING=1 ENABLE_BLOB=1 ENABLE_CHANNEL_MESSAGING=1 ENABLE_CSS_BOX_DECORATION_BREAK=1 ENABLE_CSS_COMPOSITING=1 ENABLE_CSS_EXCLUSIONS=1 ENABLE_CSS_FILTERS=1 ENABLE_CSS_IMAGE_SET=1 ENABLE_CSS_REGIONS=1 ENABLE_CSS_STICKY_POSITION=1 ENABLE_DATALIST_ELEMENT=1 ENABLE_DETAILS_ELEMENT=1 ENABLE_FAST_MOBILE_SCROLLING=1 ENABLE_FILTERS=1 ENABLE_FTPDIR=1 ENABLE_GESTURE_EVENTS=1 ENABLE_ICONDATABASE=1 ENABLE_IFRAME_SEAMLESS=1 ENABLE_INPUT_TYPE_COLOR=1 ENABLE_INSPECTOR=1 ENABLE_INSPECTOR_SERVER=1 ENABLE_JAVASCRIPT_DEBUGGER=1 ENABLE_LEGACY_NOTIFICATIONS=1 ENABLE_LEGACY_VIEWPORT_ADAPTION=1 ENABLE_LEGACY_VENDOR_PREFIXES=1 ENABLE_LINK_PREFETCH=1 ENABLE_METER_ELEMENT=1 ENABLE_MHTML=1 ENABLE_MUTATION_OBSERVERS=1 ENABLE_NOTIFICATIONS=1 ENABLE_PAGE_VISIBILITY_API=1 ENABLE_PROGRESS_ELEMENT=1 ENABLE_RESOLUTION_MEDIA_QUERY=1 ENABLE_REQUEST_ANIMATION_FRAME=1 ENABLE_SHARED_WORKERS=1 ENABLE_SMOOTH_SCROLLING=1 ENABLE_SQL_DATABASE=1 ENABLE_SVG=1 ENABLE_SVG_FONTS=1 ENABLE_TOUCH_ADJUSTMENT=1 ENABLE_TOUCH_EVENTS=1 ENABLE_WEB_SOCKETS=1 ENABLE_WEB_TIMING=1 ENABLE_WORKERS=1 ENABLE_XHR_TIMEOUT=1 ENABLE_TOUCH_SLIDER=1 ENABLE_ACCELERATED_2D_CANVAS=0 ENABLE_ANIMATION_API=0 ENABLE_BATTERY_STATUS=0 ENABLE_CSP_NEXT=0 ENABLE_CSS_GRID_LAYOUT=0 ENABLE_CSS_HIERARCHIES=0 ENABLE_CSS_IMAGE_ORIENTATION=0 ENABLE_CSS_IMAGE_RESOLUTION=0 ENABLE_CSS_SHADERS=0 ENABLE_CSS_VARIABLES=0 ENABLE_CSS3_BACKGROUND=0 ENABLE_CSS3_CONDITIONAL_RULES=0 ENABLE_CSS3_TEXT=0 ENABLE_DASHBOARD_SUPPORT=0 ENABLE_DATAGRID=0 ENABLE_DATA_TRANSFER_ITEMS=0 ENABLE_DEVICE_ORIENTATION=0 ENABLE_DIRECTORY_UPLOAD=0 ENABLE_DOWNLOAD_ATTRIBUTE=0 ENABLE_FILE_SYSTEM=0 ENABLE_FULLSCREEN_API=0 ENABLE_GAMEPAD=0 ENABLE_GEOLOCATION=0 ENABLE_HIGH_DPI_CANVAS=0 ENABLE_INDEXED_DATABASE=0 ENABLE_INPUT_SPEECH=0 ENABLE_INPUT_TYPE_DATE=0 ENABLE_INPUT_TYPE_DATETIME=0 ENABLE_INPUT_TYPE_DATETIMELOCAL=0 ENABLE_INPUT_TYPE_MONTH=0 ENABLE_INPUT_TYPE_TIME=0 ENABLE_INPUT_TYPE_WEEK=0 ENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 ENABLE_LINK_PRERENDER=0 ENABLE_MATHML=0 ENABLE_MEDIA_SOURCE=0 ENABLE_MEDIA_STATISTICS=0 ENABLE_MEDIA_STREAM=0 ENABLE_MICRODATA=0 ENABLE_NAVIGATOR_CONTENT_UTILS=0 ENABLE_NETSCAPE_PLUGIN_API=0 ENABLE_NETWORK_INFO=0 ENABLE_ORIENTATION_EVENTS=0 ENABLE_PROXIMITY_EVENTS=0 ENABLE_QUOTA=0 ENABLE_SCRIPTED_SPEECH=0 ENABLE_SHADOW_DOM=0 ENABLE_STYLE_SCOPED=0 ENABLE_SVG_DOM_OBJC_BINDINGS=0 ENABLE_TEXT_AUTOSIZING=0 ENABLE_TEXT_NOTIFICATIONS_ONLY=0 ENABLE_TOUCH_ICON_LOADING=0 ENABLE_VIBRATION=0 ENABLE_VIDEO=0 ENABLE_VIDEO_TRACK=0 ENABLE_WEBGL=0 ENABLE_WEB_AUDIO=0 ENABLE_XSLT=0" -EXTRA_DEFINES = "QT_NO_LIBUDEV QT_NO_XCB QT_NO_XKBCOMMON ENABLE_3D_RENDERING=1 ENABLE_BLOB=1 ENABLE_CHANNEL_MESSAGING=1 ENABLE_CSS_BOX_DECORATION_BREAK=1 ENABLE_CSS_COMPOSITING=1 ENABLE_CSS_EXCLUSIONS=1 ENABLE_CSS_FILTERS=1 ENABLE_CSS_IMAGE_SET=1 ENABLE_CSS_REGIONS=1 ENABLE_CSS_STICKY_POSITION=1 ENABLE_DATALIST_ELEMENT=1 ENABLE_DETAILS_ELEMENT=1 ENABLE_FAST_MOBILE_SCROLLING=1 ENABLE_FILTERS=1 ENABLE_FTPDIR=1 ENABLE_GESTURE_EVENTS=1 ENABLE_ICONDATABASE=1 ENABLE_IFRAME_SEAMLESS=1 ENABLE_INPUT_TYPE_COLOR=1 ENABLE_INSPECTOR=1 ENABLE_INSPECTOR_SERVER=1 ENABLE_JAVASCRIPT_DEBUGGER=1 ENABLE_LEGACY_NOTIFICATIONS=1 ENABLE_LEGACY_VIEWPORT_ADAPTION=1 ENABLE_LEGACY_VENDOR_PREFIXES=1 ENABLE_LINK_PREFETCH=1 ENABLE_METER_ELEMENT=1 ENABLE_MHTML=1 ENABLE_MUTATION_OBSERVERS=1 ENABLE_NOTIFICATIONS=1 ENABLE_PAGE_VISIBILITY_API=1 ENABLE_PROGRESS_ELEMENT=1 ENABLE_RESOLUTION_MEDIA_QUERY=1 ENABLE_REQUEST_ANIMATION_FRAME=1 ENABLE_SHARED_WORKERS=1 ENABLE_SMOOTH_SCROLLING=1 ENABLE_SQL_DATABASE=1 ENABLE_SVG=1 ENABLE_SVG_FONTS=1 ENABLE_TOUCH_ADJUSTMENT=1 ENABLE_TOUCH_EVENTS=1 ENABLE_WEB_SOCKETS=1 ENABLE_WEB_TIMING=1 ENABLE_WORKERS=1 ENABLE_XHR_TIMEOUT=1 WTF_USE_TILED_BACKING_STORE=1 HAVE_QTPRINTSUPPORT=1 HAVE_QSTYLE=1 HAVE_QTTESTLIB=1 WTF_USE_LIBJPEG=1 WTF_USE_LIBPNG=1 PLUGIN_ARCHITECTURE_UNSUPPORTED=1 ENABLE_TOUCH_SLIDER=1 ENABLE_ACCELERATED_2D_CANVAS=0 ENABLE_ANIMATION_API=0 ENABLE_BATTERY_STATUS=0 ENABLE_CSP_NEXT=0 ENABLE_CSS_GRID_LAYOUT=0 ENABLE_CSS_HIERARCHIES=0 ENABLE_CSS_IMAGE_ORIENTATION=0 ENABLE_CSS_IMAGE_RESOLUTION=0 ENABLE_CSS_SHADERS=0 ENABLE_CSS_VARIABLES=0 ENABLE_CSS3_BACKGROUND=0 ENABLE_CSS3_CONDITIONAL_RULES=0 ENABLE_CSS3_TEXT=0 ENABLE_DASHBOARD_SUPPORT=0 ENABLE_DATAGRID=0 ENABLE_DATA_TRANSFER_ITEMS=0 ENABLE_DEVICE_ORIENTATION=0 ENABLE_DIRECTORY_UPLOAD=0 ENABLE_DOWNLOAD_ATTRIBUTE=0 ENABLE_FILE_SYSTEM=0 ENABLE_FULLSCREEN_API=0 ENABLE_GAMEPAD=0 ENABLE_GEOLOCATION=0 ENABLE_HIGH_DPI_CANVAS=0 ENABLE_INDEXED_DATABASE=0 ENABLE_INPUT_SPEECH=0 ENABLE_INPUT_TYPE_DATE=0 ENABLE_INPUT_TYPE_DATETIME=0 ENABLE_INPUT_TYPE_DATETIMELOCAL=0 ENABLE_INPUT_TYPE_MONTH=0 ENABLE_INPUT_TYPE_TIME=0 ENABLE_INPUT_TYPE_WEEK=0 ENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 ENABLE_LINK_PRERENDER=0 ENABLE_MATHML=0 ENABLE_MEDIA_SOURCE=0 ENABLE_MEDIA_STATISTICS=0 ENABLE_MEDIA_STREAM=0 ENABLE_MICRODATA=0 ENABLE_NAVIGATOR_CONTENT_UTILS=0 ENABLE_NETSCAPE_PLUGIN_API=0 ENABLE_NETWORK_INFO=0 ENABLE_ORIENTATION_EVENTS=0 ENABLE_PROXIMITY_EVENTS=0 ENABLE_QUOTA=0 ENABLE_SCRIPTED_SPEECH=0 ENABLE_SHADOW_DOM=0 ENABLE_STYLE_SCOPED=0 ENABLE_SVG_DOM_OBJC_BINDINGS=0 ENABLE_TEXT_AUTOSIZING=0 ENABLE_TEXT_NOTIFICATIONS_ONLY=0 ENABLE_TOUCH_ICON_LOADING=0 ENABLE_VIBRATION=0 ENABLE_VIDEO=0 ENABLE_VIDEO_TRACK=0 ENABLE_WEBGL=0 ENABLE_WEB_AUDIO=0 ENABLE_XSLT=0" -GENERATE_BINDINGS_PL = $(VERBOSE)export "SOURCE_ROOT=$(WEBCORE_DIR)" && perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/bindings/scripts/generate-bindings.pl --defines $(DEFINES) --generator JS --include Modules/filesystem --include Modules/geolocation --include Modules/indexeddb --include Modules/mediasource --include Modules/notifications --include Modules/quota --include Modules/webaudio --include Modules/webdatabase --include Modules/websockets --include css --include dom --include editing --include fileapi --include html --include html/canvas --include html/shadow --include html/track --include inspector --include loader/appcache --include page --include plugins --include storage --include svg --include testing --include workers --include xml --outputDir $(dir $@) --supplementalDependencyFile $(dir $@)/supplemental_dependency.tmp --preprocessor "$(MOC) -E" -# the absolute path is needed for makeprop.pl WEBCORE_DIR = $(QT5_CONTRIB_DIR)/qtwebkit/Source/WebCore +DEFINES = "LANGUAGE_JAVASCRIPT=1 ENABLE_3D_RENDERING=1 ENABLE_ACCELERATED_2D_CANVAS=1 ENABLE_BLOB=1 ENABLE_CANVAS_PATH=1 ENABLE_CHANNEL_MESSAGING=1 ENABLE_CSS_BOX_DECORATION_BREAK=1 ENABLE_CSS_COMPOSITING=1 ENABLE_CSS_EXCLUSIONS=1 ENABLE_CSS_FILTERS=1 ENABLE_CSS_IMAGE_SET=1 ENABLE_CSS_REGIONS=1 ENABLE_CSS_SHAPES=1 ENABLE_CSS_STICKY_POSITION=1 ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=1 ENABLE_DATALIST_ELEMENT=1 ENABLE_DETAILS_ELEMENT=1 ENABLE_DOWNLOAD_ATTRIBUTE=1 ENABLE_FAST_MOBILE_SCROLLING=1 ENABLE_FILTERS=1 ENABLE_FTPDIR=1 ENABLE_FULLSCREEN_API=1 ENABLE_GESTURE_EVENTS=1 ENABLE_ICONDATABASE=1 ENABLE_IFRAME_SEAMLESS=1 ENABLE_INPUT_TYPE_COLOR=1 ENABLE_INSPECTOR=1 ENABLE_INSPECTOR_SERVER=1 ENABLE_JAVASCRIPT_DEBUGGER=1 ENABLE_LEGACY_NOTIFICATIONS=1 ENABLE_LEGACY_VIEWPORT_ADAPTION=1 ENABLE_LEGACY_VENDOR_PREFIXES=1 ENABLE_LEGACY_WEB_AUDIO=1 ENABLE_LINK_PREFETCH=1 ENABLE_METER_ELEMENT=1 ENABLE_MHTML=1 ENABLE_NOTIFICATIONS=1 ENABLE_PAGE_VISIBILITY_API=1 ENABLE_PROGRESS_ELEMENT=1 ENABLE_RESOLUTION_MEDIA_QUERY=1 ENABLE_REQUEST_ANIMATION_FRAME=1 ENABLE_SHARED_WORKERS=1 ENABLE_SMOOTH_SCROLLING=1 ENABLE_SQL_DATABASE=1 ENABLE_SUBPIXEL_LAYOUT=1 ENABLE_SVG=1 ENABLE_SVG_FONTS=1 ENABLE_TOUCH_ADJUSTMENT=1 ENABLE_TOUCH_EVENTS=1 ENABLE_TOUCH_SLIDER=1 ENABLE_VIEW_MODE_CSS_MEDIA=1 ENABLE_WEB_SOCKETS=1 ENABLE_WEB_TIMING=1 ENABLE_WORKERS=1 ENABLE_XHR_TIMEOUT=1 ENABLE_WEBGL=1" +EXTRA_DEFINES = "QT_NO_MTDEV QT_NO_LIBUDEV QT_NO_TSLIB QT_NO_LIBINPUT ENABLE_3D_RENDERING=1 ENABLE_ACCELERATED_2D_CANVAS=1 ENABLE_BLOB=1 ENABLE_CANVAS_PATH=1 ENABLE_CHANNEL_MESSAGING=1 ENABLE_CSS_BOX_DECORATION_BREAK=1 ENABLE_CSS_COMPOSITING=1 ENABLE_CSS_EXCLUSIONS=1 ENABLE_CSS_FILTERS=1 ENABLE_CSS_IMAGE_SET=1 ENABLE_CSS_REGIONS=1 ENABLE_CSS_SHAPES=1 ENABLE_CSS_STICKY_POSITION=1 ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=1 ENABLE_DATALIST_ELEMENT=1 ENABLE_DETAILS_ELEMENT=1 ENABLE_DOWNLOAD_ATTRIBUTE=1 ENABLE_FAST_MOBILE_SCROLLING=1 ENABLE_FILTERS=1 ENABLE_FTPDIR=1 ENABLE_FULLSCREEN_API=1 ENABLE_GESTURE_EVENTS=1 ENABLE_ICONDATABASE=1 ENABLE_IFRAME_SEAMLESS=1 ENABLE_INPUT_TYPE_COLOR=1 ENABLE_INSPECTOR=1 ENABLE_INSPECTOR_SERVER=1 ENABLE_JAVASCRIPT_DEBUGGER=1 ENABLE_LEGACY_NOTIFICATIONS=1 ENABLE_LEGACY_VIEWPORT_ADAPTION=1 ENABLE_LEGACY_VENDOR_PREFIXES=1 ENABLE_LEGACY_WEB_AUDIO=1 ENABLE_LINK_PREFETCH=1 ENABLE_METER_ELEMENT=1 ENABLE_MHTML=1 ENABLE_NOTIFICATIONS=1 ENABLE_PAGE_VISIBILITY_API=1 ENABLE_PROGRESS_ELEMENT=1 ENABLE_RESOLUTION_MEDIA_QUERY=1 ENABLE_REQUEST_ANIMATION_FRAME=1 ENABLE_SHARED_WORKERS=1 ENABLE_SMOOTH_SCROLLING=1 ENABLE_SQL_DATABASE=1 ENABLE_SUBPIXEL_LAYOUT=1 ENABLE_SVG=1 ENABLE_SVG_FONTS=1 ENABLE_TOUCH_ADJUSTMENT=1 ENABLE_TOUCH_EVENTS=1 ENABLE_TOUCH_SLIDER=1 ENABLE_VIEW_MODE_CSS_MEDIA=1 ENABLE_WEB_SOCKETS=1 ENABLE_WEB_TIMING=1 ENABLE_WORKERS=1 ENABLE_XHR_TIMEOUT=1 WTF_USE_TILED_BACKING_STORE=1 WTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=1 HAVE_QTQUICK=1 HAVE_QTPRINTSUPPORT=1 HAVE_QSTYLE=1 HAVE_QTTESTLIB=1 WTF_USE_LIBJPEG=1 WTF_USE_LIBPNG=1 PLUGIN_ARCHITECTURE_UNSUPPORTED=1 WTF_USE_3D_GRAPHICS=1 ENABLE_WEBGL=1 ENABLE_BATTERY_STATUS=0 ENABLE_CANVAS_PROXY=0 ENABLE_CSP_NEXT=0 ENABLE_CSS_GRID_LAYOUT=0 ENABLE_CSS_HIERARCHIES=0 ENABLE_CSS_IMAGE_ORIENTATION=0 ENABLE_CSS_IMAGE_RESOLUTION=0 ENABLE_CSS_SHADERS=0 ENABLE_CSS_VARIABLES=0 ENABLE_CSS3_CONDITIONAL_RULES=0 ENABLE_CSS3_TEXT=0 ENABLE_CSS3_TEXT_LINE_BREAK=0 ENABLE_DASHBOARD_SUPPORT=0 ENABLE_DATAGRID=0 ENABLE_DATA_TRANSFER_ITEMS=0 ENABLE_DEVICE_ORIENTATION=0 ENABLE_DIRECTORY_UPLOAD=0 ENABLE_FILE_SYSTEM=0 ENABLE_FONT_LOAD_EVENTS=0 ENABLE_GAMEPAD=0 ENABLE_GEOLOCATION=0 ENABLE_HIGH_DPI_CANVAS=0 ENABLE_INDEXED_DATABASE=0 ENABLE_INPUT_SPEECH=0 ENABLE_INPUT_TYPE_DATE=0 ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE=0 ENABLE_INPUT_TYPE_DATETIMELOCAL=0 ENABLE_INPUT_TYPE_MONTH=0 ENABLE_INPUT_TYPE_TIME=0 ENABLE_INPUT_TYPE_WEEK=0 ENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 ENABLE_MATHML=0 ENABLE_MEDIA_SOURCE=0 ENABLE_MEDIA_STATISTICS=0 ENABLE_MEDIA_STREAM=0 ENABLE_MICRODATA=0 ENABLE_MOUSE_CURSOR_SCALE=0 ENABLE_NAVIGATOR_CONTENT_UTILS=0 ENABLE_NETSCAPE_PLUGIN_API=0 ENABLE_NETWORK_INFO=0 ENABLE_NOSNIFF=0 ENABLE_ORIENTATION_EVENTS=0 ENABLE_PROXIMITY_EVENTS=0 ENABLE_QUOTA=0 ENABLE_RESOURCE_TIMING=0 ENABLE_SCRIPTED_SPEECH=0 ENABLE_SECCOMP_FILTERS=0 ENABLE_SHADOW_DOM=0 ENABLE_STYLE_SCOPED=0 ENABLE_TEMPLATE_ELEMENT=0 ENABLE_TEXT_AUTOSIZING=0 ENABLE_THREADED_HTML_PARSER=0 ENABLE_TOUCH_ICON_LOADING=0 ENABLE_USER_TIMING=0 ENABLE_VIBRATION=0 ENABLE_VIDEO=0 ENABLE_VIDEO_TRACK=0 ENABLE_WEB_AUDIO=0 ENABLE_XSLT=0" +GENERATE_BINDINGS_PL = export "SOURCE_ROOT=$(WEBCORE_DIR)" && perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/bindings/scripts/generate-bindings.pl --defines $(DEFINES) --generator JS --include Modules/filesystem --include Modules/geolocation --include Modules/indexeddb --include Modules/mediasource --include Modules/notifications --include Modules/quota --include Modules/webaudio --include Modules/webdatabase --include Modules/websockets --include css --include dom --include editing --include fileapi --include html --include html/canvas --include html/shadow --include html/track --include inspector --include loader/appcache --include page --include plugins --include storage --include svg --include testing --include workers --include xml --outputDir $(dir $@) --supplementalDependencyFile $(dir $@)/supplemental_dependency.tmp --idlAttributesFile $(WEBCORE_DIR)/bindings/scripts/IDLAttributes.txt --preprocessor "$(MOC) -E" +# The directory with the generated files must be added for the Genode build +# system, because it is not a subdirectory of the current directory. +GENERATE_BINDINGS_PL += --include $(dir $@) + # make the 'HOST_TOOLS' variable known include $(REP_DIR)/lib/mk/qt5_host_tools.mk @@ -44,599 +48,68 @@ $(QT5_PORT_DIR)/src/lib/qt5/qtwebkit/Source/WebCore/generated/generated.tag: $(H $(VERBOSE)mkdir -p $(dir $@) - $(VERBOSE)bison -d -p xpathyy $(WEBCORE_DIR)/xml/XPathGrammar.y -o $(dir $@)/XPathGrammar.tab.c && $(MOVE) $(dir $@)/XPathGrammar.tab.c $(dir $@)/XPathGrammar.cpp && $(MOVE) $(dir $@)/XPathGrammar.tab.h $(dir $@)/XPathGrammar.h - - @# preprocess-idls.pl - $(VERBOSE)sed -e "s,^,$(QT5_CONTRIB_DIR)/,g" $(REP_DIR)/src/lib/qt5/qtwebkit/Source/WebCore/idl_files > $(dir $@)/idl_files.tmp - $(VERBOSE)touch $(dir $@)/supplemental_dependency.tmp - $(VERBOSE)export "QT5_CONTRIB_DIR=$(QT5_CONTRIB_DIR)" && perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/bindings/scripts/preprocess-idls.pl --defines $(DEFINES) --idlFilesList $(dir $@)/idl_files.tmp --supplementalDependencyFile $(dir $@)/supplemental_dependency.tmp --idlAttributesFile $(WEBCORE_DIR)/bindings/scripts/IDLAttributes.txt --preprocessor "$(MOC) -E" - - @# generate-bindings.pl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/filesystem/DOMFileSystem.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/filesystem/DOMFileSystemSync.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/filesystem/DOMWindowFileSystem.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/filesystem/DirectoryEntry.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/filesystem/DirectoryEntrySync.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/filesystem/DirectoryReader.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/filesystem/DirectoryReaderSync.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/filesystem/EntriesCallback.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/filesystem/Entry.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/filesystem/EntryArray.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/filesystem/EntryArraySync.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/filesystem/EntryCallback.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/filesystem/EntrySync.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/filesystem/ErrorCallback.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/filesystem/FileCallback.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/filesystem/FileEntry.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/filesystem/FileEntrySync.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/filesystem/FileSystemCallback.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/filesystem/FileWriter.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/filesystem/FileWriterCallback.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/filesystem/Metadata.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/filesystem/MetadataCallback.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/filesystem/WorkerContextFileSystem.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/geolocation/Geolocation.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/geolocation/Geoposition.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/geolocation/NavigatorGeolocation.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/geolocation/PositionCallback.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/geolocation/PositionError.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/geolocation/PositionErrorCallback.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/indexeddb/DOMWindowIndexedDatabase.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/indexeddb/IDBAny.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/indexeddb/IDBCursor.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/indexeddb/IDBDatabaseException.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/indexeddb/IDBDatabase.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/indexeddb/IDBFactory.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/indexeddb/IDBIndex.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/indexeddb/IDBKey.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/indexeddb/IDBKeyRange.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/indexeddb/IDBObjectStore.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/indexeddb/IDBRequest.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/indexeddb/IDBTransaction.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/indexeddb/WorkerContextIndexedDatabase.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/notifications/DOMWindowNotifications.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/notifications/Notification.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/notifications/NotificationCenter.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/notifications/NotificationPermissionCallback.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/notifications/WorkerContextNotifications.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/quota/DOMWindowQuota.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/quota/StorageInfo.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/quota/StorageInfoErrorCallback.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/quota/StorageInfoQuotaCallback.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/quota/StorageInfoUsageCallback.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webaudio/AudioBuffer.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webaudio/AudioBufferCallback.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webaudio/AudioBufferSourceNode.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webaudio/ChannelMergerNode.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webaudio/ChannelSplitterNode.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webaudio/AudioContext.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webaudio/AudioDestinationNode.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webaudio/AudioGain.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webaudio/GainNode.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webaudio/AudioListener.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webaudio/AudioNode.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webaudio/PannerNode.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webaudio/AudioParam.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webaudio/AudioProcessingEvent.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webaudio/AudioSourceNode.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webaudio/BiquadFilterNode.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webaudio/ConvolverNode.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webaudio/DelayNode.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webaudio/DOMWindowWebAudio.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webaudio/DynamicsCompressorNode.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webaudio/ScriptProcessorNode.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webaudio/MediaElementAudioSourceNode.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webaudio/MediaStreamAudioSourceNode.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webaudio/OfflineAudioCompletionEvent.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webaudio/OscillatorNode.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webaudio/AnalyserNode.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webaudio/WaveShaperNode.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webaudio/WaveTable.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webdatabase/DOMWindowWebDatabase.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webdatabase/Database.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webdatabase/DatabaseCallback.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webdatabase/DatabaseSync.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webdatabase/SQLError.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webdatabase/SQLException.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webdatabase/SQLResultSet.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webdatabase/SQLResultSetRowList.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webdatabase/SQLStatementCallback.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webdatabase/SQLStatementErrorCallback.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webdatabase/SQLTransaction.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webdatabase/SQLTransactionCallback.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webdatabase/SQLTransactionErrorCallback.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webdatabase/SQLTransactionSync.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webdatabase/SQLTransactionSyncCallback.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/webdatabase/WorkerContextWebDatabase.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/websockets/CloseEvent.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/websockets/DOMWindowWebSocket.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/websockets/WebSocket.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/Modules/websockets/WorkerContextWebSocket.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/css/Counter.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/css/CSSCharsetRule.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/css/CSSFontFaceRule.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/css/CSSImportRule.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/css/CSSMediaRule.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/css/CSSPageRule.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/css/CSSPrimitiveValue.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/css/CSSRule.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/css/CSSRuleList.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/css/CSSStyleDeclaration.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/css/CSSStyleRule.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/css/CSSStyleSheet.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/css/CSSValue.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/css/CSSValueList.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/css/MediaList.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/css/MediaQueryList.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/css/Rect.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/css/RGBColor.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/css/StyleMedia.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/css/StyleSheet.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/css/StyleSheetList.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/css/WebKitCSSFilterValue.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/css/WebKitCSSKeyframeRule.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/css/WebKitCSSKeyframesRule.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/css/WebKitCSSMatrix.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/css/WebKitCSSMixFunctionValue.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/css/WebKitCSSRegionRule.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/css/WebKitCSSTransformValue.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/css/WebKitCSSViewportRule.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/Attr.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/BeforeLoadEvent.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/CharacterData.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/ClientRect.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/ClientRectList.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/Clipboard.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/CDATASection.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/Comment.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/CompositionEvent.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/CustomEvent.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/DataTransferItem.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/DataTransferItemList.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/DeviceMotionEvent.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/DeviceOrientationEvent.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/DocumentFragment.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/Document.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/DocumentType.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/DOMCoreException.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/DOMError.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/DOMImplementation.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/DOMStringList.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/DOMStringMap.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/Element.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/Entity.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/EntityReference.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/ErrorEvent.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/Event.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/EventException.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/EventTarget.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/HashChangeEvent.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/KeyboardEvent.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/MouseEvent.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/MessageChannel.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/MessageEvent.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/MessagePort.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/MutationCallback.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/MutationEvent.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/MutationObserver.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/MutationRecord.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/NamedNodeMap.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/Node.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/NodeFilter.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/NodeIterator.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/NodeList.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/Notation.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/OverflowEvent.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/PageTransitionEvent.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/PopStateEvent.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/ProcessingInstruction.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/ProgressEvent.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/PropertyNodeList.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/RangeException.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/Range.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/RequestAnimationFrameCallback.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/ShadowRoot.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/StringCallback.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/Text.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/TextEvent.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/Touch.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/TouchEvent.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/TouchList.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/TreeWalker.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/UIEvent.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/WebKitAnimationEvent.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/WebKitNamedFlow.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/DOMNamedFlowCollection.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/WebKitTransitionEvent.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/dom/WheelEvent.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/fileapi/Blob.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/fileapi/File.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/fileapi/FileError.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/fileapi/FileException.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/fileapi/FileList.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/fileapi/FileReader.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/fileapi/FileReaderSync.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/ArrayBufferView.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/ArrayBuffer.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/DataView.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/Int8Array.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/Float32Array.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/Float64Array.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/CanvasGradient.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/Int32Array.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/CanvasPattern.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/CanvasRenderingContext.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/CanvasRenderingContext2D.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/EXTTextureFilterAnisotropic.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/OESStandardDerivatives.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/OESTextureFloat.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/OESVertexArrayObject.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/OESElementIndexUint.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/WebGLActiveInfo.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/WebGLBuffer.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/WebGLCompressedTextureS3TC.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/WebGLContextAttributes.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/WebGLContextEvent.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/WebGLDebugRendererInfo.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/WebGLDebugShaders.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/WebGLDepthTexture.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/WebGLFramebuffer.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/WebGLLoseContext.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/WebGLProgram.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/WebGLRenderbuffer.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/WebGLRenderingContext.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/WebGLShader.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/WebGLShaderPrecisionFormat.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/Int16Array.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/WebGLTexture.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/WebGLUniformLocation.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/WebGLVertexArrayObjectOES.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/Uint8Array.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/Uint8ClampedArray.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/Uint32Array.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/canvas/Uint16Array.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/DOMFormData.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/DOMSettableTokenList.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/DOMTokenList.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/DOMURL.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLAllCollection.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLAudioElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLAnchorElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLAppletElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLAreaElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLBaseElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLBaseFontElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLBodyElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLBRElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLButtonElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLCanvasElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLCollection.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLDataListElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLDetailsElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLDialogElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLDirectoryElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLDivElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLDListElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLDocument.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLEmbedElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLFieldSetElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLFontElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLFormControlsCollection.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLFormElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLFrameElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLFrameSetElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLHeadElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLHeadingElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLHRElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLHtmlElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLIFrameElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLImageElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLInputElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLKeygenElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLLabelElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLLegendElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLLIElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLLinkElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLMapElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLMarqueeElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLMediaElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLMenuElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLMetaElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLMeterElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLModElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLObjectElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLOListElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLOptGroupElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLOptionElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLOptionsCollection.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLOutputElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLParagraphElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLParamElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLPreElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLProgressElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLPropertiesCollection.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLQuoteElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLScriptElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLSelectElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLSourceElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLSpanElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLStyleElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLTableCaptionElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLTableCellElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLTableColElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLTableElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLTableRowElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLTableSectionElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLTextAreaElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLTitleElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLTrackElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLUListElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLUnknownElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/HTMLVideoElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/ImageData.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/MediaController.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/MediaError.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/MicroDataItemValue.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/RadioNodeList.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/TextMetrics.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/TimeRanges.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/ValidityState.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/VoidCallback.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/shadow/HTMLContentElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/html/shadow/HTMLShadowElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/inspector/InjectedScriptHost.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/inspector/InspectorFrontendHost.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/inspector/JavaScriptCallFrame.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/inspector/ScriptProfile.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/inspector/ScriptProfileNode.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/loader/appcache/DOMApplicationCache.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/page/BarInfo.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/page/Console.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/page/Coordinates.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/page/Crypto.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/page/DOMSecurityPolicy.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/page/DOMSelection.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/page/DOMWindow.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/page/EventSource.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/page/History.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/page/Location.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/page/MemoryInfo.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/page/Navigator.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/page/Performance.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/page/PerformanceEntry.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/page/PerformanceEntryList.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/page/PerformanceNavigation.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/page/PerformanceResourceTiming.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/page/PerformanceTiming.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/page/Screen.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/page/SpeechInputEvent.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/page/SpeechInputResult.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/page/SpeechInputResultList.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/page/WebKitAnimation.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/page/WebKitAnimationList.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/page/WebKitPoint.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/page/WorkerNavigator.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/plugins/DOMPlugin.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/plugins/DOMMimeType.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/plugins/DOMPluginArray.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/plugins/DOMMimeTypeArray.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/storage/Storage.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/storage/StorageEvent.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/testing/Internals.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/testing/InternalSettings.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/testing/MallocStatistics.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/workers/AbstractWorker.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/workers/DedicatedWorkerContext.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/workers/SharedWorker.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/workers/SharedWorkerContext.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/workers/Worker.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/workers/WorkerContext.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/workers/WorkerLocation.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/xml/DOMParser.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/xml/XMLHttpRequest.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/xml/XMLHttpRequestException.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/xml/XMLHttpRequestProgressEvent.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/xml/XMLHttpRequestUpload.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/xml/XMLSerializer.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/xml/XPathNSResolver.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/xml/XPathException.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/xml/XPathExpression.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/xml/XPathResult.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/xml/XPathEvaluator.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/xml/XSLTProcessor.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGAElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGAltGlyphDefElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGAltGlyphElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGAltGlyphItemElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGAngle.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGAnimateColorElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGAnimateMotionElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGAnimatedAngle.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGAnimatedBoolean.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGAnimatedEnumeration.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGAnimatedInteger.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGAnimatedLength.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGAnimatedLengthList.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGAnimatedNumber.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGAnimatedNumberList.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGAnimatedPreserveAspectRatio.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGAnimatedRect.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGAnimatedString.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGAnimatedTransformList.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGAnimateElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGAnimateTransformElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGAnimationElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGCircleElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGClipPathElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGColor.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGComponentTransferFunctionElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGCursorElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGDefsElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGDescElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGDocument.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGElementInstance.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGElementInstanceList.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGEllipseElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGException.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGFEBlendElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGFEColorMatrixElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGFEComponentTransferElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGFECompositeElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGFEConvolveMatrixElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGFEDiffuseLightingElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGFEDisplacementMapElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGFEDistantLightElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGFEDropShadowElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGFEFloodElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGFEFuncAElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGFEFuncBElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGFEFuncGElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGFEFuncRElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGFEGaussianBlurElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGFEImageElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGFEMergeElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGFEMergeNodeElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGFEMorphologyElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGFEOffsetElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGFEPointLightElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGFESpecularLightingElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGFESpotLightElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGFETileElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGFETurbulenceElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGFilterElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGFontElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGFontFaceElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGFontFaceFormatElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGFontFaceNameElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGFontFaceSrcElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGFontFaceUriElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGForeignObjectElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGGElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGGlyphElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGGlyphRefElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGGradientElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGHKernElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGImageElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGLength.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGLengthList.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGLinearGradientElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGLineElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGMarkerElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGMaskElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGMatrix.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGMetadataElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGMissingGlyphElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGMPathElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGNumber.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGNumberList.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGPaint.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGPathElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGPathSegArcAbs.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGPathSegArcRel.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGPathSegClosePath.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGPathSegCurvetoCubicAbs.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGPathSegCurvetoCubicRel.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGPathSegCurvetoCubicSmoothAbs.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGPathSegCurvetoCubicSmoothRel.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGPathSegCurvetoQuadraticAbs.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGPathSegCurvetoQuadraticRel.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGPathSegCurvetoQuadraticSmoothAbs.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGPathSegCurvetoQuadraticSmoothRel.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGPathSeg.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGPathSegLinetoAbs.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGPathSegLinetoHorizontalAbs.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGPathSegLinetoHorizontalRel.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGPathSegLinetoRel.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGPathSegLinetoVerticalAbs.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGPathSegLinetoVerticalRel.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGPathSegList.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGPathSegMovetoAbs.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGPathSegMovetoRel.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGPatternElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGPoint.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGPointList.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGPolygonElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGPolylineElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGPreserveAspectRatio.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGRadialGradientElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGRectElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGRect.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGRenderingIntent.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGScriptElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGSetElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGStopElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGStringList.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGStyleElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGSVGElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGSwitchElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGSymbolElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGTextContentElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGTextElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGTextPathElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGTextPositioningElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGTitleElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGTransform.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGTransformList.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGTRefElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGTSpanElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGUnitTypes.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGUseElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGViewElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGVKernElement.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGViewSpec.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGZoomAndPan.idl - $(GENERATE_BINDINGS_PL) $(WEBCORE_DIR)/svg/SVGZoomEvent.idl - - @# generate-webkit-version.pl - $(VERBOSE)perl $(WEBCORE_DIR)/../WebKit/scripts/generate-webkitversion.pl --config $(WEBCORE_DIR)/../WebKit/mac/Configurations/Version.xcconfig --outputDir $(dir $@)/ - - @# make-css-file-arrays.pl - $(VERBOSE)perl $(WEBCORE_DIR)/css/make-css-file-arrays.pl $(dir $@)/UserAgentStyleSheets.h $(dir $@)/UserAgentStyleSheetsData.cpp $(WEBCORE_DIR)/css/html.css $(WEBCORE_DIR)/css/quirks.css $(WEBCORE_DIR)/css/mathml.css $(WEBCORE_DIR)/css/svg.css $(WEBCORE_DIR)/css/view-source.css $(WEBCORE_DIR)/css/fullscreen.css $(WEBCORE_DIR)/css/mediaControls.css $(WEBCORE_DIR)/css/mediaControlsQt.css $(WEBCORE_DIR)/css/mediaControlsQtFullscreen.css $(WEBCORE_DIR)/css/themeQtNoListboxes.css $(WEBCORE_DIR)/css/mobileThemeQt.css - - @# make-dom-exceptions.pl - $(VERBOSE)perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/dom/make_dom_exceptions.pl --input $(WEBCORE_DIR)/dom/DOMExceptions.in --outputDir $(dir $@) - - @# make_event_factory.pl - $(VERBOSE)perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/dom/make_event_factory.pl --input $(WEBCORE_DIR)/dom/EventNames.in --outputDir $(dir $@) - $(VERBOSE)perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/dom/make_event_factory.pl --input $(WEBCORE_DIR)/dom/EventTargetFactory.in --outputDir $(dir $@) - - @# make-hash-tools.pl - $(VERBOSE)perl $(WEBCORE_DIR)/make-hash-tools.pl $(dir $@) $(WEBCORE_DIR)/platform/ColorData.gperf - @# make_names.pl $(VERBOSE)perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/dom/make_names.pl --tags $(WEBCORE_DIR)/mathml/mathtags.in --attrs $(WEBCORE_DIR)/mathml/mathattrs.in --extraDefines $(EXTRA_DEFINES) --preprocessor "$(MOC) -E" --factory --wrapperFactory --outputDir $(dir $@) - $(VERBOSE)perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/dom/make_names.pl --tags $(WEBCORE_DIR)/html/HTMLTagNames.in --attrs $(WEBCORE_DIR)/html/HTMLAttributeNames.in --extraDefines $(EXTRA_DEFINES) --preprocessor "$(MOC) -E" --factory --wrapperFactory --outputDir $(dir $@) - $(VERBOSE)perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/dom/make_names.pl --fonts $(WEBCORE_DIR)/css/WebKitFontFamilyNames.in --outputDir $(dir $@) $(VERBOSE)perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/dom/make_names.pl --tags $(WEBCORE_DIR)/svg/svgtags.in --attrs $(WEBCORE_DIR)/svg/svgattrs.in --extraDefines $(EXTRA_DEFINES) --preprocessor "$(MOC) -E" --factory --wrapperFactory --outputDir $(dir $@) - $(VERBOSE)perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/dom/make_names.pl --attrs $(WEBCORE_DIR)/xml/xmlnsattrs.in --preprocessor "$(MOC) -E" --outputDir $(dir $@) $(VERBOSE)perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/dom/make_names.pl --attrs $(WEBCORE_DIR)/svg/xlinkattrs.in --preprocessor "$(MOC) -E" --outputDir $(dir $@) - $(VERBOSE)perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/dom/make_names.pl --attrs $(WEBCORE_DIR)/xml/xmlattrs.in --preprocessor "$(MOC) -E" --outputDir $(dir $@) - - @# make_settings.pl - $(VERBOSE)perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/page/make_settings.pl --input $(WEBCORE_DIR)/page/Settings.in --outputDir $(dir $@) @# makeprop.pl $(VERBOSE)perl -ne "print $1" $(WEBCORE_DIR)/css/CSSPropertyNames.in $(WEBCORE_DIR)/css/SVGCSSPropertyNames.in > $(dir $@)/CSSPropertyNames.in && cd $(dir $@) && perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/css/makeprop.pl --defines $(DEFINES) --preprocessor "$(MOC) -E" $(WEBCORE_DIR)/css/CSSPropertyNames.in && $(DEL_FILE) CSSPropertyNames.in CSSPropertyNames.gperf - @# makegrammar.pl - $(VERBOSE)perl -I $(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/css/makegrammar.pl --outputDir $(dir $@) --extraDefines $(EXTRA_DEFINES) --preprocessor "$(MOC) -E" --symbolsPrefix cssyy $(WEBCORE_DIR)/css/CSSGrammar.y.in + @# make_settings.pl + $(VERBOSE)perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/page/make_settings.pl --input $(WEBCORE_DIR)/page/Settings.in --outputDir $(dir $@) @# makevalues.pl $(VERBOSE)perl -ne "print $1" $(WEBCORE_DIR)/css/CSSValueKeywords.in $(WEBCORE_DIR)/css/SVGCSSValueKeywords.in > $(dir $@)/CSSValueKeywords.in && cd $(dir $@) && perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/css/makevalues.pl --defines $(DEFINES) --preprocessor "$(MOC) -E" $(WEBCORE_DIR)/css/CSSValueKeywords.in && $(DEL_FILE) CSSValueKeywords.in CSSValueKeywords.gperf + @# preprocess-idls.pl + $(VERBOSE)sed -e "s,^qtwebkit,$(QT5_CONTRIB_DIR)/qtwebkit,g" -e "s,^generated/,$(dir $@),g" $(REP_DIR)/src/lib/qt5/qtwebkit/Source/WebCore/idl_files > $(dir $@)/idl_files.tmp + $(VERBOSE)export "QT5_CONTRIB_DIR=$(QT5_CONTRIB_DIR)" && perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/bindings/scripts/preprocess-idls.pl --defines $(DEFINES) --idlFilesList $(dir $@)/idl_files.tmp --supplementalDependencyFile $(dir $@)/supplemental_dependency.tmp --windowConstructorsFile $(dir $@)/DOMWindowConstructors.idl --workerGlobalScopeConstructorsFile $(dir $@)/WorkerGlobalScopeConstructors.idl --sharedWorkerGlobalScopeConstructorsFile $(dir $@)/SharedWorkerGlobalScopeConstructors.idl --dedicatedWorkerGlobalScopeConstructorsFile $(dir $@)/DedicatedWorkerGlobalScopeConstructors.idl + + @# generate-bindings.pl + $(VERBOSE)while read -r idl_file; do $(GENERATE_BINDINGS_PL) $$idl_file; done < $(dir $@)/idl_files.tmp + #$(VERBOSE)while read -r idl_file; do echo "$(GENERATE_BINDINGS_PL) $$idl_file"; $(GENERATE_BINDINGS_PL) $$idl_file; done < $(dir $@)/idl_files.tmp + + @# CodeGeneratorInspector.py + $(VERBOSE)python $(WEBCORE_DIR)/inspector/CodeGeneratorInspector.py $(WEBCORE_DIR)/inspector/Inspector.json --output_h_dir $(dir $@) --output_cpp_dir $(dir $@) + @# xxd.pl $(VERBOSE)perl $(WEBCORE_DIR)/inspector/xxd.pl InspectorOverlayPage_html $(WEBCORE_DIR)/inspector/InspectorOverlayPage.html $(dir $@)/InspectorOverlayPage.h $(VERBOSE)perl $(WEBCORE_DIR)/inspector/xxd.pl InjectedScriptSource_js $(WEBCORE_DIR)/inspector/InjectedScriptSource.js $(dir $@)/InjectedScriptSource.h $(VERBOSE)perl $(WEBCORE_DIR)/inspector/xxd.pl InjectedScriptCanvasModuleSource_js $(WEBCORE_DIR)/inspector/InjectedScriptCanvasModuleSource.js $(dir $@)/InjectedScriptCanvasModuleSource.h - @# CodeGeneratorInspector.py - $(VERBOSE)python $(WEBCORE_DIR)/inspector/CodeGeneratorInspector.py $(WEBCORE_DIR)/inspector/Inspector.json --output_h_dir $(dir $@) --output_cpp_dir $(dir $@) + @# makegrammar.pl + $(VERBOSE)perl -I $(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/css/makegrammar.pl --outputDir $(dir $@) --extraDefines $(EXTRA_DEFINES) --preprocessor "$(MOC) -E" --symbolsPrefix cssyy $(WEBCORE_DIR)/css/CSSGrammar.y.in + + @# make_names.pl + $(VERBOSE)perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/dom/make_names.pl --tags $(WEBCORE_DIR)/html/HTMLTagNames.in --attrs $(WEBCORE_DIR)/html/HTMLAttributeNames.in --extraDefines $(EXTRA_DEFINES) --preprocessor "$(MOC) -E" --factory --wrapperFactory --outputDir $(dir $@) + $(VERBOSE)perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/dom/make_names.pl --attrs $(WEBCORE_DIR)/xml/xmlnsattrs.in --preprocessor "$(MOC) -E" --outputDir $(dir $@) + $(VERBOSE)perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/dom/make_names.pl --attrs $(WEBCORE_DIR)/xml/xmlattrs.in --preprocessor "$(MOC) -E" --outputDir $(dir $@) + $(VERBOSE)perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/dom/make_names.pl --fonts $(WEBCORE_DIR)/css/WebKitFontFamilyNames.in --outputDir $(dir $@) + + @# make_event_factory.pl + $(VERBOSE)perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/dom/make_event_factory.pl --input $(WEBCORE_DIR)/dom/EventNames.in --outputDir $(dir $@) + $(VERBOSE)perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/dom/make_event_factory.pl --input $(WEBCORE_DIR)/dom/EventTargetFactory.in --outputDir $(dir $@) + + @# make-dom-exceptions.pl + $(VERBOSE)perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/dom/make_dom_exceptions.pl --input $(WEBCORE_DIR)/dom/DOMExceptions.in --outputDir $(dir $@) @# create-html-entity-table $(VERBOSE)python $(WEBCORE_DIR)/html/parser/create-html-entity-table -o $(dir $@)/HTMLEntityTable.cpp $(WEBCORE_DIR)/html/parser/HTMLEntityNames.in + @# make-hash-tools.pl + $(VERBOSE)perl $(WEBCORE_DIR)/make-hash-tools.pl $(dir $@) $(WEBCORE_DIR)/platform/ColorData.gperf + + @# make-css-file-arrays.pl + $(VERBOSE)perl $(WEBCORE_DIR)/css/make-css-file-arrays.pl $(dir $@)/UserAgentStyleSheets.h $(dir $@)/UserAgentStyleSheetsData.cpp $(WEBCORE_DIR)/css/html.css $(WEBCORE_DIR)/css/quirks.css $(WEBCORE_DIR)/css/mathml.css $(WEBCORE_DIR)/css/svg.css $(WEBCORE_DIR)/css/view-source.css $(WEBCORE_DIR)/css/fullscreen.css $(WEBCORE_DIR)/css/mediaControls.css $(WEBCORE_DIR)/css/mediaControlsQt.css $(WEBCORE_DIR)/css/mediaControlsQtFullscreen.css $(WEBCORE_DIR)/css/plugIns.css $(WEBCORE_DIR)/css/themeQtNoListboxes.css $(WEBCORE_DIR)/css/mobileThemeQt.css + $(VERBOSE)perl $(WEBCORE_DIR)/css/make-css-file-arrays.pl $(dir $@)/PlugInsResources.h $(dir $@)/PlugInsResourcesData.cpp $(WEBCORE_DIR)/Resources/plugIns.js + + @# XPathGrammar + $(VERBOSE)bison -d -p xpathyy $(WEBCORE_DIR)/xml/XPathGrammar.y -o $(dir $@)/XPathGrammar.tab.c && $(MOVE) $(dir $@)/XPathGrammar.tab.c $(dir $@)/XPathGrammar.cpp && $(MOVE) $(dir $@)/XPathGrammar.tab.h $(dir $@)/XPathGrammar.h + + @# generate-webkit-version.pl + $(VERBOSE)perl $(WEBCORE_DIR)/../WebKit/scripts/generate-webkitversion.pl --config $(WEBCORE_DIR)/../WebKit/mac/Configurations/Version.xcconfig --outputDir $(dir $@)/ + $(VERBOSE)touch $@ include $(REP_DIR)/lib/mk/qt5_webcore_generated.inc @@ -645,6 +118,12 @@ QT_INCPATH += qtwebkit/Source/WebCore/generated QT_VPATH += qtwebkit/Source/WebCore/generated +# InspectorBackendCommands.qrc, WebKit.qrc +QT_VPATH += qtwebkit/Source/WebCore/inspector/front-end + +# WebCore.qrc +QT_VPATH += qtwebkit/Source/WebCore + include $(REP_DIR)/lib/mk/qt5.inc -LIBS += qt5_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_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 4ac591322..b504bfee5 100644 --- a/repos/libports/lib/mk/qt5_webcore_generated.inc +++ b/repos/libports/lib/mk/qt5_webcore_generated.inc @@ -1,47 +1,22 @@ -QT_DEFINES += -DQT_NO_LIBUDEV -DQT_NO_XCB -DQT_NO_XKBCOMMON -DSQLITE_CORE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_OMIT_COMPLETE -DBUILDING_QT__=1 -DNDEBUG -DENABLE_3D_RENDERING=1 -DENABLE_BLOB=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_STICKY_POSITION=1 -DENABLE_DATALIST_ELEMENT=1 -DENABLE_DETAILS_ELEMENT=1 -DENABLE_FAST_MOBILE_SCROLLING=1 -DENABLE_FILTERS=1 -DENABLE_FTPDIR=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_LINK_PREFETCH=1 -DENABLE_METER_ELEMENT=1 -DENABLE_MHTML=1 -DENABLE_MUTATION_OBSERVERS=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_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_TOUCH_ADJUSTMENT=1 -DENABLE_TOUCH_EVENTS=1 -DENABLE_WEB_SOCKETS=1 -DENABLE_WEB_TIMING=1 -DENABLE_WORKERS=1 -DENABLE_XHR_TIMEOUT=1 -DWTF_USE_TILED_BACKING_STORE=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 -DENABLE_TOUCH_SLIDER=1 -DENABLE_ACCELERATED_2D_CANVAS=0 -DENABLE_ANIMATION_API=0 -DENABLE_BATTERY_STATUS=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_BACKGROUND=0 -DENABLE_CSS3_CONDITIONAL_RULES=0 -DENABLE_CSS3_TEXT=0 -DENABLE_DASHBOARD_SUPPORT=0 -DENABLE_DATAGRID=0 -DENABLE_DATA_TRANSFER_ITEMS=0 -DENABLE_DEVICE_ORIENTATION=0 -DENABLE_DIRECTORY_UPLOAD=0 -DENABLE_DOWNLOAD_ATTRIBUTE=0 -DENABLE_FILE_SYSTEM=0 -DENABLE_FULLSCREEN_API=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=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_LINK_PRERENDER=0 -DENABLE_MATHML=0 -DENABLE_MEDIA_SOURCE=0 -DENABLE_MEDIA_STATISTICS=0 -DENABLE_MEDIA_STREAM=0 -DENABLE_MICRODATA=0 -DENABLE_NAVIGATOR_CONTENT_UTILS=0 -DENABLE_NETSCAPE_PLUGIN_API=0 -DENABLE_NETWORK_INFO=0 -DENABLE_ORIENTATION_EVENTS=0 -DENABLE_PROXIMITY_EVENTS=0 -DENABLE_QUOTA=0 -DENABLE_SCRIPTED_SPEECH=0 -DENABLE_SHADOW_DOM=0 -DENABLE_STYLE_SCOPED=0 -DENABLE_SVG_DOM_OBJC_BINDINGS=0 -DENABLE_TEXT_AUTOSIZING=0 -DENABLE_TEXT_NOTIFICATIONS_ONLY=0 -DENABLE_TOUCH_ICON_LOADING=0 -DENABLE_VIBRATION=0 -DENABLE_VIDEO=0 -DENABLE_VIDEO_TRACK=0 -DENABLE_WEBGL=0 -DENABLE_WEB_AUDIO=0 -DENABLE_XSLT=0 -DBUILDING_WebCore -DBUILDING_WEBKIT -DQT_ASCII_CAST_WARNINGS -DSTATICALLY_LINKED_WITH_JavaScriptCore -DSTATICALLY_LINKED_WITH_WTF -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_SQL_LIB -DQT_NETWORK_LIB -DQT_GUI_LIB -DQT_CORE_LIB +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_INCPATH += \ - qtbase/include \ - qtbase/include/QtCore \ - qtbase/include/QtCore/5.1.0 \ - qtbase/include/QtCore/5.1.0/QtCore \ - qtbase/include/QtGui \ - qtbase/include/QtGui/5.1.0 \ - qtbase/include/QtGui/5.1.0/QtGui \ - qtbase/include/QtNetwork \ - qtbase/include/QtSql \ - qtbase/mkspecs/genode-g++ \ - qtbase/src/3rdparty/sqlite \ - qtscript/include \ - qtscript/include/QtScript \ - qtwebkit/Source \ - qtwebkit/Source/JavaScriptCore \ - qtwebkit/Source/JavaScriptCore/API \ - qtwebkit/Source/JavaScriptCore/assembler \ - qtwebkit/Source/JavaScriptCore/bytecode \ - qtwebkit/Source/JavaScriptCore/bytecompiler \ - qtwebkit/Source/JavaScriptCore/debugger \ - qtwebkit/Source/JavaScriptCore/dfg \ - qtwebkit/Source/JavaScriptCore/disassembler \ - qtwebkit/Source/JavaScriptCore/ForwardingHeaders \ - qtwebkit/Source/JavaScriptCore/heap \ - qtwebkit/Source/JavaScriptCore/interpreter \ - qtwebkit/Source/JavaScriptCore/jit \ - qtwebkit/Source/JavaScriptCore/llint \ - qtwebkit/Source/JavaScriptCore/parser \ - qtwebkit/Source/JavaScriptCore/profiler \ - qtwebkit/Source/JavaScriptCore/runtime \ - qtwebkit/Source/JavaScriptCore/tools \ - qtwebkit/Source/JavaScriptCore/yarr \ - qtwebkit/Source/ThirdParty \ qtwebkit/Source/WebCore \ + qtwebkit/Source/WebCore \ + qtwebkit/Source/WebCore/Modules/filesystem \ + qtwebkit/Source/WebCore/Modules/geolocation \ + qtwebkit/Source/WebCore/Modules/indexeddb \ + qtwebkit/Source/WebCore/Modules/navigatorcontentutils \ + qtwebkit/Source/WebCore/Modules/notifications \ + qtwebkit/Source/WebCore/Modules/proximity \ + qtwebkit/Source/WebCore/Modules/quota \ + qtwebkit/Source/WebCore/Modules/webaudio \ + qtwebkit/Source/WebCore/Modules/webdatabase \ + qtwebkit/Source/WebCore/Modules/websockets \ qtwebkit/Source/WebCore/accessibility \ qtwebkit/Source/WebCore/bindings \ qtwebkit/Source/WebCore/bindings/generic \ - qtwebkit/Source/WebCore/bindings/js \ qtwebkit/Source/WebCore/bridge \ - qtwebkit/Source/WebCore/bridge/c \ - qtwebkit/Source/WebCore/bridge/jsc \ qtwebkit/Source/WebCore/bridge/qt \ qtwebkit/Source/WebCore/css \ qtwebkit/Source/WebCore/dom \ @@ -51,6 +26,7 @@ QT_INCPATH += \ qtwebkit/Source/WebCore/history \ qtwebkit/Source/WebCore/html \ qtwebkit/Source/WebCore/html/canvas \ + qtwebkit/Source/WebCore/html/forms \ qtwebkit/Source/WebCore/html/parser \ qtwebkit/Source/WebCore/html/shadow \ qtwebkit/Source/WebCore/html/track \ @@ -58,23 +34,14 @@ QT_INCPATH += \ qtwebkit/Source/WebCore/loader \ qtwebkit/Source/WebCore/loader/appcache \ qtwebkit/Source/WebCore/loader/archive \ - qtwebkit/Source/WebCore/loader/archive/mhtml \ qtwebkit/Source/WebCore/loader/cache \ qtwebkit/Source/WebCore/loader/icon \ qtwebkit/Source/WebCore/mathml \ - qtwebkit/Source/WebCore/Modules/filesystem \ - qtwebkit/Source/WebCore/Modules/geolocation \ - qtwebkit/Source/WebCore/Modules/indexeddb \ - qtwebkit/Source/WebCore/Modules/navigatorcontentutils \ - qtwebkit/Source/WebCore/Modules/notifications \ - qtwebkit/Source/WebCore/Modules/quota \ - qtwebkit/Source/WebCore/Modules/webaudio \ - qtwebkit/Source/WebCore/Modules/webdatabase \ - qtwebkit/Source/WebCore/Modules/websockets \ qtwebkit/Source/WebCore/page \ qtwebkit/Source/WebCore/page/animation \ qtwebkit/Source/WebCore/page/qt \ qtwebkit/Source/WebCore/page/scrolling \ + qtwebkit/Source/WebCore/page/scrolling/coordinatedgraphics \ qtwebkit/Source/WebCore/platform \ qtwebkit/Source/WebCore/platform/animation \ qtwebkit/Source/WebCore/platform/audio \ @@ -88,11 +55,12 @@ QT_INCPATH += \ qtwebkit/Source/WebCore/platform/graphics/qt \ qtwebkit/Source/WebCore/platform/graphics/surfaces \ qtwebkit/Source/WebCore/platform/graphics/texmap \ + qtwebkit/Source/WebCore/platform/graphics/texmap/coordinated \ qtwebkit/Source/WebCore/platform/graphics/transforms \ qtwebkit/Source/WebCore/platform/image-decoders \ qtwebkit/Source/WebCore/platform/image-decoders/bmp \ - qtwebkit/Source/WebCore/platform/image-decoders/gif \ qtwebkit/Source/WebCore/platform/image-decoders/ico \ + qtwebkit/Source/WebCore/platform/image-decoders/gif \ qtwebkit/Source/WebCore/platform/image-decoders/jpeg \ qtwebkit/Source/WebCore/platform/image-decoders/png \ qtwebkit/Source/WebCore/platform/image-decoders/webp \ @@ -107,6 +75,7 @@ QT_INCPATH += \ qtwebkit/Source/WebCore/plugins \ qtwebkit/Source/WebCore/rendering \ qtwebkit/Source/WebCore/rendering/mathml \ + qtwebkit/Source/WebCore/rendering/shapes \ qtwebkit/Source/WebCore/rendering/style \ qtwebkit/Source/WebCore/rendering/svg \ qtwebkit/Source/WebCore/storage \ @@ -116,168 +85,87 @@ QT_INCPATH += \ qtwebkit/Source/WebCore/svg/graphics/filters \ qtwebkit/Source/WebCore/svg/properties \ qtwebkit/Source/WebCore/testing \ - qtwebkit/Source/WebCore/testing/js \ qtwebkit/Source/WebCore/websockets \ qtwebkit/Source/WebCore/workers \ qtwebkit/Source/WebCore/xml \ qtwebkit/Source/WebCore/xml/parser \ + qtwebkit/Source/ThirdParty \ + qtwebkit/Source/WebCore/bridge/jsc \ + qtwebkit/Source/WebCore/bindings/js \ + qtwebkit/Source/WebCore/bridge/c \ + qtwebkit/Source/WebCore/testing/js \ + qtbase/src/3rdparty/sqlite \ + qtwebkit/Source/WebCore/platform/graphics/gpu \ + qtwebkit/Source/WebCore/platform/graphics/gpu \ + qtwebkit/Source/WebCore/loader/archive/mhtml \ + qtwebkit/Source \ + qtwebkit/Source/ThirdParty/ANGLE/include/GLSLANG \ + qtwebkit/Source/ThirdParty/ANGLE/include/KHR \ + qtwebkit/Source/JavaScriptCore \ + qtwebkit/Source \ qtwebkit/Source/WTF \ + qtwebkit/Source/JavaScriptCore/assembler \ + qtwebkit/Source/JavaScriptCore/bytecode \ + qtwebkit/Source/JavaScriptCore/bytecompiler \ + qtwebkit/Source/JavaScriptCore/heap \ + qtwebkit/Source/JavaScriptCore/dfg \ + qtwebkit/Source/JavaScriptCore/debugger \ + qtwebkit/Source/JavaScriptCore/disassembler \ + qtwebkit/Source/JavaScriptCore/interpreter \ + qtwebkit/Source/JavaScriptCore/jit \ + qtwebkit/Source/JavaScriptCore/llint \ + qtwebkit/Source/JavaScriptCore/parser \ + qtwebkit/Source/JavaScriptCore/profiler \ + qtwebkit/Source/JavaScriptCore/runtime \ + qtwebkit/Source/JavaScriptCore/tools \ + qtwebkit/Source/JavaScriptCore/yarr \ + qtwebkit/Source/JavaScriptCore/API \ + qtwebkit/Source/JavaScriptCore/ForwardingHeaders \ + qtwebkit/Source/WTF \ + qtbase/include/QtGui/5.6.2 \ + qtbase/include/QtGui/5.6.2/QtGui \ + qtbase/include \ + qtbase/include/QtGui \ + qtbase/include/QtNetwork \ + qtbase/include/QtSql \ + qtbase/include/QtCore/5.6.2 \ + qtbase/include/QtCore/5.6.2/QtCore \ + qtbase/include/QtCore \ + qtbase/mkspecs/genode-g++ QT_SOURCES += \ + Coordinates.cpp \ Geolocation.cpp \ GeolocationController.cpp \ NavigatorGeolocation.cpp \ - AbstractDatabase.cpp \ DOMWindowWebDatabase.cpp \ Database.cpp \ DatabaseAuthorizer.cpp \ + DatabaseBackendBase.cpp \ DatabaseContext.cpp \ + DatabaseServer.cpp \ DatabaseSync.cpp \ - WorkerContextWebDatabase.cpp \ + WorkerGlobalScopeWebDatabase.cpp \ AccessibilityMenuList.cpp \ AccessibilityMenuListOption.cpp \ AccessibilityMenuListPopup.cpp \ AccessibilityMockObject.cpp \ - AccessibilityProgressIndicator.cpp \ AccessibilitySpinButton.cpp \ ActiveDOMCallback.cpp \ BindingSecurity.cpp \ RuntimeEnabledFeatures.cpp \ ScriptControllerBase.cpp \ - ArrayValue.cpp \ - BindingState.cpp \ - CallbackFunction.cpp \ - DOMObjectHashTableMap.cpp \ - DOMWrapperWorld.cpp \ - Dictionary.cpp \ - GCController.cpp \ - JSArrayBufferCustom.cpp \ - JSAttrCustom.cpp \ - JSBlobCustom.cpp \ - JSCDATASectionCustom.cpp \ - JSCSSFontFaceRuleCustom.cpp \ - JSCSSImportRuleCustom.cpp \ - JSCSSMediaRuleCustom.cpp \ - JSCSSPageRuleCustom.cpp \ - JSCSSRuleCustom.cpp \ - JSCSSRuleListCustom.cpp \ - JSCSSStyleDeclarationCustom.cpp \ - JSCSSStyleRuleCustom.cpp \ - JSCSSValueCustom.cpp \ - JSCallbackData.cpp \ - JSCanvasRenderingContext2DCustom.cpp \ - JSCanvasRenderingContextCustom.cpp \ - JSClipboardCustom.cpp \ - JSConsoleCustom.cpp \ - JSCoordinatesCustom.cpp \ - JSCustomXPathNSResolver.cpp \ - JSDictionary.cpp \ - JSDOMBinding.cpp \ - JSDOMFormDataCustom.cpp \ - JSDOMGlobalObject.cpp \ - JSDOMImplementationCustom.cpp \ - JSDOMMimeTypeArrayCustom.cpp \ - JSDOMPluginArrayCustom.cpp \ - JSDOMPluginCustom.cpp \ - JSDOMStringListCustom.cpp \ - JSDOMStringMapCustom.cpp \ - JSDOMTokenListCustom.cpp \ - JSDOMWindowBase.cpp \ - JSDOMWindowCustom.cpp \ - JSDOMWindowShell.cpp \ - JSDOMWindowWebAudioCustom.cpp \ - JSDOMWindowWebSocketCustom.cpp \ - JSDOMWrapper.cpp \ - JSDataViewCustom.cpp \ - JSDesktopNotificationsCustom.cpp \ + JSAudioBufferCustom.cpp \ JSDeviceMotionEventCustom.cpp \ - JSDeviceOrientationEventCustom.cpp \ - JSDocumentCustom.cpp \ - JSElementCustom.cpp \ - JSErrorHandler.cpp \ - JSEventCustom.cpp \ - JSEventListener.cpp \ - JSEventTargetCustom.cpp \ - JSExceptionBase.cpp \ JSFileReaderCustom.cpp \ - JSGeolocationCustom.cpp \ - JSHTMLAllCollectionCustom.cpp \ - JSHTMLAppletElementCustom.cpp \ - JSHTMLCanvasElementCustom.cpp \ - JSHTMLCollectionCustom.cpp \ - JSHTMLDocumentCustom.cpp \ - JSHTMLElementCustom.cpp \ - JSHTMLEmbedElementCustom.cpp \ - JSHTMLFormControlsCollectionCustom.cpp \ - JSHTMLFormElementCustom.cpp \ - JSHTMLFrameElementCustom.cpp \ - JSHTMLFrameSetElementCustom.cpp \ - JSHTMLInputElementCustom.cpp \ - JSHTMLLinkElementCustom.cpp \ - JSHTMLMediaElementCustom.cpp \ - JSHTMLObjectElementCustom.cpp \ - JSHTMLOptionsCollectionCustom.cpp \ - JSHTMLOutputElementCustom.cpp \ - JSHTMLSelectElementCustom.cpp \ - JSHTMLStyleElementCustom.cpp \ - JSHistoryCustom.cpp \ - JSImageConstructor.cpp \ - JSImageDataCustom.cpp \ - JSInjectedScriptHostCustom.cpp \ - JSInjectedScriptManager.cpp \ - JSInspectorFrontendHostCustom.cpp \ - JSLazyEventListener.cpp \ - JSLocationCustom.cpp \ - JSMainThreadExecState.cpp \ - JSMediaListCustom.cpp \ - JSMemoryInfoCustom.cpp \ - JSMessageChannelCustom.cpp \ - JSMessageEventCustom.cpp \ JSMessagePortCustom.cpp \ - JSMicroDataItemValueCustom.cpp \ - JSMutationCallbackCustom.cpp \ - JSMutationObserverCustom.cpp \ - JSNamedNodeMapCustom.cpp \ - JSNodeCustom.cpp \ - JSNodeFilterCondition.cpp \ - JSNodeFilterCustom.cpp \ - JSNodeIteratorCustom.cpp \ - JSNodeListCustom.cpp \ - JSNotificationCustom.cpp \ - JSPluginElementFunctions.cpp \ - JSPopStateEventCustom.cpp \ - JSProcessingInstructionCustom.cpp \ - JSRequestAnimationFrameCallbackCustom.cpp \ - JSStorageCustom.cpp \ - JSStyleSheetCustom.cpp \ - JSStyleSheetListCustom.cpp \ - JSTextCustom.cpp \ - JSTouchCustom.cpp \ - JSTouchListCustom.cpp \ - JSTreeWalkerCustom.cpp \ - JSWebKitAnimationCustom.cpp \ - JSWebKitAnimationListCustom.cpp \ - JSWebKitCSSKeyframeRuleCustom.cpp \ - JSWebKitCSSKeyframesRuleCustom.cpp \ - JSWebKitPointCustom.cpp \ - JSXMLHttpRequestCustom.cpp \ - JSXMLHttpRequestUploadCustom.cpp \ - JSXPathResultCustom.cpp \ + JSRTCStatsResponseCustom.cpp \ PageScriptDebugServer.cpp \ - ScheduledAction.cpp \ - ScriptCachedFrameData.cpp \ - ScriptCallStackFactory.cpp \ ScriptController.cpp \ ScriptControllerQt.cpp \ - ScriptDebugServer.cpp \ - ScriptEventListener.cpp \ - ScriptFunctionCall.cpp \ - ScriptGCEvent.cpp \ ScriptObject.cpp \ ScriptProfile.cpp \ - ScriptState.cpp \ ScriptValue.cpp \ - SerializedScriptValue.cpp \ IdentifierRep.cpp \ NP_jsobject.cpp \ CRuntimeObject.cpp \ @@ -316,239 +204,67 @@ QT_SOURCES += \ FileWriterBase.cpp \ FileWriterSync.cpp \ LocalFileSystem.cpp \ - WorkerContextFileSystem.cpp \ + WorkerGlobalScopeFileSystem.cpp \ NavigatorContentUtils.cpp \ DOMWindowNotifications.cpp \ Notification.cpp \ NotificationCenter.cpp \ NotificationController.cpp \ - WorkerContextNotifications.cpp \ + WorkerGlobalScopeNotifications.cpp \ + DeviceProximityController.cpp \ + DeviceProximityEvent.cpp \ BasicShapeFunctions.cpp \ - CSSAspectRatioValue.cpp \ - CSSBasicShapes.cpp \ - CSSBorderImageSliceValue.cpp \ - CSSBorderImage.cpp \ CSSCalculationValue.cpp \ - CSSCanvasValue.cpp \ - CSSCharsetRule.cpp \ - CSSComputedStyleDeclaration.cpp \ - CSSCrossfadeValue.cpp \ - CSSCursorImageValue.cpp \ - CSSFontFace.cpp \ - CSSFontFaceRule.cpp \ - CSSFontFaceSrcValue.cpp \ - CSSFontSelector.cpp \ - CSSFontFaceSource.cpp \ - CSSFunctionValue.cpp \ - CSSGradientValue.cpp \ - CSSImageValue.cpp \ - CSSImageGeneratorValue.cpp \ + CSSFontFaceLoadEvent.cpp \ CSSImageSetValue.cpp \ - CSSImportRule.cpp \ - CSSInheritedValue.cpp \ - CSSInitialValue.cpp \ - CSSLineBoxContainValue.cpp \ - CSSMediaRule.cpp \ - CSSOMUtils.cpp \ - CSSPageRule.cpp \ - CSSParser.cpp \ - CSSParserValues.cpp \ CSSPrimitiveValue.cpp \ CSSProperty.cpp \ - CSSPropertySourceData.cpp \ - CSSReflectValue.cpp \ - CSSRule.cpp \ - CSSRuleList.cpp \ - CSSSelector.cpp \ - CSSSelectorList.cpp \ - CSSSegmentedFontFace.cpp \ - CSSStyleRule.cpp \ - CSSStyleSheet.cpp \ - CSSTimingFunctionValue.cpp \ + CSSSupportsRule.cpp \ CSSToStyleMap.cpp \ - CSSUnicodeRangeValue.cpp \ - CSSValue.cpp \ - CSSValueList.cpp \ - CSSValuePool.cpp \ FontFeatureValue.cpp \ + FontLoader.cpp \ FontValue.cpp \ LengthFunctions.cpp \ MediaFeatureNames.cpp \ - MediaList.cpp \ - MediaQuery.cpp \ - MediaQueryEvaluator.cpp \ - MediaQueryExp.cpp \ - MediaQueryList.cpp \ - MediaQueryListListener.cpp \ - MediaQueryMatcher.cpp \ PropertySetCSSStyleDeclaration.cpp \ RGBColor.cpp \ - RuleFeature.cpp \ - RuleSet.cpp \ SelectorChecker.cpp \ ShadowValue.cpp \ - StyleBuilder.cpp \ StyleInvalidationAnalysis.cpp \ StyleMedia.cpp \ - StylePropertySet.cpp \ - StylePropertyShorthand.cpp \ - StyleResolver.cpp \ StyleRule.cpp \ StyleRuleImport.cpp \ - StyleScopeResolver.cpp \ StyleSheet.cpp \ StyleSheetContents.cpp \ StyleSheetList.cpp \ - ViewportStyleResolver.cpp \ + TransformFunctions.cpp \ WebKitCSSArrayFunctionValue.cpp \ + WebKitCSSFilterRule.cpp \ WebKitCSSFilterValue.cpp \ WebKitCSSKeyframeRule.cpp \ WebKitCSSKeyframesRule.cpp \ WebKitCSSMatrix.cpp \ + WebKitCSSMatFunctionValue.cpp \ WebKitCSSMixFunctionValue.cpp \ WebKitCSSRegionRule.cpp \ WebKitCSSSVGDocumentValue.cpp \ WebKitCSSShaderValue.cpp \ WebKitCSSTransformValue.cpp \ WebKitCSSViewportRule.cpp \ - ActiveDOMObject.cpp \ - Attr.cpp \ - BeforeTextInsertedEvent.cpp \ - BeforeUnloadEvent.cpp \ - CDATASection.cpp \ - CharacterData.cpp \ - CheckedRadioButtons.cpp \ - ChildListMutationScope.cpp \ - ChildNodeList.cpp \ - ClassNodeList.cpp \ - ClientRect.cpp \ - ClientRectList.cpp \ - Clipboard.cpp \ - ClipboardEvent.cpp \ - Comment.cpp \ ComposedShadowTreeWalker.cpp \ - CompositionEvent.cpp \ - ContainerNode.cpp \ - ContainerNodeAlgorithms.cpp \ - ContextDestructionObserver.cpp \ - ContextFeatures.cpp \ - CustomEvent.cpp \ - DecodedDataDocumentParser.cpp \ - DeviceMotionController.cpp \ - DeviceMotionData.cpp \ - DeviceMotionEvent.cpp \ - DeviceOrientationController.cpp \ - DeviceOrientationData.cpp \ - DeviceOrientationEvent.cpp \ - Document.cpp \ - DocumentEventQueue.cpp \ - DocumentFragment.cpp \ - DocumentMarkerController.cpp \ - DocumentMarker.cpp \ - DocumentOrderedMap.cpp \ - DocumentParser.cpp \ DocumentStyleSheetCollection.cpp \ - DocumentType.cpp \ - DOMCoreException.cpp \ DOMError.cpp \ - DOMImplementation.cpp \ - DOMNamedFlowCollection.cpp \ - DOMStringList.cpp \ - DOMStringMap.cpp \ - DatasetDOMStringMap.cpp \ - Element.cpp \ - ElementAttributeData.cpp \ ElementRareData.cpp \ - ElementShadow.cpp \ - EntityReference.cpp \ - ErrorEvent.cpp \ - Event.cpp \ - EventContext.cpp \ - EventDispatchMediator.cpp \ - EventDispatcher.cpp \ - EventException.cpp \ - EventListenerMap.cpp \ - EventNames.cpp \ - EventTarget.cpp \ - ExceptionBase.cpp \ - ExceptionCodePlaceholder.cpp \ GenericEventQueue.cpp \ GestureEvent.cpp \ - IconURL.cpp \ - IdTargetObserver.cpp \ - IdTargetObserverRegistry.cpp \ - LiveNodeList.cpp \ - KeyboardEvent.cpp \ - MessageChannel.cpp \ - MessageEvent.cpp \ - MessagePort.cpp \ - MessagePortChannel.cpp \ MicroDataItemList.cpp \ - MouseEvent.cpp \ - MouseRelatedEvent.cpp \ - MutationEvent.cpp \ - MutationObserver.cpp \ - MutationObserverInterestGroup.cpp \ - MutationObserverRegistration.cpp \ - MutationRecord.cpp \ - WebKitNamedFlow.cpp \ - NamedFlowCollection.cpp \ NamedNodeMap.cpp \ - NameNodeList.cpp \ Node.cpp \ - NodeFilterCondition.cpp \ - NodeFilter.cpp \ - NodeIterator.cpp \ NodeRareData.cpp \ - NodeRenderingContext.cpp \ - Notation.cpp \ - StaticHashSetNodeList.cpp \ - OverflowEvent.cpp \ - PageTransitionEvent.cpp \ - PendingScript.cpp \ - PopStateEvent.cpp \ - Position.cpp \ - PositionIterator.cpp \ - ProcessingInstruction.cpp \ - ProgressEvent.cpp \ + NodeTraversal.cpp \ PropertyNodeList.cpp \ QualifiedName.cpp \ - Range.cpp \ - RangeException.cpp \ - RegisteredEventListener.cpp \ - ScopedEventQueue.cpp \ ScriptedAnimationController.cpp \ - ScriptableDocumentParser.cpp \ - ScriptElement.cpp \ - ScriptExecutionContext.cpp \ - ScriptRunner.cpp \ - SecurityContext.cpp \ - SelectorQuery.cpp \ - ShadowRoot.cpp \ - SpaceSplitString.cpp \ - StaticNodeList.cpp \ - StyledElement.cpp \ - StyleElement.cpp \ - TagNodeList.cpp \ - Text.cpp \ - TextEvent.cpp \ - Touch.cpp \ - TouchEvent.cpp \ - TouchList.cpp \ - Traversal.cpp \ - TreeScope.cpp \ - TreeScopeAdopter.cpp \ - TreeWalker.cpp \ - UIEvent.cpp \ - UIEventWithKeyState.cpp \ - UserGestureIndicator.cpp \ - UserTypingGestureIndicator.cpp \ - ViewportArguments.cpp \ - WebCoreMemoryInstrumentation.cpp \ - WebKitAnimationEvent.cpp \ - WebKitTransitionEvent.cpp \ - WheelEvent.cpp \ - WindowEventContext.cpp \ PlatformMessagePortChannel.cpp \ AsyncFileStream.cpp \ Blob.cpp \ @@ -574,7 +290,6 @@ QT_SOURCES += \ BaseChooserOnlyDateAndTimeInputType.cpp \ BaseClickableWithKeyInputType.cpp \ BaseDateAndTimeInputType.cpp \ - BaseMultipleFieldsDateAndTimeInputType.cpp \ BaseTextInputType.cpp \ ButtonInputType.cpp \ CheckboxInputType.cpp \ @@ -615,6 +330,7 @@ QT_SOURCES += \ LabelsNodeList.cpp \ LinkRelAttribute.cpp \ MediaDocument.cpp \ + MicroDataAttributeTokenList.cpp \ MicroDataItemValue.cpp \ MonthInputType.cpp \ NumberInputType.cpp \ @@ -638,45 +354,49 @@ QT_SOURCES += \ ValidityState.cpp \ WeekInputType.cpp \ CanvasGradient.cpp \ + CanvasPathMethods.cpp \ CanvasPattern.cpp \ + CanvasProxy.cpp \ CanvasRenderingContext.cpp \ CanvasRenderingContext2D.cpp \ CanvasStyle.cpp \ DataView.cpp \ + FileIconLoader.cpp \ + BackgroundHTMLInputStream.cpp \ + BackgroundHTMLParser.cpp \ CSSPreloadScanner.cpp \ + CompactHTMLToken.cpp \ HTMLConstructionSite.cpp \ HTMLDocumentParser.cpp \ HTMLElementStack.cpp \ HTMLEntityParser.cpp \ HTMLEntitySearch.cpp \ HTMLFormattingElementList.cpp \ + HTMLIdentifier.cpp \ HTMLMetaCharsetParser.cpp \ HTMLParserIdioms.cpp \ + HTMLParserOptions.cpp \ HTMLParserScheduler.cpp \ + HTMLParserThread.cpp \ HTMLPreloadScanner.cpp \ + HTMLResourcePreloader.cpp \ HTMLScriptRunner.cpp \ HTMLSourceTracker.cpp \ HTMLTokenizer.cpp \ HTMLTreeBuilder.cpp \ + HTMLTreeBuilderSimulator.cpp \ HTMLViewSourceParser.cpp \ TextDocumentParser.cpp \ TextViewSourceParser.cpp \ XSSAuditor.cpp \ + XSSAuditorDelegate.cpp \ ContentDistributor.cpp \ - ContentSelectorQuery.cpp \ - DateTimeEditElement.cpp \ - DateTimeFieldElement.cpp \ - DateTimeFieldElements.cpp \ - DateTimeNumericFieldElement.cpp \ - DateTimeSymbolicFieldElement.cpp \ DetailsMarkerControl.cpp \ InsertionPoint.cpp \ - ImageInnerElement.cpp \ MediaControls.cpp \ MediaControlsApple.cpp \ MeterShadowElement.cpp \ ProgressShadowElement.cpp \ - SelectRuleFeatureSet.cpp \ SliderThumbElement.cpp \ SpinButtonElement.cpp \ TextControlInnerElements.cpp \ @@ -684,7 +404,6 @@ QT_SOURCES += \ ManifestParser.cpp \ ArchiveResource.cpp \ ArchiveResourceCollection.cpp \ - CachedMetadata.cpp \ MemoryCache.cpp \ CachedCSSStyleSheet.cpp \ CachedFont.cpp \ @@ -695,6 +414,7 @@ QT_SOURCES += \ CachedScript.cpp \ CachedShader.cpp \ CachedSVGDocument.cpp \ + CachedSVGDocumentReference.cpp \ CachedXSLStyleSheet.cpp \ CookieJar.cpp \ CrossOriginAccessControl.cpp \ @@ -720,7 +440,6 @@ QT_SOURCES += \ ImageLoader.cpp \ LinkLoader.cpp \ LoaderStrategy.cpp \ - MainResourceLoader.cpp \ MixedContentChecker.cpp \ NavigationAction.cpp \ NetscapePlugInStreamLoader.cpp \ @@ -729,8 +448,6 @@ QT_SOURCES += \ PolicyCallback.cpp \ PolicyChecker.cpp \ ProgressTracker.cpp \ - Prerenderer.cpp \ - PrerendererClient.cpp \ NavigationScheduler.cpp \ ResourceBuffer.cpp \ ResourceLoader.cpp \ @@ -739,7 +456,6 @@ QT_SOURCES += \ SinkDocument.cpp \ SubframeLoader.cpp \ SubresourceLoader.cpp \ - SubstituteData.cpp \ TextResourceDecoder.cpp \ ThreadableLoader.cpp \ AnimationBase.cpp \ @@ -748,9 +464,9 @@ QT_SOURCES += \ CSSPropertyAnimation.cpp \ ImplicitAnimation.cpp \ KeyframeAnimation.cpp \ - WebKitAnimation.cpp \ - WebKitAnimationList.cpp \ - BarInfo.cpp \ + AutoscrollController.cpp \ + BarProp.cpp \ + CaptionUserPreferences.cpp \ Chrome.cpp \ Console.cpp \ ContentSecurityPolicy.cpp \ @@ -777,14 +493,16 @@ QT_SOURCES += \ GroupSettings.cpp \ History.cpp \ Location.cpp \ - MemoryInfo.cpp \ MouseEventWithHitTestResults.cpp \ Navigator.cpp \ NavigatorBase.cpp \ OriginAccessEntry.cpp \ Page.cpp \ + PageActivityAssertionToken.cpp \ + PageConsole.cpp \ PageGroup.cpp \ PageGroupLoadDeferrer.cpp \ + PageThrottler.cpp \ PageVisibilityState.cpp \ Performance.cpp \ PerformanceEntry.cpp \ @@ -826,25 +544,25 @@ QT_SOURCES += \ ClockGeneric.cpp \ ContentType.cpp \ CrossThreadCopier.cpp \ + DatabaseStrategy.cpp \ DateComponents.cpp \ Decimal.cpp \ DragData.cpp \ DragImage.cpp \ - EventTracer.cpp \ FileChooser.cpp \ - FileIconLoader.cpp \ FileStream.cpp \ FileSystem.cpp \ HistogramSupport.cpp \ FontDescription.cpp \ - FontFallbackList.cpp \ - FontFamily.cpp \ + FontGenericFamilies.cpp \ + FontGlyphs.cpp \ FontFeatureSettings.cpp \ BitmapImage.cpp \ Color.cpp \ CrossfadeGeneratedImage.cpp \ FloatPoint3D.cpp \ FloatPoint.cpp \ + FloatPolygon.cpp \ FloatQuad.cpp \ FloatRect.cpp \ FloatSize.cpp \ @@ -905,7 +623,6 @@ QT_SOURCES += \ KillRingNone.cpp \ KURL.cpp \ Language.cpp \ - LayoutTestSupport.cpp \ Length.cpp \ LengthBox.cpp \ LineEnding.cpp \ @@ -915,14 +632,15 @@ QT_SOURCES += \ LinkHash.cpp \ Logging.cpp \ MemoryPressureHandler.cpp \ - MemoryUsageSupportQt.cpp \ MIMETypeRegistry.cpp \ DeviceMotionClientMock.cpp \ DeviceOrientationClientMock.cpp \ GeolocationClientMock.cpp \ + PlatformSpeechSynthesizerMock.cpp \ ScrollbarThemeMock.cpp \ AuthenticationChallengeBase.cpp \ BlobData.cpp \ + BlobRegistry.cpp \ BlobRegistryImpl.cpp \ BlobResourceHandle.cpp \ Credential.cpp \ @@ -931,22 +649,22 @@ QT_SOURCES += \ FormDataBuilder.cpp \ HTTPHeaderMap.cpp \ HTTPParsers.cpp \ - HTTPRequest.cpp \ - HTTPValidation.cpp \ MIMEHeader.cpp \ NetworkStateNotifier.cpp \ + NetworkStorageSessionStub.cpp \ ParsedContentType.cpp \ ProtectionSpace.cpp \ ProxyServer.cpp \ ResourceErrorBase.cpp \ ResourceHandle.cpp \ + ResourceHandleClient.cpp \ ResourceLoadTiming.cpp \ ResourceRequestBase.cpp \ ResourceResponseBase.cpp \ + NotImplemented.cpp \ RegularExpression.cpp \ PlatformEvent.cpp \ PlatformInstrumentation.cpp \ - PlatformMemoryInstrumentation.cpp \ RuntimeApplicationChecks.cpp \ RunLoop.cpp \ SchemeRegistry.cpp \ @@ -958,7 +676,6 @@ QT_SOURCES += \ ScrollView.cpp \ SharedBuffer.cpp \ SharedBufferChunkReader.cpp \ - StatsCounter.cpp \ SQLiteAuthorizer.cpp \ SQLiteDatabase.cpp \ SQLiteFileSystem.cpp \ @@ -972,7 +689,6 @@ QT_SOURCES += \ UnicodeRange.cpp \ FontTranscoder.cpp \ UUID.cpp \ - VisitedLinks.cpp \ Widget.cpp \ PlatformStrategies.cpp \ IFrameShimSupport.cpp \ @@ -981,11 +697,6 @@ QT_SOURCES += \ PluginPackage.cpp \ PluginStream.cpp \ PluginView.cpp \ - ExclusionInterval.cpp \ - ExclusionPolygon.cpp \ - ExclusionRectangle.cpp \ - ExclusionShape.cpp \ - ExclusionShapeInsideInfo.cpp \ FlowThreadController.cpp \ RenderFlexibleBox.cpp \ RenderFlowThread.cpp \ @@ -996,11 +707,18 @@ QT_SOURCES += \ RenderNamedFlowThread.cpp \ RenderRegion.cpp \ RenderRegionSet.cpp \ - RenderTextTrackCue.cpp \ + PolygonShape.cpp \ + RectangleShape.cpp \ + Shape.cpp \ + ShapeInfo.cpp \ + ShapeInsideInfo.cpp \ + ShapeInterval.cpp \ + ShapeOutsideInfo.cpp \ BasicShapes.cpp \ StyleCachedImageSet.cpp \ StyleCachedShader.cpp \ - StorageTask.cpp \ + StyleCustomFilterProgram.cpp \ + StyleCustomFilterProgramCache.cpp \ StorageThread.cpp \ Storage.cpp \ StorageAreaImpl.cpp \ @@ -1011,6 +729,7 @@ QT_SOURCES += \ StorageNamespace.cpp \ StorageNamespaceImpl.cpp \ StorageSyncManager.cpp \ + StorageStrategy.cpp \ StorageTracker.cpp \ Internals.cpp \ InternalSettings.cpp \ @@ -1037,11 +756,6 @@ QT_SOURCES += \ XPathUtil.cpp \ XPathValue.cpp \ XPathVariableReference.cpp \ - NewXMLDocumentParser.cpp \ - XMLCharacterReferenceParser.cpp \ - XMLDocumentParser.cpp \ - XMLTokenizer.cpp \ - XMLTreeBuilder.cpp \ AccessibilityObjectQt.cpp \ DragControllerQt.cpp \ EventHandlerQt.cpp \ @@ -1051,13 +765,11 @@ QT_SOURCES += \ FloatPointQt.cpp \ FloatRectQt.cpp \ FloatSizeQt.cpp \ - LayoutPointQt.cpp \ - LayoutRectQt.cpp \ - LayoutSizeQt.cpp \ GradientQt.cpp \ GraphicsContextQt.cpp \ IconQt.cpp \ ImageBufferQt.cpp \ + ImageBufferDataQt.cpp \ ImageDecoderQt.cpp \ ImageQt.cpp \ IntPointQt.cpp \ @@ -1069,8 +781,12 @@ QT_SOURCES += \ GraphicsLayerTextureMapper.cpp \ TextureMapper.cpp \ TextureMapperBackingStore.cpp \ + TextureMapperFPSCounter.cpp \ TextureMapperImageBuffer.cpp \ TextureMapperLayer.cpp \ + TextureMapperSurfaceBackingStore.cpp \ + TextureMapperTile.cpp \ + TextureMapperTiledBackingStore.cpp \ DNSResolveQueue.cpp \ MIMESniffing.cpp \ CookieJarQt.cpp \ @@ -1082,11 +798,12 @@ QT_SOURCES += \ ProxyServerQt.cpp \ QtMIMETypeSniffer.cpp \ QNetworkReplyHandler.cpp \ - EditorQt.cpp \ Cursor.cpp \ + ContextMenu.cpp \ + ContextMenuItem.cpp \ ClipboardQt.cpp \ - ContextMenuItemQt.cpp \ - ContextMenuQt.cpp \ + ContextMenuItemNone.cpp \ + ContextMenuNone.cpp \ CursorQt.cpp \ DragDataQt.cpp \ DragImageQt.cpp \ @@ -1120,7 +837,6 @@ QT_SOURCES += \ TemporaryLinkStubsQt.cpp \ TextBoundariesQt.cpp \ TextBreakIteratorInternalICUQt.cpp \ - TextCodecQt.cpp \ WidgetQt.cpp \ XMLDocumentParserQt.cpp \ ScrollAnimatorNone.cpp \ @@ -1128,51 +844,50 @@ QT_SOURCES += \ PluginPackageNone.cpp \ PluginViewNone.cpp \ ChangeVersionWrapper.cpp \ + DatabaseBackend.cpp \ + DatabaseBackendContext.cpp \ + DatabaseBackendSync.cpp \ + DatabaseBase.cpp \ + DatabaseManager.cpp \ DatabaseTask.cpp \ DatabaseThread.cpp \ DatabaseTracker.cpp \ - OriginQuotaManager.cpp \ - OriginUsageRecord.cpp \ + OriginLock.cpp \ SQLException.cpp \ SQLResultSet.cpp \ SQLResultSetRowList.cpp \ SQLStatement.cpp \ + SQLStatementBackend.cpp \ SQLStatementSync.cpp \ SQLTransaction.cpp \ + SQLTransactionBackend.cpp \ + SQLTransactionBackendSync.cpp \ SQLTransactionClient.cpp \ SQLTransactionCoordinator.cpp \ + SQLTransactionStateMachine.cpp \ SQLTransactionSync.cpp \ - JSCustomSQLStatementErrorCallback.cpp \ - JSSQLResultSetRowListCustom.cpp \ - JSSQLTransactionCustom.cpp \ - JSSQLTransactionSyncCustom.cpp \ IconDatabase.cpp \ IconRecord.cpp \ PageURLRecord.cpp \ - JSDedicatedWorkerContextCustom.cpp \ - JSWorkerContextBase.cpp \ - JSWorkerContextCustom.cpp \ - JSWorkerCustom.cpp \ - WorkerScriptController.cpp \ - WorkerScriptDebugServer.cpp \ WorkerThreadableLoader.cpp \ WorkerNavigator.cpp \ AbstractWorker.cpp \ - DedicatedWorkerContext.cpp \ + DedicatedWorkerGlobalScope.cpp \ DedicatedWorkerThread.cpp \ Worker.cpp \ - WorkerContext.cpp \ + WorkerGlobalScope.cpp \ WorkerEventQueue.cpp \ WorkerLocation.cpp \ WorkerMessagingProxy.cpp \ WorkerRunLoop.cpp \ WorkerThread.cpp \ WorkerScriptLoader.cpp \ - JSSharedWorkerCustom.cpp \ DefaultSharedWorkerRepository.cpp \ SharedWorker.cpp \ - SharedWorkerContext.cpp \ + SharedWorkerGlobalScope.cpp \ + SharedWorkerRepository.cpp \ SharedWorkerThread.cpp \ + RenderFullScreen.cpp \ FELightingNEON.cpp \ CustomFilterValidatedProgramTextureMapper.cpp \ CustomFilterGlobalContext.cpp \ @@ -1208,14 +923,10 @@ QT_SOURCES += \ FilterOperations.cpp \ FilterOperation.cpp \ FilterEffect.cpp \ - LightSource.cpp \ PointLightSource.cpp \ SpotLightSource.cpp \ SourceAlpha.cpp \ SourceGraphic.cpp \ - JSSVGElementInstanceCustom.cpp \ - JSSVGLengthCustom.cpp \ - JSSVGPathSegCustom.cpp \ SVGCSSComputedStyleDeclaration.cpp \ SVGCSSParser.cpp \ SVGCSSStyleSelector.cpp \ @@ -1227,11 +938,10 @@ QT_SOURCES += \ SVGFilterBuilder.cpp \ SVGImage.cpp \ SVGImageCache.cpp \ + SVGImageForContainer.cpp \ + SVGAnimatedProperty.cpp \ SVGAttributeToPropertyMap.cpp \ SVGPathSegListPropertyTearOff.cpp \ - JSJavaScriptCallFrameCustom.cpp \ - ScriptProfiler.cpp \ - JavaScriptCallFrame.cpp \ WebSocket.cpp \ WebSocketChannel.cpp \ WebSocketDeflateFramer.cpp \ @@ -1240,15 +950,77 @@ QT_SOURCES += \ WebSocketExtensionParser.cpp \ WebSocketFrame.cpp \ WebSocketHandshake.cpp \ - WebSocketHandshakeRequest.cpp \ - WebSocketHandshakeResponse.cpp \ WorkerThreadableWebSocketChannel.cpp \ ThreadableWebSocketChannel.cpp \ ThreadableWebSocketChannelClientWrapper.cpp \ SocketStreamErrorBase.cpp \ SocketStreamHandleBase.cpp \ SocketStreamHandleQt.cpp \ - JSWebSocketCustom.cpp \ + JSWebGLRenderingContextCustom.cpp \ + CanvasContextAttributes.cpp \ + WebGLObject.cpp \ + WebGLBuffer.cpp \ + WebGLCompressedTextureATC.cpp \ + WebGLCompressedTexturePVRTC.cpp \ + WebGLCompressedTextureS3TC.cpp \ + WebGLContextAttributes.cpp \ + WebGLContextEvent.cpp \ + WebGLContextGroup.cpp \ + WebGLContextObject.cpp \ + WebGLDebugRendererInfo.cpp \ + WebGLDebugShaders.cpp \ + WebGLDepthTexture.cpp \ + WebGLExtension.cpp \ + WebGLFramebuffer.cpp \ + WebGLGetInfo.cpp \ + WebGLLoseContext.cpp \ + WebGLProgram.cpp \ + WebGLRenderbuffer.cpp \ + WebGLRenderingContext.cpp \ + WebGLShader.cpp \ + WebGLShaderPrecisionFormat.cpp \ + WebGLSharedObject.cpp \ + EXTDrawBuffers.cpp \ + EXTTextureFilterAnisotropic.cpp \ + OESStandardDerivatives.cpp \ + OESTextureFloat.cpp \ + OESTextureHalfFloat.cpp \ + OESVertexArrayObject.cpp \ + OESElementIndexUint.cpp \ + WebGLTexture.cpp \ + WebGLUniformLocation.cpp \ + WebGLVertexArrayObjectOES.cpp \ + ScrollingStateFixedNode.cpp \ + ScrollingStateNode.cpp \ + ScrollingStateScrollingNode.cpp \ + ScrollingStateStickyNode.cpp \ + ScrollingStateTree.cpp \ + ScrollingCoordinatorCoordinatedGraphics.cpp \ + ScrollingStateNodeCoordinatedGraphics.cpp \ + ScrollingStateScrollingNodeCoordinatedGraphics.cpp \ + ANGLEWebKitBridge.cpp \ + GraphicsContext3D.cpp \ + DrawingBuffer.cpp \ + DrawingBufferQt.cpp \ + Texture.cpp \ + TilingData.cpp \ + GraphicsContext3DOpenGLCommon.cpp \ + Extensions3DOpenGLCommon.cpp \ + GraphicsContext3DQt.cpp \ + QFramebufferPaintDevice.cpp \ + TextureMapperGL.cpp \ + TextureMapperShaderProgram.cpp \ + AreaAllocator.cpp \ + CompositingCoordinator.cpp \ + CoordinatedBackingStore.cpp \ + CoordinatedGraphicsLayer.cpp \ + CoordinatedGraphicsScene.cpp \ + CoordinatedImageBacking.cpp \ + CoordinatedSurface.cpp \ + CoordinatedTile.cpp \ + UpdateAtlas.cpp \ + GraphicsContext3DOpenGL.cpp \ + Extensions3DOpenGL.cpp \ Archive.cpp \ ArchiveFactory.cpp \ MHTMLArchive.cpp \ @@ -1258,14 +1030,15 @@ QT_SOURCES += \ PNGImageDecoder.cpp \ JPEGImageDecoder.cpp \ sqlite3.c \ - MathMLNames.cpp \ MathMLElementFactory.cpp \ - SVGNames.cpp \ + MathMLNames.cpp \ SVGElementFactory.cpp \ JSSVGElementWrapperFactory.cpp \ + SVGNames.cpp \ XLinkNames.cpp \ CSSPropertyNames.cpp \ CSSValueKeywords.cpp \ + InternalSettingsGenerated.cpp \ JSDOMFileSystem.cpp \ JSDOMFileSystemSync.cpp \ JSDOMWindowFileSystem.cpp \ @@ -1288,7 +1061,8 @@ QT_SOURCES += \ JSFileWriterCallback.cpp \ JSMetadata.cpp \ JSMetadataCallback.cpp \ - JSWorkerContextFileSystem.cpp \ + JSWorkerGlobalScopeFileSystem.cpp \ + JSCoordinates.cpp \ JSGeolocation.cpp \ JSGeoposition.cpp \ JSNavigatorGeolocation.cpp \ @@ -1298,26 +1072,30 @@ QT_SOURCES += \ JSDOMWindowIndexedDatabase.cpp \ JSIDBAny.cpp \ JSIDBCursor.cpp \ - JSIDBDatabaseException.cpp \ + JSIDBCursorWithValue.cpp \ JSIDBDatabase.cpp \ JSIDBFactory.cpp \ JSIDBIndex.cpp \ - JSIDBKey.cpp \ JSIDBKeyRange.cpp \ JSIDBObjectStore.cpp \ + JSIDBOpenDBRequest.cpp \ JSIDBRequest.cpp \ JSIDBTransaction.cpp \ - JSWorkerContextIndexedDatabase.cpp \ + JSIDBVersionChangeEvent.cpp \ + JSWorkerGlobalScopeIndexedDatabase.cpp \ JSDOMWindowNotifications.cpp \ JSNotification.cpp \ JSNotificationCenter.cpp \ JSNotificationPermissionCallback.cpp \ - JSWorkerContextNotifications.cpp \ + JSWorkerGlobalScopeNotifications.cpp \ JSDOMWindowQuota.cpp \ + JSNavigatorStorageQuota.cpp \ JSStorageInfo.cpp \ - JSStorageInfoErrorCallback.cpp \ - JSStorageInfoQuotaCallback.cpp \ - JSStorageInfoUsageCallback.cpp \ + JSStorageErrorCallback.cpp \ + JSStorageQuota.cpp \ + JSStorageQuotaCallback.cpp \ + JSStorageUsageCallback.cpp \ + JSWorkerNavigatorStorageQuota.cpp \ JSAudioBuffer.cpp \ JSAudioBufferCallback.cpp \ JSAudioBufferSourceNode.cpp \ @@ -1325,27 +1103,25 @@ QT_SOURCES += \ JSChannelSplitterNode.cpp \ JSAudioContext.cpp \ JSAudioDestinationNode.cpp \ - JSAudioGain.cpp \ JSGainNode.cpp \ JSAudioListener.cpp \ JSAudioNode.cpp \ JSPannerNode.cpp \ JSAudioParam.cpp \ JSAudioProcessingEvent.cpp \ - JSAudioSourceNode.cpp \ JSBiquadFilterNode.cpp \ JSConvolverNode.cpp \ JSDelayNode.cpp \ - JSDOMWindowWebAudio.cpp \ JSDynamicsCompressorNode.cpp \ JSScriptProcessorNode.cpp \ JSMediaElementAudioSourceNode.cpp \ JSMediaStreamAudioSourceNode.cpp \ + JSOfflineAudioContext.cpp \ JSOfflineAudioCompletionEvent.cpp \ JSOscillatorNode.cpp \ JSAnalyserNode.cpp \ JSWaveShaperNode.cpp \ - JSWaveTable.cpp \ + JSPeriodicWave.cpp \ JSDOMWindowWebDatabase.cpp \ JSDatabase.cpp \ JSDatabaseCallback.cpp \ @@ -1361,14 +1137,14 @@ QT_SOURCES += \ JSSQLTransactionErrorCallback.cpp \ JSSQLTransactionSync.cpp \ JSSQLTransactionSyncCallback.cpp \ - JSWorkerContextWebDatabase.cpp \ + JSWorkerGlobalScopeWebDatabase.cpp \ JSCloseEvent.cpp \ - JSDOMWindowWebSocket.cpp \ JSWebSocket.cpp \ - JSWorkerContextWebSocket.cpp \ JSCounter.cpp \ JSCSSCharsetRule.cpp \ + JSCSSFontFaceLoadEvent.cpp \ JSCSSFontFaceRule.cpp \ + JSCSSHostRule.cpp \ JSCSSImportRule.cpp \ JSCSSMediaRule.cpp \ JSCSSPageRule.cpp \ @@ -1378,8 +1154,11 @@ QT_SOURCES += \ JSCSSStyleDeclaration.cpp \ JSCSSStyleRule.cpp \ JSCSSStyleSheet.cpp \ + JSCSSSupportsRule.cpp \ JSCSSValue.cpp \ JSCSSValueList.cpp \ + JSDOMWindowCSS.cpp \ + JSFontLoader.cpp \ JSMediaList.cpp \ JSMediaQueryList.cpp \ JSRect.cpp \ @@ -1387,6 +1166,7 @@ QT_SOURCES += \ JSStyleMedia.cpp \ JSStyleSheet.cpp \ JSStyleSheetList.cpp \ + JSWebKitCSSFilterRule.cpp \ JSWebKitCSSFilterValue.cpp \ JSWebKitCSSKeyframeRule.cpp \ JSWebKitCSSKeyframesRule.cpp \ @@ -1398,6 +1178,7 @@ QT_SOURCES += \ JSAttr.cpp \ JSBeforeLoadEvent.cpp \ JSCharacterData.cpp \ + JSChildNode.cpp \ JSClientRect.cpp \ JSClientRectList.cpp \ JSClipboard.cpp \ @@ -1424,13 +1205,13 @@ QT_SOURCES += \ JSEvent.cpp \ JSEventException.cpp \ JSEventTarget.cpp \ + JSFocusEvent.cpp \ JSHashChangeEvent.cpp \ JSKeyboardEvent.cpp \ JSMouseEvent.cpp \ JSMessageChannel.cpp \ JSMessageEvent.cpp \ JSMessagePort.cpp \ - JSMutationCallback.cpp \ JSMutationEvent.cpp \ JSMutationObserver.cpp \ JSMutationRecord.cpp \ @@ -1456,6 +1237,7 @@ QT_SOURCES += \ JSTouch.cpp \ JSTouchEvent.cpp \ JSTouchList.cpp \ + JSTransitionEvent.cpp \ JSTreeWalker.cpp \ JSUIEvent.cpp \ JSWebKitAnimationEvent.cpp \ @@ -1479,15 +1261,21 @@ QT_SOURCES += \ JSCanvasGradient.cpp \ JSInt32Array.cpp \ JSCanvasPattern.cpp \ + JSCanvasProxy.cpp \ JSCanvasRenderingContext.cpp \ JSCanvasRenderingContext2D.cpp \ + JSDOMPath.cpp \ + JSEXTDrawBuffers.cpp \ JSEXTTextureFilterAnisotropic.cpp \ JSOESStandardDerivatives.cpp \ JSOESTextureFloat.cpp \ + JSOESTextureHalfFloat.cpp \ JSOESVertexArrayObject.cpp \ JSOESElementIndexUint.cpp \ JSWebGLActiveInfo.cpp \ JSWebGLBuffer.cpp \ + JSWebGLCompressedTextureATC.cpp \ + JSWebGLCompressedTexturePVRTC.cpp \ JSWebGLCompressedTextureS3TC.cpp \ JSWebGLContextAttributes.cpp \ JSWebGLContextEvent.cpp \ @@ -1598,16 +1386,14 @@ QT_SOURCES += \ JSValidityState.cpp \ JSVoidCallback.cpp \ JSHTMLContentElement.cpp \ - JSHTMLShadowElement.cpp \ JSInjectedScriptHost.cpp \ JSInspectorFrontendHost.cpp \ JSJavaScriptCallFrame.cpp \ JSScriptProfile.cpp \ JSScriptProfileNode.cpp \ JSDOMApplicationCache.cpp \ - JSBarInfo.cpp \ + JSBarProp.cpp \ JSConsole.cpp \ - JSCoordinates.cpp \ JSCrypto.cpp \ JSDOMSecurityPolicy.cpp \ JSDOMSelection.cpp \ @@ -1615,7 +1401,6 @@ QT_SOURCES += \ JSEventSource.cpp \ JSHistory.cpp \ JSLocation.cpp \ - JSMemoryInfo.cpp \ JSNavigator.cpp \ JSPerformance.cpp \ JSPerformanceEntry.cpp \ @@ -1627,9 +1412,9 @@ QT_SOURCES += \ JSSpeechInputEvent.cpp \ JSSpeechInputResult.cpp \ JSSpeechInputResultList.cpp \ - JSWebKitAnimation.cpp \ - JSWebKitAnimationList.cpp \ JSWebKitPoint.cpp \ + JSWindowBase64.cpp \ + JSWindowTimers.cpp \ JSWorkerNavigator.cpp \ JSDOMPlugin.cpp \ JSDOMMimeType.cpp \ @@ -1640,12 +1425,14 @@ QT_SOURCES += \ JSInternals.cpp \ JSInternalSettings.cpp \ JSMallocStatistics.cpp \ + JSMemoryInfo.cpp \ + JSTypeConversions.cpp \ JSAbstractWorker.cpp \ - JSDedicatedWorkerContext.cpp \ + JSDedicatedWorkerGlobalScope.cpp \ JSSharedWorker.cpp \ - JSSharedWorkerContext.cpp \ + JSSharedWorkerGlobalScope.cpp \ JSWorker.cpp \ - JSWorkerContext.cpp \ + JSWorkerGlobalScope.cpp \ JSWorkerLocation.cpp \ JSDOMParser.cpp \ JSXMLHttpRequest.cpp \ @@ -1694,6 +1481,7 @@ QT_SOURCES += \ JSSVGElementInstanceList.cpp \ JSSVGEllipseElement.cpp \ JSSVGException.cpp \ + JSSVGExternalResourcesRequired.cpp \ JSSVGFEBlendElement.cpp \ JSSVGFEColorMatrixElement.cpp \ JSSVGFEComponentTransferElement.cpp \ @@ -1720,6 +1508,8 @@ QT_SOURCES += \ JSSVGFETileElement.cpp \ JSSVGFETurbulenceElement.cpp \ JSSVGFilterElement.cpp \ + JSSVGFilterPrimitiveStandardAttributes.cpp \ + JSSVGFitToViewBox.cpp \ JSSVGFontElement.cpp \ JSSVGFontFaceElement.cpp \ JSSVGFontFaceFormatElement.cpp \ @@ -1731,6 +1521,7 @@ QT_SOURCES += \ JSSVGGlyphElement.cpp \ JSSVGGlyphRefElement.cpp \ JSSVGGradientElement.cpp \ + JSSVGGraphicsElement.cpp \ JSSVGHKernElement.cpp \ JSSVGImageElement.cpp \ JSSVGLength.cpp \ @@ -1783,9 +1574,11 @@ QT_SOURCES += \ JSSVGStopElement.cpp \ JSSVGStringList.cpp \ JSSVGStyleElement.cpp \ + JSSVGStyledElement.cpp \ JSSVGSVGElement.cpp \ JSSVGSwitchElement.cpp \ JSSVGSymbolElement.cpp \ + JSSVGTests.cpp \ JSSVGTextContentElement.cpp \ JSSVGTextElement.cpp \ JSSVGTextPathElement.cpp \ @@ -1795,6 +1588,7 @@ QT_SOURCES += \ JSSVGTransformList.cpp \ JSSVGTRefElement.cpp \ JSSVGTSpanElement.cpp \ + JSSVGURIReference.cpp \ JSSVGUnitTypes.cpp \ JSSVGUseElement.cpp \ JSSVGViewElement.cpp \ @@ -1802,13 +1596,14 @@ QT_SOURCES += \ JSSVGViewSpec.cpp \ JSSVGZoomAndPan.cpp \ JSSVGZoomEvent.cpp \ + JSInternalSettingsGenerated.cpp \ InspectorFrontend.cpp \ InspectorBackendDispatcher.cpp \ InspectorTypeBuilder.cpp \ CSSGrammar.cpp \ - HTMLNames.cpp \ HTMLElementFactory.cpp \ JSHTMLElementWrapperFactory.cpp \ + HTMLNames.cpp \ XMLNSNames.cpp \ XMLNames.cpp \ WebKitFontFamilyNames.cpp \ @@ -1817,6 +1612,7 @@ QT_SOURCES += \ HTMLEntityTable.cpp \ ColorData.cpp \ UserAgentStyleSheetsData.cpp \ + PlugInsResourcesData.cpp \ XPathGrammar.cpp \ RenderSVGAllInOne.cpp \ SVGAllInOne.cpp \ @@ -1828,10 +1624,24 @@ QT_SOURCES += \ HTMLElementsAllInOne.cpp \ EditingAllInOne.cpp \ RenderingAllInOne.cpp \ + CSSAllInOne.cpp \ + MediaAllInOne.cpp \ + DOMAllInOne.cpp \ + JSBindingsAllInOne.cpp \ + qrc_WebCore.cpp \ + qrc_WebKit.cpp \ + qrc_InspectorBackendCommands.cpp \ moc_QtMIMETypeSniffer.cpp QT_VPATH += \ qtbase/src/3rdparty/sqlite \ + qtwebkit/Source/WebCore/Modules/filesystem \ + qtwebkit/Source/WebCore/Modules/geolocation \ + qtwebkit/Source/WebCore/Modules/navigatorcontentutils \ + qtwebkit/Source/WebCore/Modules/notifications \ + qtwebkit/Source/WebCore/Modules/proximity \ + qtwebkit/Source/WebCore/Modules/webdatabase \ + qtwebkit/Source/WebCore/Modules/websockets \ qtwebkit/Source/WebCore/accessibility \ qtwebkit/Source/WebCore/accessibility/qt \ qtwebkit/Source/WebCore/bindings \ @@ -1845,12 +1655,12 @@ QT_VPATH += \ qtwebkit/Source/WebCore/dom \ qtwebkit/Source/WebCore/dom/default \ qtwebkit/Source/WebCore/editing \ - qtwebkit/Source/WebCore/editing/qt \ qtwebkit/Source/WebCore/fileapi \ qtwebkit/Source/WebCore/history \ qtwebkit/Source/WebCore/history/qt \ qtwebkit/Source/WebCore/html \ qtwebkit/Source/WebCore/html/canvas \ + qtwebkit/Source/WebCore/html/forms \ qtwebkit/Source/WebCore/html/parser \ qtwebkit/Source/WebCore/html/shadow \ qtwebkit/Source/WebCore/inspector \ @@ -1860,26 +1670,25 @@ QT_VPATH += \ qtwebkit/Source/WebCore/loader/archive/mhtml \ qtwebkit/Source/WebCore/loader/cache \ qtwebkit/Source/WebCore/loader/icon \ - qtwebkit/Source/WebCore/Modules/filesystem \ - qtwebkit/Source/WebCore/Modules/geolocation \ - qtwebkit/Source/WebCore/Modules/navigatorcontentutils \ - qtwebkit/Source/WebCore/Modules/notifications \ - qtwebkit/Source/WebCore/Modules/webdatabase \ - qtwebkit/Source/WebCore/Modules/websockets \ qtwebkit/Source/WebCore/page \ qtwebkit/Source/WebCore/page/animation \ qtwebkit/Source/WebCore/page/qt \ qtwebkit/Source/WebCore/page/scrolling \ + qtwebkit/Source/WebCore/page/scrolling/coordinatedgraphics \ qtwebkit/Source/WebCore/platform \ qtwebkit/Source/WebCore/platform/animation \ qtwebkit/Source/WebCore/platform/graphics \ qtwebkit/Source/WebCore/platform/graphics/cpu/arm/filters \ qtwebkit/Source/WebCore/platform/graphics/filters \ qtwebkit/Source/WebCore/platform/graphics/filters/texmap \ + qtwebkit/Source/WebCore/platform/graphics/gpu \ + qtwebkit/Source/WebCore/platform/graphics/gpu/qt \ + qtwebkit/Source/WebCore/platform/graphics/opengl \ qtwebkit/Source/WebCore/platform/graphics/qt \ qtwebkit/Source/WebCore/platform/graphics/surfaces \ qtwebkit/Source/WebCore/platform/graphics/surfaces/qt \ qtwebkit/Source/WebCore/platform/graphics/texmap \ + qtwebkit/Source/WebCore/platform/graphics/texmap/coordinated \ qtwebkit/Source/WebCore/platform/graphics/transforms \ qtwebkit/Source/WebCore/platform/image-decoders \ qtwebkit/Source/WebCore/platform/image-decoders/bmp \ @@ -1898,6 +1707,7 @@ QT_VPATH += \ qtwebkit/Source/WebCore/platform/text/transcoder \ qtwebkit/Source/WebCore/plugins \ qtwebkit/Source/WebCore/rendering \ + qtwebkit/Source/WebCore/rendering/shapes \ qtwebkit/Source/WebCore/rendering/style \ qtwebkit/Source/WebCore/rendering/svg \ qtwebkit/Source/WebCore/storage \ diff --git a/repos/libports/lib/mk/qt5_webkit_generated.inc b/repos/libports/lib/mk/qt5_webkit_generated.inc index f030a0d37..7c38410d5 100644 --- a/repos/libports/lib/mk/qt5_webkit_generated.inc +++ b/repos/libports/lib/mk/qt5_webkit_generated.inc @@ -1,45 +1,27 @@ -QT_DEFINES += -DQT_NO_LIBUDEV -DQT_NO_XCB -DQT_NO_XKBCOMMON -DBUILDING_QT__=1 -DNDEBUG -DENABLE_3D_RENDERING=1 -DENABLE_BLOB=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_STICKY_POSITION=1 -DENABLE_DATALIST_ELEMENT=1 -DENABLE_DETAILS_ELEMENT=1 -DENABLE_FAST_MOBILE_SCROLLING=1 -DENABLE_FILTERS=1 -DENABLE_FTPDIR=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_LINK_PREFETCH=1 -DENABLE_METER_ELEMENT=1 -DENABLE_MHTML=1 -DENABLE_MUTATION_OBSERVERS=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_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_TOUCH_ADJUSTMENT=1 -DENABLE_TOUCH_EVENTS=1 -DENABLE_WEB_SOCKETS=1 -DENABLE_WEB_TIMING=1 -DENABLE_WORKERS=1 -DENABLE_XHR_TIMEOUT=1 -DWTF_USE_TILED_BACKING_STORE=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 -DENABLE_TOUCH_SLIDER=1 -DENABLE_ACCELERATED_2D_CANVAS=0 -DENABLE_ANIMATION_API=0 -DENABLE_BATTERY_STATUS=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_BACKGROUND=0 -DENABLE_CSS3_CONDITIONAL_RULES=0 -DENABLE_CSS3_TEXT=0 -DENABLE_DASHBOARD_SUPPORT=0 -DENABLE_DATAGRID=0 -DENABLE_DATA_TRANSFER_ITEMS=0 -DENABLE_DEVICE_ORIENTATION=0 -DENABLE_DIRECTORY_UPLOAD=0 -DENABLE_DOWNLOAD_ATTRIBUTE=0 -DENABLE_FILE_SYSTEM=0 -DENABLE_FULLSCREEN_API=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=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_LINK_PRERENDER=0 -DENABLE_MATHML=0 -DENABLE_MEDIA_SOURCE=0 -DENABLE_MEDIA_STATISTICS=0 -DENABLE_MEDIA_STREAM=0 -DENABLE_MICRODATA=0 -DENABLE_NAVIGATOR_CONTENT_UTILS=0 -DENABLE_NETSCAPE_PLUGIN_API=0 -DENABLE_NETWORK_INFO=0 -DENABLE_ORIENTATION_EVENTS=0 -DENABLE_PROXIMITY_EVENTS=0 -DENABLE_QUOTA=0 -DENABLE_SCRIPTED_SPEECH=0 -DENABLE_SHADOW_DOM=0 -DENABLE_STYLE_SCOPED=0 -DENABLE_SVG_DOM_OBJC_BINDINGS=0 -DENABLE_TEXT_AUTOSIZING=0 -DENABLE_TEXT_NOTIFICATIONS_ONLY=0 -DENABLE_TOUCH_ICON_LOADING=0 -DENABLE_VIBRATION=0 -DENABLE_VIDEO=0 -DENABLE_VIDEO_TRACK=0 -DENABLE_WEBGL=0 -DENABLE_WEB_AUDIO=0 -DENABLE_XSLT=0 -DBUILDING_WebKit1 -DBUILDING_WEBKIT -DQT_ASCII_CAST_WARNINGS -DSQLITE_CORE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_OMIT_COMPLETE -DSTATICALLY_LINKED_WITH_WebCore -DSTATICALLY_LINKED_WITH_JavaScriptCore -DSTATICALLY_LINKED_WITH_WTF -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_SQL_LIB -DQT_NETWORK_LIB -DQT_GUI_LIB -DQT_CORE_LIB +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_INCPATH += \ - qtbase/include \ - qtbase/include/QtCore \ - qtbase/include/QtCore/5.1.0 \ - qtbase/include/QtCore/5.1.0/QtCore \ - qtbase/include/QtGui \ - qtbase/include/QtGui/5.1.0 \ - qtbase/include/QtGui/5.1.0/QtGui \ - qtbase/include/QtNetwork \ - qtbase/include/QtSql \ - qtbase/mkspecs/genode-g++ \ - qtbase/src/3rdparty/sqlite \ + qtwebkit/Source/WebKit \ + qtwebkit/Source/WebKit/qt/Api \ + qtwebkit/Source/WebKit/qt/WebCoreSupport \ + qtwebkit/Source/WTF/wtf/qt \ + qtwebkit/Source/WebKit/qt/WebCoreSupport \ qtwebkit/Source \ - qtwebkit/Source/JavaScriptCore \ - qtwebkit/Source/JavaScriptCore/API \ - qtwebkit/Source/JavaScriptCore/assembler \ - qtwebkit/Source/JavaScriptCore/bytecode \ - qtwebkit/Source/JavaScriptCore/bytecompiler \ - qtwebkit/Source/JavaScriptCore/debugger \ - qtwebkit/Source/JavaScriptCore/dfg \ - qtwebkit/Source/JavaScriptCore/disassembler \ - qtwebkit/Source/JavaScriptCore/ForwardingHeaders \ - qtwebkit/Source/JavaScriptCore/heap \ - qtwebkit/Source/JavaScriptCore/interpreter \ - qtwebkit/Source/JavaScriptCore/jit \ - qtwebkit/Source/JavaScriptCore/llint \ - qtwebkit/Source/JavaScriptCore/parser \ - qtwebkit/Source/JavaScriptCore/profiler \ - qtwebkit/Source/JavaScriptCore/runtime \ - qtwebkit/Source/JavaScriptCore/tools \ - qtwebkit/Source/JavaScriptCore/yarr \ - qtwebkit/Source/ThirdParty \ qtwebkit/Source/WebCore \ + qtwebkit/Source/WebCore/Modules/filesystem \ + qtwebkit/Source/WebCore/Modules/geolocation \ + qtwebkit/Source/WebCore/Modules/indexeddb \ + qtwebkit/Source/WebCore/Modules/navigatorcontentutils \ + qtwebkit/Source/WebCore/Modules/notifications \ + qtwebkit/Source/WebCore/Modules/proximity \ + qtwebkit/Source/WebCore/Modules/quota \ + qtwebkit/Source/WebCore/Modules/webaudio \ + qtwebkit/Source/WebCore/Modules/webdatabase \ + qtwebkit/Source/WebCore/Modules/websockets \ qtwebkit/Source/WebCore/accessibility \ qtwebkit/Source/WebCore/bindings \ qtwebkit/Source/WebCore/bindings/generic \ - qtwebkit/Source/WebCore/bindings/js \ qtwebkit/Source/WebCore/bridge \ - qtwebkit/Source/WebCore/bridge/c \ - qtwebkit/Source/WebCore/bridge/jsc \ qtwebkit/Source/WebCore/bridge/qt \ qtwebkit/Source/WebCore/css \ qtwebkit/Source/WebCore/dom \ @@ -49,6 +31,7 @@ QT_INCPATH += \ qtwebkit/Source/WebCore/history \ qtwebkit/Source/WebCore/html \ qtwebkit/Source/WebCore/html/canvas \ + qtwebkit/Source/WebCore/html/forms \ qtwebkit/Source/WebCore/html/parser \ qtwebkit/Source/WebCore/html/shadow \ qtwebkit/Source/WebCore/html/track \ @@ -59,19 +42,11 @@ QT_INCPATH += \ qtwebkit/Source/WebCore/loader/cache \ qtwebkit/Source/WebCore/loader/icon \ qtwebkit/Source/WebCore/mathml \ - qtwebkit/Source/WebCore/Modules/filesystem \ - qtwebkit/Source/WebCore/Modules/geolocation \ - qtwebkit/Source/WebCore/Modules/indexeddb \ - qtwebkit/Source/WebCore/Modules/navigatorcontentutils \ - qtwebkit/Source/WebCore/Modules/notifications \ - qtwebkit/Source/WebCore/Modules/quota \ - qtwebkit/Source/WebCore/Modules/webaudio \ - qtwebkit/Source/WebCore/Modules/webdatabase \ - qtwebkit/Source/WebCore/Modules/websockets \ qtwebkit/Source/WebCore/page \ qtwebkit/Source/WebCore/page/animation \ qtwebkit/Source/WebCore/page/qt \ qtwebkit/Source/WebCore/page/scrolling \ + qtwebkit/Source/WebCore/page/scrolling/coordinatedgraphics \ qtwebkit/Source/WebCore/platform \ qtwebkit/Source/WebCore/platform/animation \ qtwebkit/Source/WebCore/platform/audio \ @@ -85,11 +60,12 @@ QT_INCPATH += \ qtwebkit/Source/WebCore/platform/graphics/qt \ qtwebkit/Source/WebCore/platform/graphics/surfaces \ qtwebkit/Source/WebCore/platform/graphics/texmap \ + qtwebkit/Source/WebCore/platform/graphics/texmap/coordinated \ qtwebkit/Source/WebCore/platform/graphics/transforms \ qtwebkit/Source/WebCore/platform/image-decoders \ qtwebkit/Source/WebCore/platform/image-decoders/bmp \ - qtwebkit/Source/WebCore/platform/image-decoders/gif \ qtwebkit/Source/WebCore/platform/image-decoders/ico \ + qtwebkit/Source/WebCore/platform/image-decoders/gif \ qtwebkit/Source/WebCore/platform/image-decoders/jpeg \ qtwebkit/Source/WebCore/platform/image-decoders/png \ qtwebkit/Source/WebCore/platform/image-decoders/webp \ @@ -104,6 +80,7 @@ QT_INCPATH += \ qtwebkit/Source/WebCore/plugins \ qtwebkit/Source/WebCore/rendering \ qtwebkit/Source/WebCore/rendering/mathml \ + qtwebkit/Source/WebCore/rendering/shapes \ qtwebkit/Source/WebCore/rendering/style \ qtwebkit/Source/WebCore/rendering/svg \ qtwebkit/Source/WebCore/storage \ @@ -113,16 +90,49 @@ QT_INCPATH += \ qtwebkit/Source/WebCore/svg/graphics/filters \ qtwebkit/Source/WebCore/svg/properties \ qtwebkit/Source/WebCore/testing \ - qtwebkit/Source/WebCore/testing/js \ qtwebkit/Source/WebCore/websockets \ qtwebkit/Source/WebCore/workers \ qtwebkit/Source/WebCore/xml \ qtwebkit/Source/WebCore/xml/parser \ - qtwebkit/Source/WebKit \ - qtwebkit/Source/WebKit/qt/Api \ - qtwebkit/Source/WebKit/qt/WebCoreSupport \ + qtwebkit/Source/ThirdParty \ + qtwebkit/Source/WebCore/bridge/jsc \ + qtwebkit/Source/WebCore/bindings/js \ + qtwebkit/Source/WebCore/bridge/c \ + qtwebkit/Source/WebCore/testing/js \ + qtbase/src/3rdparty/sqlite \ + qtwebkit/Source/ThirdParty/ANGLE/include/GLSLANG \ + qtwebkit/Source/ThirdParty/ANGLE/include/KHR \ + qtwebkit/Source/JavaScriptCore \ + qtwebkit/Source \ qtwebkit/Source/WTF \ - qtwebkit/Source/WTF/wtf/qt \ + qtwebkit/Source/JavaScriptCore/assembler \ + qtwebkit/Source/JavaScriptCore/bytecode \ + qtwebkit/Source/JavaScriptCore/bytecompiler \ + qtwebkit/Source/JavaScriptCore/heap \ + qtwebkit/Source/JavaScriptCore/dfg \ + qtwebkit/Source/JavaScriptCore/debugger \ + qtwebkit/Source/JavaScriptCore/disassembler \ + qtwebkit/Source/JavaScriptCore/interpreter \ + qtwebkit/Source/JavaScriptCore/jit \ + qtwebkit/Source/JavaScriptCore/llint \ + qtwebkit/Source/JavaScriptCore/parser \ + qtwebkit/Source/JavaScriptCore/profiler \ + qtwebkit/Source/JavaScriptCore/runtime \ + qtwebkit/Source/JavaScriptCore/tools \ + qtwebkit/Source/JavaScriptCore/yarr \ + qtwebkit/Source/JavaScriptCore/API \ + qtwebkit/Source/JavaScriptCore/ForwardingHeaders \ + qtwebkit/Source/WTF \ + qtbase/include/QtGui/5.6.2 \ + qtbase/include/QtGui/5.6.2/QtGui \ + qtbase/include \ + qtbase/include/QtGui \ + qtbase/include/QtNetwork \ + qtbase/include/QtSql \ + qtbase/include/QtCore/5.6.2 \ + qtbase/include/QtCore/5.6.2/QtCore \ + qtbase/include/QtCore \ + qtbase/mkspecs/genode-g++ QT_SOURCES += \ qhttpheader.cpp \ diff --git a/repos/libports/lib/mk/qt5_webkitwidgets_generated.inc b/repos/libports/lib/mk/qt5_webkitwidgets_generated.inc index ce53a1664..f2627ef8d 100644 --- a/repos/libports/lib/mk/qt5_webkitwidgets_generated.inc +++ b/repos/libports/lib/mk/qt5_webkitwidgets_generated.inc @@ -1,58 +1,32 @@ -QT_DEFINES += -DQT_NO_LIBUDEV -DQT_NO_XCB -DQT_NO_XKBCOMMON -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_BLOB=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_STICKY_POSITION=1 -DENABLE_DATALIST_ELEMENT=1 -DENABLE_DETAILS_ELEMENT=1 -DENABLE_FAST_MOBILE_SCROLLING=1 -DENABLE_FILTERS=1 -DENABLE_FTPDIR=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_LINK_PREFETCH=1 -DENABLE_METER_ELEMENT=1 -DENABLE_MHTML=1 -DENABLE_MUTATION_OBSERVERS=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_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_TOUCH_ADJUSTMENT=1 -DENABLE_TOUCH_EVENTS=1 -DENABLE_WEB_SOCKETS=1 -DENABLE_WEB_TIMING=1 -DENABLE_WORKERS=1 -DENABLE_XHR_TIMEOUT=1 -DWTF_USE_TILED_BACKING_STORE=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 -DENABLE_TOUCH_SLIDER=1 -DENABLE_ACCELERATED_2D_CANVAS=0 -DENABLE_ANIMATION_API=0 -DENABLE_BATTERY_STATUS=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_BACKGROUND=0 -DENABLE_CSS3_CONDITIONAL_RULES=0 -DENABLE_CSS3_TEXT=0 -DENABLE_DASHBOARD_SUPPORT=0 -DENABLE_DATAGRID=0 -DENABLE_DATA_TRANSFER_ITEMS=0 -DENABLE_DEVICE_ORIENTATION=0 -DENABLE_DIRECTORY_UPLOAD=0 -DENABLE_DOWNLOAD_ATTRIBUTE=0 -DENABLE_FILE_SYSTEM=0 -DENABLE_FULLSCREEN_API=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=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_LINK_PRERENDER=0 -DENABLE_MATHML=0 -DENABLE_MEDIA_SOURCE=0 -DENABLE_MEDIA_STATISTICS=0 -DENABLE_MEDIA_STREAM=0 -DENABLE_MICRODATA=0 -DENABLE_NAVIGATOR_CONTENT_UTILS=0 -DENABLE_NETSCAPE_PLUGIN_API=0 -DENABLE_NETWORK_INFO=0 -DENABLE_ORIENTATION_EVENTS=0 -DENABLE_PROXIMITY_EVENTS=0 -DENABLE_QUOTA=0 -DENABLE_SCRIPTED_SPEECH=0 -DENABLE_SHADOW_DOM=0 -DENABLE_STYLE_SCOPED=0 -DENABLE_SVG_DOM_OBJC_BINDINGS=0 -DENABLE_TEXT_AUTOSIZING=0 -DENABLE_TEXT_NOTIFICATIONS_ONLY=0 -DENABLE_TOUCH_ICON_LOADING=0 -DENABLE_VIBRATION=0 -DENABLE_VIDEO=0 -DENABLE_VIDEO_TRACK=0 -DENABLE_WEBGL=0 -DENABLE_WEB_AUDIO=0 -DENABLE_XSLT=0 -DBUILDING_Qt5WebKitWidgets -DBUILDING_WEBKIT -DQT_ASCII_CAST_WARNINGS -DSQLITE_CORE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_OMIT_COMPLETE -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_QUICK_LIB -DQT_PRINTSUPPORT_LIB -DQT_WEBKIT_LIB -DQT_QML_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_NETWORK_LIB -DQT_GUI_LIB -DQT_CORE_LIB +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_INCPATH += \ - qtbase/include \ - qtbase/include/QtCore \ - qtbase/include/QtCore/5.1.0 \ - qtbase/include/QtCore/5.1.0/QtCore \ - qtbase/include/QtGui \ - qtbase/include/QtGui/5.1.0 \ - qtbase/include/QtGui/5.1.0/QtGui \ - qtbase/include/QtNetwork \ - qtbase/include/QtPrintSupport \ - qtbase/include/QtSql \ - qtbase/include/QtWidgets \ - qtbase/include/QtWidgets/5.1.0 \ - qtbase/include/QtWidgets/5.1.0/QtWidgets \ - qtbase/mkspecs/genode-g++ \ - qtdeclarative/include \ - qtdeclarative/include/QtQml \ - qtdeclarative/include/QtQuick \ - qtwebkit/include \ - qtwebkit/include/QtWebKit \ - qtwebkit/include/QtWebKitWidgets \ - qtwebkit/include/QtWebKitWidgets/5.1.0 \ - qtwebkit/include/QtWebKitWidgets/5.1.0/QtWebKitWidgets \ qtwebkit/Source \ - qtwebkit/Source/JavaScriptCore \ - qtwebkit/Source/JavaScriptCore/API \ - qtwebkit/Source/JavaScriptCore/assembler \ - qtwebkit/Source/JavaScriptCore/bytecode \ - qtwebkit/Source/JavaScriptCore/bytecompiler \ - qtwebkit/Source/JavaScriptCore/debugger \ - qtwebkit/Source/JavaScriptCore/dfg \ - qtwebkit/Source/JavaScriptCore/disassembler \ - qtwebkit/Source/JavaScriptCore/ForwardingHeaders \ - qtwebkit/Source/JavaScriptCore/heap \ - qtwebkit/Source/JavaScriptCore/interpreter \ - qtwebkit/Source/JavaScriptCore/jit \ - qtwebkit/Source/JavaScriptCore/llint \ - qtwebkit/Source/JavaScriptCore/parser \ - qtwebkit/Source/JavaScriptCore/profiler \ - qtwebkit/Source/JavaScriptCore/runtime \ - qtwebkit/Source/JavaScriptCore/tools \ - qtwebkit/Source/JavaScriptCore/yarr \ - qtwebkit/Source/qt/Api \ - qtwebkit/Source/qt/WebCoreSupport \ - qtwebkit/Source/ThirdParty \ + qtwebkit/Source/WebKit/qt/Api \ + qtwebkit/Source/WebKit/qt/WidgetApi \ + qtwebkit/Source/WebKit/qt/WebCoreSupport \ + qtwebkit/Source/WebKit/qt/WidgetSupport \ + qtwebkit/Source/WTF/wtf/qt \ + qtwebkit/Source/ThirdParty/ANGLE/include/GLSLANG \ + qtwebkit/Source/ThirdParty/ANGLE/include/KHR \ + qtwebkit/Source/WebKit/qt/Api \ + qtwebkit/Source/WebKit/qt/WebCoreSupport \ + qtwebkit/Source/WTF/wtf/qt \ qtwebkit/Source/WebCore \ + qtwebkit/Source/WebCore/Modules/filesystem \ + qtwebkit/Source/WebCore/Modules/geolocation \ + qtwebkit/Source/WebCore/Modules/indexeddb \ + qtwebkit/Source/WebCore/Modules/navigatorcontentutils \ + qtwebkit/Source/WebCore/Modules/notifications \ + qtwebkit/Source/WebCore/Modules/proximity \ + qtwebkit/Source/WebCore/Modules/quota \ + qtwebkit/Source/WebCore/Modules/webaudio \ + qtwebkit/Source/WebCore/Modules/webdatabase \ + qtwebkit/Source/WebCore/Modules/websockets \ qtwebkit/Source/WebCore/accessibility \ qtwebkit/Source/WebCore/bindings \ qtwebkit/Source/WebCore/bindings/generic \ - qtwebkit/Source/WebCore/bindings/js \ qtwebkit/Source/WebCore/bridge \ - qtwebkit/Source/WebCore/bridge/c \ - qtwebkit/Source/WebCore/bridge/jsc \ qtwebkit/Source/WebCore/bridge/qt \ qtwebkit/Source/WebCore/css \ qtwebkit/Source/WebCore/dom \ @@ -62,6 +36,7 @@ QT_INCPATH += \ qtwebkit/Source/WebCore/history \ qtwebkit/Source/WebCore/html \ qtwebkit/Source/WebCore/html/canvas \ + qtwebkit/Source/WebCore/html/forms \ qtwebkit/Source/WebCore/html/parser \ qtwebkit/Source/WebCore/html/shadow \ qtwebkit/Source/WebCore/html/track \ @@ -72,19 +47,11 @@ QT_INCPATH += \ qtwebkit/Source/WebCore/loader/cache \ qtwebkit/Source/WebCore/loader/icon \ qtwebkit/Source/WebCore/mathml \ - qtwebkit/Source/WebCore/Modules/filesystem \ - qtwebkit/Source/WebCore/Modules/geolocation \ - qtwebkit/Source/WebCore/Modules/indexeddb \ - qtwebkit/Source/WebCore/Modules/navigatorcontentutils \ - qtwebkit/Source/WebCore/Modules/notifications \ - qtwebkit/Source/WebCore/Modules/quota \ - qtwebkit/Source/WebCore/Modules/webaudio \ - qtwebkit/Source/WebCore/Modules/webdatabase \ - qtwebkit/Source/WebCore/Modules/websockets \ qtwebkit/Source/WebCore/page \ qtwebkit/Source/WebCore/page/animation \ qtwebkit/Source/WebCore/page/qt \ qtwebkit/Source/WebCore/page/scrolling \ + qtwebkit/Source/WebCore/page/scrolling/coordinatedgraphics \ qtwebkit/Source/WebCore/platform \ qtwebkit/Source/WebCore/platform/animation \ qtwebkit/Source/WebCore/platform/audio \ @@ -98,11 +65,12 @@ QT_INCPATH += \ qtwebkit/Source/WebCore/platform/graphics/qt \ qtwebkit/Source/WebCore/platform/graphics/surfaces \ qtwebkit/Source/WebCore/platform/graphics/texmap \ + qtwebkit/Source/WebCore/platform/graphics/texmap/coordinated \ qtwebkit/Source/WebCore/platform/graphics/transforms \ qtwebkit/Source/WebCore/platform/image-decoders \ qtwebkit/Source/WebCore/platform/image-decoders/bmp \ - qtwebkit/Source/WebCore/platform/image-decoders/gif \ qtwebkit/Source/WebCore/platform/image-decoders/ico \ + qtwebkit/Source/WebCore/platform/image-decoders/gif \ qtwebkit/Source/WebCore/platform/image-decoders/jpeg \ qtwebkit/Source/WebCore/platform/image-decoders/png \ qtwebkit/Source/WebCore/platform/image-decoders/webp \ @@ -117,6 +85,7 @@ QT_INCPATH += \ qtwebkit/Source/WebCore/plugins \ qtwebkit/Source/WebCore/rendering \ qtwebkit/Source/WebCore/rendering/mathml \ + qtwebkit/Source/WebCore/rendering/shapes \ qtwebkit/Source/WebCore/rendering/style \ qtwebkit/Source/WebCore/rendering/svg \ qtwebkit/Source/WebCore/storage \ @@ -126,17 +95,59 @@ QT_INCPATH += \ qtwebkit/Source/WebCore/svg/graphics/filters \ qtwebkit/Source/WebCore/svg/properties \ qtwebkit/Source/WebCore/testing \ - qtwebkit/Source/WebCore/testing/js \ qtwebkit/Source/WebCore/websockets \ qtwebkit/Source/WebCore/workers \ qtwebkit/Source/WebCore/xml \ qtwebkit/Source/WebCore/xml/parser \ - qtwebkit/Source/WebKit/qt/Api \ - qtwebkit/Source/WebKit/qt/WebCoreSupport \ - qtwebkit/Source/WebKit/qt/WidgetApi \ - qtwebkit/Source/WebKit/qt/WidgetSupport \ + qtwebkit/Source/ThirdParty \ + qtwebkit/Source/WebCore/bridge/jsc \ + qtwebkit/Source/WebCore/bindings/js \ + qtwebkit/Source/WebCore/bridge/c \ + qtwebkit/Source/WebCore/testing/js \ + qtwebkit/Source/JavaScriptCore \ + qtwebkit/Source \ qtwebkit/Source/WTF \ - qtwebkit/Source/WTF/wtf/qt \ + qtwebkit/Source/JavaScriptCore/assembler \ + qtwebkit/Source/JavaScriptCore/bytecode \ + qtwebkit/Source/JavaScriptCore/bytecompiler \ + qtwebkit/Source/JavaScriptCore/heap \ + qtwebkit/Source/JavaScriptCore/dfg \ + qtwebkit/Source/JavaScriptCore/debugger \ + qtwebkit/Source/JavaScriptCore/disassembler \ + qtwebkit/Source/JavaScriptCore/interpreter \ + qtwebkit/Source/JavaScriptCore/jit \ + qtwebkit/Source/JavaScriptCore/llint \ + qtwebkit/Source/JavaScriptCore/parser \ + qtwebkit/Source/JavaScriptCore/profiler \ + qtwebkit/Source/JavaScriptCore/runtime \ + qtwebkit/Source/JavaScriptCore/tools \ + qtwebkit/Source/JavaScriptCore/yarr \ + qtwebkit/Source/JavaScriptCore/API \ + qtwebkit/Source/JavaScriptCore/ForwardingHeaders \ + qtwebkit/Source/WTF \ + qtwebkit/include \ + qtwebkit/include/QtWebKitWidgets \ + qtwebkit/include/QtWebKitWidgets/5.6.2 \ + qtwebkit/include/QtWebKitWidgets/5.6.2/QtWebKitWidgets \ + qtwebkit/Source/qt/Api \ + qtwebkit/Source/qt/WebCoreSupport \ + qtwebkit/Source \ + qtbase/include \ + qtbase/include/QtWidgets \ + qtwebkit/include/QtWebKit \ + qtbase/include/QtGui \ + qtbase/include/QtNetwork \ + qtbase/include/QtCore \ + qtbase/include/QtWidgets/5.6.2 \ + qtbase/include/QtWidgets/5.6.2/QtWidgets \ + qtbase/include/QtGui/5.6.2 \ + qtbase/include/QtGui/5.6.2/QtGui \ + qtbase/include/QtCore/5.6.2 \ + qtbase/include/QtCore/5.6.2/QtCore \ + qtbase/include/QtPrintSupport \ + qtbase/include/QtOpenGL \ + qtbase/include/QtSql \ + qtbase/mkspecs/genode-g++ QT_SOURCES += \ qgraphicswebview.cpp \ @@ -147,7 +158,6 @@ QT_SOURCES += \ QtFallbackWebPopup.cpp \ QtWebComboBox.cpp \ QWebUndoCommand.cpp \ - DefaultFullScreenVideoHandler.cpp \ InitWebKitQt.cpp \ InspectorClientWebPage.cpp \ PageClientQt.cpp \ @@ -155,11 +165,10 @@ QT_SOURCES += \ QGraphicsWidgetPluginImpl.cpp \ QWidgetPluginImpl.cpp \ moc_qwebinspector.cpp \ - moc_qwebkitplatformplugin.cpp \ moc_InspectorClientWebPage.cpp \ - moc_DefaultFullScreenVideoHandler.cpp \ moc_QtFallbackWebPopup.cpp \ - moc_QtWebComboBox.cpp + moc_QtWebComboBox.cpp \ + moc_qwebkitplatformplugin.cpp QT_VPATH += \ qtwebkit/Source/WebKit/qt/WidgetApi \ @@ -177,13 +186,12 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ moc_qwebpage.cpp \ moc_qwebview.cpp \ moc_qwebinspector.cpp \ - moc_qwebkitplatformplugin.cpp \ moc_InspectorClientWebPage.cpp \ - moc_DefaultFullScreenVideoHandler.cpp \ moc_QtFallbackWebPopup.cpp \ moc_QtWebComboBox.cpp \ moc_QGraphicsWidgetPluginImpl.cpp \ - moc_QWidgetPluginImpl.cpp + moc_QWidgetPluginImpl.cpp \ + moc_qwebkitplatformplugin.cpp # source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) # extracted from 'compiler_moc_source_make_all' rule diff --git a/repos/libports/lib/mk/qt5_widgets_generated.inc b/repos/libports/lib/mk/qt5_widgets_generated.inc index dfd373d92..eb215f993 100644 --- a/repos/libports/lib/mk/qt5_widgets_generated.inc +++ b/repos/libports/lib/mk/qt5_widgets_generated.inc @@ -1,19 +1,19 @@ -QT_DEFINES += -DQT_NO_LIBUDEV -DQT_NO_XCB -DQT_NO_XKBCOMMON -DQT_NO_USING_NAMESPACE -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_STYLE_MAC -DQT_STYLE_WINDOWS -DQT_NO_STYLE_WINDOWSVISTA -DQT_NO_STYLE_WINDOWSXP -DQT_NO_STYLE_GTK -DQT_NO_STYLE_WINDOWSCE -DQT_NO_STYLE_WINDOWSMOBILE -DQT_NO_STYLE_ANDROID -DQT_NO_EXCEPTIONS -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB +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_GTK -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_INCPATH += \ - qtbase/include \ - qtbase/include/QtCore \ - qtbase/include/QtCore/5.1.0 \ - qtbase/include/QtCore/5.1.0/QtCore \ - qtbase/include/QtGui \ - qtbase/include/QtGui/5.1.0 \ - qtbase/include/QtGui/5.1.0/QtGui \ - qtbase/include/QtWidgets \ - qtbase/include/QtWidgets/5.1.0 \ - qtbase/include/QtWidgets/5.1.0/QtWidgets \ - qtbase/mkspecs/genode-g++ \ qtbase/src/widgets \ qtbase/src/widgets/dialogs \ + qtbase/include \ + qtbase/include/QtWidgets \ + qtbase/include/QtWidgets/5.6.2 \ + qtbase/include/QtWidgets/5.6.2/QtWidgets \ + qtbase/include/QtGui/5.6.2 \ + qtbase/include/QtGui/5.6.2/QtGui \ + qtbase/include/QtCore/5.6.2 \ + qtbase/include/QtCore/5.6.2/QtCore \ + qtbase/include/QtGui \ + qtbase/include/QtCore \ + qtbase/mkspecs/genode-g++ QT_SOURCES += \ qaction.cpp \ @@ -27,6 +27,7 @@ QT_SOURCES += \ qlayoutengine.cpp \ qlayoutitem.cpp \ qshortcut.cpp \ + qsizepolicy.cpp \ qstackedlayout.cpp \ qtooltip.cpp \ qwhatsthis.cpp \ @@ -38,11 +39,9 @@ QT_SOURCES += \ qgesturemanager.cpp \ qdesktopwidget.cpp \ qwidgetsvariant.cpp \ - qapplication_qpa.cpp \ - qdesktopwidget_qpa.cpp \ - qwidget_qpa.cpp \ qwidgetwindow.cpp \ qwindowcontainer.cpp \ + qopenglwidget.cpp \ qdrawutil.cpp \ qstyle.cpp \ qstyleanimation.cpp \ @@ -57,6 +56,7 @@ QT_SOURCES += \ qstylesheetstyle_default.cpp \ qwindowsstyle.cpp \ qfusionstyle.cpp \ + qbuttongroup.cpp \ qabstractbutton.cpp \ qabstractslider.cpp \ qabstractspinbox.cpp \ @@ -73,6 +73,7 @@ QT_SOURCES += \ qfontcombobox.cpp \ qframe.cpp \ qgroupbox.cpp \ + qkeysequenceedit.cpp \ qlabel.cpp \ qlcdnumber.cpp \ qlineedit_p.cpp \ @@ -163,7 +164,8 @@ QT_SOURCES += \ qgraphicsview.cpp \ qgraphicswidget.cpp \ qgraphicswidget_p.cpp \ - qgridlayoutengine.cpp \ + qgraphicslayoutstyleinfo.cpp \ + qgraphicsgridlayoutengine.cpp \ qsimplex_p.cpp \ qgraphicsanchorlayout_p.cpp \ qgraphicsanchorlayout.cpp \ @@ -185,87 +187,7 @@ QT_SOURCES += \ qgraphicseffect.cpp \ qpixmapfilter.cpp \ qrc_qstyle.cpp \ - qrc_qmessagebox.cpp \ - moc_qboxlayout.cpp \ - moc_qdesktopwidget.cpp \ - moc_qformlayout.cpp \ - moc_qgridlayout.cpp \ - moc_qlayout.cpp \ - moc_qshortcut.cpp \ - moc_qsizepolicy.cpp \ - moc_qstackedlayout.cpp \ - moc_qdesktopwidget_qpa_p.cpp \ - moc_qwidgetwindow_qpa_p.cpp \ - moc_qwindowcontainer_p.cpp \ - moc_qstyle.cpp \ - moc_qstyleanimation_p.cpp \ - moc_qstyleplugin.cpp \ - moc_qproxystyle.cpp \ - moc_qwindowsstyle_p.cpp \ - moc_qfusionstyle_p.cpp \ - moc_qbuttongroup.cpp \ - moc_qabstractbutton.cpp \ - moc_qabstractslider.cpp \ - moc_qcalendartextnavigator_p.cpp \ - moc_qcheckbox.cpp \ - moc_qcombobox_p.cpp \ - moc_qcommandlinkbutton.cpp \ - moc_qdatetimeedit_p.cpp \ - moc_qdial.cpp \ - moc_qdockwidget_p.cpp \ - moc_qframe.cpp \ - moc_qlcdnumber.cpp \ - moc_qmainwindow.cpp \ - moc_qmainwindowlayout_p.cpp \ - moc_qprogressbar.cpp \ - moc_qradiobutton.cpp \ - moc_qrubberband.cpp \ - moc_qscrollbar.cpp \ - moc_qslider.cpp \ - moc_qspinbox.cpp \ - moc_qsplashscreen.cpp \ - moc_qsplitter.cpp \ - moc_qstackedwidget.cpp \ - moc_qstatusbar.cpp \ - moc_qtabbar_p.cpp \ - moc_qtoolbarlayout_p.cpp \ - moc_qtoolbarextension_p.cpp \ - moc_qtoolbarseparator_p.cpp \ - moc_qwidgetresizehandler_p.cpp \ - moc_qfocusframe.cpp \ - moc_qscrollarea.cpp \ - moc_qwidgetanimator_p.cpp \ - moc_qwidgetlinecontrol_p.cpp \ - moc_qerrormessage.cpp \ - moc_qsidebar_p.cpp \ - moc_qfileinfogatherer_p.cpp \ - moc_qlistview.cpp \ - moc_qabstractitemdelegate.cpp \ - moc_qlistwidget_p.cpp \ - moc_qtablewidget_p.cpp \ - moc_qtreewidget_p.cpp \ - moc_qitemeditorfactory_p.cpp \ - moc_qcolumnviewgrip_p.cpp \ - moc_qgraphicsitemanimation.cpp \ - moc_qgraphicsscenelinearindex_p.cpp \ - moc_qgraphicswidget.cpp \ - moc_qgraphicsanchorlayout.cpp \ - moc_qcompleter_p.cpp \ - moc_qsystemtrayicon_p.cpp \ - moc_qscroller.cpp \ - moc_qscroller_p.cpp \ - moc_qflickgesture_p.cpp \ - moc_qundogroup.cpp \ - moc_qundostack.cpp \ - moc_qundostack_p.cpp \ - moc_qundoview.cpp \ - moc_qkeyeventtransition.cpp \ - moc_qmouseeventtransition.cpp \ - moc_qbasickeyeventtransition_p.cpp \ - moc_qbasicmouseeventtransition_p.cpp \ - moc_qgraphicseffect.cpp \ - moc_qgraphicseffect_p.cpp \ - moc_qpixmapfilter_p.cpp + qrc_qmessagebox.cpp QT_VPATH += \ qtbase/src/widgets/dialogs \ @@ -288,6 +210,7 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ moc_qaction.cpp \ moc_qactiongroup.cpp \ moc_qapplication.cpp \ + moc_qwidgetbackingstore_p.cpp \ moc_qboxlayout.cpp \ moc_qdesktopwidget.cpp \ moc_qformlayout.cpp \ @@ -300,9 +223,10 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ moc_qwidgetaction.cpp \ moc_qgesture.cpp \ moc_qgesturemanager_p.cpp \ - moc_qdesktopwidget_qpa_p.cpp \ - moc_qwidgetwindow_qpa_p.cpp \ + moc_qdesktopwidget_p.cpp \ + moc_qwidgetwindow_p.cpp \ moc_qwindowcontainer_p.cpp \ + moc_qopenglwidget.cpp \ moc_qstyle.cpp \ moc_qstyleanimation_p.cpp \ moc_qstyleplugin.cpp \ @@ -315,7 +239,6 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ moc_qabstractbutton.cpp \ moc_qabstractslider.cpp \ moc_qabstractspinbox.cpp \ - moc_qcalendartextnavigator_p.cpp \ moc_qcalendarwidget.cpp \ moc_qcheckbox.cpp \ moc_qcombobox.cpp \ @@ -330,9 +253,11 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ moc_qfontcombobox.cpp \ moc_qframe.cpp \ moc_qgroupbox.cpp \ + moc_qkeysequenceedit.cpp \ moc_qlabel.cpp \ moc_qlcdnumber.cpp \ moc_qlineedit.cpp \ + moc_qlineedit_p.cpp \ moc_qmainwindow.cpp \ moc_qmainwindowlayout_p.cpp \ moc_qmdiarea.cpp \ diff --git a/repos/libports/lib/mk/qt5_wtf_generated.inc b/repos/libports/lib/mk/qt5_wtf_generated.inc index 1b8e03007..7207e55c6 100644 --- a/repos/libports/lib/mk/qt5_wtf_generated.inc +++ b/repos/libports/lib/mk/qt5_wtf_generated.inc @@ -1,18 +1,18 @@ -QT_DEFINES += -DQT_NO_LIBUDEV -DQT_NO_XCB -DQT_NO_XKBCOMMON -DBUILDING_QT__=1 -DNDEBUG -DENABLE_3D_RENDERING=1 -DENABLE_BLOB=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_STICKY_POSITION=1 -DENABLE_DATALIST_ELEMENT=1 -DENABLE_DETAILS_ELEMENT=1 -DENABLE_FAST_MOBILE_SCROLLING=1 -DENABLE_FILTERS=1 -DENABLE_FTPDIR=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_LINK_PREFETCH=1 -DENABLE_METER_ELEMENT=1 -DENABLE_MHTML=1 -DENABLE_MUTATION_OBSERVERS=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_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_TOUCH_ADJUSTMENT=1 -DENABLE_TOUCH_EVENTS=1 -DENABLE_WEB_SOCKETS=1 -DENABLE_WEB_TIMING=1 -DENABLE_WORKERS=1 -DENABLE_XHR_TIMEOUT=1 -DWTF_USE_TILED_BACKING_STORE=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 -DENABLE_TOUCH_SLIDER=1 -DENABLE_ACCELERATED_2D_CANVAS=0 -DENABLE_ANIMATION_API=0 -DENABLE_BATTERY_STATUS=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_BACKGROUND=0 -DENABLE_CSS3_CONDITIONAL_RULES=0 -DENABLE_CSS3_TEXT=0 -DENABLE_DASHBOARD_SUPPORT=0 -DENABLE_DATAGRID=0 -DENABLE_DATA_TRANSFER_ITEMS=0 -DENABLE_DEVICE_ORIENTATION=0 -DENABLE_DIRECTORY_UPLOAD=0 -DENABLE_DOWNLOAD_ATTRIBUTE=0 -DENABLE_FILE_SYSTEM=0 -DENABLE_FULLSCREEN_API=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=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_LINK_PRERENDER=0 -DENABLE_MATHML=0 -DENABLE_MEDIA_SOURCE=0 -DENABLE_MEDIA_STATISTICS=0 -DENABLE_MEDIA_STREAM=0 -DENABLE_MICRODATA=0 -DENABLE_NAVIGATOR_CONTENT_UTILS=0 -DENABLE_NETSCAPE_PLUGIN_API=0 -DENABLE_NETWORK_INFO=0 -DENABLE_ORIENTATION_EVENTS=0 -DENABLE_PROXIMITY_EVENTS=0 -DENABLE_QUOTA=0 -DENABLE_SCRIPTED_SPEECH=0 -DENABLE_SHADOW_DOM=0 -DENABLE_STYLE_SCOPED=0 -DENABLE_SVG_DOM_OBJC_BINDINGS=0 -DENABLE_TEXT_AUTOSIZING=0 -DENABLE_TEXT_NOTIFICATIONS_ONLY=0 -DENABLE_TOUCH_ICON_LOADING=0 -DENABLE_VIBRATION=0 -DENABLE_VIDEO=0 -DENABLE_VIDEO_TRACK=0 -DENABLE_WEBGL=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 += -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_INCPATH += \ - qtbase/include \ - qtbase/include/QtCore \ - qtbase/mkspecs/genode-g++ \ - qtwebkit/Source \ + qtwebkit/Source/WTF \ qtwebkit/Source/WTF \ qtwebkit/Source/WTF/wtf \ + qtwebkit/Source \ + qtbase/include \ + qtbase/include/QtCore \ + qtbase/mkspecs/genode-g++ QT_SOURCES += \ ArrayBuffer.cpp \ ArrayBufferView.cpp \ Assertions.cpp \ - Atomics.cpp \ BitVector.cpp \ CryptographicallyRandomNumber.cpp \ CurrentTime.cpp \ @@ -30,6 +30,7 @@ QT_SOURCES += \ strtod.cc \ FastMalloc.cpp \ FilePrintStream.cpp \ + FunctionDispatcher.cpp \ GregorianDateTime.cpp \ GOwnPtr.cpp \ GRefPtr.cpp \ @@ -37,7 +38,6 @@ QT_SOURCES += \ MD5.cpp \ MainThread.cpp \ MediaTime.cpp \ - MemoryInstrumentation.cpp \ MetaAllocator.cpp \ NullPtr.cpp \ NumberOfCores.cpp \ @@ -59,6 +59,7 @@ QT_SOURCES += \ TypeTraits.cpp \ WTFThreadData.cpp \ AtomicString.cpp \ + AtomicStringTable.cpp \ Base64.cpp \ CString.cpp \ StringBuilder.cpp \ @@ -70,7 +71,8 @@ QT_SOURCES += \ UTF8.cpp \ OSAllocatorPosix.cpp \ ThreadIdentifierDataPthreads.cpp \ - ThreadingPthreads.cpp + ThreadingPthreads.cpp \ + BinarySemaphore.cpp QT_VPATH += \ qtwebkit/Source/WTF/wtf \ @@ -78,6 +80,7 @@ QT_VPATH += \ qtwebkit/Source/WTF/wtf/gobject \ qtwebkit/Source/WTF/wtf/qt \ qtwebkit/Source/WTF/wtf/text \ + qtwebkit/Source/WTF/wtf/threads \ qtwebkit/Source/WTF/wtf/unicode \ qtwebkit/Source/WTF/wtf/unicode/icu \ diff --git a/repos/libports/lib/mk/qt5_xml_generated.inc b/repos/libports/lib/mk/qt5_xml_generated.inc index afe80ea9b..036844688 100644 --- a/repos/libports/lib/mk/qt5_xml_generated.inc +++ b/repos/libports/lib/mk/qt5_xml_generated.inc @@ -1,15 +1,15 @@ -QT_DEFINES += -DQT_NO_LIBUDEV -DQT_NO_XCB -DQT_NO_XKBCOMMON -DQT_NO_USING_NAMESPACE -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_MTDEV -DQT_NO_LIBUDEV -DQT_NO_TSLIB -DQT_NO_LIBINPUT -DQT_NO_USING_NAMESPACE -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_INCPATH += \ - qtbase/include \ - qtbase/include/QtCore \ - qtbase/include/QtCore/5.1.0 \ - qtbase/include/QtCore/5.1.0/QtCore \ - qtbase/include/QtXml \ - qtbase/include/QtXml/5.1.0 \ - qtbase/include/QtXml/5.1.0/QtXml \ - qtbase/mkspecs/genode-g++ \ qtbase/src/xml \ + qtbase/include \ + qtbase/include/QtXml \ + qtbase/include/QtXml/5.6.2 \ + qtbase/include/QtXml/5.6.2/QtXml \ + qtbase/include/QtCore/5.6.2 \ + qtbase/include/QtCore/5.6.2/QtCore \ + qtbase/include/QtCore \ + qtbase/mkspecs/genode-g++ QT_SOURCES += \ qdom.cpp \ diff --git a/repos/libports/ports/qt5.hash b/repos/libports/ports/qt5.hash index 4106d2460..f160a7775 100644 --- a/repos/libports/ports/qt5.hash +++ b/repos/libports/ports/qt5.hash @@ -1 +1 @@ -611edaa36c381060de17fa7e619c3a2e3a2b65ff +26325684a0649f90e7b7760f326dae2f246e2f8a diff --git a/repos/libports/ports/qt5.port b/repos/libports/ports/qt5.port index d4a9917cb..bacf3ff98 100644 --- a/repos/libports/ports/qt5.port +++ b/repos/libports/ports/qt5.port @@ -1,28 +1,34 @@ LICENSE := GPL -VERSION := 5.1.0 +VERSION := 5.6.2 QT5 := qt-everywhere-opensource-src-${VERSION} +QT5_WEBKIT := qtwebkit-opensource-src-$(VERSION) QTSCRIPTCLASSIC := qtscriptclassic-1.0_1-opensource -DOWNLOADS := ${QT5}.archive ${QTSCRIPTCLASSIC}.archive +DOWNLOADS := ${QT5}.archive ${QT5_WEBKIT}.archive ${QTSCRIPTCLASSIC}.archive -URL(${QT5}) := http://download.qt.io/archive/qt/5.1/$(VERSION)/single/$(QT5).tar.xz -SHA(${QT5}) := 589bf240228f3a1249bd250c968104aa68ba0e36 +URL(${QT5}) := http://download.qt.io/archive/qt/5.6/$(VERSION)/single/$(QT5).tar.xz +SHA(${QT5}) := 42af05f2086c38a10ba1c707bbff7eca5fe55a22 DIR(${QT5}) := src/lib/qt5/${QT5} +URL(${QT5_WEBKIT}) := http://download.qt.io/community_releases/5.6/$(VERSION)/${QT5_WEBKIT}.tar.xz +SHA(${QT5_WEBKIT}) := 3dba4ec72c784f03ef4bf62a199cf4e7e49a6562 +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 SHA(${QTSCRIPTCLASSIC}) := 74e9dc82dd194d8ae0fb0f8f1df74081948b943a DIR(${QTSCRIPTCLASSIC}) := src/lib/qt5/${QTSCRIPTCLASSIC} -PATCHES_DIR := $(REP_DIR)/src/lib/qt5/patches -QT5_PATCHES := $(shell cat $(PATCHES_DIR)/series) -QTSCRIPTCLASSIC_PATCHES = qtscriptclassic_qt5.patch +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 -PATCHES := $(addprefix src/lib/qt5/patches/, ${QT5_PATCHES} ${QTSCRIPTCLASSIC_PATCHES}) +PATCHES := $(addprefix src/lib/qt5/patches/, ${QT5_PATCHES} ${QT5_WEBKIT_PATCHES} ${QTSCRIPTCLASSIC_PATCHES}) -PATCH_OPT := -p1 -d src/lib/qt5/${QT5} -PATCH_OPT(src/lib/qt5/patches/qtscriptclassic_qt5.patch) := -p1 -d src/lib/qt5/${QTSCRIPTCLASSIC} +PATCH_OPT := -p1 -d ${DIR(${QT5})} +PATCH_OPT(src/lib/qt5/patches/qtscriptclassic_qt5.patch) := -p1 -d ${DIR(${QTSCRIPTCLASSIC})} $(call check_tool,bison) $(call check_tool,perl) diff --git a/repos/libports/run/qt5.run b/repos/libports/run/qt5.run index 2bd98b667..e1f26883f 100644 --- a/repos/libports/run/qt5.run +++ b/repos/libports/run/qt5.run @@ -42,7 +42,7 @@ append config { append config [qt5_start_nodes feature] append config { - + @@ -50,7 +50,7 @@ append config { - + @@ -59,7 +59,7 @@ append config { - + @@ -93,6 +93,7 @@ append boot_modules { libm.lib.so libpng.lib.so jpeg.lib.so + pcre16.lib.so pthread.lib.so qt5_core.lib.so qt5_gui.lib.so diff --git a/repos/libports/run/qt5_avplay.run b/repos/libports/run/qt5_avplay.run index cd9d4ba9f..e7f04185d 100644 --- a/repos/libports/run/qt5_avplay.run +++ b/repos/libports/run/qt5_avplay.run @@ -85,6 +85,7 @@ append boot_modules { libm.lib.so libpng.lib.so jpeg.lib.so + pcre16.lib.so pthread.lib.so qt5_core.lib.so qt5_gui.lib.so diff --git a/repos/libports/run/qt5_calculatorform.run b/repos/libports/run/qt5_calculatorform.run index 21ed876ef..fa4beafea 100644 --- a/repos/libports/run/qt5_calculatorform.run +++ b/repos/libports/run/qt5_calculatorform.run @@ -39,7 +39,7 @@ append config { append config [qt5_start_nodes feature] append config { - + @@ -72,6 +72,7 @@ append boot_modules { libm.lib.so libpng.lib.so jpeg.lib.so + pcre16.lib.so pthread.lib.so qt5_core.lib.so qt5_gui.lib.so diff --git a/repos/libports/run/qt5_openglwindow.run b/repos/libports/run/qt5_openglwindow.run index aa1d87437..f49c55731 100644 --- a/repos/libports/run/qt5_openglwindow.run +++ b/repos/libports/run/qt5_openglwindow.run @@ -71,6 +71,7 @@ append boot_modules { libm.lib.so libpng.lib.so jpeg.lib.so + pcre16.lib.so pthread.lib.so qt5_core.lib.so qt5_gui.lib.so diff --git a/repos/libports/run/qt5_previewer.run b/repos/libports/run/qt5_previewer.run deleted file mode 100644 index d17380b8e..000000000 --- a/repos/libports/run/qt5_previewer.run +++ /dev/null @@ -1,99 +0,0 @@ -source ${genode_dir}/repos/libports/run/qt5_common.inc - -# -# Build -# - -append build_components [qt5_build_components feature] - -append build_components { - app/qt5/examples/previewer -} - -build $build_components - -create_boot_directory - -# -# Create Qt tar archive -# - -create_qt5_fs_tar_archive "previewer" "gui" - -# -# Generate config -# - -append config { - - } -append config [qt5_parent_provides feature] -append config { - - - - - } - -append config [qt5_start_nodes feature] - -append config { - - - - - - - - - - - -} - -install_config $config - -# -# Boot modules -# - -append boot_modules [qt5_boot_modules feature] - -append boot_modules { - previewer - freetype.lib.so - gallium.lib.so - icu.lib.so - ld.lib.so - libc.lib.so - posix.lib.so - libc_pipe.lib.so - libm.lib.so - libpng.lib.so - jpeg.lib.so - libcrypto.lib.so - libssl.lib.so - pthread.lib.so - qt5_core.lib.so - qt5_gui.lib.so - qt5_jscore.lib.so - qt5_network.lib.so - qt5_printsupport.lib.so - qt5_sql.lib.so - qt5_webcore.lib.so - qt5_webkit.lib.so - qt5_webkitwidgets.lib.so - qt5_widgets.lib.so - qt5_wtf.lib.so - qt5_xml.lib.so - zlib.lib.so - stdcxx.lib.so - qt5_fs_previewer.tar -} - -build_boot_image $boot_modules - -append qemu_args " -m 300" - -run_genode_until forever - diff --git a/repos/libports/run/qt5_qpluginwidget.run b/repos/libports/run/qt5_qpluginwidget.run index 353a96565..25a069c5d 100644 --- a/repos/libports/run/qt5_qpluginwidget.run +++ b/repos/libports/run/qt5_qpluginwidget.run @@ -93,6 +93,7 @@ append boot_modules { libpng.lib.so libssl.lib.so jpeg.lib.so + pcre16.lib.so pthread.lib.so qt5_core.lib.so qt5_gui.lib.so diff --git a/repos/libports/run/qt5_quicktest.run b/repos/libports/run/qt5_quicktest.run index fb49d9656..a2823dcff 100644 --- a/repos/libports/run/qt5_quicktest.run +++ b/repos/libports/run/qt5_quicktest.run @@ -39,7 +39,7 @@ append config { append config [qt5_start_nodes feature] append config { - + @@ -77,13 +77,13 @@ append boot_modules { libpng.lib.so libssl.lib.so jpeg.lib.so + pcre16.lib.so pthread.lib.so qt5_core.lib.so qt5_network.lib.so qt5_qml.lib.so qt5_gui.lib.so qt5_quick.lib.so - qt5_v8.lib.so qt5_widgets.lib.so qt5_xml.lib.so zlib.lib.so diff --git a/repos/libports/run/qt5_samegame.run b/repos/libports/run/qt5_samegame.run index fa55948e4..e49069be7 100644 --- a/repos/libports/run/qt5_samegame.run +++ b/repos/libports/run/qt5_samegame.run @@ -39,7 +39,7 @@ append config { append config [qt5_start_nodes feature] append config { - + @@ -77,13 +77,13 @@ append boot_modules { libpng.lib.so libssl.lib.so jpeg.lib.so + pcre16.lib.so pthread.lib.so qt5_core.lib.so qt5_network.lib.so qt5_qml.lib.so qt5_gui.lib.so qt5_quick.lib.so - qt5_v8.lib.so qt5_widgets.lib.so qt5_xml.lib.so zlib.lib.so diff --git a/repos/libports/run/qt5_tetrix.run b/repos/libports/run/qt5_tetrix.run index 6d0424d7c..aa195bfe3 100644 --- a/repos/libports/run/qt5_tetrix.run +++ b/repos/libports/run/qt5_tetrix.run @@ -71,6 +71,7 @@ append boot_modules { libm.lib.so libpng.lib.so jpeg.lib.so + pcre16.lib.so pthread.lib.so qt5_core.lib.so qt5_gui.lib.so diff --git a/repos/libports/run/qt5_textedit.run b/repos/libports/run/qt5_textedit.run index b2cb09d87..b24c3c88d 100644 --- a/repos/libports/run/qt5_textedit.run +++ b/repos/libports/run/qt5_textedit.run @@ -87,7 +87,7 @@ append_if [expr ![have_spec linux]] config { } append config { - + @@ -98,7 +98,7 @@ append config { - + @@ -133,6 +133,7 @@ append boot_modules { libm.lib.so libpng.lib.so jpeg.lib.so + pcre16.lib.so pthread.lib.so qt5_core.lib.so qt5_gui.lib.so diff --git a/repos/libports/src/app/qt5/examples/previewer/target.mk b/repos/libports/src/app/qt5/examples/previewer/target.mk deleted file mode 100644 index cd35c6336..000000000 --- a/repos/libports/src/app/qt5/examples/previewer/target.mk +++ /dev/null @@ -1,19 +0,0 @@ -# identify the qt repository by searching for a file that is unique for qt -QT5_REP_DIR := $(call select_from_repositories,lib/import/import-qt5.inc) -QT5_REP_DIR := $(realpath $(dir $(QT5_REP_DIR))../..) - -include $(QT5_REP_DIR)/lib/mk/qt5_version.inc - -QT5_PORT_DIR := $(call select_from_ports,qt5) -QT5_CONTRIB_DIR := $(QT5_PORT_DIR)/src/lib/qt5/$(QT5) - -QMAKE_PROJECT_PATH = $(QT5_CONTRIB_DIR)/qtwebkit-examples/examples/webkitwidgets/previewer -QMAKE_PROJECT_FILE = $(QMAKE_PROJECT_PATH)/previewer.pro - -vpath % $(QMAKE_PROJECT_PATH) - -include $(QT5_REP_DIR)/src/app/qt5/tmpl/target_defaults.inc - -include $(QT5_REP_DIR)/src/app/qt5/tmpl/target_final.inc - -LIBS += posix diff --git a/repos/libports/src/app/qt5/qt_avplay/target.mk b/repos/libports/src/app/qt5/qt_avplay/target.mk index 6c35907b0..2f0afcf1d 100644 --- a/repos/libports/src/app/qt5/qt_avplay/target.mk +++ b/repos/libports/src/app/qt5/qt_avplay/target.mk @@ -26,5 +26,4 @@ $(BUILD_BASE_DIR)/bin/qt5_fs/$(TARGET)/player_stop.png: $(BUILD_BASE_DIR)/bin/qt $(VERBOSE)ln -sf $(QT5_CONTRIB_DIR)/qtbase/examples/network/torrent/icons/$(notdir $@) $@ $(BUILD_BASE_DIR)/bin/qt5_fs/$(TARGET)/volume.png: $(BUILD_BASE_DIR)/bin/qt5_fs/$(TARGET) - $(VERBOSE)ln -sf $(QT5_CONTRIB_DIR)/qtwebkit/Source/WebKit/efl/DefaultTheme/widget/mediacontrol/mutebutton/unmutebutton.png $@ - + $(VERBOSE)ln -sf $(QT5_CONTRIB_DIR)/qtwebkit/Source/WebCore/platform/efl/DefaultTheme/widget/mediacontrol/mutebutton/unmutebutton.png $@ diff --git a/repos/libports/src/lib/pcre/include/config.h b/repos/libports/src/lib/pcre/include/config.h index 0efdc82c0..049d7f143 100644 --- a/repos/libports/src/lib/pcre/include/config.h +++ b/repos/libports/src/lib/pcre/include/config.h @@ -322,7 +322,9 @@ them both to 0; an emulation function will be used. */ /* #undef SUPPORT_LIBZ */ /* Define to enable the 16 bit PCRE library. */ -/* #undef SUPPORT_PCRE16 */ +#ifndef SUPPORT_PCRE16 +#define SUPPORT_PCRE16 /**/ +#endif /* Define to enable the 8 bit PCRE library. */ #ifndef SUPPORT_PCRE8 @@ -339,7 +341,9 @@ them both to 0; an emulation function will be used. */ even in an EBCDIC environment, but it is incompatible with the EBCDIC macro. That is, PCRE can support *either* EBCDIC code *or* ASCII/UTF-8/16, but not both at once. */ -/* #undef SUPPORT_UTF */ +#ifndef SUPPORT_UTF +#define SUPPORT_UTF /**/ +#endif /* Version number of package */ #ifndef VERSION diff --git a/repos/libports/src/lib/qt5/dejavusans/dejavusans.qrc b/repos/libports/src/lib/qt5/dejavusans/dejavusans.qrc deleted file mode 100644 index 56c13579f..000000000 --- a/repos/libports/src/lib/qt5/dejavusans/dejavusans.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - - -../../../../contrib/qt-everywhere-opensource-src-5.1.0/qtbase/lib/fonts/DejaVuSans.ttf - - diff --git a/repos/libports/src/lib/qt5/patches/qt5_arm.patch b/repos/libports/src/lib/qt5/patches/qt5_arm.patch deleted file mode 100644 index e22592869..000000000 --- a/repos/libports/src/lib/qt5/patches/qt5_arm.patch +++ /dev/null @@ -1,77 +0,0 @@ -qt5_arm.patch - -From: Christian Prochaska - - ---- - qtjsbackend/src/3rdparty/v8/src/arm/cpu-arm.cc | 6 ++++++ - .../Source/JavaScriptCore/assembler/ARMAssembler.h | 7 +++++++ - .../JavaScriptCore/assembler/MacroAssemblerARM.cpp | 3 ++- - 3 files changed, 15 insertions(+), 1 deletion(-) - -diff --git a/qtjsbackend/src/3rdparty/v8/src/arm/cpu-arm.cc b/qtjsbackend/src/3rdparty/v8/src/arm/cpu-arm.cc -index bed9503..286d7be 100644 ---- a/qtjsbackend/src/3rdparty/v8/src/arm/cpu-arm.cc -+++ b/qtjsbackend/src/3rdparty/v8/src/arm/cpu-arm.cc -@@ -27,6 +27,10 @@ - - // CPU specific code for arm independent of OS goes here. - -+#ifdef __GENODE__ -+#include -+#endif -+ - #include "v8.h" - - #if defined(__arm__) && !defined(_WIN32_WCE) -@@ -78,6 +82,8 @@ void CPU::FlushICache(void* start, size_t size) { - // __ARM_NR_cacheflush. As well as Windows CE does not support to flush a - // region, so we need to flush the whole process. - FlushInstructionCache(GetCurrentProcess(), NULL, NULL); -+#elif defined(__GENODE__) -+ Genode::cache_coherent((Genode::addr_t)start, size); - #else - // Ideally, we would call - // syscall(__ARM_NR_cacheflush, start, -diff --git a/qtwebkit/Source/JavaScriptCore/assembler/ARMAssembler.h b/qtwebkit/Source/JavaScriptCore/assembler/ARMAssembler.h -index 18b1017..7b0e2ea 100644 ---- a/qtwebkit/Source/JavaScriptCore/assembler/ARMAssembler.h -+++ b/qtwebkit/Source/JavaScriptCore/assembler/ARMAssembler.h -@@ -29,9 +29,14 @@ - - #if ENABLE(ASSEMBLER) && CPU(ARM_TRADITIONAL) - -+#if OS(GENODE) -+#include -+#endif -+ - #include "AssemblerBufferWithConstantPool.h" - #include "JITCompilationEffort.h" - #include -+ - namespace JSC { - - typedef uint32_t ARMWord; -@@ -1052,6 +1057,8 @@ namespace JSC { - UNUSED_PARAM(size); - #elif OS(QNX) - msync(code, size, MS_INVALIDATE_ICACHE); -+#elif OS(GENODE) -+ Genode::cache_coherent((Genode::addr_t)code, size); - #else - #error "The cacheFlush support is missing on this platform." - #endif -diff --git a/qtwebkit/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp b/qtwebkit/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp -index 98dc3e9..e26df76 100644 ---- a/qtwebkit/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp -+++ b/qtwebkit/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp -@@ -57,7 +57,8 @@ static bool isVFPPresent() - } - #endif - --#if (COMPILER(RVCT) && defined(__TARGET_FPU_VFP)) || (COMPILER(GCC) && defined(__VFP_FP__)) -+#if (COMPILER(RVCT) && defined(__TARGET_FPU_VFP)) || \ -+ (COMPILER(GCC) && defined(__VFP_FP__) && !defined(__SOFTFP__)) - return true; - #else - return false; diff --git a/repos/libports/src/lib/qt5/patches/qt5_configuration.patch b/repos/libports/src/lib/qt5/patches/qt5_configuration.patch index abd9b08ed..61e5dfaca 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_configuration.patch +++ b/repos/libports/src/lib/qt5/patches/qt5_configuration.patch @@ -4,98 +4,23 @@ From: Christian Prochaska --- - configure | 2 - qt.pro | 42 +- - qtbase/configure | 8 - qtbase/mkspecs/genode-g++/qmake.conf | 12 - qtbase/mkspecs/genode-g++/qplatformdefs.h | 112 ++++ - qtbase/src/corelib/global/qconfig-genode.h | 546 ++++++++++++++++++++ - qtdeclarative/examples/quick/quick.pro | 6 - qtdeclarative/src/imports/imports.pro | 2 - qtdeclarative/tests/tests.pro | 4 - qtquick1/examples/declarative/declarative.pro | 1 - qtwebkit/Tools/qmake/mkspecs/features/features.prf | 6 - 11 files changed, 707 insertions(+), 34 deletions(-) + qtbase/configure | 98 +++--- + qtbase/mkspecs/genode-g++/qmake.conf | 10 + + qtbase/mkspecs/genode-g++/qplatformdefs.h | 82 +++++ + qtbase/src/corelib/global/qconfig-genode.h | 426 ++++++++++++++++++++++++++++ + qtdeclarative/tools/tools.pro | 5 + 5 files changed, 568 insertions(+), 53 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/configure b/configure -index 9ba24b5..d0f1357 100755 ---- a/configure -+++ b/configure -@@ -60,4 +60,4 @@ echo "+ cd .." - cd .. - - echo "+ qtbase/bin/qmake $srcpath" --exec qtbase/bin/qmake "$srcpath" -+exec qtbase/bin/qmake -r "$srcpath" -diff --git a/qt.pro b/qt.pro -index 218701a..bb4c037 100644 ---- a/qt.pro -+++ b/qt.pro -@@ -54,33 +54,33 @@ defineTest(addModule) { - # it may not build. - - addModule(qtbase) --addModule(qtx11extras, qtbase) --addModule(qlalr, qtbase) -+#addModule(qtx11extras, qtbase) -+#addModule(qlalr, qtbase) - addModule(qtsvg, qtbase) - addModule(qtxmlpatterns, qtbase) - addModule(qtjsbackend, qtbase) - addModule(qtdeclarative, qtjsbackend, qtsvg qtxmlpatterns) --addModule(qtquickcontrols, qtdeclarative) --addModule(qtmultimedia, qtdeclarative) --addModule(qtactiveqt, qtbase) --addModule(qt3d, qtdeclarative) --addModule(qtjsondb, qtdeclarative) --addModule(qtsystems, qtbase, qtdeclarative qtjsondb) --addModule(qtlocation, qtbase, qt3d qtjsondb qtsystems qtmultimedia) --addModule(qtsensors, qtbase, qtdeclarative) --addModule(qtconnectivity, qtsystems) --addModule(qtfeedback, qtdeclarative, qtmultimedia) --addModule(qtpim, qtdeclarative, qtjsondb) -+#addModule(qtquickcontrols, qtdeclarative) -+#addModule(qtmultimedia, qtdeclarative) -+#addModule(qtactiveqt, qtbase) -+#addModule(qt3d, qtdeclarative) -+#addModule(qtjsondb, qtdeclarative) -+#addModule(qtsystems, qtbase, qtdeclarative qtjsondb) -+#addModule(qtlocation, qtbase, qt3d qtjsondb qtsystems qtmultimedia) -+#addModule(qtsensors, qtbase, qtdeclarative) -+#addModule(qtconnectivity, qtsystems) -+#addModule(qtfeedback, qtdeclarative, qtmultimedia) -+#addModule(qtpim, qtdeclarative, qtjsondb) - addModule(qtwebkit, qtdeclarative, qtlocation qtsensors, WebKit.pro) - addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit) - addModule(qtwebkit-examples, qtwebkit qttools) - addModule(qtimageformats, qtbase) --addModule(qtgraphicaleffects, qtdeclarative) -+#addModule(qtgraphicaleffects, qtdeclarative) - addModule(qtscript, qtbase) --addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit qttools) --addModule(qtdocgallery, qtdeclarative, qtjsondb) --!win32:!mac:addModule(qtwayland, qtbase, qtdeclarative) --addModule(qtserialport, qtbase) --addModule(qttranslations, qttools) --addModule(qtdoc, qtdeclarative) --addModule(qtqa, qtbase) -+#addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit qttools) -+#addModule(qtdocgallery, qtdeclarative, qtjsondb) -+#!win32:!mac:addModule(qtwayland, qtbase, qtdeclarative) -+#addModule(qtserialport, qtbase) -+#addModule(qttranslations, qttools) -+#addModule(qtdoc, qtdeclarative) -+#addModule(qtqa, qtbase) diff --git a/qtbase/configure b/qtbase/configure -index d7c9674..956c3e1 100755 +index 0b8b417..1d8bd6b 100755 --- a/qtbase/configure +++ b/qtbase/configure -@@ -857,10 +857,10 @@ CFG_XINERAMA=runtime - CFG_XFIXES=runtime - CFG_ZLIB=auto +@@ -633,10 +633,10 @@ CFG_MTDEV=auto + CFG_JOURNALD=no + CFG_SYSLOG=no CFG_SQLITE=qt -CFG_GIF=auto +CFG_GIF=yes @@ -106,85 +31,179 @@ index d7c9674..956c3e1 100755 CFG_LIBJPEG=auto CFG_XCURSOR=runtime CFG_XRANDR=runtime -@@ -883,7 +883,7 @@ CFG_SKIP_MODULES="" - CFG_COMPILE_EXAMPLES=auto - CFG_RELEASE_QMAKE=no - CFG_AUDIO_BACKEND=auto --CFG_V8SNAPSHOT=auto -+CFG_V8SNAPSHOT=no - CFG_QML_DEBUG=yes - CFG_JAVASCRIPTCORE_JIT=auto - CFG_PKGCONFIG=auto -@@ -949,7 +949,7 @@ CFG_GETADDRINFO=auto +@@ -743,7 +743,7 @@ CFG_GETADDRINFO=auto CFG_IPV6IFNAME=auto CFG_GETIFADDRS=auto CFG_INOTIFY=auto -CFG_EVENTFD=auto +CFG_EVENTFD=no + CFG_CLOEXEC=no CFG_RPATH=yes CFG_FRAMEWORK=auto - CFG_MAC_HARFBUZZ=no +@@ -5337,16 +5337,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 +@@ -5760,39 +5760,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 +@@ -6064,9 +6064,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 [ "$XPLATFORM_MAC" = "yes" ] && [ "$CFG_SECURETRANSPORT" != "no" ] && ([ "$CFG_OPENSSL" = "no" ] || [ "$CFG_OPENSSL" = "auto" ]); then + CFG_SECURETRANSPORT=yes diff --git a/qtbase/mkspecs/genode-g++/qmake.conf b/qtbase/mkspecs/genode-g++/qmake.conf new file mode 100644 -index 0000000..f99671f +index 0000000..734ae5c --- /dev/null +++ b/qtbase/mkspecs/genode-g++/qmake.conf -@@ -0,0 +1,12 @@ +@@ -0,0 +1,10 @@ +# +# qmake configuration for genode-g++ +# + +MAKEFILE_GENERATOR = UNIX -+CONFIG += incremental gdb_dwarf_index -+QMAKE_INCREMENTAL_STYLE = sublib + -+include(../common/linux.conf) ++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..4d2c580 +index 0000000..d4d67b0 --- /dev/null +++ b/qtbase/mkspecs/genode-g++/qplatformdefs.h -@@ -0,0 +1,112 @@ +@@ -0,0 +1,82 @@ +/**************************************************************************** +** -+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -+** Contact: http://www.qt-project.org/legal ++** Copyright (C) 2015 The Qt Company Ltd. ++** Contact: http://www.qt.io/licensing/ +** +** This file is part of the qmake spec of the Qt Toolkit. +** -+** $QT_BEGIN_LICENSE:LGPL$ ++** $QT_BEGIN_LICENSE:LGPL21$ +** 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 Digia. For licensing terms and -+** conditions see http://qt.digia.com/licensing. For further information -+** use the contact form at http://qt.digia.com/contact-us. ++** a written agreement between you and The Qt Company. For licensing terms ++** and conditions see http://www.qt.io/terms-conditions. For further ++** information use the contact form at http://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 2.1 as published by the Free Software -+** Foundation and appearing in the file LICENSE.LGPL included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU Lesser General Public License version 2.1 requirements -+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** General Public License version 2.1 or version 3 as published by the Free ++** Software Foundation and appearing in the file LICENSE.LGPLv21 and ++** LICENSE.LGPLv3 included in the packaging of this file. Please review the ++** following information to ensure the GNU Lesser General Public License ++** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ++** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** -+** In addition, as a special exception, Digia gives you certain additional -+** rights. These rights are described in the Digia Qt LGPL Exception ++** As a special exception, The Qt Company gives you certain additional ++** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 3.0 as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU General Public License version 3.0 requirements will be -+** met: http://www.gnu.org/copyleft/gpl.html. -+** -+** +** $QT_END_LICENSE$ +** +****************************************************************************/ @@ -198,28 +217,21 @@ index 0000000..4d2c580 + +// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs + -+// 1) need to reset default environment if _BSD_SOURCE is defined -+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0 -+// 3) it seems older glibc need this to include the X/Open stuff -+#ifndef _GNU_SOURCE -+# define _GNU_SOURCE -+#endif -+ +#include + + +// We are hot - unistd.h should have turned on the specific APIs we requested + -+#ifndef Q_OS_GENODE -+#include -+#endif ++ +#include +#include +#include +#include +#include +#include ++#include + ++#include +#include +#include +#include @@ -231,45 +243,27 @@ index 0000000..4d2c580 +#include +#include +#include -+#ifdef Q_OS_GENODE -+#define QT_NO_IPV6IFNAME -+#endif +#ifndef QT_NO_IPV6IFNAME +#include +#endif + -+#define QT_USE_XOPEN_LFS_EXTENSIONS +#include "../common/posix/qplatformdefs.h" + -+#ifdef Q_OS_GENODE +#undef QT_OPEN_LARGEFILE ++ +#define QT_OPEN_LARGEFILE 0 -+#endif + -+#undef QT_SOCKLEN_T -+ -+#if (defined(__GLIBC__) && (__GLIBC__ >= 2)) || defined(Q_OS_GENODE) -+#define QT_SOCKLEN_T socklen_t -+#else -+#define QT_SOCKLEN_T int -+#endif -+ -+#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf -+#endif + +#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..681af14 +index 0000000..56a0b73 --- /dev/null +++ b/qtbase/src/corelib/global/qconfig-genode.h -@@ -0,0 +1,546 @@ +@@ -0,0 +1,426 @@ +/* Data structures */ -+#ifndef QT_NO_STL -+# define QT_NO_STL -+#endif +//#ifndef QT_NO_TEXTDATE +//# define QT_NO_TEXTDATE +//#endif @@ -305,9 +299,6 @@ index 0000000..681af14 +//#ifndef QT_NO_PROGRESSDIALOG +//# define QT_NO_PROGRESSDIALOG +//#endif -+//#ifndef QT_NO_TABDIALOG -+//# define QT_NO_TABDIALOG -+//#endif +//#ifndef QT_NO_WIZARD +//# define QT_NO_WIZARD +//#endif @@ -339,9 +330,6 @@ index 0000000..681af14 +//#ifndef QT_NO_FREETYPE +//# define QT_NO_FREETYPE +//#endif -+#ifndef QT_NO_QWS_QPF2 -+# define QT_NO_QWS_QPF2 -+#endif + +/* Images */ +//#ifndef QT_NO_IMAGEFORMATPLUGIN @@ -376,9 +364,6 @@ index 0000000..681af14 +//#ifndef QT_NO_BIG_CODECS +//# define QT_NO_BIG_CODECS +//#endif -+//#ifndef QT_NO_QWS_INPUTMETHODS -+//# define QT_NO_QWS_INPUTMETHODS -+//#endif +//#ifndef QT_NO_TEXTCODEC +//# define QT_NO_TEXTCODEC +//#endif @@ -388,9 +373,6 @@ index 0000000..681af14 +//#ifndef QT_NO_TRANSLATION +//# define QT_NO_TRANSLATION +//#endif -+//#ifndef QT_NO_TRANSLATION_UTF8 -+//# define QT_NO_TRANSLATION_UTF8 -+//#endif + +/* ItemViews */ +//#ifndef QT_NO_ITEMVIEWS @@ -458,12 +440,6 @@ index 0000000..681af14 +//#ifndef QT_NO_SHORTCUT +//# define QT_NO_SHORTCUT +//#endif -+#ifndef QT_NO_SOUND -+# define QT_NO_SOUND -+#endif -+#ifndef QT_NO_SYSTEMLOCALE -+# define QT_NO_SYSTEMLOCALE -+#endif +#ifndef QT_NO_SYSTEMSEMAPHORE +# define QT_NO_SYSTEMSEMAPHORE +#endif @@ -490,12 +466,6 @@ index 0000000..681af14 +//#endif + +/* Networking */ -+#ifndef QT_NO_COP -+# define QT_NO_COP -+#endif -+//#ifndef QT_NO_HOSTINFO -+//# define QT_NO_HOSTINFO -+//#endif +//#ifndef QT_NO_HTTP +//# define QT_NO_HTTP +//#endif @@ -505,37 +475,22 @@ index 0000000..681af14 +//#ifndef QT_NO_SOCKS5 +//# define QT_NO_SOCKS5 +//#endif -+#ifndef QT_NO_UDPSOCKET -+# define QT_NO_UDPSOCKET -+#endif -+#ifndef QT_NO_URLINFO -+# define QT_NO_URLINFO -+#endif ++//#ifndef QT_NO_UDPSOCKET ++//# define QT_NO_UDPSOCKET ++//#endif +#ifndef QT_NO_FTP +# define QT_NO_FTP +#endif -+/* found in source files */ -+//#ifndef QT_NO_LOCALSOCKET -+//# define QT_NO_LOCALSOCKET -+//#endif -+//#ifndef QT_NO_LOCALSERVER -+//# define QT_NO_LOCALSERVER -+//#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_DIRECTPAINTER -+//# define QT_NO_DIRECTPAINTER -+//#endif -+//#ifndef QT_NO_PAINTONSCREEN -+//# define QT_NO_PAINTONSCREEN -+//#endif +//#ifndef QT_NO_PAINT_DEBUG +//# define QT_NO_PAINT_DEBUG +//#endif @@ -549,73 +504,6 @@ index 0000000..681af14 +# define QT_NO_CUPS +#endif + -+/* Qt for Embedded Linux */ -+//#ifndef QT_NO_QWSEMBEDWIDGET -+//# define QT_NO_QWSEMBEDWIDGET -+//#endif -+//#ifndef QT_NO_QWS_ALPHA_CURSOR -+//# define QT_NO_QWS_ALPHA_CURSOR -+//#endif -+#ifndef QT_NO_QWS_CURSOR -+# define QT_NO_QWS_CURSOR -+#endif -+//#ifndef QT_NO_QWS_DECORATION_DEFAULT -+//# define QT_NO_QWS_DECORATION_DEFAULT -+//#endif -+//#ifndef QT_NO_QWS_DECORATION_STYLED -+//# define QT_NO_QWS_DECORATION_STYLED -+//#endif -+//#ifndef QT_NO_QWS_DECORATION_WINDOWS -+//# define QT_NO_QWS_DECORATION_WINDOWS -+//#endif -+//#ifndef QT_NO_QWS_MANAGER -+//# define QT_NO_QWS_MANAGER -+//#endif -+//#ifndef QT_NO_QWS_KEYBOARD -+//# define QT_NO_QWS_KEYBOARD -+//#endif -+//#ifndef QT_NO_QWS_MOUSE -+//# define QT_NO_QWS_MOUSE -+//#endif -+//#ifndef QT_NO_QWS_MOUSE_AUTO -+//# define QT_NO_QWS_MOUSE_AUTO -+//#endif -+//#ifndef QT_NO_QWS_MOUSE_MANUAL -+//# define QT_NO_QWS_MOUSE_MANUAL -+//#endif -+#ifndef QT_NO_QWS_MULTIPROCESS -+# define QT_NO_QWS_MULTIPROCESS -+#endif -+#ifndef QT_NO_QWS_SOUNDSERVER -+# define QT_NO_QWS_SOUNDSERVER -+#endif -+//#ifndef QT_NO_QWS_PROPERTIES -+//# define QT_NO_QWS_PROPERTIES -+//#endif -+//#ifndef QT_NO_QWS_PROXYSCREEN -+//# define QT_NO_QWS_PROXYSCREEN -+//#endif -+//#ifndef QT_NO_QWS_DYNAMICSCREENTRANSFORMATION -+//# define QT_NO_QWS_DYNAMICSCREENTRANSFORMATION -+//#endif -+ -+/* SVG */ -+//#ifndef QT_NO_SVG -+//# define QT_NO_SVG -+//#endif -+//#ifndef QT_NO_GRAPHICSSVGITEM -+//# define QT_NO_GRAPHICSSVGITEM -+//#endif -+//#ifndef QT_NO_SVGGENERATOR -+//# define QT_NO_SVGGENERATOR -+//#endif -+//#ifndef QT_NO_SVGRENDERER -+//# define QT_NO_SVGRENDERER -+//#endif -+//#ifndef QT_NO_SVGWIDGET -+//# define QT_NO_SVGWIDGET -+//#endif -+ +/* Styles */ +//#ifndef QT_NO_STYLE_FUSION +//# define QT_NO_STYLE_FUSION @@ -646,9 +534,6 @@ index 0000000..681af14 +//#ifndef QT_NO_DESKTOPSERVICES +//# define QT_NO_DESKTOPSERVICES +//#endif -+//#ifndef QT_NO_SCRIPT -+//# define QT_NO_SCRIPT -+//#endif +//#ifndef QT_NO_SYSTEMTRAYICON +//# define QT_NO_SYSTEMTRAYICON +//#endif @@ -729,9 +614,6 @@ index 0000000..681af14 +//#ifndef QT_NO_SPLITTER +//# define QT_NO_SPLITTER +//#endif -+//#ifndef QT_NO_SIGNALMAPPER -+//# define QT_NO_SIGNALMAPPER -+//#endif +//#ifndef QT_NO_SIZEGRIP +//# define QT_NO_SIZEGRIP +//#endif @@ -807,87 +689,23 @@ index 0000000..681af14 +//#ifndef QT_NO_VALIDATOR +//# define QT_NO_VALIDATOR +//#endif -+ -+/* Windows */ -+//#ifndef QT_NO_WIN_ACTIVEQT -+//# define QT_NO_WIN_ACTIVEQT -+//#endif -diff --git a/qtdeclarative/examples/quick/quick.pro b/qtdeclarative/examples/quick/quick.pro -index 311e264..b356a56 100644 ---- a/qtdeclarative/examples/quick/quick.pro -+++ b/qtdeclarative/examples/quick/quick.pro -@@ -12,7 +12,6 @@ SUBDIRS = accessibility \ - positioners \ - righttoleft \ - scenegraph \ -- shadereffects \ - text \ - threading \ - touchinteraction \ -@@ -29,6 +28,11 @@ qtHaveModule(widgets) { - SUBDIRS += embeddedinwidgets - } - -+# OpenGL dependent examples -+qtHaveModule(opengl) { -+ SUBDIRS += shadereffects -+} -+ - EXAMPLE_FILES = \ - ui-components \ - shared -diff --git a/qtdeclarative/src/imports/imports.pro b/qtdeclarative/src/imports/imports.pro -index 733c7c4..fb1a413 100644 ---- a/qtdeclarative/src/imports/imports.pro -+++ b/qtdeclarative/src/imports/imports.pro -@@ -16,4 +16,4 @@ qtHaveModule(quick) { - - qtHaveModule(xmlpatterns) : SUBDIRS += xmllistmodel - --qtHaveModule(widgets) : SUBDIRS += widgets -+qtHaveModule(widgets),qtHaveModule(quick): SUBDIRS += widgets -diff --git a/qtdeclarative/tests/tests.pro b/qtdeclarative/tests/tests.pro -index 85e4f3a..9aa752b 100644 ---- a/qtdeclarative/tests/tests.pro -+++ b/qtdeclarative/tests/tests.pro -@@ -1,2 +1,2 @@ --TEMPLATE = subdirs --SUBDIRS += auto -+#TEMPLATE = subdirs -+#SUBDIRS += auto -diff --git a/qtquick1/examples/declarative/declarative.pro b/qtquick1/examples/declarative/declarative.pro -index 91378da..123539f 100644 ---- a/qtquick1/examples/declarative/declarative.pro -+++ b/qtquick1/examples/declarative/declarative.pro -@@ -16,7 +16,6 @@ SUBDIRS = \ - righttoleft \ - rssnews \ - samegame \ -- shadereffects \ - snake \ - sqllocalstorage \ - text \ -diff --git a/qtwebkit/Tools/qmake/mkspecs/features/features.prf b/qtwebkit/Tools/qmake/mkspecs/features/features.prf -index ddbccf9..e4d3999 100644 ---- a/qtwebkit/Tools/qmake/mkspecs/features/features.prf -+++ b/qtwebkit/Tools/qmake/mkspecs/features/features.prf -@@ -39,8 +39,8 @@ defineTest(detectFeatures) { - - config_libxml2: WEBKIT_CONFIG += use_libxml2 - config_libxslt: WEBKIT_CONFIG += xslt -- config_libzlib: WEBKIT_CONFIG += use_zlib -- config_libwebp: WEBKIT_CONFIG += use_webp -+ #config_libzlib: WEBKIT_CONFIG += use_zlib -+ #config_libwebp: WEBKIT_CONFIG += use_webp - - # We can't use Qt's 3rdparty sources for libjpeg and libpng outside of qtbase, but if Qt - # is using the system libraries, use them to take advantage of the WebCore image decoders as well. -@@ -81,7 +81,7 @@ defineTest(detectFeatures) { - - # Enable the USE(3D_GRAPHICS) flag when QtOpenGL is enabled. - # Disable on Windows CE for now, as ANGLE won't compile. -- !wince*:contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics -+ #!wince*:contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics - - # Temporarily disable FTPDIR on Windows CE (missing functions from time.h) - wince* { +diff --git a/qtdeclarative/tools/tools.pro b/qtdeclarative/tools/tools.pro +index 96cf804..24432b3 100644 +--- a/qtdeclarative/tools/tools.pro ++++ b/qtdeclarative/tools/tools.pro +@@ -9,14 +9,11 @@ qmlimportscanner.CONFIG = host_build + !android|android_app { + SUBDIRS += \ + qml \ +- qmlprofiler \ + qmllint + qtHaveModule(quick) { + !static: { + SUBDIRS += \ +- qmlscene \ +- qmlplugindump \ +- qmltime ++ qmlscene + } + qtHaveModule(widgets): SUBDIRS += qmleasing + } diff --git a/repos/libports/src/lib/qt5/patches/qt5_gcc5.patch b/repos/libports/src/lib/qt5/patches/qt5_gcc5.patch deleted file mode 100644 index 1ed4f9ef0..000000000 --- a/repos/libports/src/lib/qt5/patches/qt5_gcc5.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 650c6ee8e76bb574d3a1bea09e2494992d8f070e Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen -Date: Fri, 6 Mar 2015 11:20:13 +0100 -Subject: [PATCH] Fix g++ 5.0 build - -A non-inline template needs to be explicitly instantiated if used -outside the object where it is declared. - -Patch suggested by Khem Raj. - -Task-number: QTBUG-44829 -Change-Id: Ib0adbd9273bd1cef01e5863bc8aaa9c373022792 -Reviewed-by: Andras Becsi ---- - Source/JavaScriptCore/runtime/JSObject.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/Source/JavaScriptCore/runtime/JSObject.cpp b/Source/JavaScriptCore/runtime/JSObject.cpp -index 5637e20..bd55919 100644 ---- a/qtwebkit/Source/JavaScriptCore/runtime/JSObject.cpp -+++ b/qtwebkit/Source/JavaScriptCore/runtime/JSObject.cpp -@@ -1909,6 +1909,11 @@ void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, un - } - } - -+// Used in JSArray.cpp so we must instantiate explicit -+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, unsigned i, JSValue value); -+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, unsigned i, JSValue value); -+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, unsigned i, JSValue value); -+ - void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage) - { - VM& vm = exec->vm(); diff --git a/repos/libports/src/lib/qt5/patches/qt5_generated_headers.patch b/repos/libports/src/lib/qt5/patches/qt5_generated_headers.patch index b2a9463c8..18c988a30 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_generated_headers.patch +++ b/repos/libports/src/lib/qt5/patches/qt5_generated_headers.patch @@ -4,12 +4,13 @@ From: Christian Prochaska --- - .stgit-new.txt~ | 0 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 +++ @@ -17,16 +18,15 @@ From: Christian Prochaska qtscript/include/QtScript/QtScriptDepends | 2 ++ qtsvg/include/QtSvg/QtSvgDepends | 4 ++++ qttools/include/QtUiTools/QtUiToolsDepends | 2 ++ - qtwebkit/include/QtWebKit/QtWebKitDepends | 4 ++++ - .../include/QtWebKitWidgets/QtWebKitWidgetsDepends | 7 +++++++ .../include/QtXmlPatterns/QtXmlPatternsDepends | 3 +++ - 16 files changed, 40 insertions(+) - create mode 100644 .stgit-new.txt~ + 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 @@ -34,13 +34,8 @@ From: Christian Prochaska create mode 100644 qtscript/include/QtScript/QtScriptDepends create mode 100644 qtsvg/include/QtSvg/QtSvgDepends create mode 100644 qttools/include/QtUiTools/QtUiToolsDepends - create mode 100644 qtwebkit/include/QtWebKit/QtWebKitDepends - create mode 100644 qtwebkit/include/QtWebKitWidgets/QtWebKitWidgetsDepends create mode 100644 qtxmlpatterns/include/QtXmlPatterns/QtXmlPatternsDepends -diff --git a/.stgit-new.txt~ b/.stgit-new.txt~ -new file mode 100644 -index 0000000..e69de29 diff --git a/qtbase/include/QtCore/QtConfig b/qtbase/include/QtCore/QtConfig new file mode 100644 index 0000000..c734263 @@ -62,6 +57,13 @@ index 0000000..aa8a3d6 +++ 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 @@ -78,6 +80,16 @@ index 0000000..cb2c29d @@ -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 @@ -139,29 +151,6 @@ index 0000000..2c0063e @@ -0,0 +1,2 @@ +/* This file was generated by qmake with the info from /src/designer/src/uitools/uitools.pro. */ +#include -diff --git a/qtwebkit/include/QtWebKit/QtWebKitDepends b/qtwebkit/include/QtWebKit/QtWebKitDepends -new file mode 100644 -index 0000000..1b3f8ad ---- /dev/null -+++ b/qtwebkit/include/QtWebKit/QtWebKitDepends -@@ -0,0 +1,4 @@ -+/* This file was generated by qmake with the info from /Source/api.pri. */ -+#include -+#include -+#include -diff --git a/qtwebkit/include/QtWebKitWidgets/QtWebKitWidgetsDepends b/qtwebkit/include/QtWebKitWidgets/QtWebKitWidgetsDepends -new file mode 100644 -index 0000000..672bd42 ---- /dev/null -+++ b/qtwebkit/include/QtWebKitWidgets/QtWebKitWidgetsDepends -@@ -0,0 +1,7 @@ -+/* This file was generated by qmake with the info from /Source/widgetsapi.pri. */ -+#include -+#include -+#include -+#include -+#include -+#include diff --git a/qtxmlpatterns/include/QtXmlPatterns/QtXmlPatternsDepends b/qtxmlpatterns/include/QtXmlPatterns/QtXmlPatternsDepends new file mode 100644 index 0000000..60615c7 diff --git a/repos/libports/src/lib/qt5/patches/qt5_qarraydata.patch b/repos/libports/src/lib/qt5/patches/qt5_qarraydata.patch index ded419852..e68e17abd 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_qarraydata.patch +++ b/repos/libports/src/lib/qt5/patches/qt5_qarraydata.patch @@ -8,10 +8,10 @@ From: Christian Prochaska 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase/src/corelib/tools/qarraydata.cpp b/qtbase/src/corelib/tools/qarraydata.cpp -index a61147a..ee9cde3 100644 +index eb6ce21..ba93eec 100644 --- a/qtbase/src/corelib/tools/qarraydata.cpp +++ b/qtbase/src/corelib/tools/qarraydata.cpp -@@ -97,8 +97,8 @@ QArrayData *QArrayData::allocate(size_t objectSize, size_t alignment, +@@ -107,8 +107,8 @@ QArrayData *QArrayData::allocate(size_t objectSize, size_t alignment, QArrayData *header = static_cast(::malloc(allocSize)); if (header) { @@ -20,5 +20,5 @@ index a61147a..ee9cde3 100644 + 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))); - header->size = 0; diff --git a/repos/libports/src/lib/qt5/patches/qt5_qml.patch b/repos/libports/src/lib/qt5/patches/qt5_qml.patch index faa8c3db9..d7a54d529 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_qml.patch +++ b/repos/libports/src/lib/qt5/patches/qt5_qml.patch @@ -4,20 +4,68 @@ From: Christian Prochaska --- - qtdeclarative/src/qml/qml/qqmlaccessors_p.h | 2 - qtdeclarative/src/qml/qml/qqmlimport.cpp | 9 - qtdeclarative/src/qml/qml/v8/qv8qobjectwrapper.cpp | 4 - qtdeclarative/src/qml/types/qqmldelegatemodel_p.h | 2 - qtjsbackend/src/3rdparty/v8/src/platform-genode.cc | 686 ++++++++++++++++++++ - qtjsbackend/src/v8/v8.pri | 2 - 6 files changed, 702 insertions(+), 3 deletions(-) - create mode 100644 qtjsbackend/src/3rdparty/v8/src/platform-genode.cc + 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(-) +diff --git a/qtdeclarative/src/qml/jsruntime/qv4alloca_p.h b/qtdeclarative/src/qml/jsruntime/qv4alloca_p.h +index df40a01..c3c5c51 100644 +--- a/qtdeclarative/src/qml/jsruntime/qv4alloca_p.h ++++ b/qtdeclarative/src/qml/jsruntime/qv4alloca_p.h +@@ -47,6 +47,7 @@ + + #include + ++#ifndef Q_OS_GENODE + #if defined(Q_OS_WIN) + # include + # ifndef __GNUC__ +@@ -54,6 +55,9 @@ + # endif + #elif !defined(Q_OS_BSD4) || defined(Q_OS_DARWIN) + # include ++#else ++# include ++#endif + #endif + + #endif +diff --git a/qtdeclarative/src/qml/jsruntime/qv4engine.cpp b/qtdeclarative/src/qml/jsruntime/qv4engine.cpp +index 557b678..4051e6f 100644 +--- a/qtdeclarative/src/qml/jsruntime/qv4engine.cpp ++++ b/qtdeclarative/src/qml/jsruntime/qv4engine.cpp +@@ -94,6 +94,10 @@ + #include + #endif + ++#if defined(Q_OS_GENODE) ++#include ++#endif ++ + QT_BEGIN_NAMESPACE + + using namespace QV4; +diff --git a/qtdeclarative/src/qml/jsruntime/qv4global_p.h b/qtdeclarative/src/qml/jsruntime/qv4global_p.h +index 960741d..c81f09f 100644 +--- a/qtdeclarative/src/qml/jsruntime/qv4global_p.h ++++ b/qtdeclarative/src/qml/jsruntime/qv4global_p.h +@@ -105,7 +105,7 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); } + + // Black list some platforms + #if defined(V4_ENABLE_JIT) +-#if defined(Q_OS_IOS) || defined(Q_OS_WINRT) ++#if defined(Q_OS_IOS) || defined(Q_OS_WINRT) || defined(Q_OS_GENODE) + # 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 6df624e..1d61b5b 100644 +index 8b0a587..5e22682 100644 --- a/qtdeclarative/src/qml/qml/qqmlaccessors_p.h +++ b/qtdeclarative/src/qml/qml/qqmlaccessors_p.h -@@ -48,7 +48,7 @@ +@@ -51,7 +51,7 @@ #include #include @@ -27,10 +75,10 @@ index 6df624e..1d61b5b 100644 #endif diff --git a/qtdeclarative/src/qml/qml/qqmlimport.cpp b/qtdeclarative/src/qml/qml/qqmlimport.cpp -index 2fbb614..5816e9a 100644 +index dfdf2ed..940d556 100644 --- a/qtdeclarative/src/qml/qml/qqmlimport.cpp +++ b/qtdeclarative/src/qml/qml/qqmlimport.cpp -@@ -1463,6 +1463,14 @@ QString QQmlImportDatabase::resolvePlugin(QQmlTypeLoader *typeLoader, +@@ -1667,6 +1667,14 @@ QString QQmlImportDatabase::resolvePlugin(QQmlTypeLoader *typeLoader, const QString &qmldirPath, const QString &qmldirPluginPath, const QString &baseName) { @@ -42,754 +90,14 @@ index 2fbb614..5816e9a 100644 + +#else + - #if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) + #if defined(Q_OS_WIN) return resolvePlugin(typeLoader, qmldirPath, qmldirPluginPath, baseName, QStringList() -@@ -1512,6 +1520,7 @@ QString QQmlImportDatabase::resolvePlugin(QQmlTypeLoader *typeLoader, - # endif - +@@ -1691,6 +1699,7 @@ QString QQmlImportDatabase::resolvePlugin(QQmlTypeLoader *typeLoader, + # else // Unix + return resolvePlugin(typeLoader, qmldirPath, qmldirPluginPath, baseName, QStringList() << QLatin1String(".so"), QLatin1String("lib")); #endif +#endif } /*! -diff --git a/qtdeclarative/src/qml/qml/v8/qv8qobjectwrapper.cpp b/qtdeclarative/src/qml/qml/v8/qv8qobjectwrapper.cpp -index 53f70ad..0b31aa6 100644 ---- a/qtdeclarative/src/qml/qml/v8/qv8qobjectwrapper.cpp -+++ b/qtdeclarative/src/qml/qml/v8/qv8qobjectwrapper.cpp -@@ -973,6 +973,8 @@ v8::Local QQmlPropertyCache::newQObject(QObject *object, QV8Engine * - if (checkForDuplicates) - uniqueHash.reserve(stringCache.count()); - -+/* disabling this code seems to avoid crashes on 32-bit Linux and NOVA */ -+#if 0 - // XXX TODO: Enables fast property accessors. These more than double the property access - // performance, but the cost of setting up this structure hasn't been measured so - // its not guaranteed that this is a win overall. We need to try and measure the cost. -@@ -1032,7 +1034,7 @@ v8::Local QQmlPropertyCache::newQObject(QObject *object, QV8Engine * - v8::External::New(property)); - } - } -- -+#endif - if (ft.IsEmpty()) { - constructor = qPersistentNew(engine->qobjectWrapper()->m_constructor); - } else { -diff --git a/qtdeclarative/src/qml/types/qqmldelegatemodel_p.h b/qtdeclarative/src/qml/types/qqmldelegatemodel_p.h -index 5702c59..3d616b5 100644 ---- a/qtdeclarative/src/qml/types/qqmldelegatemodel_p.h -+++ b/qtdeclarative/src/qml/types/qqmldelegatemodel_p.h -@@ -52,6 +52,8 @@ - #include - #include - -+#include -+ - Q_DECLARE_METATYPE(QModelIndex) - - QT_BEGIN_NAMESPACE -diff --git a/qtjsbackend/src/3rdparty/v8/src/platform-genode.cc b/qtjsbackend/src/3rdparty/v8/src/platform-genode.cc -new file mode 100644 -index 0000000..705b371 ---- /dev/null -+++ b/qtjsbackend/src/3rdparty/v8/src/platform-genode.cc -@@ -0,0 +1,686 @@ -+// Copyright 2012 the V8 project authors. All rights reserved. -+// Redistribution and use in source and binary forms, with or without -+// modification, are permitted provided that the following conditions are -+// met: -+// -+// * Redistributions of source code must retain the above copyright -+// notice, this list of conditions and the following disclaimer. -+// * Redistributions in binary form must reproduce the above -+// copyright notice, this list of conditions and the following -+// disclaimer in the documentation and/or other materials provided -+// with the distribution. -+// * Neither the name of Google Inc. nor the names of its -+// contributors may be used to endorse or promote products derived -+// from this software without specific prior written permission. -+// -+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ -+// Platform specific code for Genode goes here -+ -+// Minimal include to get access to abort, fprintf and friends for bootstrapping -+// messages. -+ -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "v8.h" -+ -+#include "platform-posix.h" -+#include "platform.h" -+#include "vm-state-inl.h" -+ -+ -+namespace v8 { -+namespace internal { -+ -+static const pthread_t kNoThread = (pthread_t) 0; -+ -+#undef UNIMPLEMENTED -+#define UNIMPLEMENTED(...) Genode::warning(__PRETTY_FUNCTION__, ": UNIMPLEMENTED") -+ -+ -+double ceiling(double x) { -+ return ceil(x); -+} -+ -+ -+// Initialize OS class early in the V8 startup. -+void OS::SetUp() { -+ // Seed the random number generator. -+ UNIMPLEMENTED(); -+} -+ -+ -+void OS::PostSetUp() { -+ POSIXPostSetUp(); -+} -+ -+ -+void OS::TearDown() { -+ UNIMPLEMENTED(); -+} -+ -+int OS::ActivationFrameAlignment() { -+#ifdef V8_TARGET_ARCH_ARM -+ // On EABI ARM targets this is required for fp correctness in the -+ // runtime system. -+ return 8; -+#elif V8_TARGET_ARCH_MIPS -+ return 8; -+#endif -+ // With gcc 4.4 the tree vectorization optimizer can generate code -+ // that requires 16 byte alignment such as movdqa on x86. -+ return 16; -+} -+ -+ -+void OS::ReleaseStore(volatile AtomicWord* ptr, AtomicWord value) { -+#if (defined(V8_TARGET_ARCH_ARM) && defined(__arm__)) || \ -+ (defined(V8_TARGET_ARCH_MIPS) && defined(__mips__)) -+ // Only use on ARM or MIPS hardware. -+ MemoryBarrier(); -+#else -+ __asm__ __volatile__("" : : : "memory"); -+ // An x86 store acts as a release barrier. -+#endif -+ *ptr = value; -+} -+ -+ -+// Returns a string identifying the current timezone taking into -+// account daylight saving. -+const char* OS::LocalTimezone(double time) { -+ UNIMPLEMENTED(); -+ return ""; -+} -+ -+ -+// Returns the local time offset in milliseconds east of UTC without -+// taking daylight savings time into account. -+double OS::LocalTimeOffset() { -+ UNIMPLEMENTED(); -+ return 0; -+} -+ -+ -+uint64_t OS::CpuFeaturesImpliedByPlatform() { -+ return 0; -+} -+ -+ -+CpuImplementer OS::GetCpuImplementer() { -+ return UNKNOWN_IMPLEMENTER; -+} -+ -+ -+bool OS::ArmCpuHasFeature(CpuFeature feature) { -+ return false; -+} -+ -+#if 0 -+bool OS::ArmUsingHardFloat() { -+ UNIMPLEMENTED(); -+} -+#endif -+ -+bool OS::IsOutsideAllocatedSpace(void* address) { -+ UNIMPLEMENTED(); -+ return false; -+} -+ -+#if 0 -+size_t OS::AllocateAlignment() { -+ UNIMPLEMENTED(); -+ return 0; -+} -+#endif -+ -+void* OS::Allocate(const size_t requested, -+ size_t* allocated, -+ bool executable) { -+ //UNIMPLEMENTED(); -+ *allocated = requested; -+ return malloc(requested); -+} -+ -+#if 0 -+void OS::Free(void* buf, const size_t length) { -+ // TODO(1240712): potential system call return value which is ignored here. -+ UNIMPLEMENTED(); -+} -+ -+ -+void OS::Guard(void* address, const size_t size) { -+ UNIMPLEMENTED(); -+} -+#endif -+ -+void OS::Sleep(int milliseconds) { -+ UNIMPLEMENTED(); -+} -+ -+ -+void OS::Abort() { -+ // Minimalistic implementation for bootstrapping. -+ abort(); -+} -+ -+#if 0 -+void OS::DebugBreak() { -+ UNIMPLEMENTED(); -+} -+#endif -+ -+OS::MemoryMappedFile* OS::MemoryMappedFile::open(const char* name) { -+ UNIMPLEMENTED(); -+ return NULL; -+} -+ -+#if 0 -+OS::MemoryMappedFile* OS::MemoryMappedFile::create(const char* name, int size, -+ void* initial) { -+ UNIMPLEMENTED(); -+ return NULL; -+} -+#endif -+ -+void OS::LogSharedLibraryAddresses() { -+ UNIMPLEMENTED(); -+} -+ -+ -+void OS::SignalCodeMovingGC() { -+ UNIMPLEMENTED(); -+} -+ -+#if 0 -+int OS::StackWalk(Vector frames) { -+ UNIMPLEMENTED(); -+ return 0; -+} -+#endif -+ -+/* --- */ -+ -+class Attached_region_map : private Genode::Rm_connection, -+ public Genode::Region_map_client, -+ public Genode::Avl_node -+ -+{ -+ -+ private: -+ -+ Genode::Dataspace_capability _ds_cap; -+ -+ size_t _size; -+ Genode::addr_t _base_addr; -+ -+ public: -+ -+ typedef Region_map_client::Region_conflict Region_conflict; -+ -+ Attached_region_map(size_t size, size_t alignment = 0) -+ : Genode::Region_map_client(Rm_connection::create(size)), -+ _ds_cap(dataspace()), -+ _size(size) -+ { -+ if (alignment == 0) { -+ _base_addr = Genode::env()->rm_session()->attach(_ds_cap); -+ } else { -+ for (_base_addr = alignment; -+ _base_addr != 0; /* wrap-around */ -+ _base_addr += alignment) { -+ try { -+ Genode::env()->rm_session()->attach_at(_ds_cap, _base_addr); -+ return; -+ } catch (Genode::Region_map::Region_conflict) { } -+ } -+ Genode::error(__PRETTY_FUNCTION__, ": could not attach region"); -+ throw Region_map::Region_conflict(); -+ } -+ } -+ -+ ~Attached_region_map() -+ { -+ Genode::env()->rm_session()->detach(_base_addr); -+ } -+ -+ size_t size() const { return _size; } -+ -+ void *base_addr() const { return (void*)_base_addr; } -+ -+ void attach(Genode::Dataspace_capability ds_cap, Genode::addr_t addr, -+ bool executable) -+ { -+ Genode::Region_map_client::attach(ds_cap, 0, 0, true, -+ (void*)(addr - _base_addr), -+ executable); -+ } -+ -+ Attached_region_map *find_by_addr(Genode::addr_t addr) -+ { -+ if ((addr >= _base_addr) && (addr < _base_addr + _size)) -+ return this; -+ -+ Attached_region_map *next = child(addr > _base_addr); -+ return next ? next->find_by_addr(addr) : 0; -+ } -+ -+ /** -+ * Avl_node interface -+ */ -+ bool higher(Attached_region_map *other) -+ { -+ return ((Genode::addr_t)other->base_addr() > _base_addr); -+ } -+}; -+ -+ -+static Genode::Avl_tree &vm_registry() -+{ -+ static Genode::Avl_tree _vm_registry; -+ return _vm_registry; -+} -+ -+ -+static void *reserve_region(size_t size, size_t alignment = 0) -+{ -+ Attached_region_map *rm; -+ try { -+ rm = new Attached_region_map(size, alignment); -+ } catch (Attached_region_map::Region_conflict) { -+ Genode::error(__PRETTY_FUNCTION__, ": could not reserve region"); -+ return 0; -+ } -+ vm_registry().insert(rm); -+ return rm->base_addr(); -+} -+ -+/* --- */ -+ -+VirtualMemory::VirtualMemory() : address_(NULL), size_(0) { } -+ -+ -+VirtualMemory::VirtualMemory(size_t size) { -+ address_ = ReserveRegion(size); -+ size_ = size; -+} -+ -+ -+VirtualMemory::VirtualMemory(size_t size, size_t alignment) { -+ address_ = reserve_region(size, alignment); -+ size_ = size; -+} -+ -+ -+VirtualMemory::~VirtualMemory() { -+ if (IsReserved()) { -+ bool result = ReleaseRegion(address(), size()); -+ ASSERT(result); -+ USE(result); -+ } -+} -+ -+ -+bool VirtualMemory::IsReserved() { -+ return address_ != NULL; -+} -+ -+ -+void VirtualMemory::Reset() { -+ address_ = NULL; -+ size_ = 0; -+} -+ -+ -+bool VirtualMemory::Commit(void* address, size_t size, bool is_executable) { -+ return CommitRegion(address, size, is_executable); -+} -+ -+ -+ -+bool VirtualMemory::Uncommit(void* address, size_t size) { -+ return UncommitRegion(address, size); -+} -+ -+ -+bool VirtualMemory::Guard(void* address) { -+ UNIMPLEMENTED(); -+ return true; -+} -+ -+ -+void* VirtualMemory::ReserveRegion(size_t size) { -+ return reserve_region(size); -+} -+ -+ -+bool VirtualMemory::CommitRegion(void* base, size_t size, bool is_executable) { -+ Attached_region_map *rm = vm_registry().first(); -+ rm = rm->find_by_addr((Genode::addr_t)base); -+ if (!rm) { -+ Genode::error(__PRETTY_FUNCTION__, ": could not find RM connection"); -+ return false; -+ } -+ -+ Genode::Ram_dataspace_capability ds_cap = -+ Genode::env()->ram_session()->alloc(size); -+ -+ try { -+ rm->attach(ds_cap, (Genode::addr_t)base, is_executable); -+ } catch (Genode::Region_map::Region_conflict) { -+ return false; -+ } -+ -+ return true; -+} -+ -+ -+bool VirtualMemory::UncommitRegion(void* base, size_t size) { -+ UNIMPLEMENTED(); -+ return false; -+} -+ -+ -+bool VirtualMemory::ReleaseRegion(void* base, size_t size) { -+ -+ UNIMPLEMENTED(); -+ -+#if 0 -+ /* -+ * FIXME -+ * -+ * Unmapping of managed dataspaces is not supported on all platforms. -+ * To make it still work, all dataspaces attached to the sub RM session must -+ * be detached before detaching the sub RM session. -+ */ -+ -+ Attached_rm_connection *rm = vm_registry().first(); -+ /* XXX: also pass the size for checking? */ -+ rm = rm->find_by_addr((Genode::addr_t)base); -+ if (!rm) -+ return false; -+ -+ vm_registry().remove(rm); -+ -+ delete rm; -+#endif -+ -+ return true; -+} -+ -+ -+bool VirtualMemory::HasLazyCommits() { -+ // TODO(alph): implement for the platform. -+ return false; -+} -+ -+ -+class Thread::PlatformData : public Malloced { -+ public: -+ PlatformData() : thread_(kNoThread) {} -+ -+ pthread_t thread_; // Thread handle for pthread. -+}; -+ -+ -+Thread::Thread(const Options& options) -+ : data_(new PlatformData()), -+ stack_size_(options.stack_size()) { -+ set_name(options.name()); -+} -+ -+ -+Thread::~Thread() { -+ delete data_; -+} -+ -+ -+static void* ThreadEntry(void* arg) { -+ Thread* thread = reinterpret_cast(arg); -+ // This is also initialized by the first argument to pthread_create() but we -+ // don't know which thread will run first (the original thread or the new -+ // one) so we initialize it here too. -+#ifdef PR_SET_NAME -+ prctl(PR_SET_NAME, -+ reinterpret_cast(thread->name()), // NOLINT -+ 0, 0, 0); -+#endif -+ thread->data()->thread_ = pthread_self(); -+ ASSERT(thread->data()->thread_ != kNoThread); -+ thread->Run(); -+ return NULL; -+} -+ -+ -+void Thread::set_name(const char* name) { -+ strncpy(name_, name, sizeof(name_)); -+ name_[sizeof(name_) - 1] = '\0'; -+} -+ -+ -+void Thread::Start() { -+ pthread_attr_t* attr_ptr = NULL; -+ pthread_attr_t attr; -+ if (stack_size_ > 0) { -+ pthread_attr_init(&attr); -+ pthread_attr_setstacksize(&attr, static_cast(stack_size_)); -+ attr_ptr = &attr; -+ } -+ int result = pthread_create(&data_->thread_, attr_ptr, ThreadEntry, this); -+ CHECK_EQ(0, result); -+ ASSERT(data_->thread_ != kNoThread); -+} -+ -+ -+void Thread::Join() { -+ pthread_join(data_->thread_, NULL); -+} -+ -+ -+Thread::LocalStorageKey Thread::CreateThreadLocalKey() { -+ pthread_key_t key; -+ int result = pthread_key_create(&key, NULL); -+ USE(result); -+ ASSERT(result == 0); -+ return static_cast(key); -+} -+ -+ -+void Thread::DeleteThreadLocalKey(LocalStorageKey key) { -+ pthread_key_t pthread_key = static_cast(key); -+ int result = pthread_key_delete(pthread_key); -+ USE(result); -+ ASSERT(result == 0); -+} -+ -+ -+void* Thread::GetThreadLocal(LocalStorageKey key) { -+ pthread_key_t pthread_key = static_cast(key); -+ return pthread_getspecific(pthread_key); -+} -+ -+ -+void Thread::SetThreadLocal(LocalStorageKey key, void* value) { -+ pthread_key_t pthread_key = static_cast(key); -+ pthread_setspecific(pthread_key, value); -+} -+ -+ -+void Thread::YieldCPU() { -+ UNIMPLEMENTED(); -+} -+ -+ -+class GenodeMutex : public Mutex { -+ public: -+ GenodeMutex() { -+ pthread_mutexattr_t attrs; -+ int result = pthread_mutexattr_init(&attrs); -+ ASSERT(result == 0); -+ result = pthread_mutexattr_settype(&attrs, PTHREAD_MUTEX_RECURSIVE); -+ ASSERT(result == 0); -+ result = pthread_mutex_init(&mutex_, &attrs); -+ ASSERT(result == 0); -+ USE(result); -+ } -+ -+ virtual ~GenodeMutex() { pthread_mutex_destroy(&mutex_); } -+ -+ virtual int Lock() { -+ int result = pthread_mutex_lock(&mutex_); -+ return result; -+ } -+ -+ virtual int Unlock() { -+ int result = pthread_mutex_unlock(&mutex_); -+ return result; -+ } -+ -+ virtual bool TryLock() { -+ int result = pthread_mutex_trylock(&mutex_); -+ // Return false if the lock is busy and locking failed. -+ if (result == EBUSY) { -+ return false; -+ } -+ ASSERT(result == 0); // Verify no other errors. -+ return true; -+ } -+ -+ private: -+ pthread_mutex_t mutex_; // Pthread mutex for POSIX platforms. -+}; -+ -+ -+Mutex* OS::CreateMutex() { -+ return new GenodeMutex(); -+} -+ -+ -+class GenodeSemaphore : public Semaphore { -+ public: -+ explicit GenodeSemaphore(int count) { sem_init(&sem_, 0, count); } -+ virtual ~GenodeSemaphore() { sem_destroy(&sem_); } -+ -+ virtual void Wait(); -+ virtual bool Wait(int timeout); -+ virtual void Signal() { sem_post(&sem_); } -+ private: -+ sem_t sem_; -+}; -+ -+ -+void GenodeSemaphore::Wait() { -+ while (true) { -+ int result = sem_wait(&sem_); -+ if (result == 0) return; // Successfully got semaphore. -+ CHECK(result == -1 && errno == EINTR); // Signal caused spurious wakeup. -+ } -+} -+ -+ -+#ifndef TIMEVAL_TO_TIMESPEC -+#define TIMEVAL_TO_TIMESPEC(tv, ts) do { \ -+ (ts)->tv_sec = (tv)->tv_sec; \ -+ (ts)->tv_nsec = (tv)->tv_usec * 1000; \ -+} while (false) -+#endif -+ -+ -+bool GenodeSemaphore::Wait(int timeout) { -+ const long kOneSecondMicros = 1000000; // NOLINT -+ -+ // Split timeout into second and nanosecond parts. -+ struct timeval delta; -+ delta.tv_usec = timeout % kOneSecondMicros; -+ delta.tv_sec = timeout / kOneSecondMicros; -+ -+ struct timeval current_time; -+ // Get the current time. -+ if (gettimeofday(¤t_time, NULL) == -1) { -+ return false; -+ } -+ -+ // Calculate time for end of timeout. -+ struct timeval end_time; -+ timeradd(¤t_time, &delta, &end_time); -+ -+ struct timespec ts; -+ TIMEVAL_TO_TIMESPEC(&end_time, &ts); -+ // Wait for semaphore signalled or timeout. -+ while (true) { -+ int result = sem_timedwait(&sem_, &ts); -+ if (result == 0) return true; // Successfully got semaphore. -+ if (result > 0) { -+ // For glibc prior to 2.3.4 sem_timedwait returns the error instead of -1. -+ errno = result; -+ result = -1; -+ } -+ if (result == -1 && errno == ETIMEDOUT) return false; // Timeout. -+ CHECK(result == -1 && errno == EINTR); // Signal caused spurious wakeup. -+ } -+} -+ -+ -+Semaphore* OS::CreateSemaphore(int count) { -+ return new GenodeSemaphore(count); -+} -+ -+ -+class Sampler::PlatformData : public Malloced { -+ public: -+ PlatformData() { -+ UNIMPLEMENTED(); -+ } -+}; -+ -+ -+Sampler::Sampler(Isolate *isolate, int interval) -+ : isolate_(isolate), -+ interval_(interval), -+ profiling_(false), -+ active_(false), -+ samples_taken_(0) { -+ UNIMPLEMENTED(); -+ // Shared setup follows. -+ data_ = new PlatformData; -+} -+ -+ -+Sampler::~Sampler() { -+ UNIMPLEMENTED(); -+ // Shared tear down follows. -+ delete data_; -+} -+ -+ -+void Sampler::Start() { -+ UNIMPLEMENTED(); -+} -+ -+ -+void Sampler::Stop() { -+ UNIMPLEMENTED(); -+} -+ -+ -+} } // namespace v8::internal -diff --git a/qtjsbackend/src/v8/v8.pri b/qtjsbackend/src/v8/v8.pri -index 3a563ff..6a83034 100644 ---- a/qtjsbackend/src/v8/v8.pri -+++ b/qtjsbackend/src/v8/v8.pri -@@ -265,7 +265,7 @@ SOURCES += \ - LIBS += -lexecinfo - } else:unix:!qnx { - SOURCES += \ -- $$V8SRC/platform-linux.cc \ -+ $$V8SRC/platform-genode.cc \ - $$V8SRC/platform-posix.cc - } - diff --git a/repos/libports/src/lib/qt5/patches/qt5_qpa.patch b/repos/libports/src/lib/qt5/patches/qt5_qpa.patch index 4067a500e..6efe48cc3 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_qpa.patch +++ b/repos/libports/src/lib/qt5/patches/qt5_qpa.patch @@ -5,75 +5,102 @@ From: Christian Prochaska --- .../fontdatabases/basic/qbasicfontdatabase.cpp | 9 +++++++++ - .../input/evdevkeyboard/qevdevkeyboardhandler.cpp | 18 +++++++++++++++--- + .../evdevkeyboard/qevdevkeyboard_defaultmap_p.h | 4 ++++ + .../input/evdevkeyboard/qevdevkeyboardhandler.cpp | 17 +++++++++++++++++ .../input/evdevkeyboard/qevdevkeyboardhandler_p.h | 2 ++ - qtbase/src/widgets/kernel/qwidget_qpa.cpp | 2 +- - 4 files changed, 27 insertions(+), 4 deletions(-) + 4 files changed, 32 insertions(+) diff --git a/qtbase/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp b/qtbase/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp -index 9b87418..aa25c6b 100644 +index 728b166..af957f7 100644 --- a/qtbase/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp +++ b/qtbase/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp -@@ -114,7 +114,16 @@ void QBasicFontDatabase::populateFontDatabase() - for (int i = 0; i < int(dir.count()); ++i) { - const QByteArray file = QFile::encodeName(dir.absoluteFilePath(dir[i])); - // qDebug() << "looking at" << file; +@@ -72,7 +72,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(); -+ addTTFile(data, file); ++ QBasicFontDatabase::addTTFile(data, file); +#else - addTTFile(QByteArray(), file); + 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 34f20f4..6e8bcbd 100644 +--- a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h ++++ b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h +@@ -46,7 +46,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... + +@@ -638,6 +640,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 }, +@@ -666,6 +669,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 26dc116..f0c104d 100644 +index 089cc13..c8fb47c 100644 --- a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp +++ b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp -@@ -49,7 +49,9 @@ - #include +@@ -42,7 +42,9 @@ + #include #include +#ifndef Q_OS_GENODE #include +#endif /* Q_OS_GENODE */ - //#define QT_QPA_KEYMAP_DEBUG - -@@ -78,11 +80,12 @@ QEvdevKeyboardHandler::QEvdevKeyboardHandler(const QString &device, int fd, bool + QT_BEGIN_NAMESPACE +@@ -67,9 +69,11 @@ QEvdevKeyboardHandler::QEvdevKeyboardHandler(const QString &device, int fd, bool if (keymapFile.isEmpty() || !loadKeymap(keymapFile)) unloadKeymap(); -- + +#ifndef Q_OS_GENODE // socket notifier for events on the keyboard device - QSocketNotifier *notifier; - notifier = new QSocketNotifier(m_fd, QSocketNotifier::Read, this); - connect(notifier, SIGNAL(activated(int)), this, SLOT(readKeycode())); + m_notify = new QSocketNotifier(m_fd, QSocketNotifier::Read, this); + connect(m_notify, SIGNAL(activated(int)), this, SLOT(readKeycode())); +#endif /* Q_OS_GENODE */ } QEvdevKeyboardHandler::~QEvdevKeyboardHandler() -@@ -92,7 +95,7 @@ QEvdevKeyboardHandler::~QEvdevKeyboardHandler() - if (m_fd >= 0) +@@ -80,6 +84,7 @@ QEvdevKeyboardHandler::~QEvdevKeyboardHandler() qt_safe_close(m_fd); } -- + +#ifndef Q_OS_GENODE - QEvdevKeyboardHandler *QEvdevKeyboardHandler::create(const QString &device, const QString &specification) - { - #ifdef QT_QPA_KEYMAP_DEBUG -@@ -218,10 +221,19 @@ void QEvdevKeyboardHandler::readKeycode() + QEvdevKeyboardHandler *QEvdevKeyboardHandler::create(const QString &device, + const QString &specification, + const QString &defaultKeymapFile) +@@ -205,10 +210,20 @@ void QEvdevKeyboardHandler::readKeycode() } } } -- +#endif /* Q_OS_GENODE */ + void QEvdevKeyboardHandler::processKeyEvent(int nativecode, int unicode, int qtcode, Qt::KeyboardModifiers modifiers, bool isPress, bool autoRepeat) { @@ -88,14 +115,30 @@ index 26dc116..f0c104d 100644 +#endif QWindowSystemInterface::handleExtendedKeyEvent(0, (isPress ? QEvent::KeyPress : QEvent::KeyRelease), qtcode, modifiers, nativecode + 8, 0, int(modifiers), - QString(unicode), autoRepeat); + (unicode != 0xffff ) ? QString(unicode) : QString(), autoRepeat); +@@ -468,6 +483,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)); +@@ -488,6 +504,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 1065b05..b395d46 100644 +index 84c251c..54c9cf3 100644 --- a/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h +++ b/qtbase/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h -@@ -161,8 +161,10 @@ public: - return qtmod; - } +@@ -171,8 +171,10 @@ public: + bool loadKeymap(const QString &file); + void unloadKeymap(); +#ifndef Q_OS_GENODE private slots: @@ -104,16 +147,3 @@ index 1065b05..b395d46 100644 KeycodeAction processKeycode(quint16 keycode, bool pressed, bool autorepeat); private: -diff --git a/qtbase/src/widgets/kernel/qwidget_qpa.cpp b/qtbase/src/widgets/kernel/qwidget_qpa.cpp -index dafe7dc..79bfd40 100644 ---- a/qtbase/src/widgets/kernel/qwidget_qpa.cpp -+++ b/qtbase/src/widgets/kernel/qwidget_qpa.cpp -@@ -933,7 +933,7 @@ void QWidgetPrivate::registerDropSite(bool on) - void QWidgetPrivate::setMask_sys(const QRegion ®ion) - { - if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowMasks)) { -- qWarning("%s: Not supported on %s.", Q_FUNC_INFO, qPrintable(QGuiApplication::platformName())); -+ //qWarning("%s: Not supported on %s.", Q_FUNC_INFO, qPrintable(QGuiApplication::platformName())); - return; - } - Q_Q(QWidget); diff --git a/repos/libports/src/lib/qt5/patches/qt5_qtbase_genode.patch b/repos/libports/src/lib/qt5/patches/qt5_qtbase_genode.patch index cbd99d98a..0cbfbb9d5 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_qtbase_genode.patch +++ b/repos/libports/src/lib/qt5/patches/qt5_qtbase_genode.patch @@ -5,28 +5,29 @@ From: Christian Prochaska Genode-specific adaptations --- qtbase/src/corelib/codecs/qtextcodec.cpp | 4 + - qtbase/src/corelib/global/qlogging.cpp | 6 ++ + qtbase/src/corelib/global/qcompilerdetection.h | 4 + qtbase/src/corelib/global/qsystemdetection.h | 5 +- + qtbase/src/corelib/global/qversiontagging.cpp | 2 - qtbase/src/corelib/io/qresource.cpp | 2 - qtbase/src/corelib/kernel/qcoreapplication.cpp | 2 - .../src/corelib/kernel/qeventdispatcher_unix.cpp | 14 +++++ qtbase/src/corelib/kernel/qtranslator.cpp | 2 - - qtbase/src/corelib/thread/qthread.cpp | 5 +- + qtbase/src/corelib/thread/qthread.cpp | 4 + qtbase/src/corelib/thread/qthread_p.h | 55 ++++++++++++++++++++ - qtbase/src/corelib/tools/qdatetime.cpp | 15 +++++ + qtbase/src/corelib/tools/qdatetime.cpp | 3 + qtbase/src/gui/image/qxpmhandler.cpp | 8 +++ .../network/access/qnetworkaccessfilebackend.cpp | 5 ++ qtbase/src/network/kernel/qhostinfo.cpp | 5 ++ qtbase/src/network/kernel/qhostinfo_unix.cpp | 7 ++- qtbase/src/widgets/dialogs/qfiledialog.cpp | 2 - qtbase/src/widgets/styles/qstylefactory.cpp | 7 +++ - 16 files changed, 137 insertions(+), 7 deletions(-) + 17 files changed, 123 insertions(+), 8 deletions(-) diff --git a/qtbase/src/corelib/codecs/qtextcodec.cpp b/qtbase/src/corelib/codecs/qtextcodec.cpp -index 1cedd3a..646be07 100644 +index c55f93b..9d69f16 100644 --- a/qtbase/src/corelib/codecs/qtextcodec.cpp +++ b/qtbase/src/corelib/codecs/qtextcodec.cpp -@@ -203,7 +203,11 @@ static QTextCodec *setupLocaleMapper() +@@ -198,7 +198,11 @@ static QTextCodec *setupLocaleMapper() // First part is getting that locale name. First try setlocale() which // definitely knows it, but since we cannot fully trust it, get ready // to fall back to environment variables. @@ -38,44 +39,35 @@ index 1cedd3a..646be07 100644 // Get the first nonempty value from $LC_ALL, $LC_CTYPE, and $LANG // environment variables. -diff --git a/qtbase/src/corelib/global/qlogging.cpp b/qtbase/src/corelib/global/qlogging.cpp -index c8293be..02b7e40 100644 ---- a/qtbase/src/corelib/global/qlogging.cpp -+++ b/qtbase/src/corelib/global/qlogging.cpp -@@ -61,6 +61,10 @@ - #include - #endif - -+#ifdef Q_OS_GENODE -+#include -+#endif -+ - #include - - QT_BEGIN_NAMESPACE -@@ -875,6 +879,8 @@ static void qDefaultMessageHandler(QtMsgType type, const QMessageLogContext &con - - #if defined(QT_USE_SLOG2) - slog2_default_handler(type, logMessage.toLocal8Bit().constData()); -+#elif defined(Q_OS_GENODE) -+ Genode::log(logMessage.toLocal8Bit().constData()); - #elif defined(Q_OS_ANDROID) - static bool logToAndroid = qEnvironmentVariableIsEmpty("QT_ANDROID_PLAIN_LOG"); - if (logToAndroid) { +diff --git a/qtbase/src/corelib/global/qcompilerdetection.h b/qtbase/src/corelib/global/qcompilerdetection.h +index 2d9e046..aac1d7b 100644 +--- a/qtbase/src/corelib/global/qcompilerdetection.h ++++ b/qtbase/src/corelib/global/qcompilerdetection.h +@@ -826,7 +826,9 @@ + # define Q_COMPILER_ALIGNAS + # define Q_COMPILER_ALIGNOF + # define Q_COMPILER_INHERITING_CONSTRUCTORS +-# define Q_COMPILER_THREAD_LOCAL ++# ifndef __GENODE__ ++# define Q_COMPILER_THREAD_LOCAL ++# endif + # if Q_CC_GNU > 408 || __GNUC_PATCHLEVEL__ >= 1 + # define Q_COMPILER_REF_QUALIFIERS + # endif diff --git a/qtbase/src/corelib/global/qsystemdetection.h b/qtbase/src/corelib/global/qsystemdetection.h -index cb55fa8..7d5c507 100644 +index de95ae3..7b6aaa6 100644 --- a/qtbase/src/corelib/global/qsystemdetection.h +++ b/qtbase/src/corelib/global/qsystemdetection.h -@@ -49,6 +49,7 @@ +@@ -41,6 +41,7 @@ /* The operating system, must be one of: (Q_OS_x) + GENODE - Genode - DARWIN - Darwin OS (synonym for Q_OS_MAC) - MAC - OS X or iOS (synonym for Q_OS_DARWIN) - MACX - OS X -@@ -84,7 +85,9 @@ - ANDROID - Android platform + DARWIN - Any Darwin system + MACOS - macOS + IOS - iOS +@@ -86,7 +87,9 @@ + - Q_OS_FREEBSD_KERNEL is always defined on FreeBSD, even if the userland is from GNU */ -#if defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__)) @@ -85,11 +77,24 @@ index cb55fa8..7d5c507 100644 # define Q_OS_DARWIN # define Q_OS_BSD4 # ifdef __LP64__ +diff --git a/qtbase/src/corelib/global/qversiontagging.cpp b/qtbase/src/corelib/global/qversiontagging.cpp +index e7524f3..e31f8b3 100644 +--- a/qtbase/src/corelib/global/qversiontagging.cpp ++++ b/qtbase/src/corelib/global/qversiontagging.cpp +@@ -36,7 +36,7 @@ + #define SYM QT_MANGLE_NAMESPACE(qt_version_tag) + //#define SSYM QT_STRINGIFY(SYM) + +-#if defined(Q_CC_GNU) && defined(Q_OF_ELF) && !defined(Q_OS_ANDROID) ++#if defined(Q_CC_GNU) && defined(Q_OF_ELF) && !defined(Q_OS_ANDROID) && !defined(Q_OS_GENODE) + # define make_versioned_symbol2(sym, m, n, separator) \ + Q_CORE_EXPORT extern const char sym ## _ ## m ## _ ## n = 0; \ + asm(".symver " QT_STRINGIFY(sym) "_" QT_STRINGIFY(m) "_" QT_STRINGIFY(n) ", " \ diff --git a/qtbase/src/corelib/io/qresource.cpp b/qtbase/src/corelib/io/qresource.cpp -index 04ec81e..2211125 100644 +index c584933..615a7d5 100644 --- a/qtbase/src/corelib/io/qresource.cpp +++ b/qtbase/src/corelib/io/qresource.cpp -@@ -920,7 +920,7 @@ public: +@@ -922,7 +922,7 @@ public: } }; @@ -99,10 +104,10 @@ index 04ec81e..2211125 100644 #endif diff --git a/qtbase/src/corelib/kernel/qcoreapplication.cpp b/qtbase/src/corelib/kernel/qcoreapplication.cpp -index 100e014..00263a0 100644 +index f5b1520..5ae76c5 100644 --- a/qtbase/src/corelib/kernel/qcoreapplication.cpp +++ b/qtbase/src/corelib/kernel/qcoreapplication.cpp -@@ -525,7 +525,7 @@ void QCoreApplicationPrivate::initLocale() +@@ -602,7 +602,7 @@ void QCoreApplicationPrivate::initLocale() if (qt_locale_initialized) return; qt_locale_initialized = true; @@ -112,10 +117,10 @@ index 100e014..00263a0 100644 #endif } diff --git a/qtbase/src/corelib/kernel/qeventdispatcher_unix.cpp b/qtbase/src/corelib/kernel/qeventdispatcher_unix.cpp -index 69363bc..be1a7cf 100644 +index 155f7b7..2e32ddb 100644 --- a/qtbase/src/corelib/kernel/qeventdispatcher_unix.cpp +++ b/qtbase/src/corelib/kernel/qeventdispatcher_unix.cpp -@@ -74,6 +74,11 @@ +@@ -66,6 +66,11 @@ # include #endif @@ -127,7 +132,7 @@ index 69363bc..be1a7cf 100644 QT_BEGIN_NAMESPACE #if defined(Q_OS_INTEGRITY) || defined(Q_OS_VXWORKS) -@@ -287,6 +292,9 @@ int QEventDispatcherUNIXPrivate::processThreadWakeUp(int nsel) +@@ -279,6 +284,9 @@ int QEventDispatcherUNIXPrivate::processThreadWakeUp(int nsel) char c[16]; ::read(thread_pipe[0], c, sizeof(c)); ::ioctl(thread_pipe[0], FIOFLUSH, 0); @@ -137,7 +142,7 @@ index 69363bc..be1a7cf 100644 #else # ifndef QT_NO_EVENTFD if (thread_pipe[1] == -1) { -@@ -325,6 +333,12 @@ QEventDispatcherUNIX::~QEventDispatcherUNIX() +@@ -317,6 +325,12 @@ QEventDispatcherUNIX::~QEventDispatcherUNIX() int QEventDispatcherUNIX::select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, timespec *timeout) { @@ -151,10 +156,10 @@ index 69363bc..be1a7cf 100644 } diff --git a/qtbase/src/corelib/kernel/qtranslator.cpp b/qtbase/src/corelib/kernel/qtranslator.cpp -index 9243d09..d953b20 100644 +index 794a4aa..953d63c 100644 --- a/qtbase/src/corelib/kernel/qtranslator.cpp +++ b/qtbase/src/corelib/kernel/qtranslator.cpp -@@ -60,7 +60,7 @@ +@@ -51,7 +51,7 @@ #include "qendian.h" #include "qresource.h" @@ -164,26 +169,25 @@ index 9243d09..d953b20 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 4d5bee3..622056e 100644 +index 8ea487e..2a8ee31 100644 --- a/qtbase/src/corelib/thread/qthread.cpp +++ b/qtbase/src/corelib/thread/qthread.cpp -@@ -150,7 +150,10 @@ QThreadPrivate::QThreadPrivate(QThreadData *d) +@@ -142,6 +142,10 @@ QThreadPrivate::QThreadPrivate(QThreadData *d) + exited(false), returnCode(-1), stackSize(0), priority(QThread::InheritPriority), data(d) { - #if defined (Q_OS_UNIX) -- thread_id = 0; -+ thread_id = 0; +#ifdef Q_OS_GENODE + genode_thread = 0; +#endif /* Q_OS_GENODE */ - #elif defined (Q_OS_WIN) ++ + #if defined (Q_OS_WIN) handle = 0; - id = 0; + # ifndef Q_OS_WINRT diff --git a/qtbase/src/corelib/thread/qthread_p.h b/qtbase/src/corelib/thread/qthread_p.h -index 9d773b3..9beb7e6 100644 +index a56b879..c23862b 100644 --- a/qtbase/src/corelib/thread/qthread_p.h +++ b/qtbase/src/corelib/thread/qthread_p.h -@@ -54,6 +54,10 @@ +@@ -46,6 +46,10 @@ // // @@ -194,7 +198,7 @@ index 9d773b3..9beb7e6 100644 #include "qplatformdefs.h" #include "QtCore/qthread.h" #include "QtCore/qmutex.h" -@@ -160,12 +164,63 @@ public: +@@ -169,11 +173,62 @@ public: static QThread *threadForId(int id); #ifdef Q_OS_UNIX @@ -248,7 +252,6 @@ index 9d773b3..9beb7e6 100644 + static void finish(void *arg); + +#else // Q_OS_UNIX && !Q_OS_GENODE - pthread_t thread_id; QWaitCondition thread_done; static void *start(void *arg); @@ -259,63 +262,24 @@ index 9d773b3..9beb7e6 100644 #ifdef Q_OS_WIN diff --git a/qtbase/src/corelib/tools/qdatetime.cpp b/qtbase/src/corelib/tools/qdatetime.cpp -index d8e3a78..78202c6 100644 +index e6d0b97..da15640 100644 --- a/qtbase/src/corelib/tools/qdatetime.cpp +++ b/qtbase/src/corelib/tools/qdatetime.cpp -@@ -3072,9 +3072,14 @@ QTime QTime::currentTime() - // posix compliant system - struct timeval tv; - gettimeofday(&tv, 0); -+ - time_t ltime = tv.tv_sec; - struct tm *t = 0; - -+#ifdef Q_OS_GENODE -+ struct tm res; -+ t = gmtime_r(<ime, &res); -+#else /* Q_OS_GENODE */ - #if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) - // use the reentrant version of localtime() where available - tzset(); -@@ -3083,9 +3088,11 @@ QTime QTime::currentTime() - #else - t = localtime(<ime); - #endif -+#endif /* Q_OS_GENODE */ - Q_CHECK_PTR(t); - - ct.mds = msecsFromDecomposed(t->tm_hour, t->tm_min, t->tm_sec, tv.tv_usec / 1000); -+ - return ct; - } - -@@ -3970,6 +3977,10 @@ static QDate adjustDate(QDate date) - - static QDateTimePrivate::Spec utcToLocal(QDate &date, QTime &time) - { -+#ifdef Q_OS_GENODE -+ /* no timezones in Genode */ -+ return QDateTimePrivate::LocalUnknown; -+#endif - QDate fakeDate = adjustDate(date); - - // won't overflow because of fakeDate -@@ -4023,6 +4034,10 @@ static QDateTimePrivate::Spec utcToLocal(QDate &date, QTime &time) - - static void localToUtc(QDate &date, QTime &time, int isdst) - { -+#ifdef Q_OS_GENODE -+ /* no timezones in Genode */ -+ return; -+#endif - if (!date.isValid()) - return; - +@@ -2145,6 +2145,9 @@ static int qt_timezone() + long offset; + _get_timezone(&offset); + return offset; ++#elif defined(Q_OS_GENODE) ++ /* no timezone support on Genode */ ++ return 0; + #elif defined(Q_OS_BSD4) && !defined(Q_OS_DARWIN) + time_t clock = time(NULL); + struct tm t; diff --git a/qtbase/src/gui/image/qxpmhandler.cpp b/qtbase/src/gui/image/qxpmhandler.cpp -index a7936f9..eee3a87 100644 +index b673ae5..6df45c3 100644 --- a/qtbase/src/gui/image/qxpmhandler.cpp +++ b/qtbase/src/gui/image/qxpmhandler.cpp -@@ -848,8 +848,16 @@ static bool read_xpm_header( +@@ -842,8 +842,16 @@ static bool read_xpm_header( #if defined(_MSC_VER) && _MSC_VER >= 1400 && !defined(Q_OS_WINCE) if (sscanf_s(buf, "%d %d %d %d", w, h, ncols, cpp) < 4) #else @@ -333,10 +297,10 @@ index a7936f9..eee3a87 100644 return true; diff --git a/qtbase/src/network/access/qnetworkaccessfilebackend.cpp b/qtbase/src/network/access/qnetworkaccessfilebackend.cpp -index 13428cc..0713528 100644 +index bb97bae..38de88b 100644 --- a/qtbase/src/network/access/qnetworkaccessfilebackend.cpp +++ b/qtbase/src/network/access/qnetworkaccessfilebackend.cpp -@@ -115,6 +115,7 @@ void QNetworkAccessFileBackend::open() +@@ -118,6 +118,7 @@ void QNetworkAccessFileBackend::open() url.setPath(QLatin1String("/")); setUrl(url); @@ -344,7 +308,7 @@ index 13428cc..0713528 100644 QString fileName = url.toLocalFile(); if (fileName.isEmpty()) { if (url.scheme() == QLatin1String("qrc")) { -@@ -128,6 +129,10 @@ void QNetworkAccessFileBackend::open() +@@ -131,6 +132,10 @@ void QNetworkAccessFileBackend::open() fileName = url.toString(QUrl::RemoveAuthority | QUrl::RemoveFragment | QUrl::RemoveQuery); } } @@ -356,10 +320,10 @@ index 13428cc..0713528 100644 if (operation() == QNetworkAccessManager::GetOperation) { diff --git a/qtbase/src/network/kernel/qhostinfo.cpp b/qtbase/src/network/kernel/qhostinfo.cpp -index d25372e..131100e 100644 +index c6c0954..934ebc3 100644 --- a/qtbase/src/network/kernel/qhostinfo.cpp +++ b/qtbase/src/network/kernel/qhostinfo.cpp -@@ -508,7 +508,12 @@ QHostInfoLookupManager::QHostInfoLookupManager() : mutex(QMutex::Recursive), was +@@ -512,7 +512,12 @@ QHostInfoLookupManager::QHostInfoLookupManager() : mutex(QMutex::Recursive), was { moveToThread(QCoreApplicationPrivate::mainThread()); connect(QCoreApplication::instance(), SIGNAL(destroyed()), SLOT(waitForThreadPoolDone()), Qt::DirectConnection); @@ -367,16 +331,16 @@ index d25372e..131100e 100644 + /* 'getaddrinfo()' is currently not thread-safe on Genode */ + threadPool.setMaxThreadCount(1); +#else - threadPool.setMaxThreadCount(5); // do 5 DNS lookups in parallel + threadPool.setMaxThreadCount(20); // do up to 20 DNS lookups in parallel +#endif } QHostInfoLookupManager::~QHostInfoLookupManager() diff --git a/qtbase/src/network/kernel/qhostinfo_unix.cpp b/qtbase/src/network/kernel/qhostinfo_unix.cpp -index 04daf2e..001354c 100644 +index dabf191..ce3da10 100644 --- a/qtbase/src/network/kernel/qhostinfo_unix.cpp +++ b/qtbase/src/network/kernel/qhostinfo_unix.cpp -@@ -144,6 +144,11 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName) +@@ -142,6 +142,11 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName) QHostAddress address; if (address.setAddress(hostName)) { // Reverse lookup @@ -388,7 +352,7 @@ index 04daf2e..001354c 100644 // Reverse lookups using getnameinfo are broken on darwin, use gethostbyaddr instead. #if !defined (QT_NO_GETADDRINFO) && !defined (Q_OS_DARWIN) sockaddr_in sa4; -@@ -174,7 +179,7 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName) +@@ -172,7 +177,7 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName) if (ent) results.setHostName(QString::fromLatin1(ent->h_name)); #endif @@ -398,10 +362,10 @@ index 04daf2e..001354c 100644 results.setHostName(address.toString()); results.setAddresses(QList() << address); diff --git a/qtbase/src/widgets/dialogs/qfiledialog.cpp b/qtbase/src/widgets/dialogs/qfiledialog.cpp -index c427523..ed92116 100644 +index bc2de89..ce3a97e 100644 --- a/qtbase/src/widgets/dialogs/qfiledialog.cpp +++ b/qtbase/src/widgets/dialogs/qfiledialog.cpp -@@ -943,7 +943,7 @@ Q_AUTOTEST_EXPORT QString qt_tildeExpansion(const QString &path, bool *expanded +@@ -1106,7 +1106,7 @@ Q_AUTOTEST_EXPORT QString qt_tildeExpansion(const QString &path, bool *expanded userName.remove(0, 1); #if defined(Q_OS_VXWORKS) const QString homePath = QDir::homePath(); @@ -411,10 +375,10 @@ index c427523..ed92116 100644 passwd *tmpPw; char buf[200]; diff --git a/qtbase/src/widgets/styles/qstylefactory.cpp b/qtbase/src/widgets/styles/qstylefactory.cpp -index 2b81acf..eb3510a 100644 +index 520e303..8226dd2 100644 --- a/qtbase/src/widgets/styles/qstylefactory.cpp +++ b/qtbase/src/widgets/styles/qstylefactory.cpp -@@ -192,6 +192,13 @@ QStringList QStyleFactory::keys() +@@ -184,6 +184,13 @@ QStringList QStyleFactory::keys() for (PluginKeyMap::const_iterator it = keyMap.constBegin(); it != cend; ++it) list.append(it.value()); #endif 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 index d2f7d24dc..3185bd96a 100644 --- 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 @@ -8,10 +8,10 @@ From: Christian Prochaska 1 file changed, 16 insertions(+) diff --git a/qtbase/src/network/socket/qnativesocketengine_unix.cpp b/qtbase/src/network/socket/qnativesocketengine_unix.cpp -index 4c94c4d..03c98fa 100644 +index 1ce12ed..db45dc0 100644 --- a/qtbase/src/network/socket/qnativesocketengine_unix.cpp +++ b/qtbase/src/network/socket/qnativesocketengine_unix.cpp -@@ -408,6 +408,22 @@ bool QNativeSocketEnginePrivate::nativeConnect(const QHostAddress &addr, quint16 +@@ -402,6 +402,22 @@ bool QNativeSocketEnginePrivate::nativeConnect(const QHostAddress &addr, quint16 case EISCONN: socketState = QAbstractSocket::ConnectedState; break; diff --git a/repos/libports/src/lib/qt5/patches/qt5_qtbase_qconfig.patch b/repos/libports/src/lib/qt5/patches/qt5_qtbase_qconfig.patch index 45f2b0f0e..e371fb2a5 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_qtbase_qconfig.patch +++ b/repos/libports/src/lib/qt5/patches/qt5_qtbase_qconfig.patch @@ -4,83 +4,101 @@ From: Christian Prochaska --- - qtbase/src/corelib/global/qconfig.cpp | 39 +++++++ - qtbase/src/corelib/global/qconfig.h | 183 +++++++++++++++++++++++++++++++++ - 2 files changed, 222 insertions(+) + qtbase/src/corelib/global/qconfig.cpp | 59 +++++++ + qtbase/src/corelib/global/qconfig.h | 165 +++++++++++++++++++++ + qtbase/src/corelib/global/qfeatures.h | 263 +++++++++++++++++++++++++++++++++ + 3 files changed, 487 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..15523a3 +index 0000000..5438a45 --- /dev/null +++ b/qtbase/src/corelib/global/qconfig.cpp -@@ -0,0 +1,39 @@ +@@ -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=2013-05-23"; ++static const char qt_configure_installation [12+11] = "qt_instdate=2017-03-28"; + +/* Installation Info */ -+static const char qt_configure_prefix_path_strs[][256 + 12] = { -+ "qt_prfxpath=/qt", -+ "qt_docspath=/qt/doc", -+ "qt_hdrspath=/qt/include", -+ "qt_libspath=/qt/lib", -+ "qt_lbexpath=/qt/libexec", -+ "qt_binspath=/qt/bin", -+ "qt_plugpath=/qt/plugins", -+ "qt_impspath=/qt/imports", -+ "qt_qml2path=/qt/qml", -+ "qt_adatpath=/qt", -+ "qt_datapath=/qt", -+ "qt_trnspath=/qt/translations", -+ "qt_xmplpath=/qt/examples", -+ "qt_tstspath=/qt/tests", ++static const char qt_configure_prefix_path_str [256 + 12] = "qt_prfxpath=/qt"; +#ifdef QT_BUILD_QMAKE -+ "qt_ssrtpath=", -+ "qt_hpfxpath=/qt", -+ "qt_hbinpath=/qt/bin", -+ "qt_hdatpath=/qt", -+ "qt_targspec=genode-g++", -+ "qt_hostspec=linux-g++", ++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_settings_path_str[256 + 12] = "qt_stngpath=/qt/etc/xdg"; ++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_LICENSEE qt_configure_licensee_str + 12 ++#define QT_CONFIGURE_LICENSED_PRODUCTS qt_configure_licensed_products_str + 12 + -+#define QT_CONFIGURE_SETTINGS_PATH qt_configure_settings_path_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..bcf7dc1 +index 0000000..27629e5 --- /dev/null +++ b/qtbase/src/corelib/global/qconfig.h -@@ -0,0 +1,183 @@ +@@ -0,0 +1,165 @@ ++#define QT_VERSION_MAJOR 5 ++#define QT_VERSION_MINOR 6 ++#define QT_VERSION_PATCH 2 ++#define QT_VERSION_STR "5.6.2" ++ +#ifndef QT_BOOTSTRAPPED +#include "qconfig-genode.h" +#endif + -+/* Qt Edition */ -+#ifndef QT_EDITION -+# define QT_EDITION QT_EDITION_OPENSOURCE -+#endif -+ +/* Compile time features */ -+#ifdef QT_ARCH_X86_64 -+# define QT_POINTER_SIZE 8 -+#endif -+#ifdef QT_ARCH_I386 -+# define QT_POINTER_SIZE 4 -+#endif -+ +//#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 @@ -100,12 +118,6 @@ index 0000000..bcf7dc1 +# define QT_NO_ACCESSIBILITY +#endif + -+#if defined(QT_NO_CLOCK_MONOTONIC) && defined(QT_CLOCK_MONOTONIC) -+# undef QT_NO_CLOCK_MONOTONIC -+#elif !defined(QT_NO_CLOCK_MONOTONIC) && !defined(QT_CLOCK_MONOTONIC) -+# define QT_NO_CLOCK_MONOTONIC -+#endif -+ +#if defined(QT_NO_CUPS) && defined(QT_CUPS) +# undef QT_NO_CUPS +#elif !defined(QT_NO_CUPS) && !defined(QT_CUPS) @@ -118,12 +130,6 @@ index 0000000..bcf7dc1 +# define QT_NO_DBUS +#endif + -+#if defined(QT_NO_EGLFS) && defined(QT_EGLFS) -+# undef QT_NO_EGLFS -+#elif !defined(QT_NO_EGLFS) && !defined(QT_EGLFS) -+# define QT_NO_EGLFS -+#endif -+ +#if defined(QT_NO_EVENTFD) && defined(QT_EVENTFD) +# undef QT_NO_EVENTFD +#elif !defined(QT_NO_EVENTFD) && !defined(QT_EVENTFD) @@ -142,10 +148,10 @@ index 0000000..bcf7dc1 +# define QT_NO_GLIB +#endif + -+#if defined(QT_NO_GSTREAMER) && defined(QT_GSTREAMER) -+# undef QT_NO_GSTREAMER -+#elif !defined(QT_NO_GSTREAMER) && !defined(QT_GSTREAMER) -+# define QT_NO_GSTREAMER ++#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) @@ -154,10 +160,10 @@ index 0000000..bcf7dc1 +# define QT_NO_ICONV +#endif + -+#if defined(QT_NO_NIS) && defined(QT_NIS) -+# undef QT_NO_NIS -+#elif !defined(QT_NO_NIS) && !defined(QT_NIS) -+# define QT_NO_NIS ++#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) @@ -178,6 +184,12 @@ index 0000000..bcf7dc1 +# define QT_NO_STYLE_GTK +#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) @@ -214,15 +226,7 @@ index 0000000..bcf7dc1 +# define QT_RUNTIME_XRANDR +#endif + -+#if defined(QT_USE_MATH_H_FLOATS) && defined(QT_NO_USE_MATH_H_FLOATS) -+# undef QT_USE_MATH_H_FLOATS -+#elif !defined(QT_USE_MATH_H_FLOATS) && !defined(QT_NO_USE_MATH_H_FLOATS) -+# define QT_USE_MATH_H_FLOATS -+#endif -+ -+#ifndef Q_WS_QPA -+# define Q_WS_QPA -+#endif ++#endif // QT_BOOTSTRAPPED + +#define QT_VISIBILITY_AVAILABLE + @@ -244,3 +248,272 @@ index 0000000..bcf7dc1 +# 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 index 272052801..ded41b866 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_qtbase_virtual_deletelater.patch +++ b/repos/libports/src/lib/qt5/patches/qt5_qtbase_virtual_deletelater.patch @@ -8,11 +8,11 @@ From: Christian Prochaska 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase/src/corelib/kernel/qobject.h b/qtbase/src/corelib/kernel/qobject.h -index aaa09fa..5e07216 100644 +index b39eefa..7932c8d 100644 --- a/qtbase/src/corelib/kernel/qobject.h +++ b/qtbase/src/corelib/kernel/qobject.h -@@ -389,7 +389,7 @@ public: - { return const_cast(this)->qt_metacast(classname) != 0; } +@@ -422,7 +422,7 @@ public: + { return const_cast(this)->qt_metacast(classname) != Q_NULLPTR; } public Q_SLOTS: - void deleteLater(); diff --git a/repos/libports/src/lib/qt5/patches/qt5_qtnetwork.patch b/repos/libports/src/lib/qt5/patches/qt5_qtnetwork.patch index e7a84622e..67df37e4d 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_qtnetwork.patch +++ b/repos/libports/src/lib/qt5/patches/qt5_qtnetwork.patch @@ -5,15 +5,16 @@ From: Christian Prochaska --- qtbase/src/network/access/qhttpnetworkreply.cpp | 8 ++++++++ + 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 +++ - 3 files changed, 20 insertions(+) + 4 files changed, 30 insertions(+) diff --git a/qtbase/src/network/access/qhttpnetworkreply.cpp b/qtbase/src/network/access/qhttpnetworkreply.cpp -index eb8a886..1150088 100644 +index f1b0a84..eae866e 100644 --- a/qtbase/src/network/access/qhttpnetworkreply.cpp +++ b/qtbase/src/network/access/qhttpnetworkreply.cpp -@@ -238,8 +238,16 @@ void QHttpNetworkReply::setReadBufferSize(qint64 size) +@@ -247,8 +247,16 @@ void QHttpNetworkReply::setReadBufferSize(qint64 size) bool QHttpNetworkReply::supportsUserProvidedDownloadBuffer() { @@ -30,14 +31,50 @@ index eb8a886..1150088 100644 } void QHttpNetworkReply::setUserProvidedDownloadBuffer(char* b) +diff --git a/qtbase/src/network/socket/qnet_unix_p.h b/qtbase/src/network/socket/qnet_unix_p.h +index 1481f56..63ca9a8 100644 +--- a/qtbase/src/network/socket/qnet_unix_p.h ++++ b/qtbase/src/network/socket/qnet_unix_p.h +@@ -179,6 +179,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 +@@ -188,14 +192,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 54b7264..5702e01 100644 +index 3fd1252..56251ca 100644 --- a/qtbase/src/network/ssl/qsslconfiguration_p.h +++ b/qtbase/src/network/ssl/qsslconfiguration_p.h -@@ -81,7 +81,16 @@ class QSslConfigurationPrivate: public QSharedData - public: +@@ -76,7 +76,16 @@ public: QSslConfigurationPrivate() - : protocol(QSsl::SecureProtocols), + : sessionProtocol(QSsl::UnknownProtocol), + protocol(QSsl::SecureProtocols), +#ifdef Q_OS_GENODE + /* + * With enabled peer verification, currently often a 'handshake error' @@ -52,10 +89,10 @@ index 54b7264..5702e01 100644 allowRootCertOnDemandLoading(true), peerSessionShared(false), diff --git a/qtbase/src/network/ssl/qsslsocket_openssl.cpp b/qtbase/src/network/ssl/qsslsocket_openssl.cpp -index 675bd7d..647f3fd 100644 +index 82644c1..1701cf4 100644 --- a/qtbase/src/network/ssl/qsslsocket_openssl.cpp +++ b/qtbase/src/network/ssl/qsslsocket_openssl.cpp -@@ -445,7 +445,10 @@ bool QSslSocketPrivate::ensureLibraryLoaded() +@@ -481,7 +481,10 @@ bool QSslSocketPrivate::ensureLibraryLoaded() if (q_SSL_library_init() != 1) return false; q_SSL_load_error_strings(); @@ -64,5 +101,5 @@ index 675bd7d..647f3fd 100644 q_OpenSSL_add_all_algorithms(); +#endif - // Initialize OpenSSL's random seed. - if (!q_RAND_status()) { + #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 index 52c2780df..5266a549b 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_qtscript.patch +++ b/repos/libports/src/lib/qt5/patches/qt5_qtscript.patch @@ -12,10 +12,10 @@ From: Christian Prochaska 5 files changed, 44 insertions(+), 1 deletion(-) diff --git a/qtbase/src/corelib/global/qglobal.h b/qtbase/src/corelib/global/qglobal.h -index 79e32fe..324c168 100644 +index a7183cb..457ba65 100644 --- a/qtbase/src/corelib/global/qglobal.h +++ b/qtbase/src/corelib/global/qglobal.h -@@ -763,13 +763,17 @@ inline void qSwap(T &value1, T &value2) +@@ -864,13 +864,17 @@ inline void qSwap(T &value1, T &value2) swap(value1, value2); } @@ -35,10 +35,10 @@ index 79e32fe..324c168 100644 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 4ec049e..e5e8dc4 100644 +index 337e140..11f73ab 100644 --- a/qtbase/src/corelib/kernel/qvariant_p.h +++ b/qtbase/src/corelib/kernel/qvariant_p.h -@@ -401,7 +401,10 @@ public: +@@ -383,7 +383,10 @@ public: void delegate(const void*) { @@ -50,7 +50,7 @@ index 4ec049e..e5e8dc4 100644 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 d5adbd7..d2a5ad9 100644 +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 @@ @@ -102,7 +102,7 @@ index d5adbd7..d2a5ad9 100644 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 352a74b..20ef8b4 100644 +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 @@ @@ -131,10 +131,10 @@ index 352a74b..20ef8b4 100644 #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 d483806..e956b49 100644 +index 00caa6d..67d0855 100644 --- a/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +++ b/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -@@ -330,6 +330,11 @@ +@@ -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 ==== */ diff --git a/repos/libports/src/lib/qt5/patches/qt5_qtwebkit.patch b/repos/libports/src/lib/qt5/patches/qt5_qtwebkit.patch index a44313b18..f9db91b3c 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_qtwebkit.patch +++ b/repos/libports/src/lib/qt5/patches/qt5_qtwebkit.patch @@ -4,24 +4,71 @@ From: Christian Prochaska --- + .../Source/JavaScriptCore/assembler/ARMAssembler.h | 7 +++++++ + .../JavaScriptCore/assembler/MacroAssemblerARM.cpp | 3 ++- .../Source/JavaScriptCore/dfg/DFGOperations.cpp | 1 + .../JavaScriptCore/jit/ExecutableAllocator.h | 8 ++++++++ - qtwebkit/Source/WTF/wtf/Assertions.h | 11 ++++++++++ + qtwebkit/Source/WTF/wtf/Assertions.cpp | 9 +++++++++ qtwebkit/Source/WTF/wtf/FastMalloc.cpp | 2 +- qtwebkit/Source/WTF/wtf/InlineASM.h | 4 ++-- - qtwebkit/Source/WTF/wtf/OSAllocatorPosix.cpp | 13 ++++++++++++ + qtwebkit/Source/WTF/wtf/OSAllocatorPosix.cpp | 13 +++++++++++++ qtwebkit/Source/WTF/wtf/OSRandomSource.cpp | 8 ++++++++ - qtwebkit/Source/WTF/wtf/Platform.h | 21 ++++++++++++++++---- - qtwebkit/Source/WTF/wtf/StackBounds.cpp | 13 ++++++++++++ - qtwebkit/Source/WTF/wtf/TCSystemAlloc.cpp | 20 +++++++++++++++++++ + qtwebkit/Source/WTF/wtf/Platform.h | 19 +++++++++++++++---- + qtwebkit/Source/WTF/wtf/StackBounds.cpp | 13 +++++++++++++ + qtwebkit/Source/WTF/wtf/TCSystemAlloc.cpp | 20 ++++++++++++++++++++ + .../front-end/InspectorBackendCommands.qrc | 2 +- .../platform/graphics/qt/MediaPlayerPrivateQt.cpp | 3 +++ - 11 files changed, 97 insertions(+), 7 deletions(-) + .../network/qt/SocketStreamHandlePrivate.h | 1 + + .../platform/network/qt/SocketStreamHandleQt.cpp | 14 ++++++++++++++ + 16 files changed, 118 insertions(+), 9 deletions(-) +diff --git a/qtwebkit/Source/JavaScriptCore/assembler/ARMAssembler.h b/qtwebkit/Source/JavaScriptCore/assembler/ARMAssembler.h +index 19db71d..9cbe4e3 100644 +--- a/qtwebkit/Source/JavaScriptCore/assembler/ARMAssembler.h ++++ b/qtwebkit/Source/JavaScriptCore/assembler/ARMAssembler.h +@@ -29,9 +29,14 @@ + + #if ENABLE(ASSEMBLER) && CPU(ARM_TRADITIONAL) + ++#if OS(GENODE) ++#include ++#endif ++ + #include "AssemblerBufferWithConstantPool.h" + #include "JITCompilationEffort.h" + #include ++ + namespace JSC { + + typedef uint32_t ARMWord; +@@ -1069,6 +1074,8 @@ namespace JSC { + UNUSED_PARAM(size); + #elif OS(QNX) + msync(code, size, MS_INVALIDATE_ICACHE); ++#elif OS(GENODE) ++ Genode::cache_coherent((Genode::addr_t)code, size); + #else + #error "The cacheFlush support is missing on this platform." + #endif +diff --git a/qtwebkit/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp b/qtwebkit/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp +index ca0fa21..782aabf 100644 +--- a/qtwebkit/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp ++++ b/qtwebkit/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp +@@ -65,7 +65,8 @@ static bool isVFPPresent() + } + #endif + +-#if (COMPILER(RVCT) && defined(__TARGET_FPU_VFP)) || (COMPILER(GCC) && defined(__VFP_FP__)) ++#if (COMPILER(RVCT) && defined(__TARGET_FPU_VFP)) || \ ++ (COMPILER(GCC) && defined(__VFP_FP__) && !defined(__SOFTFP__)) + return true; + #else + return false; diff --git a/qtwebkit/Source/JavaScriptCore/dfg/DFGOperations.cpp b/qtwebkit/Source/JavaScriptCore/dfg/DFGOperations.cpp -index bb9ccc3..077cbed 100644 +index 1305c0a..9af93c0 100644 --- a/qtwebkit/Source/JavaScriptCore/dfg/DFGOperations.cpp +++ b/qtwebkit/Source/JavaScriptCore/dfg/DFGOperations.cpp -@@ -1624,6 +1624,7 @@ namespace JSC { +@@ -1796,6 +1796,7 @@ namespace JSC { #if COMPILER(GCC) && CPU(X86_64) asm ( @@ -30,13 +77,13 @@ index bb9ccc3..077cbed 100644 HIDE_SYMBOL(getHostCallReturnValue) "\n" SYMBOL_STRING(getHostCallReturnValue) ":" "\n" diff --git a/qtwebkit/Source/JavaScriptCore/jit/ExecutableAllocator.h b/qtwebkit/Source/JavaScriptCore/jit/ExecutableAllocator.h -index 85779e6..231ba3b 100644 +index 42e1f95..369f3a8 100644 --- a/qtwebkit/Source/JavaScriptCore/jit/ExecutableAllocator.h +++ b/qtwebkit/Source/JavaScriptCore/jit/ExecutableAllocator.h -@@ -107,7 +107,15 @@ class DemandExecutableAllocator; - #if CPU(ARM) +@@ -105,7 +105,15 @@ class DemandExecutableAllocator; + #if CPU(ARM) || CPU(MIPS) static const size_t fixedExecutableMemoryPoolSize = 16 * 1024 * 1024; - #elif CPU(X86_64) + #elif CPU(X86_64) && !CPU(X32) +#if OS(GENODE) +/* + * Genode's 'mmap()' implementation currently does not support on-demand @@ -49,40 +96,38 @@ index 85779e6..231ba3b 100644 #else static const size_t fixedExecutableMemoryPoolSize = 32 * 1024 * 1024; #endif -diff --git a/qtwebkit/Source/WTF/wtf/Assertions.h b/qtwebkit/Source/WTF/wtf/Assertions.h -index 7e079ab..2a54393 100644 ---- a/qtwebkit/Source/WTF/wtf/Assertions.h -+++ b/qtwebkit/Source/WTF/wtf/Assertions.h -@@ -50,6 +50,10 @@ - #include +diff --git a/qtwebkit/Source/WTF/wtf/Assertions.cpp b/qtwebkit/Source/WTF/wtf/Assertions.cpp +index 1b2091f..15d1d03 100644 +--- a/qtwebkit/Source/WTF/wtf/Assertions.cpp ++++ b/qtwebkit/Source/WTF/wtf/Assertions.cpp +@@ -75,6 +75,10 @@ + #include #endif +#if OS(GENODE) +#include +#endif + - #ifdef NDEBUG - /* Disable ASSERT* macros in release mode. */ - #define ASSERTIONS_DISABLED_DEFAULT 1 -@@ -173,6 +177,13 @@ WTF_EXPORT_PRIVATE void WTFInstallReportBacktraceOnCrashHook(); - WTFInvokeCrashHook(), \ - (*(int *)(uintptr_t)0xbbadbeef = 0), \ - __builtin_trap()) -+#elif OS(GENODE) -+#define CRASH() ( \ -+ Genode::error("WebKit 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() \ - (WTFReportBacktrace(), \ + extern "C" { + + WTF_ATTRIBUTE_PRINTF(1, 0) +@@ -341,6 +345,11 @@ void WTFCrash() + if (globalHook) + globalHook(); + ++#if OS(GENODE) ++ Genode::error("WebKit CRASH in '", WTF_PRETTY_FUNCTION, "'"); ++ Genode::error(" in ", __FILE__, ":", __LINE__); ++#endif /* OS(GENODE) */ ++ + WTFReportBacktrace(); + *(int *)(uintptr_t)0xbbadbeef = 0; + // More reliable, but doesn't say BBADBEEF. diff --git a/qtwebkit/Source/WTF/wtf/FastMalloc.cpp b/qtwebkit/Source/WTF/wtf/FastMalloc.cpp -index f2e34c7..f91c2fc 100644 +index 82fbd25..9791492 100644 --- a/qtwebkit/Source/WTF/wtf/FastMalloc.cpp +++ b/qtwebkit/Source/WTF/wtf/FastMalloc.cpp -@@ -101,7 +101,7 @@ +@@ -111,7 +111,7 @@ #endif // Use a background thread to periodically scavenge memory to release back to the system @@ -111,10 +156,10 @@ index 0a2fe78..d1fdd01 100644 #define HIDE_SYMBOL(name) ".hidden " #name #else diff --git a/qtwebkit/Source/WTF/wtf/OSAllocatorPosix.cpp b/qtwebkit/Source/WTF/wtf/OSAllocatorPosix.cpp -index a2f6a79..be8fff9 100644 +index fb24cd9..e289dc3 100644 --- a/qtwebkit/Source/WTF/wtf/OSAllocatorPosix.cpp +++ b/qtwebkit/Source/WTF/wtf/OSAllocatorPosix.cpp -@@ -120,6 +120,7 @@ void* OSAllocator::reserveAndCommit(size_t bytes, Usage usage, bool writable, bo +@@ -158,6 +158,7 @@ void* OSAllocator::reserveAndCommit(size_t bytes, Usage usage, bool writable, bo #endif CRASH(); } @@ -122,7 +167,7 @@ index a2f6a79..be8fff9 100644 if (result && includesGuardPages) { // We use mmap to remap the guardpages rather than using mprotect as // mprotect results in multiple references to the code region. This -@@ -128,6 +129,7 @@ void* OSAllocator::reserveAndCommit(size_t bytes, Usage usage, bool writable, bo +@@ -166,6 +167,7 @@ void* OSAllocator::reserveAndCommit(size_t bytes, Usage usage, bool writable, bo mmap(result, pageSize(), PROT_NONE, MAP_FIXED | MAP_PRIVATE | MAP_ANON, fd, 0); mmap(static_cast(result) + bytes - pageSize(), pageSize(), PROT_NONE, MAP_FIXED | MAP_PRIVATE | MAP_ANON, fd, 0); } @@ -130,7 +175,7 @@ index a2f6a79..be8fff9 100644 return result; } -@@ -179,9 +181,20 @@ void OSAllocator::decommit(void* address, size_t bytes) +@@ -224,9 +226,20 @@ void OSAllocator::decommit(void* address, size_t bytes) void OSAllocator::releaseDecommitted(void* address, size_t bytes) { @@ -152,7 +197,7 @@ index a2f6a79..be8fff9 100644 } // namespace WTF diff --git a/qtwebkit/Source/WTF/wtf/OSRandomSource.cpp b/qtwebkit/Source/WTF/wtf/OSRandomSource.cpp -index 0c1416a..921ea54 100644 +index 2495abf..7f05661 100644 --- a/qtwebkit/Source/WTF/wtf/OSRandomSource.cpp +++ b/qtwebkit/Source/WTF/wtf/OSRandomSource.cpp @@ -29,6 +29,10 @@ @@ -166,8 +211,8 @@ index 0c1416a..921ea54 100644 #if OS(UNIX) #include #include -@@ -44,6 +48,10 @@ namespace WTF { - #if USE(OS_RANDOMNESS) +@@ -43,6 +47,10 @@ namespace WTF { + void cryptographicallyRandomValuesFromOS(unsigned char* buffer, size_t length) { +#if OS(GENODE) @@ -178,13 +223,13 @@ index 0c1416a..921ea54 100644 int fd = open("/dev/urandom", O_RDONLY, 0); if (fd < 0) diff --git a/qtwebkit/Source/WTF/wtf/Platform.h b/qtwebkit/Source/WTF/wtf/Platform.h -index 35fa7e3..44343cf 100644 +index 562840c..89a1919 100644 --- a/qtwebkit/Source/WTF/wtf/Platform.h +++ b/qtwebkit/Source/WTF/wtf/Platform.h -@@ -426,6 +426,12 @@ - #define WTF_OS_UNIX 1 +@@ -498,6 +498,12 @@ #endif + +/* OS(GENODE) */ +#ifdef __GENODE__ +/* Note: WTF_OS_FREEBSD is defined, too */ @@ -194,29 +239,28 @@ index 35fa7e3..44343cf 100644 /* Operating environments */ /* FIXME: these are all mixes of OS, operating environment and policy choices. */ -@@ -699,7 +705,8 @@ +@@ -650,6 +656,11 @@ + #define HAVE_SYS_PARAM_H 1 + #define HAVE_SYS_TIME_H 1 + #define WTF_USE_PTHREADS 1 ++ ++#elif OS(GENODE) ++#define HAVE_ERRNO_H 1 ++#define HAVE_SYS_TIME_H 1 ++ + #endif /* OS(UNIX) */ - #if !OS(WINDOWS) && !OS(SOLARIS) \ - && !OS(RVCT) \ -- && !OS(ANDROID) -+ && !OS(ANDROID) \ -+ && !OS(GENODE) + #if OS(UNIX) && !OS(ANDROID) && !OS(QNX) +@@ -672,7 +683,7 @@ + #endif + #endif + +-#if !OS(WINDOWS) && !OS(SOLARIS) && !OS(ANDROID) ++#if !OS(WINDOWS) && !OS(SOLARIS) && !OS(ANDROID) && !OS(GENODE) #define HAVE_TM_GMTOFF 1 #define HAVE_TM_ZONE 1 #define HAVE_TIMEGM 1 -@@ -764,6 +771,11 @@ - #define HAVE_SYS_PARAM_H 1 - #define HAVE_SYS_TIME_H 1 - -+#elif OS(GENODE) -+ -+#define HAVE_ERRNO_H 1 -+#define HAVE_SYS_TIME_H 1 -+ - #else - - /* FIXME: is this actually used or do other platforms generate their own config.h? */ -@@ -782,7 +794,7 @@ +@@ -719,7 +730,7 @@ #if PLATFORM(QT) /* We must not customize the global operator new and delete for the Qt port. */ #define ENABLE_GLOBAL_FASTMALLOC_NEW 0 @@ -225,27 +269,26 @@ index 35fa7e3..44343cf 100644 #define USE_SYSTEM_MALLOC 1 #endif #endif -@@ -935,7 +947,7 @@ +@@ -838,7 +849,7 @@ #define ENABLE_DFG_JIT 1 #endif - /* Enable the DFG JIT on ARM. */ --#if CPU(ARM_TRADITIONAL) -+#if CPU(ARM_TRADITIONAL) && !OS(GENODE) + /* Enable the DFG JIT on ARM, MIPS and SH4. */ +-#if CPU(ARM_TRADITIONAL) || CPU(MIPS) || CPU(SH4) ++#if (CPU(ARM_TRADITIONAL) || CPU(MIPS) || CPU(SH4)) && !OS(GENODE) #define ENABLE_DFG_JIT 1 #endif - /* Enable the DFG JIT on MIPS. */ -@@ -1005,7 +1017,8 @@ + #endif +@@ -914,7 +925,7 @@ #define ENABLE_REGEXP_TRACING 0 /* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */ --#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !PLATFORM(CHROMIUM) -+/* When enabled for Genode, the 'exec()' function returns invalid string objects */ -+#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !PLATFORM(CHROMIUM) && !OS(GENODE) +-#if !defined(ENABLE_YARR_JIT) && !ENABLE(LLINT_C_LOOP) && !(OS(QNX) && PLATFORM(QT)) ++#if !defined(ENABLE_YARR_JIT) && !ENABLE(LLINT_C_LOOP) && !(OS(QNX) && PLATFORM(QT)) && !OS(GENODE) #define ENABLE_YARR_JIT 1 /* Setting this flag compares JIT results with interpreter results. */ diff --git a/qtwebkit/Source/WTF/wtf/StackBounds.cpp b/qtwebkit/Source/WTF/wtf/StackBounds.cpp -index a272ce3..65a5a1f 100644 +index 061cae7..04d012c 100644 --- a/qtwebkit/Source/WTF/wtf/StackBounds.cpp +++ b/qtwebkit/Source/WTF/wtf/StackBounds.cpp @@ -44,6 +44,10 @@ @@ -259,8 +302,8 @@ index a272ce3..65a5a1f 100644 #elif OS(UNIX) #include -@@ -128,6 +132,15 @@ void StackBounds::initialize() - m_bound = estimateStackBound(m_origin); +@@ -124,6 +128,15 @@ void StackBounds::initialize() + #endif } +#elif OS(GENODE) @@ -276,7 +319,7 @@ index a272ce3..65a5a1f 100644 void StackBounds::initialize() diff --git a/qtwebkit/Source/WTF/wtf/TCSystemAlloc.cpp b/qtwebkit/Source/WTF/wtf/TCSystemAlloc.cpp -index f547085..3263f04 100644 +index ae67918..6d7b69a 100644 --- a/qtwebkit/Source/WTF/wtf/TCSystemAlloc.cpp +++ b/qtwebkit/Source/WTF/wtf/TCSystemAlloc.cpp @@ -49,6 +49,11 @@ @@ -291,7 +334,7 @@ index f547085..3263f04 100644 #ifndef MAP_ANONYMOUS #define MAP_ANONYMOUS MAP_ANON #endif -@@ -367,6 +372,21 @@ void* TCMalloc_SystemAlloc(size_t size, size_t *actual_size, size_t alignment) { +@@ -370,6 +375,21 @@ void* TCMalloc_SystemAlloc(size_t size, size_t *actual_size, size_t alignment) { } #endif @@ -313,8 +356,20 @@ index f547085..3263f04 100644 // nothing worked - reset failure flags and try again devmem_failure = false; sbrk_failure = false; +diff --git a/qtwebkit/Source/WebCore/inspector/front-end/InspectorBackendCommands.qrc b/qtwebkit/Source/WebCore/inspector/front-end/InspectorBackendCommands.qrc +index 5b1488b..22df481 100644 +--- a/qtwebkit/Source/WebCore/inspector/front-end/InspectorBackendCommands.qrc ++++ b/qtwebkit/Source/WebCore/inspector/front-end/InspectorBackendCommands.qrc +@@ -1,6 +1,6 @@ + + +- InspectorBackendCommands.js ++ ../../../../../../qtwebkit/Source/WebCore/generated/InspectorBackendCommands.js + + + diff --git a/qtwebkit/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp b/qtwebkit/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp -index e083e29..dc73aac 100644 +index b2c8d48..caeb3ec 100644 --- a/qtwebkit/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp +++ b/qtwebkit/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp @@ -18,6 +18,8 @@ @@ -326,8 +381,52 @@ index e083e29..dc73aac 100644 #include "MediaPlayerPrivateQt.h" #include "Frame.h" -@@ -661,3 +663,4 @@ PlatformMedia MediaPlayerPrivateQt::platformMedia() const +@@ -666,3 +668,4 @@ PlatformMedia MediaPlayerPrivateQt::platformMedia() const } // namespace WebCore #include "moc_MediaPlayerPrivateQt.cpp" +#endif /* ENABLE(VIDEO) */ +diff --git a/qtwebkit/Source/WebCore/platform/network/qt/SocketStreamHandlePrivate.h b/qtwebkit/Source/WebCore/platform/network/qt/SocketStreamHandlePrivate.h +index 647c4ef..ec4a645 100644 +--- a/qtwebkit/Source/WebCore/platform/network/qt/SocketStreamHandlePrivate.h ++++ b/qtwebkit/Source/WebCore/platform/network/qt/SocketStreamHandlePrivate.h +@@ -65,6 +65,7 @@ public Q_SLOTS: + #endif + public: + void initConnections(); ++ void init(const KURL& url); + QTcpSocket* m_socket; + SocketStreamHandle* m_streamHandle; + }; +diff --git a/qtwebkit/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp b/qtwebkit/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp +index cd71190..4f8a7b9 100644 +--- a/qtwebkit/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp ++++ b/qtwebkit/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp +@@ -58,6 +58,19 @@ SocketStreamHandlePrivate::SocketStreamHandlePrivate(SocketStreamHandle* streamH + return; + + initConnections(); ++ } ++ ++/* ++ * This code was factored out from the constructor, because its execution can ++ * end up in 'SocketStreamHandle::platformSend()', which needs the ++ * 'SocketStreamHandle::m_p' member, which gets initialized only after the ++ * constructor returned. ++ * ++ * Genode issue #1677 ++ */ ++void SocketStreamHandlePrivate::init(const KURL& url) ++{ ++ bool isSecure = url.protocolIs("wss"); + + unsigned int port = url.hasPort() ? url.port() : (isSecure ? 443 : 80); + +@@ -188,6 +201,7 @@ SocketStreamHandle::SocketStreamHandle(const KURL& url, SocketStreamHandleClient + { + LOG(Network, "SocketStreamHandle %p new client %p", this, m_client); + m_p = new SocketStreamHandlePrivate(this, url); ++ m_p->init(url); + } + + SocketStreamHandle::SocketStreamHandle(QTcpSocket* socket, SocketStreamHandleClient* client) diff --git a/repos/libports/src/lib/qt5/patches/qt5_qtwebkit_configuration.patch b/repos/libports/src/lib/qt5/patches/qt5_qtwebkit_configuration.patch new file mode 100644 index 000000000..a2e89df4f --- /dev/null +++ b/repos/libports/src/lib/qt5/patches/qt5_qtwebkit_configuration.patch @@ -0,0 +1,80 @@ +qt5_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.pri | 2 +- + 3 files changed, 9 insertions(+), 10 deletions(-) + +diff --git a/qtwebkit/Tools/qmake/mkspecs/features/configure.prf b/qtwebkit/Tools/qmake/mkspecs/features/configure.prf +index 49f8495..aa33732 100644 +--- a/qtwebkit/Tools/qmake/mkspecs/features/configure.prf ++++ b/qtwebkit/Tools/qmake/mkspecs/features/configure.prf +@@ -49,7 +49,6 @@ defineTest(runConfigure) { + + WEBKIT_CONFIG += \ + build_webkit1 \ +- build_webkit2 \ + build_tests \ + $$WEBKIT_TOOLS_CONFIG + +diff --git a/qtwebkit/Tools/qmake/mkspecs/features/features.prf b/qtwebkit/Tools/qmake/mkspecs/features/features.prf +index 21286be..5c04376 100644 +--- a/qtwebkit/Tools/qmake/mkspecs/features/features.prf ++++ b/qtwebkit/Tools/qmake/mkspecs/features/features.prf +@@ -37,13 +37,13 @@ defineTest(detectFeatures) { + qtHaveModule(printsupport): WEBKIT_CONFIG += have_qtprintsupport + qtHaveModule(widgets): WEBKIT_CONFIG += have_qstyle + qtHaveModule(testlib): WEBKIT_CONFIG += have_qttestlib +- qtHaveModule(positioning): WEBKIT_CONFIG += have_qtpositioning +- qtHaveModule(sensors): WEBKIT_CONFIG += have_qtsensors ++ #qtHaveModule(positioning): WEBKIT_CONFIG += have_qtpositioning ++ #qtHaveModule(sensors): WEBKIT_CONFIG += have_qtsensors + + config_libxml2: WEBKIT_CONFIG += use_libxml2 + config_libxslt: WEBKIT_CONFIG += xslt +- config_libzlib: WEBKIT_CONFIG += use_zlib +- config_libwebp: WEBKIT_CONFIG += use_webp ++ #config_libzlib: WEBKIT_CONFIG += use_zlib ++ #config_libwebp: WEBKIT_CONFIG += use_webp + config_leveldb: WEBKIT_CONFIG += use_system_leveldb + + # We can't use Qt's 3rdparty sources for libjpeg and libpng outside of qtbase, but if Qt +@@ -108,9 +108,9 @@ defineTest(detectFeatures) { + use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video + } + +- !enable?(video):qtHaveModule(multimediawidgets) { +- WEBKIT_CONFIG += video use_qt_multimedia +- } ++ #!enable?(video):qtHaveModule(multimediawidgets) { ++ # WEBKIT_CONFIG += video use_qt_multimedia ++ #} + + !enable?(video) { + CONFIGURE_WARNINGS += "Missing GStreamer or QtMultimedia, disabling HTML5 media element support" +@@ -125,7 +125,7 @@ defineTest(detectFeatures) { + } + + # Gamepad API Support (depends on udev and linux/joystick.h) +- linux:!android: WEBKIT_CONFIG += gamepad ++ #linux:!android: WEBKIT_CONFIG += gamepad + + # Support for Graphics Surface + # GraphicsSurface requires GraphicsContext3D and hence use_3d_graphics +diff --git a/qtwebkit/Tools/qmake/mkspecs/features/features.pri b/qtwebkit/Tools/qmake/mkspecs/features/features.pri +index ba18b35..dd27a42 100644 +--- a/qtwebkit/Tools/qmake/mkspecs/features/features.pri ++++ b/qtwebkit/Tools/qmake/mkspecs/features/features.pri +@@ -59,7 +59,7 @@ FEATURE_DEFAULTS = \ + ENABLE_HIGH_DPI_CANVAS=0 \ + ENABLE_ICONDATABASE=1 \ + ENABLE_IFRAME_SEAMLESS=1 \ +- ENABLE_INDEXED_DATABASE=1 \ ++ ENABLE_INDEXED_DATABASE=0 \ + ENABLE_INPUT_SPEECH=0 \ + ENABLE_INPUT_TYPE_COLOR=1 \ + ENABLE_INPUT_TYPE_DATE=0 \ diff --git a/repos/libports/src/lib/qt5/patches/qt5_qtwebkit_generated_headers.patch b/repos/libports/src/lib/qt5/patches/qt5_qtwebkit_generated_headers.patch new file mode 100644 index 000000000..34e2dd37b --- /dev/null +++ b/repos/libports/src/lib/qt5/patches/qt5_qtwebkit_generated_headers.patch @@ -0,0 +1,35 @@ +qt5_qtwebkit_generated_headers.patch + +From: Christian Prochaska + + +--- + qtwebkit/include/QtWebKit/QtWebKitDepends | 4 ++++ + .../include/QtWebKitWidgets/QtWebKitWidgetsDepends | 7 +++++++ + 2 files changed, 11 insertions(+) + create mode 100644 qtwebkit/include/QtWebKit/QtWebKitDepends + create mode 100644 qtwebkit/include/QtWebKitWidgets/QtWebKitWidgetsDepends + +diff --git a/qtwebkit/include/QtWebKit/QtWebKitDepends b/qtwebkit/include/QtWebKit/QtWebKitDepends +new file mode 100644 +index 0000000..1b3f8ad +--- /dev/null ++++ b/qtwebkit/include/QtWebKit/QtWebKitDepends +@@ -0,0 +1,4 @@ ++/* This file was generated by qmake with the info from /Source/api.pri. */ ++#include ++#include ++#include +diff --git a/qtwebkit/include/QtWebKitWidgets/QtWebKitWidgetsDepends b/qtwebkit/include/QtWebKitWidgets/QtWebKitWidgetsDepends +new file mode 100644 +index 0000000..672bd42 +--- /dev/null ++++ b/qtwebkit/include/QtWebKitWidgets/QtWebKitWidgetsDepends +@@ -0,0 +1,7 @@ ++/* This file was generated by qmake with the info from /Source/widgetsapi.pri. */ ++#include ++#include ++#include ++#include ++#include ++#include diff --git a/repos/libports/src/lib/qt5/patches/qt5_qtwebkit_socketstreamhandle.patch b/repos/libports/src/lib/qt5/patches/qt5_qtwebkit_socketstreamhandle.patch deleted file mode 100644 index 6fb9edfa9..000000000 --- a/repos/libports/src/lib/qt5/patches/qt5_qtwebkit_socketstreamhandle.patch +++ /dev/null @@ -1,54 +0,0 @@ -qt5_qtwebkit_socketstreamhandle.patch - -From: Christian Prochaska - - ---- - .../network/qt/SocketStreamHandlePrivate.h | 1 + - .../platform/network/qt/SocketStreamHandleQt.cpp | 14 ++++++++++++++ - 2 files changed, 15 insertions(+) - -diff --git a/qtwebkit/Source/WebCore/platform/network/qt/SocketStreamHandlePrivate.h b/qtwebkit/Source/WebCore/platform/network/qt/SocketStreamHandlePrivate.h -index f447cc2..4e79275 100644 ---- a/qtwebkit/Source/WebCore/platform/network/qt/SocketStreamHandlePrivate.h -+++ b/qtwebkit/Source/WebCore/platform/network/qt/SocketStreamHandlePrivate.h -@@ -65,6 +65,7 @@ public Q_SLOTS: - #endif - public: - void initConnections(); -+ void init(const KURL& url); - QTcpSocket* m_socket; - SocketStreamHandle* m_streamHandle; - }; -diff --git a/qtwebkit/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp b/qtwebkit/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp -index 271edd8..818fada 100644 ---- a/qtwebkit/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp -+++ b/qtwebkit/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp -@@ -57,6 +57,19 @@ SocketStreamHandlePrivate::SocketStreamHandlePrivate(SocketStreamHandle* streamH - return; - - initConnections(); -+ } -+ -+/* -+ * This code was factored out from the constructor, because its execution can -+ * end up in 'SocketStreamHandle::platformSend()', which needs the -+ * 'SocketStreamHandle::m_p' member, which gets initialized only after the -+ * constructor returned. -+ * -+ * Genode issue #1677 -+ */ -+void SocketStreamHandlePrivate::init(const KURL& url) -+{ -+ bool isSecure = url.protocolIs("wss"); - - unsigned int port = url.hasPort() ? url.port() : (isSecure ? 443 : 80); - -@@ -184,6 +197,7 @@ SocketStreamHandle::SocketStreamHandle(const KURL& url, SocketStreamHandleClient - { - LOG(Network, "SocketStreamHandle %p new client %p", this, m_client); - m_p = new SocketStreamHandlePrivate(this, url); -+ m_p->init(url); - } - - SocketStreamHandle::SocketStreamHandle(QTcpSocket* socket, SocketStreamHandleClient* client) diff --git a/repos/libports/src/lib/qt5/patches/qt5_qwidgetanimator.patch b/repos/libports/src/lib/qt5/patches/qt5_qwidgetanimator.patch index d21658af8..58302e899 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_qwidgetanimator.patch +++ b/repos/libports/src/lib/qt5/patches/qt5_qwidgetanimator.patch @@ -4,14 +4,14 @@ From: Christian Prochaska --- - qtbase/src/widgets/widgets/qwidgetanimator.cpp | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) + 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 bbd96ca..d3fbf92 100644 +index a6aaddd..6c8cb4b 100644 --- a/qtbase/src/widgets/widgets/qwidgetanimator.cpp +++ b/qtbase/src/widgets/widgets/qwidgetanimator.cpp -@@ -74,7 +74,8 @@ void QWidgetAnimator::abort(QWidget *w) +@@ -67,7 +67,8 @@ void QWidgetAnimator::abort(QWidget *w) void QWidgetAnimator::animationFinished() { QPropertyAnimation *anim = qobject_cast(sender()); @@ -21,12 +21,3 @@ index bbd96ca..d3fbf92 100644 } #endif //QT_NO_ANIMATION -@@ -92,7 +93,7 @@ void QWidgetAnimator::animate(QWidget *widget, const QRect &_final_geometry, boo - - #ifndef QT_NO_ANIMATION - AnimationMap::const_iterator it = m_animation_map.constFind(widget); -- if (it != m_animation_map.constEnd() && (*it)->endValue().toRect() == final_geometry) -+ if (it != m_animation_map.constEnd() && (*it) && (*it)->endValue().toRect() == final_geometry) - return; - - QPropertyAnimation *anim = new QPropertyAnimation(widget, "geometry", widget); diff --git a/repos/libports/src/lib/qt5/patches/qt5_qwidgetwindow.patch b/repos/libports/src/lib/qt5/patches/qt5_qwidgetwindow.patch index b1e13f14f..09bff5941 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_qwidgetwindow.patch +++ b/repos/libports/src/lib/qt5/patches/qt5_qwidgetwindow.patch @@ -8,12 +8,12 @@ From: Christian Prochaska 1 file changed, 3 insertions(+) diff --git a/qtbase/src/widgets/kernel/qwidgetwindow.cpp b/qtbase/src/widgets/kernel/qwidgetwindow.cpp -index 18dd315..347ce7e 100644 +index 872572a..ea6314d 100644 --- a/qtbase/src/widgets/kernel/qwidgetwindow.cpp +++ b/qtbase/src/widgets/kernel/qwidgetwindow.cpp -@@ -231,6 +231,9 @@ bool QWidgetWindow::event(QEvent *event) - case QEvent::Hide: - return QWindow::event(event); +@@ -318,6 +318,9 @@ bool QWidgetWindow::event(QEvent *event) + m_widget->repaint(); + return true; + case QEvent::MetaCall: + return QWindow::event(event); diff --git a/repos/libports/src/lib/qt5/patches/qt5_textedit_example.patch b/repos/libports/src/lib/qt5/patches/qt5_textedit_example.patch index 515b6862b..c85d80db2 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_textedit_example.patch +++ b/repos/libports/src/lib/qt5/patches/qt5_textedit_example.patch @@ -4,16 +4,15 @@ From: Christian Prochaska --- - qtbase/examples/widgets/richtext/textedit/main.cpp | 17 ++++++++++++++++- - .../widgets/richtext/textedit/textedit.cpp | 11 +++++------ + qtbase/examples/widgets/richtext/textedit/main.cpp | 20 ++++++++++++++++---- .../widgets/richtext/textedit/textedit.pro | 4 ---- - 3 files changed, 21 insertions(+), 11 deletions(-) + 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 196dbfc..ff8d024 100644 +index 1de6d99..b802866 100644 --- a/qtbase/examples/widgets/richtext/textedit/main.cpp +++ b/qtbase/examples/widgets/richtext/textedit/main.cpp -@@ -39,6 +39,10 @@ +@@ -31,6 +31,10 @@ ** ****************************************************************************/ @@ -22,9 +21,9 @@ index 196dbfc..ff8d024 100644 + +/* Qt includes */ #include "textedit.h" - #include -@@ -46,9 +50,20 @@ int main(int argc, char *argv[]) + #include +@@ -42,6 +46,16 @@ int main(int argc, char *argv[]) { Q_INIT_RESOURCE(textedit); @@ -39,46 +38,21 @@ index 196dbfc..ff8d024 100644 + try { Genode::config()->xml_node().attribute("height").value(&h); } catch (...) { } + QApplication a(argc, argv); + QCoreApplication::setOrganizationName("QtProject"); + QCoreApplication::setApplicationName("Rich Text"); +@@ -55,10 +69,8 @@ int main(int argc, char *argv[]) + TextEdit mw; -- mw.resize(700, 800); + +- 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); - mw.show(); - return a.exec(); - } -diff --git a/qtbase/examples/widgets/richtext/textedit/textedit.cpp b/qtbase/examples/widgets/richtext/textedit/textedit.cpp -index ae2bded..be98558 100644 ---- a/qtbase/examples/widgets/richtext/textedit/textedit.cpp -+++ b/qtbase/examples/widgets/richtext/textedit/textedit.cpp -@@ -476,7 +476,7 @@ void TextEdit::fileNew() - void TextEdit::fileOpen() - { - QString fn = QFileDialog::getOpenFileName(this, tr("Open File..."), -- QString(), tr("HTML-Files (*.htm *.html);;All Files (*)")); -+ QString("/"), tr("HTML-Files (*.htm *.html);;All Files (*)")); - if (!fn.isEmpty()) - load(fn); - } -@@ -495,15 +495,14 @@ bool TextEdit::fileSave() - bool TextEdit::fileSaveAs() - { -- QString fn = QFileDialog::getSaveFileName(this, tr("Save as..."), QString(), -- tr("ODF files (*.odt);;HTML-Files " -+ QString fn = QFileDialog::getSaveFileName(this, tr("Save as..."), QString("/"), -+ tr("HTML-Files " - "(*.htm *.html);;All Files (*)")); - if (fn.isEmpty()) - return false; -- if (!(fn.endsWith(".odt", Qt::CaseInsensitive) -- || fn.endsWith(".htm", Qt::CaseInsensitive) -+ if (!(fn.endsWith(".htm", Qt::CaseInsensitive) - || fn.endsWith(".html", Qt::CaseInsensitive))) { -- fn += ".odt"; // default -+ fn += ".html"; // default - } - setCurrentFileName(fn); - return fileSave(); + 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 diff --git a/repos/libports/src/lib/qt5/patches/qt5_tools.patch b/repos/libports/src/lib/qt5/patches/qt5_tools.patch index ae82c5c04..d2fd5cb2e 100644 --- a/repos/libports/src/lib/qt5/patches/qt5_tools.patch +++ b/repos/libports/src/lib/qt5/patches/qt5_tools.patch @@ -5,14 +5,28 @@ From: Christian Prochaska Support out-of-tree build of Qt host tools. This patch should not be applied when running the Qt 'configure' script. --- - qtbase/mkspecs/features/qt_build_config.prf | 2 + - qtbase/mkspecs/features/qt_functions.prf | 2 + - qtbase/mkspecs/features/qt_module.prf | 4 +- - qtbase/mkspecs/features/qt_tool.prf | 54 ++++++++++++++------------- - 4 files changed, 31 insertions(+), 31 deletions(-) + qtbase/mkspecs/features/qt.prf | 2 - + qtbase/mkspecs/features/qt_build_config.prf | 2 - + qtbase/mkspecs/features/qt_module.prf | 4 + + qtbase/mkspecs/features/qt_tool.prf | 94 ++++++++++++++------------- + qtbase/qmake/Makefile.unix | 2 - + 5 files changed, 52 insertions(+), 52 deletions(-) +diff --git a/qtbase/mkspecs/features/qt.prf b/qtbase/mkspecs/features/qt.prf +index be08a2a..ea41489 100644 +--- a/qtbase/mkspecs/features/qt.prf ++++ b/qtbase/mkspecs/features/qt.prf +@@ -151,7 +151,7 @@ for(ever) { + WINRT_MANIFEST.capabilities_device_default += $$MODULE_WINRT_CAPABILITIES_DEVICE + } + } +- !isEmpty(BAD_QT):error("Unknown module(s) in QT$$var_sfx: $$replace(BAD_QT, _private$, -private)") ++ !isEmpty(BAD_QT):debug("Unknown module(s) in QT$$var_sfx: $$replace(BAD_QT, _private$, -private)") + + !isEmpty(var_sfx): break() + var_sfx = _PRIVATE diff --git a/qtbase/mkspecs/features/qt_build_config.prf b/qtbase/mkspecs/features/qt_build_config.prf -index a29e09c..32c8388 100644 +index 1e2d5c2..4f7e611 100644 --- a/qtbase/mkspecs/features/qt_build_config.prf +++ b/qtbase/mkspecs/features/qt_build_config.prf @@ -12,7 +12,7 @@ @@ -24,21 +38,8 @@ index a29e09c..32c8388 100644 } else { debug(1, "Loaded qmodule.pri from ($$QMAKE_QT_MODULE)") } -diff --git a/qtbase/mkspecs/features/qt_functions.prf b/qtbase/mkspecs/features/qt_functions.prf -index bbbb5d3..62006ee 100644 ---- a/qtbase/mkspecs/features/qt_functions.prf -+++ b/qtbase/mkspecs/features/qt_functions.prf -@@ -167,7 +167,7 @@ defineTest(qtAddModules) { - - qtAddModule($$QTLIB, $$eval(QT.$${QTLIB}.want_private), $$2) - } -- !isEmpty(BAD_QT):error("Unknown module(s) in $$1: $$BAD_QT") -+ !isEmpty(BAD_QT):debug(1, "Unknown module(s) in $$1: $$BAD_QT") - - export(using_privates) - } diff --git a/qtbase/mkspecs/features/qt_module.prf b/qtbase/mkspecs/features/qt_module.prf -index 53a5499..035480d 100644 +index 22e2dd5..7141d22 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 @@ -50,27 +51,27 @@ index 53a5499..035480d 100644 # Compile as shared/DLL or static according to the option given to configure # unless overridden. Host builds are always static -@@ -53,7 +53,7 @@ else: \ - MODULE_DEFINE = QT_$${ucmodule}_LIB - MODULE_DEFINES = $$MODULE_DEFINE $$MODULE_DEFINES +@@ -82,7 +82,7 @@ QMAKE_DOCS_TARGETDIR = qt$${MODULE} + load(qt_common) + !no_module_headers: load(qt_module_headers) -load(qt_module_pris) +#load(qt_module_pris) - INCLUDEPATH *= $$eval(QT.$${MODULE}.includes) $$eval(QT.$${MODULE}.private_includes) + 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 9a6b963..30a2059 100644 +index 839c3d6..6d88db7 100644 --- a/qtbase/mkspecs/features/qt_tool.prf +++ b/qtbase/mkspecs/features/qt_tool.prf -@@ -16,30 +16,30 @@ CONFIG += console +@@ -17,52 +17,52 @@ 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. -!build_pass:if(!host_build|!force_bootstrap|force_independent) { - isEmpty(MODULE):MODULE = $$TARGET - -- !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, ) +- !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, _private) - - load(qt_build_paths) - @@ -78,9 +79,29 @@ index 9a6b963..30a2059 100644 - - TOOL_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_tool_$${MODULE}.pri - +- vars = binary depends +- !isEmpty(QT_TOOL_ENV) { +- vars += envvars +- module_var_names = +- module_var_sets = +- for(var, QT_TOOL_ENV) { +- vars += env.$${var}.name env.$${var}.value +- module_var_names += QT_TOOL.$${MODULE}.env.$${var} +- module_var_sets += \ +- "QT_TOOL.$${MODULE}.env.$${var}.name = $$val_escape($${var}.name)" \ +- "QT_TOOL.$${MODULE}.env.$${var}.value = $$val_escape($${var}.value)" +- } +- module_envvars = \ +- "QT_TOOL.$${MODULE}.envvars = $$module_var_names" \ +- $$module_var_sets +- } else { +- module_envvars = +- } +- bin = $$system_path($$QMAKE_RESOLVED_TARGET) - TOOL_PRI_CONT = \ -- "QT_TOOL.$${MODULE}.binary = $$QMAKE_RESOLVED_TARGET" \ -- "QT_TOOL.$${MODULE}.depends =$$join(MODULE_DEPENDS, " ", " ")" +- "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.") - - # Then, inject the new tool into the current cache state @@ -90,14 +111,14 @@ index 9a6b963..30a2059 100644 - unset(added) - } - include($$TOOL_PRI) -- for(var, $$list(binary depends)): \ +- for(var, vars): \ - cache(QT_TOOL.$${MODULE}.$$var, transient) - -} +#!build_pass:if(!host_build|!force_bootstrap|force_independent) { +# isEmpty(MODULE):MODULE = $$TARGET +# -+# !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, ) ++# !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, _private) +# +# load(qt_build_paths) +# @@ -105,9 +126,29 @@ index 9a6b963..30a2059 100644 +# +# TOOL_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_tool_$${MODULE}.pri +# ++# vars = binary depends ++# !isEmpty(QT_TOOL_ENV) { ++# vars += envvars ++# module_var_names = ++# module_var_sets = ++# for(var, QT_TOOL_ENV) { ++# vars += env.$${var}.name env.$${var}.value ++# module_var_names += QT_TOOL.$${MODULE}.env.$${var} ++# module_var_sets += \ ++# "QT_TOOL.$${MODULE}.env.$${var}.name = $$val_escape($${var}.name)" \ ++# "QT_TOOL.$${MODULE}.env.$${var}.value = $$val_escape($${var}.value)" ++# } ++# module_envvars = \ ++# "QT_TOOL.$${MODULE}.envvars = $$module_var_names" \ ++# $$module_var_sets ++# } else { ++# module_envvars = ++# } ++# bin = $$system_path($$QMAKE_RESOLVED_TARGET) +# TOOL_PRI_CONT = \ -+# "QT_TOOL.$${MODULE}.binary = $$QMAKE_RESOLVED_TARGET" \ -+# "QT_TOOL.$${MODULE}.depends =$$join(MODULE_DEPENDS, " ", " ")" ++# "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.") +# +# # Then, inject the new tool into the current cache state @@ -117,7 +158,22 @@ index 9a6b963..30a2059 100644 +# unset(added) +# } +# include($$TOOL_PRI) -+# for(var, $$list(binary depends)): \ ++# for(var, vars): \ +# cache(QT_TOOL.$${MODULE}.$$var, transient) +# +#} + # 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 405bbf9..cf5fa02 100644 +--- a/qtbase/qmake/Makefile.unix ++++ b/qtbase/qmake/Makefile.unix +@@ -229,7 +229,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 + +-qlibraryinfo.o: $(SOURCE_PATH)/src/corelib/global/qlibraryinfo.cpp $(BUILD_PATH)/src/corelib/global/qconfig.cpp ++qlibraryinfo.o: $(SOURCE_PATH)/src/corelib/global/qlibraryinfo.cpp + $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/global/qlibraryinfo.cpp + + qnumeric.o: $(SOURCE_PATH)/src/corelib/global/qnumeric.cpp diff --git a/repos/libports/src/lib/qt5/patches/series b/repos/libports/src/lib/qt5/patches/series index 998ea2bcf..dc0b8ff7b 100644 --- a/repos/libports/src/lib/qt5/patches/series +++ b/repos/libports/src/lib/qt5/patches/series @@ -10,11 +10,7 @@ qt5_qwidgetanimator.patch qt5_qwidgetwindow.patch qt5_qtscript.patch qt5_qtnetwork.patch -qt5_qtwebkit.patch -qt5_qtwebkit_socketstreamhandle.patch qt5_textedit_example.patch qt5_openglwindow_example.patch qt5_qml.patch -qt5_arm.patch qt5_tools.patch -qt5_gcc5.patch 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 ee59922d1..6b21478fa 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 @@ -1,40 +1,32 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL$ +** $QT_BEGIN_LICENSE:LGPL21$ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://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 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -44,9 +36,13 @@ #include "qplatformdefs.h" #include +#include #if defined(Q_OS_BLACKBERRY) # include +#elif defined(Q_OS_OSX) +# include +# include #else # if !defined(QT_NO_GLIB) # include "../kernel/qeventdispatcher_glib_p.h" @@ -84,9 +80,6 @@ # define old_qDebug qDebug # undef qDebug # endif -#ifndef Q_OS_IOS -# include -#endif //Q_OS_IOS # ifdef old_qDebug # undef qDebug @@ -123,6 +116,8 @@ QHash QThreadPrivate::tls; #else +Q_STATIC_ASSERT(sizeof(pthread_t) <= sizeof(Qt::HANDLE)); + enum { ThreadPriorityResetFlag = 0x80000000 }; #if defined(Q_OS_LINUX) && defined(__GLIBC__) && (defined(Q_CC_GNU) || defined(Q_CC_INTEL)) && !defined(QT_LINUXBASE) @@ -183,6 +178,12 @@ static void destroy_current_thread_data_key() { pthread_once(¤t_thread_data_once, create_current_thread_data_key); pthread_key_delete(current_thread_data_key); + + // Reset current_thread_data_once in case we end up recreating + // the thread-data in the rare case of QObject construction + // after destroying the QThreadData. + pthread_once_t pthread_once_init = PTHREAD_ONCE_INIT; + current_thread_data_once = pthread_once_init; } Q_DESTRUCTOR_FUNCTION(destroy_current_thread_data_key) @@ -236,15 +237,39 @@ static void clear_thread_data() #endif /* Q_OS_GENODE */ } +template +static typename QtPrivate::QEnableIf::isIntegral, Qt::HANDLE>::Type to_HANDLE(T id) +{ + return reinterpret_cast(static_cast(id)); +} + +template +static typename QtPrivate::QEnableIf::isIntegral, T>::Type from_HANDLE(Qt::HANDLE id) +{ + return static_cast(reinterpret_cast(id)); +} + +template +static typename QtPrivate::QEnableIf::isPointer, Qt::HANDLE>::Type to_HANDLE(T id) +{ + return id; +} + +template +static typename QtPrivate::QEnableIf::isPointer, T>::Type from_HANDLE(Qt::HANDLE id) +{ + return static_cast(id); +} + void QThreadData::clearCurrentThreadData() { clear_thread_data(); } -QThreadData *QThreadData::current() +QThreadData *QThreadData::current(bool createIfNecessary) { QThreadData *data = get_thread_data(); - if (!data) { + if (!data && createIfNecessary) { data = new QThreadData; QT_TRY { set_thread_data(data); @@ -260,10 +285,10 @@ QThreadData *QThreadData::current() #ifdef Q_OS_GENODE data->threadId = QThread::currentThreadId(); #else - data->threadId = (Qt::HANDLE)pthread_self(); + data->threadId = to_HANDLE(pthread_self()); #endif /* Q_OS_GENODE */ if (!QCoreApplicationPrivate::theMainThread) - QCoreApplicationPrivate::theMainThread = data->thread; + QCoreApplicationPrivate::theMainThread = data->thread.load(); } return data; } @@ -273,9 +298,6 @@ void QAdoptedThread::init() { #ifdef Q_OS_GENODE d_func()->thread_id = QThread::currentThreadId(); -#else - Q_D(QThread); - d->thread_id = pthread_self(); #endif /* Q_OS_GENODE */ } @@ -283,15 +305,9 @@ void QAdoptedThread::init() QThreadPrivate */ -#if defined(Q_C_CALLBACKS) extern "C" { -#endif - typedef void*(*QtThreadCallback)(void*); - -#if defined(Q_C_CALLBACKS) } -#endif #endif // QT_NO_THREAD @@ -299,14 +315,21 @@ void QThreadPrivate::createEventDispatcher(QThreadData *data) { #if defined(Q_OS_BLACKBERRY) data->eventDispatcher.storeRelease(new QEventDispatcherBlackberry); -#else -#if !defined(QT_NO_GLIB) +# elif defined(Q_OS_OSX) + bool ok = false; + int value = qEnvironmentVariableIntValue("QT_EVENT_DISPATCHER_CORE_FOUNDATION", &ok); + if (ok && value > 0) + data->eventDispatcher.storeRelease(new QEventDispatcherCoreFoundation); + else + data->eventDispatcher.storeRelease(new QEventDispatcherUNIX); +# elif !defined(QT_NO_GLIB) if (qEnvironmentVariableIsEmpty("QT_NO_GLIB") && qEnvironmentVariableIsEmpty("QT_NO_THREADED_GLIB") && QEventDispatcherGlib::versionSupported()) data->eventDispatcher.storeRelease(new QEventDispatcherGlib); else -#endif + data->eventDispatcher.storeRelease(new QEventDispatcherUNIX); +#else data->eventDispatcher.storeRelease(new QEventDispatcherUNIX); #endif @@ -357,7 +380,7 @@ void *QThreadPrivate::start(void *arg) thr->d_func()->setPriority(QThread::Priority(thr->d_func()->priority & ~ThreadPriorityResetFlag)); } - data->threadId = (Qt::HANDLE)pthread_self(); + data->threadId = to_HANDLE(pthread_self()); set_thread_data(data); #endif /* Q_OS_GENODE */ @@ -374,14 +397,16 @@ void *QThreadPrivate::start(void *arg) QThread::setTerminationEnabled(true); #else #if (defined(Q_OS_LINUX) || defined(Q_OS_MAC) || defined(Q_OS_QNX)) - // sets the name of the current thread. - QString objectName = thr->objectName(); - - if (Q_LIKELY(objectName.isEmpty())) - setCurrentThreadName(thr->d_func()->thread_id, thr->metaObject()->className()); - else - setCurrentThreadName(thr->d_func()->thread_id, objectName.toLocal8Bit()); + { + // sets the name of the current thread. + QString objectName = thr->objectName(); + pthread_t thread_id = from_HANDLE(data->threadId); + if (Q_LIKELY(objectName.isEmpty())) + setCurrentThreadName(thread_id, thr->metaObject()->className()); + else + setCurrentThreadName(thread_id, objectName.toLocal8Bit()); + } #endif emit thr->started(QThread::QPrivateSignal()); @@ -424,9 +449,9 @@ void QThreadPrivate::finish(void *arg) locker.relock(); } - d->thread_id = 0; d->running = false; d->finished = true; + d->interruptionRequested = false; #ifdef Q_OS_GENODE QThreadPrivate::tls.remove(QThread::currentThreadId()); @@ -449,7 +474,7 @@ Qt::HANDLE QThread::currentThreadId() Q_DECL_NOTHROW return (Qt::HANDLE)QThreadPrivate::Genode_thread::myself(); #else // requires a C cast here otherwise we run into trouble on AIX - return (Qt::HANDLE)pthread_self(); + return to_HANDLE(pthread_self()); #endif /* Q_OS_GENODE */ } @@ -462,31 +487,36 @@ Qt::HANDLE QThread::currentThreadId() Q_DECL_NOTHROW int QThread::idealThreadCount() Q_DECL_NOTHROW { - int cores = -1; + int cores = 1; #if defined(Q_OS_HPUX) // HP-UX struct pst_dynamic psd; if (pstat_getdynamic(&psd, sizeof(psd), 1, 0) == -1) { perror("pstat_getdynamic"); - cores = -1; } else { cores = (int)psd.psd_proc_cnt; } #elif defined(Q_OS_BSD4) - // FreeBSD, OpenBSD, NetBSD, BSD/OS, Mac OS X + // FreeBSD, OpenBSD, NetBSD, BSD/OS, OS X, iOS size_t len = sizeof(cores); int mib[2]; mib[0] = CTL_HW; mib[1] = HW_NCPU; if (sysctl(mib, 2, &cores, &len, NULL, 0) != 0) { perror("sysctl"); - cores = -1; } #elif defined(Q_OS_IRIX) // IRIX cores = (int)sysconf(_SC_NPROC_ONLN); #elif defined(Q_OS_INTEGRITY) +#if (__INTEGRITY_MAJOR_VERSION >= 10) + // Integrity V10+ does support multicore CPUs + Value processorCount; + if (GetProcessorCount(CurrentTask(), &processorCount) == 0) + cores = processorCount; + else +#endif // as of aug 2008 Integrity only supports one single core CPU cores = 1; #elif defined(Q_OS_VXWORKS) @@ -511,8 +541,9 @@ int QThread::idealThreadCount() Q_DECL_NOTHROW #else // the rest: Linux, Solaris, AIX, Tru64 cores = (int)sysconf(_SC_NPROCESSORS_ONLN); + if (cores == -1) + return 1; #endif - return cores; } @@ -623,6 +654,7 @@ void QThread::start(Priority priority) d->finished = false; d->returnCode = 0; d->exited = false; + d->interruptionRequested = false; #ifndef Q_OS_GENODE pthread_attr_t attr; @@ -726,17 +758,17 @@ void QThread::start(Priority priority) } } - int code = - pthread_create(&d->thread_id, &attr, QThreadPrivate::start, this); + pthread_t threadId; + int code = pthread_create(&threadId, &attr, QThreadPrivate::start, this); if (code == EPERM) { // caller does not have permission to set the scheduling // parameters/policy #if defined(QT_HAS_THREAD_PRIORITY_SCHEDULING) pthread_attr_setinheritsched(&attr, PTHREAD_INHERIT_SCHED); #endif - code = - pthread_create(&d->thread_id, &attr, QThreadPrivate::start, this); + code = pthread_create(&threadId, &attr, QThreadPrivate::start, this); } + d->data->threadId = to_HANDLE(threadId); pthread_attr_destroy(&attr); @@ -745,7 +777,7 @@ void QThread::start(Priority priority) d->running = false; d->finished = false; - d->thread_id = 0; + d->data->threadId = 0; } #endif /* Q_OS_GENODE */ @@ -770,10 +802,10 @@ void QThread::terminate() d->running = false; } #else - if (!d->thread_id) + if (!d->data->threadId) return; - int code = pthread_cancel(d->thread_id); + int code = pthread_cancel(from_HANDLE(d->data->threadId)); if (code) { qWarning("QThread::start: Thread termination error: %s", qPrintable(qt_error_string((code)))); @@ -801,7 +833,7 @@ bool QThread::wait(unsigned long time) #ifdef Q_OS_GENODE if (d->thread_id == QThread::currentThreadId()) { #else - if (d->thread_id == pthread_self()) { + if (from_HANDLE(d->data->threadId) == pthread_self()) { #endif /* Q_OS_GENODE */ qWarning("QThread::wait: Thread tried to wait on itself"); return false; @@ -862,7 +894,7 @@ void QThreadPrivate::setPriority(QThread::Priority threadPriority) int sched_policy; sched_param param; - if (pthread_getschedparam(thread_id, &sched_policy, ¶m) != 0) { + if (pthread_getschedparam(from_HANDLE(data->threadId), &sched_policy, ¶m) != 0) { // failed to get the scheduling policy, don't bother setting // the priority qWarning("QThread::setPriority: Cannot get scheduler parameters"); @@ -878,15 +910,15 @@ void QThreadPrivate::setPriority(QThread::Priority threadPriority) } param.sched_priority = prio; - int status = pthread_setschedparam(thread_id, sched_policy, ¶m); + int status = pthread_setschedparam(from_HANDLE(data->threadId), sched_policy, ¶m); # ifdef SCHED_IDLE // were we trying to set to idle priority and failed? if (status == -1 && sched_policy == SCHED_IDLE && errno == EINVAL) { // reset to lowest priority possible - pthread_getschedparam(thread_id, &sched_policy, ¶m); + pthread_getschedparam(from_HANDLE(data->threadId), &sched_policy, ¶m); param.sched_priority = sched_get_priority_min(sched_policy); - pthread_setschedparam(thread_id, sched_policy, ¶m); + pthread_setschedparam(from_HANDLE(data->threadId), sched_policy, ¶m); } # else Q_UNUSED(status); 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 e42b2be3a..6b2505cbe 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 @@ -24,6 +24,7 @@ QStringList QNitpickerIntegrationPlugin::keys() const QPlatformIntegration *QNitpickerIntegrationPlugin::create(const QString& system, const QStringList& paramList) { +qDebug() << "QNitpickerIntegrationPlugin::create()"; Q_UNUSED(paramList); if (system.toLower() == "nitpicker") return new QNitpickerIntegration; diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegration.cpp b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegration.cpp index 4c77f3422..b78d8819b 100644 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegration.cpp +++ b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegration.cpp @@ -34,11 +34,8 @@ Genode::Signal_receiver &QNitpickerIntegration::_signal_receiver() QNitpickerIntegration::QNitpickerIntegration() : _signal_handler_thread(_signal_receiver()), - _nitpicker_screen(new QNitpickerScreen()), - _event_dispatcher(createUnixEventDispatcher()) + _nitpicker_screen(new QNitpickerScreen()) { - QGuiApplicationPrivate::instance()->setEventDispatcher(_event_dispatcher); - screenAdded(_nitpicker_screen); _signal_handler_thread.start(); } @@ -73,11 +70,17 @@ QPlatformBackingStore *QNitpickerIntegration::createPlatformBackingStore(QWindow } -QAbstractEventDispatcher *QNitpickerIntegration::guiThreadEventDispatcher() const +QAbstractEventDispatcher *QNitpickerIntegration::createEventDispatcher() const { if (verbose) - qDebug() << "QNitpickerIntegration::guiThreadEventDispatcher()"; - return _event_dispatcher; + qDebug() << "QNitpickerIntegration::createEventDispatcher()"; + return createUnixEventDispatcher(); +} + + +void QNitpickerIntegration::initialize() +{ + screenAdded(_nitpicker_screen); } diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegration.h b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegration.h index 2e31e0b39..e85143b9e 100644 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegration.h +++ b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegration.h @@ -32,7 +32,6 @@ class QNitpickerIntegration : public QPlatformIntegration QSignalHandlerThread _signal_handler_thread; QNitpickerScreen *_nitpicker_screen; - QAbstractEventDispatcher *_event_dispatcher; /* * A reference to the signal receiver gets passed to newly created @@ -46,18 +45,20 @@ class QNitpickerIntegration : public QPlatformIntegration QNitpickerIntegration(); - bool hasCapability(QPlatformIntegration::Capability cap) const override; + void initialize() Q_DECL_OVERRIDE; + bool hasCapability(QPlatformIntegration::Capability cap) const Q_DECL_OVERRIDE; - QPlatformWindow *createPlatformWindow(QWindow *window) const override; - QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const override; - QAbstractEventDispatcher *guiThreadEventDispatcher() const override; + QPlatformWindow *createPlatformWindow(QWindow *window) const Q_DECL_OVERRIDE; + QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const Q_DECL_OVERRIDE; - QPlatformFontDatabase *fontDatabase() const override; + QAbstractEventDispatcher *createEventDispatcher() const Q_DECL_OVERRIDE; + + QPlatformFontDatabase *fontDatabase() const Q_DECL_OVERRIDE; #ifndef QT_NO_CLIPBOARD - QPlatformClipboard *clipboard() const override; + QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE; #endif - QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const override; + QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const Q_DECL_OVERRIDE; }; QT_END_NAMESPACE diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegrationplugin.h b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegrationplugin.h index 2d36756d9..0e153073e 100644 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegrationplugin.h +++ b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegrationplugin.h @@ -23,7 +23,7 @@ QT_BEGIN_NAMESPACE class QNitpickerIntegrationPlugin : public QPlatformIntegrationPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.1" FILE "nitpicker.json") + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.3" FILE "nitpicker.json") public: QStringList keys() const; QPlatformIntegration *create(const QString&, const QStringList&); diff --git a/repos/libports/src/lib/qt5/qtwebkit/Source/WebCore/idl_files b/repos/libports/src/lib/qt5/qtwebkit/Source/WebCore/idl_files index dd7a68f5c..11ce87d1a 100644 --- a/repos/libports/src/lib/qt5/qtwebkit/Source/WebCore/idl_files +++ b/repos/libports/src/lib/qt5/qtwebkit/Source/WebCore/idl_files @@ -20,7 +20,8 @@ qtwebkit/Source/WebCore/Modules/filesystem/FileWriter.idl qtwebkit/Source/WebCore/Modules/filesystem/FileWriterCallback.idl qtwebkit/Source/WebCore/Modules/filesystem/Metadata.idl qtwebkit/Source/WebCore/Modules/filesystem/MetadataCallback.idl -qtwebkit/Source/WebCore/Modules/filesystem/WorkerContextFileSystem.idl +qtwebkit/Source/WebCore/Modules/filesystem/WorkerGlobalScopeFileSystem.idl +qtwebkit/Source/WebCore/Modules/geolocation/Coordinates.idl qtwebkit/Source/WebCore/Modules/geolocation/Geolocation.idl qtwebkit/Source/WebCore/Modules/geolocation/Geoposition.idl qtwebkit/Source/WebCore/Modules/geolocation/NavigatorGeolocation.idl @@ -30,26 +31,30 @@ qtwebkit/Source/WebCore/Modules/geolocation/PositionErrorCallback.idl qtwebkit/Source/WebCore/Modules/indexeddb/DOMWindowIndexedDatabase.idl qtwebkit/Source/WebCore/Modules/indexeddb/IDBAny.idl qtwebkit/Source/WebCore/Modules/indexeddb/IDBCursor.idl -qtwebkit/Source/WebCore/Modules/indexeddb/IDBDatabaseException.idl +qtwebkit/Source/WebCore/Modules/indexeddb/IDBCursorWithValue.idl qtwebkit/Source/WebCore/Modules/indexeddb/IDBDatabase.idl qtwebkit/Source/WebCore/Modules/indexeddb/IDBFactory.idl qtwebkit/Source/WebCore/Modules/indexeddb/IDBIndex.idl -qtwebkit/Source/WebCore/Modules/indexeddb/IDBKey.idl qtwebkit/Source/WebCore/Modules/indexeddb/IDBKeyRange.idl qtwebkit/Source/WebCore/Modules/indexeddb/IDBObjectStore.idl +qtwebkit/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.idl qtwebkit/Source/WebCore/Modules/indexeddb/IDBRequest.idl qtwebkit/Source/WebCore/Modules/indexeddb/IDBTransaction.idl -qtwebkit/Source/WebCore/Modules/indexeddb/WorkerContextIndexedDatabase.idl +qtwebkit/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.idl +qtwebkit/Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.idl qtwebkit/Source/WebCore/Modules/notifications/DOMWindowNotifications.idl qtwebkit/Source/WebCore/Modules/notifications/Notification.idl qtwebkit/Source/WebCore/Modules/notifications/NotificationCenter.idl qtwebkit/Source/WebCore/Modules/notifications/NotificationPermissionCallback.idl -qtwebkit/Source/WebCore/Modules/notifications/WorkerContextNotifications.idl +qtwebkit/Source/WebCore/Modules/notifications/WorkerGlobalScopeNotifications.idl qtwebkit/Source/WebCore/Modules/quota/DOMWindowQuota.idl +qtwebkit/Source/WebCore/Modules/quota/NavigatorStorageQuota.idl qtwebkit/Source/WebCore/Modules/quota/StorageInfo.idl -qtwebkit/Source/WebCore/Modules/quota/StorageInfoErrorCallback.idl -qtwebkit/Source/WebCore/Modules/quota/StorageInfoQuotaCallback.idl -qtwebkit/Source/WebCore/Modules/quota/StorageInfoUsageCallback.idl +qtwebkit/Source/WebCore/Modules/quota/StorageErrorCallback.idl +qtwebkit/Source/WebCore/Modules/quota/StorageQuota.idl +qtwebkit/Source/WebCore/Modules/quota/StorageQuotaCallback.idl +qtwebkit/Source/WebCore/Modules/quota/StorageUsageCallback.idl +qtwebkit/Source/WebCore/Modules/quota/WorkerNavigatorStorageQuota.idl qtwebkit/Source/WebCore/Modules/webaudio/AudioBuffer.idl qtwebkit/Source/WebCore/Modules/webaudio/AudioBufferCallback.idl qtwebkit/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.idl @@ -57,27 +62,25 @@ qtwebkit/Source/WebCore/Modules/webaudio/ChannelMergerNode.idl qtwebkit/Source/WebCore/Modules/webaudio/ChannelSplitterNode.idl qtwebkit/Source/WebCore/Modules/webaudio/AudioContext.idl qtwebkit/Source/WebCore/Modules/webaudio/AudioDestinationNode.idl -qtwebkit/Source/WebCore/Modules/webaudio/AudioGain.idl qtwebkit/Source/WebCore/Modules/webaudio/GainNode.idl qtwebkit/Source/WebCore/Modules/webaudio/AudioListener.idl qtwebkit/Source/WebCore/Modules/webaudio/AudioNode.idl qtwebkit/Source/WebCore/Modules/webaudio/PannerNode.idl qtwebkit/Source/WebCore/Modules/webaudio/AudioParam.idl qtwebkit/Source/WebCore/Modules/webaudio/AudioProcessingEvent.idl -qtwebkit/Source/WebCore/Modules/webaudio/AudioSourceNode.idl qtwebkit/Source/WebCore/Modules/webaudio/BiquadFilterNode.idl qtwebkit/Source/WebCore/Modules/webaudio/ConvolverNode.idl qtwebkit/Source/WebCore/Modules/webaudio/DelayNode.idl -qtwebkit/Source/WebCore/Modules/webaudio/DOMWindowWebAudio.idl qtwebkit/Source/WebCore/Modules/webaudio/DynamicsCompressorNode.idl qtwebkit/Source/WebCore/Modules/webaudio/ScriptProcessorNode.idl qtwebkit/Source/WebCore/Modules/webaudio/MediaElementAudioSourceNode.idl qtwebkit/Source/WebCore/Modules/webaudio/MediaStreamAudioSourceNode.idl +qtwebkit/Source/WebCore/Modules/webaudio/OfflineAudioContext.idl qtwebkit/Source/WebCore/Modules/webaudio/OfflineAudioCompletionEvent.idl qtwebkit/Source/WebCore/Modules/webaudio/OscillatorNode.idl qtwebkit/Source/WebCore/Modules/webaudio/AnalyserNode.idl qtwebkit/Source/WebCore/Modules/webaudio/WaveShaperNode.idl -qtwebkit/Source/WebCore/Modules/webaudio/WaveTable.idl +qtwebkit/Source/WebCore/Modules/webaudio/PeriodicWave.idl qtwebkit/Source/WebCore/Modules/webdatabase/DOMWindowWebDatabase.idl qtwebkit/Source/WebCore/Modules/webdatabase/Database.idl qtwebkit/Source/WebCore/Modules/webdatabase/DatabaseCallback.idl @@ -93,14 +96,14 @@ qtwebkit/Source/WebCore/Modules/webdatabase/SQLTransactionCallback.idl qtwebkit/Source/WebCore/Modules/webdatabase/SQLTransactionErrorCallback.idl qtwebkit/Source/WebCore/Modules/webdatabase/SQLTransactionSync.idl qtwebkit/Source/WebCore/Modules/webdatabase/SQLTransactionSyncCallback.idl -qtwebkit/Source/WebCore/Modules/webdatabase/WorkerContextWebDatabase.idl +qtwebkit/Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.idl qtwebkit/Source/WebCore/Modules/websockets/CloseEvent.idl -qtwebkit/Source/WebCore/Modules/websockets/DOMWindowWebSocket.idl qtwebkit/Source/WebCore/Modules/websockets/WebSocket.idl -qtwebkit/Source/WebCore/Modules/websockets/WorkerContextWebSocket.idl qtwebkit/Source/WebCore/css/Counter.idl qtwebkit/Source/WebCore/css/CSSCharsetRule.idl +qtwebkit/Source/WebCore/css/CSSFontFaceLoadEvent.idl qtwebkit/Source/WebCore/css/CSSFontFaceRule.idl +qtwebkit/Source/WebCore/css/CSSHostRule.idl qtwebkit/Source/WebCore/css/CSSImportRule.idl qtwebkit/Source/WebCore/css/CSSMediaRule.idl qtwebkit/Source/WebCore/css/CSSPageRule.idl @@ -110,8 +113,11 @@ qtwebkit/Source/WebCore/css/CSSRuleList.idl qtwebkit/Source/WebCore/css/CSSStyleDeclaration.idl qtwebkit/Source/WebCore/css/CSSStyleRule.idl qtwebkit/Source/WebCore/css/CSSStyleSheet.idl +qtwebkit/Source/WebCore/css/CSSSupportsRule.idl qtwebkit/Source/WebCore/css/CSSValue.idl qtwebkit/Source/WebCore/css/CSSValueList.idl +qtwebkit/Source/WebCore/css/DOMWindowCSS.idl +qtwebkit/Source/WebCore/css/FontLoader.idl qtwebkit/Source/WebCore/css/MediaList.idl qtwebkit/Source/WebCore/css/MediaQueryList.idl qtwebkit/Source/WebCore/css/Rect.idl @@ -119,6 +125,7 @@ qtwebkit/Source/WebCore/css/RGBColor.idl qtwebkit/Source/WebCore/css/StyleMedia.idl qtwebkit/Source/WebCore/css/StyleSheet.idl qtwebkit/Source/WebCore/css/StyleSheetList.idl +qtwebkit/Source/WebCore/css/WebKitCSSFilterRule.idl qtwebkit/Source/WebCore/css/WebKitCSSFilterValue.idl qtwebkit/Source/WebCore/css/WebKitCSSKeyframeRule.idl qtwebkit/Source/WebCore/css/WebKitCSSKeyframesRule.idl @@ -130,6 +137,7 @@ qtwebkit/Source/WebCore/css/WebKitCSSViewportRule.idl qtwebkit/Source/WebCore/dom/Attr.idl qtwebkit/Source/WebCore/dom/BeforeLoadEvent.idl qtwebkit/Source/WebCore/dom/CharacterData.idl +qtwebkit/Source/WebCore/dom/ChildNode.idl qtwebkit/Source/WebCore/dom/ClientRect.idl qtwebkit/Source/WebCore/dom/ClientRectList.idl qtwebkit/Source/WebCore/dom/Clipboard.idl @@ -156,13 +164,13 @@ qtwebkit/Source/WebCore/dom/ErrorEvent.idl qtwebkit/Source/WebCore/dom/Event.idl qtwebkit/Source/WebCore/dom/EventException.idl qtwebkit/Source/WebCore/dom/EventTarget.idl +qtwebkit/Source/WebCore/dom/FocusEvent.idl qtwebkit/Source/WebCore/dom/HashChangeEvent.idl qtwebkit/Source/WebCore/dom/KeyboardEvent.idl qtwebkit/Source/WebCore/dom/MouseEvent.idl qtwebkit/Source/WebCore/dom/MessageChannel.idl qtwebkit/Source/WebCore/dom/MessageEvent.idl qtwebkit/Source/WebCore/dom/MessagePort.idl -qtwebkit/Source/WebCore/dom/MutationCallback.idl qtwebkit/Source/WebCore/dom/MutationEvent.idl qtwebkit/Source/WebCore/dom/MutationObserver.idl qtwebkit/Source/WebCore/dom/MutationRecord.idl @@ -188,6 +196,7 @@ qtwebkit/Source/WebCore/dom/TextEvent.idl qtwebkit/Source/WebCore/dom/Touch.idl qtwebkit/Source/WebCore/dom/TouchEvent.idl qtwebkit/Source/WebCore/dom/TouchList.idl +qtwebkit/Source/WebCore/dom/TransitionEvent.idl qtwebkit/Source/WebCore/dom/TreeWalker.idl qtwebkit/Source/WebCore/dom/UIEvent.idl qtwebkit/Source/WebCore/dom/WebKitAnimationEvent.idl @@ -211,15 +220,21 @@ qtwebkit/Source/WebCore/html/canvas/Float64Array.idl qtwebkit/Source/WebCore/html/canvas/CanvasGradient.idl qtwebkit/Source/WebCore/html/canvas/Int32Array.idl qtwebkit/Source/WebCore/html/canvas/CanvasPattern.idl +qtwebkit/Source/WebCore/html/canvas/CanvasProxy.idl qtwebkit/Source/WebCore/html/canvas/CanvasRenderingContext.idl qtwebkit/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl +qtwebkit/Source/WebCore/html/canvas/DOMPath.idl +qtwebkit/Source/WebCore/html/canvas/EXTDrawBuffers.idl qtwebkit/Source/WebCore/html/canvas/EXTTextureFilterAnisotropic.idl qtwebkit/Source/WebCore/html/canvas/OESStandardDerivatives.idl qtwebkit/Source/WebCore/html/canvas/OESTextureFloat.idl +qtwebkit/Source/WebCore/html/canvas/OESTextureHalfFloat.idl qtwebkit/Source/WebCore/html/canvas/OESVertexArrayObject.idl qtwebkit/Source/WebCore/html/canvas/OESElementIndexUint.idl qtwebkit/Source/WebCore/html/canvas/WebGLActiveInfo.idl qtwebkit/Source/WebCore/html/canvas/WebGLBuffer.idl +qtwebkit/Source/WebCore/html/canvas/WebGLCompressedTextureATC.idl +qtwebkit/Source/WebCore/html/canvas/WebGLCompressedTexturePVRTC.idl qtwebkit/Source/WebCore/html/canvas/WebGLCompressedTextureS3TC.idl qtwebkit/Source/WebCore/html/canvas/WebGLContextAttributes.idl qtwebkit/Source/WebCore/html/canvas/WebGLContextEvent.idl @@ -330,16 +345,14 @@ qtwebkit/Source/WebCore/html/TimeRanges.idl qtwebkit/Source/WebCore/html/ValidityState.idl qtwebkit/Source/WebCore/html/VoidCallback.idl qtwebkit/Source/WebCore/html/shadow/HTMLContentElement.idl -qtwebkit/Source/WebCore/html/shadow/HTMLShadowElement.idl qtwebkit/Source/WebCore/inspector/InjectedScriptHost.idl qtwebkit/Source/WebCore/inspector/InspectorFrontendHost.idl qtwebkit/Source/WebCore/inspector/JavaScriptCallFrame.idl qtwebkit/Source/WebCore/inspector/ScriptProfile.idl qtwebkit/Source/WebCore/inspector/ScriptProfileNode.idl qtwebkit/Source/WebCore/loader/appcache/DOMApplicationCache.idl -qtwebkit/Source/WebCore/page/BarInfo.idl +qtwebkit/Source/WebCore/page/BarProp.idl qtwebkit/Source/WebCore/page/Console.idl -qtwebkit/Source/WebCore/page/Coordinates.idl qtwebkit/Source/WebCore/page/Crypto.idl qtwebkit/Source/WebCore/page/DOMSecurityPolicy.idl qtwebkit/Source/WebCore/page/DOMSelection.idl @@ -347,7 +360,6 @@ qtwebkit/Source/WebCore/page/DOMWindow.idl qtwebkit/Source/WebCore/page/EventSource.idl qtwebkit/Source/WebCore/page/History.idl qtwebkit/Source/WebCore/page/Location.idl -qtwebkit/Source/WebCore/page/MemoryInfo.idl qtwebkit/Source/WebCore/page/Navigator.idl qtwebkit/Source/WebCore/page/Performance.idl qtwebkit/Source/WebCore/page/PerformanceEntry.idl @@ -359,9 +371,9 @@ qtwebkit/Source/WebCore/page/Screen.idl qtwebkit/Source/WebCore/page/SpeechInputEvent.idl qtwebkit/Source/WebCore/page/SpeechInputResult.idl qtwebkit/Source/WebCore/page/SpeechInputResultList.idl -qtwebkit/Source/WebCore/page/WebKitAnimation.idl -qtwebkit/Source/WebCore/page/WebKitAnimationList.idl qtwebkit/Source/WebCore/page/WebKitPoint.idl +qtwebkit/Source/WebCore/page/WindowBase64.idl +qtwebkit/Source/WebCore/page/WindowTimers.idl qtwebkit/Source/WebCore/page/WorkerNavigator.idl qtwebkit/Source/WebCore/plugins/DOMPlugin.idl qtwebkit/Source/WebCore/plugins/DOMMimeType.idl @@ -372,12 +384,14 @@ qtwebkit/Source/WebCore/storage/StorageEvent.idl qtwebkit/Source/WebCore/testing/Internals.idl qtwebkit/Source/WebCore/testing/InternalSettings.idl qtwebkit/Source/WebCore/testing/MallocStatistics.idl +qtwebkit/Source/WebCore/testing/MemoryInfo.idl +qtwebkit/Source/WebCore/testing/TypeConversions.idl qtwebkit/Source/WebCore/workers/AbstractWorker.idl -qtwebkit/Source/WebCore/workers/DedicatedWorkerContext.idl +qtwebkit/Source/WebCore/workers/DedicatedWorkerGlobalScope.idl qtwebkit/Source/WebCore/workers/SharedWorker.idl -qtwebkit/Source/WebCore/workers/SharedWorkerContext.idl +qtwebkit/Source/WebCore/workers/SharedWorkerGlobalScope.idl qtwebkit/Source/WebCore/workers/Worker.idl -qtwebkit/Source/WebCore/workers/WorkerContext.idl +qtwebkit/Source/WebCore/workers/WorkerGlobalScope.idl qtwebkit/Source/WebCore/workers/WorkerLocation.idl qtwebkit/Source/WebCore/xml/DOMParser.idl qtwebkit/Source/WebCore/xml/XMLHttpRequest.idl @@ -426,6 +440,7 @@ qtwebkit/Source/WebCore/svg/SVGElementInstance.idl qtwebkit/Source/WebCore/svg/SVGElementInstanceList.idl qtwebkit/Source/WebCore/svg/SVGEllipseElement.idl qtwebkit/Source/WebCore/svg/SVGException.idl +qtwebkit/Source/WebCore/svg/SVGExternalResourcesRequired.idl qtwebkit/Source/WebCore/svg/SVGFEBlendElement.idl qtwebkit/Source/WebCore/svg/SVGFEColorMatrixElement.idl qtwebkit/Source/WebCore/svg/SVGFEComponentTransferElement.idl @@ -452,6 +467,8 @@ qtwebkit/Source/WebCore/svg/SVGFESpotLightElement.idl qtwebkit/Source/WebCore/svg/SVGFETileElement.idl qtwebkit/Source/WebCore/svg/SVGFETurbulenceElement.idl qtwebkit/Source/WebCore/svg/SVGFilterElement.idl +qtwebkit/Source/WebCore/svg/SVGFilterPrimitiveStandardAttributes.idl +qtwebkit/Source/WebCore/svg/SVGFitToViewBox.idl qtwebkit/Source/WebCore/svg/SVGFontElement.idl qtwebkit/Source/WebCore/svg/SVGFontFaceElement.idl qtwebkit/Source/WebCore/svg/SVGFontFaceFormatElement.idl @@ -463,6 +480,7 @@ qtwebkit/Source/WebCore/svg/SVGGElement.idl qtwebkit/Source/WebCore/svg/SVGGlyphElement.idl qtwebkit/Source/WebCore/svg/SVGGlyphRefElement.idl qtwebkit/Source/WebCore/svg/SVGGradientElement.idl +qtwebkit/Source/WebCore/svg/SVGGraphicsElement.idl qtwebkit/Source/WebCore/svg/SVGHKernElement.idl qtwebkit/Source/WebCore/svg/SVGImageElement.idl qtwebkit/Source/WebCore/svg/SVGLength.idl @@ -515,9 +533,11 @@ qtwebkit/Source/WebCore/svg/SVGSetElement.idl qtwebkit/Source/WebCore/svg/SVGStopElement.idl qtwebkit/Source/WebCore/svg/SVGStringList.idl qtwebkit/Source/WebCore/svg/SVGStyleElement.idl +qtwebkit/Source/WebCore/svg/SVGStyledElement.idl qtwebkit/Source/WebCore/svg/SVGSVGElement.idl qtwebkit/Source/WebCore/svg/SVGSwitchElement.idl qtwebkit/Source/WebCore/svg/SVGSymbolElement.idl +qtwebkit/Source/WebCore/svg/SVGTests.idl qtwebkit/Source/WebCore/svg/SVGTextContentElement.idl qtwebkit/Source/WebCore/svg/SVGTextElement.idl qtwebkit/Source/WebCore/svg/SVGTextPathElement.idl @@ -527,6 +547,7 @@ qtwebkit/Source/WebCore/svg/SVGTransform.idl qtwebkit/Source/WebCore/svg/SVGTransformList.idl qtwebkit/Source/WebCore/svg/SVGTRefElement.idl qtwebkit/Source/WebCore/svg/SVGTSpanElement.idl +qtwebkit/Source/WebCore/svg/SVGURIReference.idl qtwebkit/Source/WebCore/svg/SVGUnitTypes.idl qtwebkit/Source/WebCore/svg/SVGUseElement.idl qtwebkit/Source/WebCore/svg/SVGViewElement.idl @@ -534,3 +555,13 @@ qtwebkit/Source/WebCore/svg/SVGVKernElement.idl qtwebkit/Source/WebCore/svg/SVGViewSpec.idl qtwebkit/Source/WebCore/svg/SVGZoomAndPan.idl qtwebkit/Source/WebCore/svg/SVGZoomEvent.idl +qtwebkit/Source/WebCore/html/track/AudioTrack.idl +qtwebkit/Source/WebCore/html/track/AudioTrackList.idl +qtwebkit/Source/WebCore/html/track/TextTrack.idl +qtwebkit/Source/WebCore/html/track/TextTrackCue.idl +qtwebkit/Source/WebCore/html/track/TextTrackCueList.idl +qtwebkit/Source/WebCore/html/track/TextTrackList.idl +qtwebkit/Source/WebCore/html/track/TrackEvent.idl +qtwebkit/Source/WebCore/html/track/VideoTrack.idl +qtwebkit/Source/WebCore/html/track/VideoTrackList.idl +generated/InternalSettingsGenerated.idl 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 df14637a7..3eabbb566 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 @@ -1,5 +1,7 @@ #!/bin/bash +LANG=C + function extract_defines() { sed -e '/DEFINES =/!d' \ @@ -13,7 +15,7 @@ function extract_incpath() sed -e '/INCPATH =/!d' \ -e 's/INCPATH = //' \ -e 's/ / \\\n/g' \ - Makefile | sort -u > incpath.inc.tmp + Makefile > incpath.inc.tmp echo -e "QT_INCPATH += \\" > 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 0d84de5d8..769cb0bb6 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,23 +1,24 @@ #!/bin/sh +QT_VERSION=5.6.2 + ./genode_qt5_configure +qtbase/bin/qmake -r ../qt-everywhere-opensource-src-${QT_VERSION} + # qtbase cd qtbase/src/corelib && ../../../create_generated_inc qt5_core && cp qt5_core_generated.inc ../../.. && cd ../../.. cd qtbase/src/gui && ../../../create_generated_inc qt5_gui && cp qt5_gui_generated.inc ../../.. && cd ../../.. cd qtbase/src/network && ../../../create_generated_inc qt5_network && cp qt5_network_generated.inc ../../.. && cd ../../.. +cd qtbase/src/opengl && ../../../create_generated_inc qt5_opengl && cp qt5_opengl_generated.inc ../../.. && cd ../../.. cd qtbase/src/printsupport && ../../../create_generated_inc qt5_printsupport && cp qt5_printsupport_generated.inc ../../.. && cd ../../.. cd qtbase/src/sql && ../../../create_generated_inc qt5_sql && cp qt5_sql_generated.inc ../../.. && cd ../../.. cd qtbase/src/widgets && ../../../create_generated_inc qt5_widgets && cp qt5_widgets_generated.inc ../../.. && cd ../../.. cd qtbase/src/xml && ../../../create_generated_inc qt5_xml && cp qt5_xml_generated.inc ../../.. && cd ../../.. -cd qtscript/src/script && ../../../create_generated_inc qt5_script && cp qt5_script_generated.inc ../../.. && cd ../../.. - cd qttools/src/designer/src/uitools && ../../../../../create_generated_inc qt5_ui_tools && cp qt5_ui_tools_generated.inc ../../../../.. && cd ../../../../.. -cd qtjsbackend/src/v8 && ../../../create_generated_inc qt5_v8 && cp qt5_v8_generated.inc ../../.. && cd ../../.. - cd qtdeclarative/src/qml && ../../../create_generated_inc qt5_qml && cp qt5_qml_generated.inc ../../.. && cd ../../.. cd qtdeclarative/src/quick && ../../../create_generated_inc qt5_quick && cp qt5_quick_generated.inc ../../.. && cd ../../.. cd qtdeclarative/src/imports/qtquick2 && ../../../../create_generated_inc qt5_qtquick2plugin && cp qt5_qtquick2plugin_generated.inc ../../../.. && cd ../../../.. @@ -27,25 +28,24 @@ cd qtdeclarative/src/imports/qtquick2 && ../../../../create_generated_inc make -C qtbase/src/tools/bootstrap make -C qtbase/src/tools/moc -make -C qtwebkit/Source/JavaScriptCore -f Makefile.JavaScriptCore sub-DerivedSources-pri +make -C qtwebkit/Source/JavaScriptCore -f Makefile.JavaScriptCore sub-DerivedSources-pri > JavaScriptCore.log cd qtwebkit/Source/JavaScriptCore -../../../qtbase/bin/qmake ../../../../qt-everywhere-opensource-src-5.1.0/qtwebkit/Source/JavaScriptCore/Target.pri -o Makefile +../../../qtbase/bin/qmake ../../../../qt-everywhere-opensource-src-${QT_VERSION}/qtwebkit/Source/JavaScriptCore/Target.pri -o Makefile ../../../create_generated_inc qt5_jscore && cp qt5_jscore_generated.inc ../../.. && cd ../../.. - cd qtwebkit/Source/WTF -ln -sf Makefile.WTF Makefile && ../../../create_generated_inc qt5_wtf && cp qt5_wtf_generated.inc ../../.. && cd ../../.. +ln -sf Makefile.WTF Makefile && ../../../create_generated_inc qt5_wtf && cp qt5_wtf_generated.inc ../../.. && cd ../../.. -make -C qtwebkit/Source/WebCore -f Makefile.WebCore sub-DerivedSources-pri +make -C qtwebkit/Source/ThirdParty/ANGLE -f Makefile.ANGLE sub-DerivedSources-pri > ANGLE.log +cd qtwebkit/Source/ThirdParty/ANGLE +../../../../qtbase/bin/qmake ../../../../../qt-everywhere-opensource-src-${QT_VERSION}/qtwebkit/Source/ThirdParty/ANGLE/Target.pri -o Makefile + ../../../../create_generated_inc qt5_angle && cp qt5_angle_generated.inc ../../../.. && cd ../../../.. + +make -C qtwebkit/Source/WebCore -f Makefile.WebCore sub-DerivedSources-pri > WebCore.log cd qtwebkit/Source/WebCore -../../../qtbase/bin/qmake ../../../../qt-everywhere-opensource-src-5.1.0/qtwebkit/Source/WebCore/Target.pri -o Makefile +../../../qtbase/bin/qmake ../../../../qt-everywhere-opensource-src-${QT_VERSION}/qtwebkit/Source/WebCore/Target.pri -o Makefile ../../../create_generated_inc qt5_webcore && cp qt5_webcore_generated.inc ../../.. && cd ../../.. cd qtwebkit/Source/WebKit -ln -sf Makefile.WebKit1 Makefile && ../../../create_generated_inc qt5_webkit && cp qt5_webkit_generated.inc ../../.. && cd ../../.. +ln -sf Makefile.WebKit1 Makefile && ../../../create_generated_inc qt5_webkit && cp qt5_webkit_generated.inc ../../.. && cd ../../.. cd qtwebkit/Source -ln -sf Makefile.widgetsapi Makefile && ../../create_generated_inc qt5_webkitwidgets && cp qt5_webkitwidgets_generated.inc ../.. && cd ../.. - -#make -C qtwebkit/Source/WebKit2 -f Makefile.WebKit2 sub-DerivedSources-pri -#cd qtwebkit/Source/WebKit2 -#../../../qtbase/bin/qmake ../../../../qt-everywhere-opensource-src-5.1.0/qtwebkit/Source/WebKit2/Target.pri -o Makefile -# ../../../create_generated_inc qt5_webkit && cp qt5_webkit_generated.inc ../../.. && cd ../../.. +ln -sf Makefile.widgetsapi Makefile && ../../create_generated_inc qt5_webkitwidgets && cp qt5_webkitwidgets_generated.inc ../.. && cd ../.. diff --git a/repos/libports/src/lib/qt5/tools/lib_mk_file_generator/genode_qt5_configure b/repos/libports/src/lib/qt5/tools/lib_mk_file_generator/genode_qt5_configure index 1a9f6e10a..cff4bb148 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,6 +1,6 @@ #!/bin/sh -../qt-everywhere-opensource-src-5.1.0/configure \ +../qt-everywhere-opensource-src-5.6.2/configure \ -opensource \ -confirm-license \ -qconfig genode \ @@ -8,31 +8,24 @@ -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-nis \ -no-pkg-config \ -no-xcb \ - -no-sse \ - -no-sse2 \ -no-sse3 \ -no-ssse3 \ -no-sse4.1 \ -no-sse4.2 \ -no-avx \ - -no-neon \ + -qt-pcre \ + -system-libjpeg \ + -system-libpng \ -make tools \ - -nomake examples \ - -nomake demos \ - -# -# notes -# -# - '-no-opengl' would prevent the generation of qtwebkit Makefiles -# -# + -nomake examples diff --git a/repos/ports/ports/arora.hash b/repos/ports/ports/arora.hash index 34ce940c0..46aa93476 100644 --- a/repos/ports/ports/arora.hash +++ b/repos/ports/ports/arora.hash @@ -1 +1 @@ -8537dffb154dacd9efbcfdd99464866a8e4ef0ef +47da99c7ec2062eab675ad7deef5b626eed9e984 diff --git a/repos/ports/run/arora.run b/repos/ports/run/arora.run index e3cff5438..06126bf75 100644 --- a/repos/ports/run/arora.run +++ b/repos/ports/run/arora.run @@ -10,6 +10,7 @@ append build_components [qt5_build_components feature] append build_components { server/clipboard server/loader server/tar_rom server/nit_fb app/launchpad test/nitpicker + lib/vfs/jitterentropy app/arora } @@ -88,7 +89,10 @@ append config { - + + + + @@ -124,6 +128,7 @@ append boot_modules { freetype.lib.so libc_pipe.lib.so stdcxx.lib.so + vfs_jitterentropy.lib.so nitpicker_plugin.tar } @@ -133,11 +138,14 @@ append boot_modules { append boot_modules { gallium.lib.so icu.lib.so + pcre16.lib.so pthread.lib.so + qt5_angle.lib.so qt5_core.lib.so qt5_gui.lib.so qt5_jscore.lib.so qt5_network.lib.so + qt5_opengl.lib.so qt5_qnitpickerviewwidget.lib.so qt5_qpluginwidget.lib.so qt5_ui_tools.lib.so diff --git a/repos/ports/src/app/arora/patches/arora_qt5_cpp.patch b/repos/ports/src/app/arora/patches/arora_qt5_cpp.patch index e4b4bb13b..4f2b80d1f 100644 --- a/repos/ports/src/app/arora/patches/arora_qt5_cpp.patch +++ b/repos/ports/src/app/arora/patches/arora_qt5_cpp.patch @@ -19,8 +19,9 @@ From: Christian Prochaska src/modelmenu.cpp | 5 ++ src/modeltoolbar.cpp | 3 + src/network/cookiejar/cookieexceptionsmodel.cpp | 5 ++ - src/network/cookiejar/cookiejar.cpp | 2 + + src/network/cookiejar/cookiejar.cpp | 3 + src/network/cookiejar/cookiemodel.cpp | 5 ++ + .../networkcookiejar/networkcookiejar.cpp | 2 + .../cookiejar/networkcookiejar/networkcookiejar.h | 2 + .../networkcookiejar/networkcookiejar_p.h | 2 + src/network/networkaccessmanager.cpp | 16 +++++++ @@ -35,7 +36,7 @@ From: Christian Prochaska src/webview.cpp | 14 ++++-- tools/cacheinfo/main.cpp | 5 ++ tools/htmlToXBel/main.cpp | 5 ++ - 31 files changed, 222 insertions(+), 14 deletions(-) + 32 files changed, 225 insertions(+), 14 deletions(-) diff --git a/src/aboutdialog.cpp b/src/aboutdialog.cpp index 42e1c81..ce70df2 100644 @@ -523,13 +524,14 @@ index 6e45d2a..93abbca 100644 } diff --git a/src/network/cookiejar/cookiejar.cpp b/src/network/cookiejar/cookiejar.cpp -index 532600a..97b6b36 100644 +index 532600a..f95dfb2 100644 --- a/src/network/cookiejar/cookiejar.cpp +++ b/src/network/cookiejar/cookiejar.cpp -@@ -71,6 +71,8 @@ +@@ -71,6 +71,9 @@ #include #include ++#include +#include + #include @@ -550,6 +552,19 @@ index 391e2cc..318af47 100644 reset(); +#endif } +diff --git a/src/network/cookiejar/networkcookiejar/networkcookiejar.cpp b/src/network/cookiejar/networkcookiejar/networkcookiejar.cpp +index 940269d..e542d79 100644 +--- a/src/network/cookiejar/networkcookiejar/networkcookiejar.cpp ++++ b/src/network/cookiejar/networkcookiejar/networkcookiejar.cpp +@@ -47,6 +47,8 @@ + #include + #endif + ++#include ++ + #include + #include + diff --git a/src/network/cookiejar/networkcookiejar/networkcookiejar.h b/src/network/cookiejar/networkcookiejar/networkcookiejar.h index 365b4a3..52d9c6e 100644 --- a/src/network/cookiejar/networkcookiejar/networkcookiejar.h