diff --git a/libports/lib/import/import-qt5.inc b/libports/lib/import/import-qt5.inc
index c36393c52..771248fba 100644
--- a/libports/lib/import/import-qt5.inc
+++ b/libports/lib/import/import-qt5.inc
@@ -18,6 +18,7 @@ include $(QT5_REP_DIR)/lib/mk/qt5_version.inc
QT5_INC_DIR := $(QT5_REP_DIR)/src/lib/qt5/qtbase/mkspecs/genode-g++ \
$(QT5_REP_DIR)/src/lib/qt5/qtbase/src/corelib/global \
$(QT5_REP_DIR)/include/qt5 \
+ $(QT5_REP_DIR)/include/qt5/qtbase \
$(QT5_REP_DIR)/contrib/$(QT5)/qtbase/include \
INC_DIR += $(QT5_INC_DIR)
diff --git a/libports/lib/mk/qt5.inc b/libports/lib/mk/qt5.inc
index a0cc2fd78..c9f604b18 100644
--- a/libports/lib/mk/qt5.inc
+++ b/libports/lib/mk/qt5.inc
@@ -11,11 +11,11 @@ $(SRC_CC:.cpp=.o): $(COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTERED)
COMPILER_MOC_SOURCE_MAKE_ALL_FILES_FILTERED = $(filter-out $(COMPILER_MOC_SOURCE_MAKE_ALL_FILES_FILTER_OUT), $(COMPILER_MOC_SOURCE_MAKE_ALL_FILES))
$(SRC_CC:.cpp=.o): $(COMPILER_MOC_SOURCE_MAKE_ALL_FILES_FILTERED)
-INC_DIR += $(REP_DIR)/src/lib/qt5/qtbase/mkspecs/qws/genode-generic-g++ \
- $(REP_DIR)/src/lib/qt5/qtbase/src/corelib/global
+QT5_INC_DIR += $(REP_DIR)/src/lib/qt5/qtbase/mkspecs/qws/genode-generic-g++ \
+ $(REP_DIR)/src/lib/qt5/qtbase/src/corelib/global
-INC_DIR += $(addprefix $(REP_DIR)/src/lib/qt5/, $(QT_INCPATH))
-INC_DIR += $(addprefix $(REP_DIR)/contrib/$(QT5)/, $(QT_INCPATH))
+QT5_INC_DIR += $(addprefix $(REP_DIR)/src/lib/qt5/, $(QT_INCPATH))
+QT5_INC_DIR += $(addprefix $(REP_DIR)/contrib/$(QT5)/, $(QT_INCPATH))
vpath % $(addprefix $(REP_DIR)/src/lib/qt5/, $(QT_VPATH))
vpath % $(addprefix $(REP_DIR)/contrib/$(QT5)/, $(QT_VPATH))
diff --git a/libports/lib/mk/qt5_gui.mk b/libports/lib/mk/qt5_gui.mk
index 50ab38c39..43cf6ed27 100644
--- a/libports/lib/mk/qt5_gui.mk
+++ b/libports/lib/mk/qt5_gui.mk
@@ -38,4 +38,4 @@ INC_DIR += $(REP_DIR)/include/qt5/qtbase/QtGui/private \
$(REP_DIR)/contrib/$(QT5)/qtbase/include/QtCore/$(QT_VERSION) \
$(REP_DIR)/contrib/$(QT5)/qtbase/include/QtCore/$(QT_VERSION)/QtCore
-LIBS += qt5_core jpeg zlib libpng
+LIBS += qt5_core jpeg zlib libpng gallium
diff --git a/libports/lib/mk/qt5_gui_generated.inc b/libports/lib/mk/qt5_gui_generated.inc
index e19505259..1970f7288 100644
--- a/libports/lib/mk/qt5_gui_generated.inc
+++ b/libports/lib/mk/qt5_gui_generated.inc
@@ -63,6 +63,8 @@ QT_SOURCES += \
qplatformservices.cpp \
qplatformscreenpageflipper.cpp \
qplatformsystemtrayicon_qpa.cpp \
+ qplatformopenglcontext.cpp \
+ qopenglcontext.cpp \
qbitmap.cpp \
qimage.cpp \
qimageiohandler.cpp \
@@ -170,6 +172,48 @@ QT_SOURCES += \
qvector2d.cpp \
qvector3d.cpp \
qvector4d.cpp \
+ qopengl.cpp \
+ qopenglfunctions.cpp \
+ qopenglframebufferobject.cpp \
+ qopenglpaintdevice.cpp \
+ qopenglbuffer.cpp \
+ qopenglshaderprogram.cpp \
+ qopenglgradientcache.cpp \
+ qopengltexturecache.cpp \
+ qopenglengineshadermanager.cpp \
+ qopengl2pexvertexarray.cpp \
+ qopenglpaintengine.cpp \
+ qopenglcustomshaderstage.cpp \
+ qtriangulatingstroker.cpp \
+ qopengltextureglyphcache.cpp \
+ qtriangulator.cpp \
+ qopenglversionfunctions.cpp \
+ qopenglversionfunctionsfactory.cpp \
+ qopenglvertexarrayobject.cpp \
+ qopengldebug.cpp \
+ qopenglfunctions_1_0.cpp \
+ qopenglfunctions_1_1.cpp \
+ qopenglfunctions_1_2.cpp \
+ qopenglfunctions_1_3.cpp \
+ qopenglfunctions_1_4.cpp \
+ qopenglfunctions_1_5.cpp \
+ qopenglfunctions_2_0.cpp \
+ qopenglfunctions_2_1.cpp \
+ qopenglfunctions_3_0.cpp \
+ qopenglfunctions_3_1.cpp \
+ qopenglfunctions_3_2_core.cpp \
+ qopenglfunctions_3_3_core.cpp \
+ qopenglfunctions_4_0_core.cpp \
+ qopenglfunctions_4_1_core.cpp \
+ qopenglfunctions_4_2_core.cpp \
+ qopenglfunctions_4_3_core.cpp \
+ qopenglfunctions_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 \
+ qopengltimerquery.cpp \
qguivariantanimation.cpp \
qstandarditemmodel.cpp \
moc_qgenericplugin.cpp \
@@ -192,6 +236,7 @@ QT_SOURCES += \
moc_qplatformsharedgraphicscache.cpp \
moc_qplatformdialoghelper.cpp \
moc_qplatformscreenpageflipper.cpp \
+ moc_qopenglcontext.cpp \
moc_qimageiohandler.cpp \
moc_qpictureformatplugin.cpp \
moc_qiconengineplugin.cpp \
@@ -207,7 +252,10 @@ QT_SOURCES += \
moc_qbrush.cpp \
moc_qpainter.cpp \
moc_qpdfwriter.cpp \
- moc_qvalidator.cpp
+ moc_qvalidator.cpp \
+ moc_qopenglshaderprogram.cpp \
+ moc_qopenglengineshadermanager_p.cpp \
+ moc_qopengltimerquery.cpp
QT_VPATH += \
qtbase/src/gui/animation \
@@ -215,6 +263,7 @@ QT_VPATH += \
qtbase/src/gui/itemmodels \
qtbase/src/gui/kernel \
qtbase/src/gui/math3d \
+ qtbase/src/gui/opengl \
qtbase/src/gui/painting \
qtbase/src/gui/text \
qtbase/src/gui/util \
@@ -250,6 +299,7 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
moc_qplatformdialoghelper.cpp \
moc_qplatformscreenpageflipper.cpp \
moc_qplatformsystemtrayicon.cpp \
+ moc_qopenglcontext.cpp \
moc_qimageiohandler.cpp \
moc_qmovie.cpp \
moc_qpictureformatplugin.cpp \
@@ -270,6 +320,11 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
moc_qpainter.cpp \
moc_qpdfwriter.cpp \
moc_qvalidator.cpp \
+ moc_qopenglshaderprogram.cpp \
+ moc_qopenglengineshadermanager_p.cpp \
+ moc_qopenglvertexarrayobject.cpp \
+ moc_qopengldebug.cpp \
+ moc_qopengltimerquery.cpp \
moc_qstandarditemmodel.cpp
# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc)
diff --git a/libports/lib/mk/qt5_jscore_generated.inc b/libports/lib/mk/qt5_jscore_generated.inc
index 103930c04..d43116bce 100644
--- a/libports/lib/mk/qt5_jscore_generated.inc
+++ b/libports/lib/mk/qt5_jscore_generated.inc
@@ -1,4 +1,4 @@
-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_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_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_INCPATH += \
qtbase/include \
diff --git a/libports/lib/mk/qt5_qpa_nitpicker.mk b/libports/lib/mk/qt5_qpa_nitpicker.mk
index fab439a69..5f51bcb09 100644
--- a/libports/lib/mk/qt5_qpa_nitpicker.mk
+++ b/libports/lib/mk/qt5_qpa_nitpicker.mk
@@ -6,9 +6,11 @@ QT_DEFINES += -DQT_BUILD_GUI_LIB
SRC_CC = qgenericunixeventdispatcher.cpp \
qunixeventdispatcher.cpp \
qbasicfontdatabase.cpp \
- qfontengine_ft.cpp
+ qfontengine_ft.cpp \
+ qeglconvenience.cpp
SRC_CC += main.cpp \
+ qnitpickerglcontext.cpp \
qnitpickerintegration.cpp \
qnitpickerwindowsurface.cpp \
moc_qnitpickerplatformwindow.cpp \
@@ -23,16 +25,18 @@ INC_DIR += $(REP_DIR)/contrib/$(QT5)/qtbase/src/platformsupport/eventdispatchers
$(REP_DIR)/contrib/$(QT5)/qtbase/src/platformsupport/fontdatabases/basic \
$(REP_DIR)/contrib/$(QT5)/qtbase/src/3rdparty/harfbuzz/src \
$(REP_DIR)/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker \
+ $(REP_DIR)/contrib/$(QT5)/qtbase/include/QtPlatformSupport/$(QT_VERSION) \
$(REP_DIR)/contrib/$(QT5)/qtbase/include/QtGui/$(QT_VERSION) \
$(REP_DIR)/contrib/$(QT5)/qtbase/include/QtGui/$(QT_VERSION)/QtGui \
$(REP_DIR)/contrib/$(QT5)/qtbase/include/QtCore/$(QT_VERSION) \
$(REP_DIR)/contrib/$(QT5)/qtbase/include/QtCore/$(QT_VERSION)/QtCore
-
-LIBS += qt5_xml qt5_gui qt5_core libm freetype
+
+LIBS += qt5_xml qt5_gui qt5_core libm freetype gallium
vpath % $(call select_from_repositories,contrib/$(QT5)/qtbase/src/platformsupport/eventdispatchers)
vpath % $(call select_from_repositories,contrib/$(QT5)/qtbase/src/platformsupport/input/evdevkeyboard)
vpath % $(call select_from_repositories,contrib/$(QT5)/qtbase/src/platformsupport/fontdatabases/basic)
+vpath % $(call select_from_repositories,contrib/$(QT5)/qtbase/src/platformsupport/eglconvenience)
vpath % $(call select_from_repositories,contrib/$(QT5)/qtbase/src/gui/text)
vpath % $(call select_from_repositories,src/lib/qt5/qtbase/src/plugins/platforms/nitpicker)
diff --git a/libports/lib/mk/qt5_webcore_generated.inc b/libports/lib/mk/qt5_webcore_generated.inc
index 834caa794..4ac591322 100644
--- a/libports/lib/mk/qt5_webcore_generated.inc
+++ b/libports/lib/mk/qt5_webcore_generated.inc
@@ -1,4 +1,4 @@
-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_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_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_INCPATH += \
qtbase/include \
diff --git a/libports/lib/mk/qt5_webkit_generated.inc b/libports/lib/mk/qt5_webkit_generated.inc
index 3b2dde73e..f030a0d37 100644
--- a/libports/lib/mk/qt5_webkit_generated.inc
+++ b/libports/lib/mk/qt5_webkit_generated.inc
@@ -1,4 +1,4 @@
-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_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_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_INCPATH += \
qtbase/include \
diff --git a/libports/lib/mk/qt5_webkitwidgets_generated.inc b/libports/lib/mk/qt5_webkitwidgets_generated.inc
index a8615a6ca..ce53a1664 100644
--- a/libports/lib/mk/qt5_webkitwidgets_generated.inc
+++ b/libports/lib/mk/qt5_webkitwidgets_generated.inc
@@ -1,4 +1,4 @@
-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_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_PRINTSUPPORT_LIB -DQT_WEBKIT_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_NETWORK_LIB -DQT_GUI_LIB -DQT_CORE_LIB
+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_INCPATH += \
qtbase/include \
@@ -15,6 +15,9 @@ QT_INCPATH += \
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 \
diff --git a/libports/lib/mk/qt5_wtf_generated.inc b/libports/lib/mk/qt5_wtf_generated.inc
index e2c699937..1b8e03007 100644
--- a/libports/lib/mk/qt5_wtf_generated.inc
+++ b/libports/lib/mk/qt5_wtf_generated.inc
@@ -1,4 +1,4 @@
-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_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_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_INCPATH += \
qtbase/include \
diff --git a/libports/run/qt5.run b/libports/run/qt5.run
index a8908afdc..ceb874eec 100644
--- a/libports/run/qt5.run
+++ b/libports/run/qt5.run
@@ -99,6 +99,7 @@ set boot_modules {
liquid_fb
qt_launchpad
freetype.lib.so
+ gallium.lib.so
icu.lib.so
ld.lib.so
libc.lib.so
diff --git a/libports/run/qt5_avplay.run b/libports/run/qt5_avplay.run
index d9e42d143..3c4b70868 100644
--- a/libports/run/qt5_avplay.run
+++ b/libports/run/qt5_avplay.run
@@ -116,6 +116,7 @@ set boot_modules {
liquid_fb
qt_avplay
freetype.lib.so
+ gallium.lib.so
icu.lib.so
ld.lib.so
libc.lib.so
diff --git a/libports/run/qt5_calculatorform.run b/libports/run/qt5_calculatorform.run
index 174ac6808..75c9fd7c8 100644
--- a/libports/run/qt5_calculatorform.run
+++ b/libports/run/qt5_calculatorform.run
@@ -96,6 +96,7 @@ set boot_modules {
liquid_fb
calculatorform
freetype.lib.so
+ gallium.lib.so
icu.lib.so
ld.lib.so
libc.lib.so
diff --git a/libports/run/qt5_openglwindow.run b/libports/run/qt5_openglwindow.run
new file mode 100644
index 000000000..811348a57
--- /dev/null
+++ b/libports/run/qt5_openglwindow.run
@@ -0,0 +1,128 @@
+#
+# Build
+#
+
+build {
+ core
+ init
+ drivers/input/ps2
+ drivers/pci
+ drivers/framebuffer
+ drivers/timer
+ server/nitpicker
+ server/liquid_framebuffer
+ app/qt5/examples/openglwindow
+}
+
+create_boot_directory
+
+#
+# Generate config
+#
+
+set config {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ }
+
+append_if [have_spec sdl] config {
+
+
+
+
+
+
+ }
+
+append_if [have_spec pci] config {
+
+
+
+ }
+
+append_if [have_spec framebuffer] config {
+
+
+
+ }
+
+append_if [have_spec ps2] config {
+
+
+
+ }
+
+append config {
+
+
+
+
+
+
+
+
+
+
+
+
+}
+
+install_config $config
+
+#
+# Boot modules
+#
+
+# generic modules
+set boot_modules {
+ core
+ init
+ timer
+ nitpicker
+ liquid_fb
+ openglwindow
+ freetype.lib.so
+ gallium.lib.so
+ icu.lib.so
+ ld.lib.so
+ libc.lib.so
+ libc_log.lib.so
+ libc_lock_pipe.lib.so
+ libm.lib.so
+ libpng.lib.so
+ jpeg.lib.so
+ pthread.lib.so
+ qt5_core.lib.so
+ qt5_dejavusans.lib.so
+ qt5_gui.lib.so
+ qt5_widgets.lib.so
+ qt5_xml.lib.so
+ zlib.lib.so
+ stdcxx.lib.so
+}
+
+# platform-specific modules
+lappend_if [have_spec linux] boot_modules fb_sdl
+lappend_if [have_spec pci] boot_modules pci_drv
+lappend_if [have_spec framebuffer] boot_modules fb_drv
+lappend_if [have_spec ps2] boot_modules ps2_drv
+
+build_boot_image $boot_modules
+
+append qemu_args " -m 256"
+
+run_genode_until forever
diff --git a/libports/run/qt5_previewer.run b/libports/run/qt5_previewer.run
index b363748aa..da63acb6a 100644
--- a/libports/run/qt5_previewer.run
+++ b/libports/run/qt5_previewer.run
@@ -96,6 +96,7 @@ set boot_modules {
liquid_fb
previewer
freetype.lib.so
+ gallium.lib.so
icu.lib.so
ld.lib.so
libc.lib.so
diff --git a/libports/run/qt5_qpluginwidget.run b/libports/run/qt5_qpluginwidget.run
index bcf112c2b..ae7d6c5f5 100644
--- a/libports/run/qt5_qpluginwidget.run
+++ b/libports/run/qt5_qpluginwidget.run
@@ -108,6 +108,7 @@ set boot_modules {
testnit
test-qpluginwidget
freetype.lib.so
+ gallium.lib.so
icu.lib.so
ld.lib.so
libc.lib.so
diff --git a/libports/run/qt5_tetrix.run b/libports/run/qt5_tetrix.run
index 216e1fe5c..de76a33d5 100644
--- a/libports/run/qt5_tetrix.run
+++ b/libports/run/qt5_tetrix.run
@@ -10,7 +10,6 @@ build {
drivers/framebuffer
drivers/timer
server/nitpicker
- server/nit_fb
server/liquid_framebuffer
app/qt5/examples/tetrix
}
@@ -94,10 +93,10 @@ set boot_modules {
init
timer
nitpicker
- nit_fb
liquid_fb
tetrix
freetype.lib.so
+ gallium.lib.so
icu.lib.so
ld.lib.so
libc.lib.so
diff --git a/libports/run/qt5_textedit.run b/libports/run/qt5_textedit.run
index 2f4a9cc28..6ba1a8a88 100644
--- a/libports/run/qt5_textedit.run
+++ b/libports/run/qt5_textedit.run
@@ -160,6 +160,7 @@ set boot_modules {
liquid_fb
textedit
freetype.lib.so
+ gallium.lib.so
icu.lib.so
ld.lib.so
libc.lib.so
diff --git a/libports/src/app/qt5/examples/openglwindow/target.mk b/libports/src/app/qt5/examples/openglwindow/target.mk
new file mode 100644
index 000000000..dfbc9cd09
--- /dev/null
+++ b/libports/src/app/qt5/examples/openglwindow/target.mk
@@ -0,0 +1,14 @@
+# identify the Qt5 repository by searching for a file that is unique for Qt5
+QT5_REP_DIR := $(call select_from_repositories,lib/import/import-qt5.inc)
+QT5_REP_DIR := $(realpath $(dir $(QT5_REP_DIR))../..)
+
+include $(QT5_REP_DIR)/lib/mk/qt5_version.inc
+
+QMAKE_PROJECT_PATH = $(realpath $(QT5_REP_DIR)/contrib/$(QT5)/qtbase/examples/gui/openglwindow)
+QMAKE_PROJECT_FILE = $(QMAKE_PROJECT_PATH)/openglwindow.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
diff --git a/libports/src/lib/qt5/patches/qt5_openglwindow_example.patch b/libports/src/lib/qt5/patches/qt5_openglwindow_example.patch
new file mode 100644
index 000000000..9c8a0faf2
--- /dev/null
+++ b/libports/src/lib/qt5/patches/qt5_openglwindow_example.patch
@@ -0,0 +1,28 @@
+qt5_openglwindow_example.patch
+
+From: Christian Prochaska
+
+
+---
+ qtbase/examples/gui/openglwindow/openglwindow.pro | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/qtbase/examples/gui/openglwindow/openglwindow.pro b/qtbase/examples/gui/openglwindow/openglwindow.pro
+index 93f18f3..ffff275 100644
+--- a/qtbase/examples/gui/openglwindow/openglwindow.pro
++++ b/qtbase/examples/gui/openglwindow/openglwindow.pro
+@@ -1,7 +1,11 @@
+-include(openglwindow.pri)
++#include(openglwindow.pri)
+
+ SOURCES += \
+- main.cpp
++ main.cpp \
++ openglwindow.cpp
+
+-target.path = $$[QT_INSTALL_EXAMPLES]/gui/openglwindow
++HEADERS += \
++ openglwindow.h
++
++#target.path = $$[QT_INSTALL_EXAMPLES]/gui/openglwindow
+ INSTALLS += target
diff --git a/libports/src/lib/qt5/patches/series b/libports/src/lib/qt5/patches/series
index e7343d11f..9f4c00f48 100644
--- a/libports/src/lib/qt5/patches/series
+++ b/libports/src/lib/qt5/patches/series
@@ -11,4 +11,5 @@ qt5_qtscript.patch
qt5_qtnetwork.patch
qt5_qtwebkit.patch
qt5_textedit_example.patch
+qt5_openglwindow_example.patch
qt5_tools.patch
diff --git a/libports/src/lib/qt5/qtbase/src/corelib/global/qconfig.h b/libports/src/lib/qt5/qtbase/src/corelib/global/qconfig.h
index f9361ac94..bcf7dc116 100644
--- a/libports/src/lib/qt5/qtbase/src/corelib/global/qconfig.h
+++ b/libports/src/lib/qt5/qtbase/src/corelib/global/qconfig.h
@@ -55,12 +55,6 @@
# define QT_NO_DBUS
#endif
-#if defined(QT_NO_EGL) && defined(QT_EGL)
-# undef QT_NO_EGL
-#elif !defined(QT_NO_EGL) && !defined(QT_EGL)
-# define QT_NO_EGL
-#endif
-
#if defined(QT_NO_EGLFS) && defined(QT_EGLFS)
# undef QT_NO_EGLFS
#elif !defined(QT_NO_EGLFS) && !defined(QT_EGLFS)
@@ -103,12 +97,6 @@
# define QT_NO_NIS
#endif
-#if defined(QT_NO_OPENGL) && defined(QT_OPENGL)
-# undef QT_NO_OPENGL
-#elif !defined(QT_NO_OPENGL) && !defined(QT_OPENGL)
-# define QT_NO_OPENGL
-#endif
-
#if defined(QT_NO_OPENVG) && defined(QT_OPENVG)
# undef QT_NO_OPENVG
#elif !defined(QT_NO_OPENVG) && !defined(QT_OPENVG)
diff --git a/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerglcontext.cpp b/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerglcontext.cpp
new file mode 100644
index 000000000..5d560387a
--- /dev/null
+++ b/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerglcontext.cpp
@@ -0,0 +1,166 @@
+/*
+ * \brief QNitpickerGLContext
+ * \author Christian Prochaska
+ * \date 2013-11-18
+ */
+
+/*
+ * Copyright (C) 2013 Genode Labs GmbH
+ *
+ * This file is part of the Genode OS framework, which is distributed
+ * under the terms of the GNU General Public License version 2.
+ */
+
+/* Genode includes */
+#include
+
+/* EGL includes */
+#define EGL_EGLEXT_PROTOTYPES
+
+#include
+#include
+
+/* Qt includes */
+#include
+#include
+
+/* local includes */
+#include "qnitpickerplatformwindow.h"
+#include "qnitpickerglcontext.h"
+
+static const bool qnglc_verbose = false;
+
+QT_BEGIN_NAMESPACE
+
+QNitpickerGLContext::QNitpickerGLContext(QOpenGLContext *context)
+ : QPlatformOpenGLContext()
+{
+ if (qnglc_verbose)
+ PDBG("called");
+
+ if (!eglBindAPI(EGL_OPENGL_API))
+ qFatal("eglBindAPI() failed");
+
+ _egl_display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+ if (_egl_display == EGL_NO_DISPLAY)
+ qFatal("eglGetDisplay() failed");
+
+ int major = -1;
+ int minor = -1;
+ if (!eglInitialize(_egl_display, &major, &minor))
+ qFatal("eglInitialize() failed");
+
+ if (qnglc_verbose)
+ PDBG("eglInitialize() returned major: %d, minor: %d", major, minor);
+
+ _egl_config = q_configFromGLFormat(_egl_display, context->format(), false, EGL_PBUFFER_BIT);
+ if (_egl_config == 0)
+ qFatal("Could not find a matching EGL config");
+
+ _format = q_glFormatFromConfig(_egl_display, _egl_config);
+
+ _egl_context = eglCreateContext(_egl_display, _egl_config, EGL_NO_CONTEXT, 0);
+ if (_egl_context == EGL_NO_CONTEXT)
+ qFatal("eglCreateContext() failed");
+}
+
+
+bool QNitpickerGLContext::makeCurrent(QPlatformSurface *surface)
+{
+ if (qnglc_verbose)
+ PDBG("called");
+
+ doneCurrent();
+
+ QNitpickerPlatformWindow *w = static_cast(surface);
+
+ Genode_egl_window egl_window = { w->geometry().width(),
+ w->geometry().height(),
+ w->framebuffer() };
+
+ if (qnglc_verbose)
+ PDBG("w->framebuffer() = %p", w->framebuffer());
+
+#if 0
+
+ /*
+ * Unfortunalety, this code triggers a memory leak somewhere,
+ * so it cannot be used yet.
+ */
+
+ if (w->egl_surface() != EGL_NO_SURFACE)
+ if (!eglDestroySurface(_egl_display, w->egl_surface()))
+ qFatal("eglDestroySurface() failed");
+
+ EGLSurface egl_surface =
+ eglCreateWindowSurface(_egl_display, _egl_config, &egl_window, 0);
+
+ if (egl_surface == EGL_NO_SURFACE)
+ qFatal("eglCreateiWindowSurface() failed");
+
+ w->egl_surface(egl_surface);
+
+#else
+
+ /* temporary workaround, the surface gets created only once */
+
+ if (w->egl_surface() == EGL_NO_SURFACE) {
+
+ EGLSurface egl_surface =
+ eglCreateWindowSurface(_egl_display, _egl_config, &egl_window, 0);
+
+ if (egl_surface == EGL_NO_SURFACE)
+ qFatal("eglCreateiWindowSurface() failed");
+
+ w->egl_surface(egl_surface);
+ }
+
+#endif
+
+ if (!eglMakeCurrent(_egl_display, w->egl_surface(), w->egl_surface(), _egl_context))
+ qFatal("eglMakeCurrent() failed");
+
+ return true;
+}
+
+
+void QNitpickerGLContext::doneCurrent()
+{
+ if (qnglc_verbose)
+ PDBG("called");
+
+ if (!eglMakeCurrent(_egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT))
+ qFatal("eglMakeCurrent() failed");
+}
+
+
+void QNitpickerGLContext::swapBuffers(QPlatformSurface *surface)
+{
+ if (qnglc_verbose)
+ PDBG("called");
+
+ QNitpickerPlatformWindow *w = static_cast(surface);
+
+ if (!eglSwapBuffers(_egl_display, w->egl_surface()))
+ qFatal("eglSwapBuffers() failed");
+
+ w->refresh(0, 0, w->geometry().width(), w->geometry().height());
+}
+
+
+void (*QNitpickerGLContext::getProcAddress(const QByteArray &procName)) ()
+{
+ if (qnglc_verbose)
+ PDBG("procName = %s, pointer = %p", procName.constData(), eglGetProcAddress(procName.constData()));
+
+ return static_cast(eglGetProcAddress(procName.constData()));
+}
+
+
+QSurfaceFormat QNitpickerGLContext::format() const
+{
+ return _format;
+}
+
+QT_END_NAMESPACE
+
diff --git a/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerglcontext.h b/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerglcontext.h
new file mode 100644
index 000000000..b08f99319
--- /dev/null
+++ b/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerglcontext.h
@@ -0,0 +1,54 @@
+/*
+ * \brief QNitpickerGLContext
+ * \author Christian Prochaska
+ * \date 2013-11-18
+ */
+
+/*
+ * Copyright (C) 2013 Genode Labs GmbH
+ *
+ * This file is part of the Genode OS framework, which is distributed
+ * under the terms of the GNU General Public License version 2.
+ */
+
+#ifndef QNITPICKERGLCONTEXT_H
+#define QNITPICKERGLCONTEXT_H
+
+#include
+
+#include
+
+#include
+
+
+QT_BEGIN_NAMESPACE
+
+
+class QNitpickerGLContext : public QPlatformOpenGLContext
+{
+ private:
+
+ QSurfaceFormat _format;
+
+ EGLDisplay _egl_display;
+ EGLContext _egl_context;
+ EGLConfig _egl_config;
+
+ public:
+
+ QNitpickerGLContext(QOpenGLContext *context);
+
+ QSurfaceFormat format() const;
+
+ void swapBuffers(QPlatformSurface *surface);
+
+ bool makeCurrent(QPlatformSurface *surface);
+
+ void doneCurrent();
+
+ void (*getProcAddress(const QByteArray &procName)) ();
+};
+
+QT_END_NAMESPACE
+
+#endif // QNITPICKERGLCONTEXT_H
diff --git a/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegration.cpp b/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegration.cpp
index 999caffb5..5c58cbfab 100644
--- a/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegration.cpp
+++ b/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegration.cpp
@@ -18,6 +18,7 @@
/* Qt includes */
#include
+#include "qnitpickerglcontext.h"
#include "qnitpickerintegration.h"
#include "qnitpickerplatformwindow.h"
#include "qnitpickerscreen.h"
@@ -90,4 +91,11 @@ QPlatformFontDatabase *QNitpickerIntegration::fontDatabase() const
return &db;
}
+
+QPlatformOpenGLContext *QNitpickerIntegration::createPlatformOpenGLContext(QOpenGLContext *context) const
+{
+ return new QNitpickerGLContext(context);
+}
+
QT_END_NAMESPACE
+
diff --git a/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegration.h b/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegration.h
index 74928f970..ceeb5e73c 100644
--- a/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegration.h
+++ b/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegration.h
@@ -15,6 +15,8 @@
#ifndef _QNITPICKERINTEGRATION_H_
#define _QNITPICKERINTEGRATION_H_
+#include
+
#include
#include
@@ -40,6 +42,8 @@ class QNitpickerIntegration : public QPlatformIntegration
QAbstractEventDispatcher *guiThreadEventDispatcher() const;
QPlatformFontDatabase *fontDatabase() const;
+
+ QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const;
};
QT_END_NAMESPACE
diff --git a/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerplatformwindow.h b/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerplatformwindow.h
index 7adca6df9..54df2a468 100644
--- a/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerplatformwindow.h
+++ b/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerplatformwindow.h
@@ -18,6 +18,9 @@
/* Genode includes */
#include
+/* EGL includes */
+#include
+
/* Qt includes */
#include
#include
@@ -49,6 +52,7 @@ class QNitpickerPlatformWindow : public QObject, public QPlatformWindow
QByteArray _title;
bool _resize_handle;
bool _decoration;
+ EGLSurface _egl_surface;
void _process_mouse_event(Input::Event *ev)
{
@@ -151,7 +155,8 @@ class QNitpickerPlatformWindow : public QObject, public QPlatformWindow
_timer(this),
_keyboard_handler("", -1, false, false, ""),
_resize_handle(!window->flags().testFlag(Qt::Popup)),
- _decoration(!window->flags().testFlag(Qt::Popup))
+ _decoration(!window->flags().testFlag(Qt::Popup)),
+ _egl_surface(EGL_NO_SURFACE)
{
_window_slave_policy.wait_for_service_announcements();
@@ -189,7 +194,7 @@ class QNitpickerPlatformWindow : public QObject, public QPlatformWindow
void setGeometry(const QRect &rect)
{
- //if (qnpw_verbose)
+ if (qnpw_verbose)
qDebug() << "QNitpickerPlatformWindow::setGeometry(" << rect << ")";
/* limit window size to screen size */
@@ -211,6 +216,9 @@ class QNitpickerPlatformWindow : public QObject, public QPlatformWindow
QPlatformWindow::setGeometry(final_geometry);
emit framebuffer_changed();
+
+ if (qnpw_verbose)
+ qDebug() << "QNitpickerPlatformWindow::setGeometry() finished";
}
QRect geometry() const
@@ -232,7 +240,6 @@ class QNitpickerPlatformWindow : public QObject, public QPlatformWindow
if (qnpw_verbose)
qDebug() << "QNitpickerPlatformWindow::setVisible(" << visible << ")";
- QPlatformWindow::setVisible(visible);
QRect g = geometry();
int x = g.x();
if (!visible)
@@ -243,6 +250,11 @@ class QNitpickerPlatformWindow : public QObject, public QPlatformWindow
_resize_handle, _decoration);
emit framebuffer_changed();
+
+ QPlatformWindow::setVisible(visible);
+
+ if (qnpw_verbose)
+ qDebug() << "QNitpickerPlatformWindow::setVisible() finished";
}
void setWindowFlags(Qt::WindowFlags flags)
@@ -267,7 +279,10 @@ class QNitpickerPlatformWindow : public QObject, public QPlatformWindow
_decoration);
QPlatformWindow::setWindowFlags(flags);
- }
+
+ if (qnpw_verbose)
+ qDebug() << "QNitpickerPlatformWindow::setWindowFlags() finished";
+ }
void setWindowState(Qt::WindowState state)
{
@@ -306,6 +321,9 @@ class QNitpickerPlatformWindow : public QObject, public QPlatformWindow
_title.constData(),
_resize_handle, _decoration);
emit framebuffer_changed();
+
+ if (qnpw_verbose)
+ qDebug() << "QNitpickerPlatformWindow::setWindowTitle() finished";
}
void setWindowFilePath(const QString &title)
@@ -474,6 +492,16 @@ class QNitpickerPlatformWindow : public QObject, public QPlatformWindow
_window_slave_policy.refresh(x, y, w, h);
}
+ EGLSurface egl_surface() const
+ {
+ return _egl_surface;
+ }
+
+ void egl_surface(EGLSurface egl_surface)
+ {
+ _egl_surface = egl_surface;
+ }
+
signals:
void framebuffer_changed();
diff --git a/libports/tool/qt5/lib_mk_file_generator/create_generated_inc b/libports/tool/qt5/lib_mk_file_generator/create_generated_inc
index fde36a342..df14637a7 100755
--- a/libports/tool/qt5/lib_mk_file_generator/create_generated_inc
+++ b/libports/tool/qt5/lib_mk_file_generator/create_generated_inc
@@ -32,8 +32,9 @@ function extract_sources()
-e 's/OBJECTS .*//' \
-e 's/.*SOURCES =/QT_SOURCES += \\/' \
-e 's/\\/\\\n/g' \
- -e 's/\.cpp \.moc/\.cpp \\\n\.moc\t\t/' \
- -e 's/\.cpp \.rcc/\.cpp \\\n\.rcc\t\t/' \
+ -e 's/\.cpp \.moc/\.cpp \\\n\t\t\.moc/g' \
+ -e 's/\.cpp \.rcc/\.cpp \\\n\t\t\.rcc/g' \
+ -e 's/\.cc generated/\.cc \\\n\t\tgenerated/g' \
Makefile > sources.inc.tmp
sed -e 's/.*\// /' \
@@ -50,8 +51,9 @@ function extract_vpath()
-e 's/OBJECTS .*//' \
-e 's/.*SOURCES =//' \
-e 's/\\/\\\n/g' \
- -e 's/\.cpp \.moc/\.cpp \\\n\.moc\t\t/' \
- -e 's/\.cpp \.rcc/\.cpp \\\n\.rcc\t\t/' \
+ -e 's/\.cpp \.moc/\.cpp \\\n\t\t\.moc/' \
+ -e 's/\.cpp \.rcc/\.cpp \\\n\t\t\.rcc/' \
+ -e 's/\.cc generated/\.cc \\\n\t\tgenerated/g' \
Makefile > vpath.inc.tmp
echo -e "QT_VPATH += \\" > vpath.inc
diff --git a/libports/tool/qt5/lib_mk_file_generator/genode_qt5_configure b/libports/tool/qt5/lib_mk_file_generator/genode_qt5_configure
index 3a8faf5ff..1a9f6e10a 100755
--- a/libports/tool/qt5/lib_mk_file_generator/genode_qt5_configure
+++ b/libports/tool/qt5/lib_mk_file_generator/genode_qt5_configure
@@ -8,6 +8,7 @@
-no-qpa-platform-guard \
-qpa minimal \
-no-separate-debug-info \
+ -opengl desktop \
-openssl-linked \
-no-accessibility \
-no-cups \
@@ -15,7 +16,6 @@
-no-iconv \
-no-largefile \
-no-nis \
- -no-opengl \
-no-pkg-config \
-no-xcb \
-no-sse \