diff --git a/base/include/base/thread.h b/base/include/base/thread.h
index 3eff6a0d2..fd510d74d 100644
--- a/base/include/base/thread.h
+++ b/base/include/base/thread.h
@@ -324,6 +324,13 @@ namespace Genode {
*/
void *stack_top() { return &_context->stack[-1]; }
+ /**
+ * Return base of stack
+ *
+ * \return pointer to last stack element
+ */
+ void *stack_base() { return (void*)_context->stack_base; }
+
/**
* Return 'Thread_base' object corresponding to the calling thread
*
diff --git a/ports/run/arora.run b/ports/run/arora.run
index 7af76e00e..a804e1b9e 100644
--- a/ports/run/arora.run
+++ b/ports/run/arora.run
@@ -53,7 +53,7 @@ append_if [have_spec sdl] config {
append_if [have_spec pci] config {
-
+
}
@@ -115,8 +115,8 @@ set boot_modules {
testnit
arora
ld.lib.so
- libc.lib.so libm.lib.so lwip.lib.so
- zlib.lib.so libpng.lib.so jpeg.lib.so
+ libc.lib.so libm.lib.so lwip.lib.so libc_log.lib.so
+ zlib.lib.so libpng.lib.so jpeg.lib.so libssl.lib.so libcrypto.lib.so
dejavusans.lib.so
freetype.lib.so
libc_lock_pipe.lib.so
@@ -128,6 +128,7 @@ set boot_modules {
qt_script.lib.so
qt_ui_tools.lib.so
qt_webcore.lib.so
+ qt_webkit.lib.so
qt_xml.lib.so
qnitpickerviewwidget.lib.so
qpluginwidget.lib.so
diff --git a/ports/src/app/arora/target.mk b/ports/src/app/arora/target.mk
index 2ec202c86..37d3172b1 100644
--- a/ports/src/app/arora/target.mk
+++ b/ports/src/app/arora/target.mk
@@ -31,7 +31,7 @@ HEADERS_FILTER_OUT = \
QT_MAIN_STACK_SIZE = 768*1024
-LIBS += libm libc_lwip libc_lwip_nic_dhcp qpluginwidget qnitpickerviewwidget
+LIBS += libm libc_lwip libc_lwip_nic_dhcp libc_log qpluginwidget qnitpickerviewwidget
RESOURCES += demo_html.qrc
diff --git a/qt4/Makefile b/qt4/Makefile
index b88aa9057..ee15962f3 100644
--- a/qt4/Makefile
+++ b/qt4/Makefile
@@ -9,29 +9,20 @@ VERBOSE ?= @
ECHO = @echo
DOWNLOAD_DIR = download
CONTRIB_DIR = contrib
-PATCHES_DIR = ../../src/lib/qt4
+PATCHES_DIR = src/lib/qt4/patches
REP_DIR := $(realpath .)
include $(REP_DIR)/lib/mk/qt_version.inc
-QT4_URL = http://ftp.heanet.ie/mirrors/ftp.trolltech.com/pub/qt/source
+QT4_URL = http://releases.qt-project.org/qt4/source
QT4_TGZ = $(QT4).tar.gz
QTSCRIPTCLASSIC_URL = http://ftp.heanet.ie/mirrors/ftp.trolltech.com/pub/qt/solutions/lgpl
QTSCRIPTCLASSIC = qtscriptclassic-1.0_1-opensource
QTSCRIPTCLASSIC_TGZ = $(QTSCRIPTCLASSIC).tar.gz
-PATCHES = qt4_genode.patch \
- qt4_nonblocking_sockets.patch \
- qt4_no_search_for_resolv_lib.patch \
- qt4_lwip_connect_semantics_adaption.patch \
- previewer_example.patch \
- textedit_example.patch \
- qt4_no_exit_on_window_close.patch \
- qt4_virtual_deletelater.patch \
- qt4_renderwidget.patch \
- qt4_include_time_h.patch
+PATCHES = $(shell cat $(PATCHES_DIR)/series)
#
# Utility to check if a tool is installed
@@ -57,7 +48,7 @@ $(CONTRIB_DIR)/$(QT4): $(CONTRIB_DIR) $(DOWNLOAD_DIR)/$(QT4_TGZ)
$(VERBOSE)tar xzf $(DOWNLOAD_DIR)/$(QT4_TGZ) -C $(CONTRIB_DIR)
$(VERBOSE)touch $(CONTRIB_DIR)/$(QT4)
$(VERBOSE)for p in $(PATCHES); do \
- patch -d $(CONTRIB_DIR)/$(QT4) -p1 -i $(PATCHES_DIR)/$$p; done
+ patch -d $(CONTRIB_DIR)/$(QT4) -p1 -i ../../$(PATCHES_DIR)/$$p; done
$(CONTRIB_DIR)/$(QTSCRIPTCLASSIC): $(CONTRIB_DIR) $(DOWNLOAD_DIR)/$(QTSCRIPTCLASSIC_TGZ)
$(VERBOSE)tar xzf $(DOWNLOAD_DIR)/$(QTSCRIPTCLASSIC_TGZ) -C $(CONTRIB_DIR)
diff --git a/qt4/include/qt4/QtCore/qconfig-genode.h b/qt4/include/qt4/QtCore/qconfig-genode.h
index e23cb1470..fa61b022d 100644
--- a/qt4/include/qt4/QtCore/qconfig-genode.h
+++ b/qt4/include/qt4/QtCore/qconfig-genode.h
@@ -217,6 +217,9 @@
#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
diff --git a/qt4/include/qt4/QtCore/qconfig.h b/qt4/include/qt4/QtCore/qconfig.h
index 0b7981333..a39402a20 100644
--- a/qt4/include/qt4/QtCore/qconfig.h
+++ b/qt4/include/qt4/QtCore/qconfig.h
@@ -31,6 +31,12 @@
# define QT_POINTER_SIZE 4
#endif
+#if defined(QT_LINKED_OPENSSL) && defined(QT_NO_LINKED_OPENSSL)
+# undef QT_LINKED_OPENSSL
+#elif !defined(QT_LINKED_OPENSSL) && !defined(QT_NO_LINKED_OPENSSL)
+# define QT_LINKED_OPENSSL
+#endif
+
#if defined(QT_NO_ACCESSIBILITY) && defined(QT_ACCESSIBILITY)
# undef QT_NO_ACCESSIBILITY
#elif !defined(QT_NO_ACCESSIBILITY) && !defined(QT_ACCESSIBILITY)
@@ -145,12 +151,6 @@
# define QT_NO_OPENGL
#endif
-#if defined(QT_NO_OPENSSL) && defined(QT_OPENSSL)
-# undef QT_NO_OPENSSL
-#elif !defined(QT_NO_OPENSSL) && !defined(QT_OPENSSL)
-# define QT_NO_OPENSSL
-#endif
-
#if defined(QT_NO_OPENVG) && defined(QT_OPENVG)
# undef QT_NO_OPENVG
#elif !defined(QT_NO_OPENVG) && !defined(QT_OPENVG)
diff --git a/qt4/lib/import/import-qt4.inc b/qt4/lib/import/import-qt4.inc
index cbe9a6fd3..5e5f66e9f 100644
--- a/qt4/lib/import/import-qt4.inc
+++ b/qt4/lib/import/import-qt4.inc
@@ -10,7 +10,7 @@ QT4_REP_DIR := $(realpath $(dir $(QT4_REP_DIR))../..)
include $(QT4_REP_DIR)/lib/mk/qt_version.inc
-QT4_INC_DIR := $(QT4_REP_DIR)/src/lib/qt4/mkspecs/qws/genode-x86-g++ \
+QT4_INC_DIR := $(QT4_REP_DIR)/src/lib/qt4/mkspecs/qws/genode-generic-g++ \
$(QT4_REP_DIR)/include/qt4 \
$(QT4_REP_DIR)/contrib/$(QT4)/include \
$(QT4_REP_DIR)/include/qt4/QtCore \
diff --git a/qt4/lib/import/import-qt_webkit.mk b/qt4/lib/import/import-qt_webkit.mk
new file mode 100644
index 000000000..ec79bf453
--- /dev/null
+++ b/qt4/lib/import/import-qt_webkit.mk
@@ -0,0 +1,3 @@
+IMPORT_QT4_INC=$(call select_from_repositories,lib/import/import-qt4.inc)
+
+include $(IMPORT_QT4_INC)
diff --git a/qt4/lib/mk/qt.inc b/qt4/lib/mk/qt.inc
index c5eb93e5b..45b5a6e20 100644
--- a/qt4/lib/mk/qt.inc
+++ b/qt4/lib/mk/qt.inc
@@ -10,5 +10,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/qt4/mkspecs/qws/genode-x86-g++ \
+INC_DIR += $(REP_DIR)/src/lib/qt4/mkspecs/qws/genode-generic-g++ \
$(REP_DIR)/src/lib/qt4/src/corelib/global
+
+INC_DIR += $(addprefix $(REP_DIR)/src/lib/qt4/, $(QT_INCPATH))
+INC_DIR += $(addprefix $(REP_DIR)/contrib/$(QT4)/, $(QT_INCPATH))
+
+vpath % $(addprefix $(REP_DIR)/src/lib/qt4/, $(QT_VPATH))
+vpath % $(addprefix $(REP_DIR)/contrib/$(QT4)/, $(QT_VPATH))
diff --git a/qt4/lib/mk/qt_core.mk b/qt4/lib/mk/qt_core.mk
index 6e5fdbd5a..717383669 100644
--- a/qt4/lib/mk/qt_core.mk
+++ b/qt4/lib/mk/qt_core.mk
@@ -2,9 +2,6 @@ include $(REP_DIR)/lib/import/import-qt_core.mk
SHARED_LIB = yes
-# extracted from src/corelib/Makefile
-QT_DEFINES += -DQT_BUILD_CORE_LIB -DQT_NO_USING_NAMESPACE -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_FAST_OPERATOR_PLUS -DQT_USE_FAST_CONCATENATION -DHB_EXPORT=Q_CORE_EXPORT -DQT_NO_DEBUG
-
# use default warning level to avoid noise when compiling contrib code
CC_WARN = -Wno-unused-but-set-variable -Wno-deprecated-declarations
@@ -32,47 +29,12 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT = \
moc_qfuturewatcher.cpp \
moc_qsharedmemory.cpp
+include $(REP_DIR)/lib/mk/qt.inc
+
INC_DIR += $(REP_DIR)/include/qt4/QtCore/private \
- $(REP_DIR)/contrib/$(QT4)/include/QtCore/private \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/harfbuzz/src
+ $(REP_DIR)/contrib/$(QT4)/include/QtCore/private
LIBS += launchpad zlib libc libm alarm libc_lock_pipe
vpath % $(REP_DIR)/include/qt4/QtCore
vpath % $(REP_DIR)/include/qt4/QtCore/private
-
-vpath % $(REP_DIR)/src/lib/qt4/src/corelib/global
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/harfbuzz/src
-vpath % $(REP_DIR)/src/lib/qt4/src/corelib/animation
-vpath % $(REP_DIR)/src/lib/qt4/src/corelib/concurrent
-vpath % $(REP_DIR)/src/lib/qt4/src/corelib/thread
-vpath % $(REP_DIR)/src/lib/qt4/src/corelib/tools
-vpath % $(REP_DIR)/src/lib/qt4/src/corelib/io
-vpath % $(REP_DIR)/src/lib/qt4/src/corelib/plugin
-vpath % $(REP_DIR)/src/lib/qt4/src/corelib/kernel
-vpath % $(REP_DIR)/src/lib/qt4/src/corelib/statemachine
-vpath % $(REP_DIR)/src/lib/qt4/src/corelib/xml
-vpath % $(REP_DIR)/src/lib/qt4/src/corelib/codecs
-vpath % $(REP_DIR)/src/lib/qt4/src/plugins/codecs/cn
-vpath % $(REP_DIR)/src/lib/qt4/src/plugins/codecs/jp
-vpath % $(REP_DIR)/src/lib/qt4/src/plugins/codecs/kr
-vpath % $(REP_DIR)/src/lib/qt4/src/plugins/codecs/tw
-
-vpath % $(REP_DIR)/contrib/$(QT4)/src/corelib/global
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/harfbuzz/src
-vpath % $(REP_DIR)/contrib/$(QT4)/src/corelib/animation
-vpath % $(REP_DIR)/contrib/$(QT4)/src/corelib/concurrent
-vpath % $(REP_DIR)/contrib/$(QT4)/src/corelib/thread
-vpath % $(REP_DIR)/contrib/$(QT4)/src/corelib/tools
-vpath % $(REP_DIR)/contrib/$(QT4)/src/corelib/io
-vpath % $(REP_DIR)/contrib/$(QT4)/src/corelib/plugin
-vpath % $(REP_DIR)/contrib/$(QT4)/src/corelib/kernel
-vpath % $(REP_DIR)/contrib/$(QT4)/src/corelib/statemachine
-vpath % $(REP_DIR)/contrib/$(QT4)/src/corelib/xml
-vpath % $(REP_DIR)/contrib/$(QT4)/src/corelib/codecs
-vpath % $(REP_DIR)/contrib/$(QT4)/src/plugins/codecs/cn
-vpath % $(REP_DIR)/contrib/$(QT4)/src/plugins/codecs/jp
-vpath % $(REP_DIR)/contrib/$(QT4)/src/plugins/codecs/kr
-vpath % $(REP_DIR)/contrib/$(QT4)/src/plugins/codecs/tw
-
-include $(REP_DIR)/lib/mk/qt.inc
diff --git a/qt4/lib/mk/qt_core_generated.inc b/qt4/lib/mk/qt_core_generated.inc
index 5720873dc..0bc29731b 100644
--- a/qt4/lib/mk/qt_core_generated.inc
+++ b/qt4/lib/mk/qt_core_generated.inc
@@ -1,3 +1,12 @@
+QT_DEFINES += -DQT_BUILD_CORE_LIB -DQT_NO_USING_NAMESPACE -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DHB_EXPORT=Q_CORE_EXPORT -DQT_NO_DEBUG
+
+QT_INCPATH = \
+ mkspecs/qws/genode-generic-g++ \
+ src/3rdparty/harfbuzz/src \
+ src/3rdparty/md4 \
+ src/3rdparty/md5 \
+ src/corelib \
+
QT_SOURCES = \
qabstractanimation.cpp \
qvariantanimation.cpp \
@@ -44,6 +53,7 @@ QT_SOURCES = \
qlinkedlist.cpp \
qlist.cpp \
qlocale.cpp \
+ qlocale_tools.cpp \
qpoint.cpp \
qmap.cpp \
qmargins.cpp \
@@ -62,6 +72,7 @@ QT_SOURCES = \
qvector.cpp \
qvsnprintf.cpp \
qelapsedtimer_unix.cpp \
+ qlocale_unix.cpp \
harfbuzz-buffer.c \
harfbuzz-gdef.c \
harfbuzz-gsub.c \
@@ -75,6 +86,7 @@ QT_SOURCES = \
qbuffer.cpp \
qdatastream.cpp \
qdataurl.cpp \
+ qtldurl.cpp \
qdebug.cpp \
qdir.cpp \
qdiriterator.cpp \
@@ -92,13 +104,17 @@ QT_SOURCES = \
qfsfileengine.cpp \
qfsfileengine_iterator.cpp \
qfilesystemwatcher.cpp \
+ qfilesystementry.cpp \
+ qfilesystemengine.cpp \
qfsfileengine_unix.cpp \
- qfsfileengine_iterator_unix.cpp \
+ qfilesystemengine_unix.cpp \
qprocess_unix.cpp \
+ qfilesystemiterator_unix.cpp \
qpluginloader.cpp \
qfactoryloader.cpp \
quuid.cpp \
qlibrary.cpp \
+ qelfparser_p.cpp \
qlibrary_unix.cpp \
qabstracteventdispatcher.cpp \
qabstractitemmodel.cpp \
@@ -121,6 +137,7 @@ QT_SOURCES = \
qsystemsemaphore.cpp \
qpointer.cpp \
qmath.cpp \
+ qsystemerror.cpp \
qcore_unix.cpp \
qcrashhandler.cpp \
qsharedmemory_unix.cpp \
@@ -152,6 +169,7 @@ QT_SOURCES = \
qeventtransition.cpp \
qxmlstream.cpp \
qxmlutils.cpp \
+ moc_qabstractanimation_p.cpp \
moc_qfuturewatcher.cpp \
moc_qthreadpool.cpp \
moc_qnamespace.cpp \
@@ -189,6 +207,24 @@ QT_SOURCES = \
moc_qsignaltransition.cpp \
moc_qeventtransition.cpp
+QT_VPATH = \
+ src/3rdparty/harfbuzz/src \
+ src/corelib/animation \
+ src/corelib/codecs \
+ src/corelib/concurrent \
+ src/corelib/global \
+ src/corelib/io \
+ src/corelib/kernel \
+ src/corelib/plugin \
+ src/corelib/statemachine \
+ src/corelib/thread \
+ src/corelib/tools \
+ src/corelib/xml \
+ src/plugins/codecs/cn \
+ src/plugins/codecs/jp \
+ src/plugins/codecs/kr \
+ src/plugins/codecs/tw \
+
# 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
@@ -197,6 +233,7 @@ QT_SOURCES = \
COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
moc_qabstractanimation.cpp \
+ moc_qabstractanimation_p.cpp \
moc_qvariantanimation.cpp \
moc_qpropertyanimation.cpp \
moc_qanimationgroup.cpp \
diff --git a/qt4/lib/mk/qt_gui.mk b/qt4/lib/mk/qt_gui.mk
index 190fe7695..705adc2da 100644
--- a/qt4/lib/mk/qt_gui.mk
+++ b/qt4/lib/mk/qt_gui.mk
@@ -2,15 +2,13 @@ include $(REP_DIR)/lib/import/import-qt_gui.mk
SHARED_LIB = yes
-# extracted from src/gui/Makefile
-QT_DEFINES += -DQT_BUILD_GUI_LIB -DQT_NO_USING_NAMESPACE -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_FAST_OPERATOR_PLUS -DQT_USE_FAST_CONCATENATION -DQT_NO_FONTCONFIG -DQT_NO_OPENTYPE -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_S60 -DQ_INTERNAL_QAPP_SRC -DQT_NO_DEBUG -DQT_CORE_LIB
-QT_DEFINES += -DQT_NO_QWS_SIGNALHANDLER
-
# use default warning level to avoid noise when compiling contrib code
CC_WARN = -Wno-unused-but-set-variable -Wno-deprecated-declarations
include $(REP_DIR)/lib/mk/qt_gui_generated.inc
+QT_DEFINES += -DQT_NO_QWS_SIGNALHANDLER
+
# add Genode-specific sources
QT_SOURCES += qkbdpc101_qws.cpp \
qwindowsurface_nitpicker_qws.cpp \
@@ -51,50 +49,12 @@ COMPILER_MOC_SOURCE_MAKE_ALL_FILES_FILTER_OUT = \
# UI headers
qfiledialog.o: ui_qfiledialog.h
+include $(REP_DIR)/lib/mk/qt.inc
+
INC_DIR += $(REP_DIR)/include/qt4/QtGui/private \
- $(REP_DIR)/contrib/$(QT4)/include/QtGui/private \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/harfbuzz/src
+ $(REP_DIR)/contrib/$(QT4)/include/QtGui/private
LIBS += qt_core libpng zlib libc libm freetype jpeg
vpath % $(REP_DIR)/include/qt4/QtGui
vpath % $(REP_DIR)/include/qt4/QtGui/private
-
-vpath % $(REP_DIR)/src/lib/qt4/src/gui/embedded
-vpath % $(REP_DIR)/src/lib/qt4/src/gui/animation
-vpath % $(REP_DIR)/src/lib/qt4/src/gui/effects
-vpath % $(REP_DIR)/src/lib/qt4/src/gui/kernel
-vpath % $(REP_DIR)/src/lib/qt4/src/gui/image
-vpath % $(REP_DIR)/src/lib/qt4/src/gui/painting
-vpath % $(REP_DIR)/src/lib/qt4/src/gui/text
-vpath % $(REP_DIR)/src/lib/qt4/src/gui/styles
-vpath % $(REP_DIR)/src/lib/qt4/src/gui/widgets
-vpath % $(REP_DIR)/src/lib/qt4/src/gui/dialogs
-vpath % $(REP_DIR)/src/lib/qt4/src/gui/accessible
-vpath % $(REP_DIR)/src/lib/qt4/src/gui/itemviews
-vpath % $(REP_DIR)/src/lib/qt4/src/gui/inputmethod
-vpath % $(REP_DIR)/src/lib/qt4/src/gui/graphicsview
-vpath % $(REP_DIR)/src/lib/qt4/src/gui/util
-vpath % $(REP_DIR)/src/lib/qt4/src/gui/statemachine
-vpath % $(REP_DIR)/src/lib/qt4/src/gui/math3d
-
-
-vpath % $(REP_DIR)/contrib/$(QT4)/src/gui/embedded
-vpath % $(REP_DIR)/contrib/$(QT4)/src/gui/animation
-vpath % $(REP_DIR)/contrib/$(QT4)/src/gui/effects
-vpath % $(REP_DIR)/contrib/$(QT4)/src/gui/kernel
-vpath % $(REP_DIR)/contrib/$(QT4)/src/gui/image
-vpath % $(REP_DIR)/contrib/$(QT4)/src/gui/painting
-vpath % $(REP_DIR)/contrib/$(QT4)/src/gui/text
-vpath % $(REP_DIR)/contrib/$(QT4)/src/gui/styles
-vpath % $(REP_DIR)/contrib/$(QT4)/src/gui/widgets
-vpath % $(REP_DIR)/contrib/$(QT4)/src/gui/dialogs
-vpath % $(REP_DIR)/contrib/$(QT4)/src/gui/accessible
-vpath % $(REP_DIR)/contrib/$(QT4)/src/gui/itemviews
-vpath % $(REP_DIR)/contrib/$(QT4)/src/gui/inputmethod
-vpath % $(REP_DIR)/contrib/$(QT4)/src/gui/graphicsview
-vpath % $(REP_DIR)/contrib/$(QT4)/src/gui/util
-vpath % $(REP_DIR)/contrib/$(QT4)/src/gui/statemachine
-vpath % $(REP_DIR)/contrib/$(QT4)/src/gui/math3d
-
-include $(REP_DIR)/lib/mk/qt.inc
diff --git a/qt4/lib/mk/qt_gui_generated.inc b/qt4/lib/mk/qt_gui_generated.inc
index 81985415d..5d66b83a2 100644
--- a/qt4/lib/mk/qt_gui_generated.inc
+++ b/qt4/lib/mk/qt_gui_generated.inc
@@ -1,3 +1,12 @@
+QT_DEFINES += -DQT_BUILD_GUI_LIB -DQT_NO_USING_NAMESPACE -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_NO_FONTCONFIG -DQT_NO_OPENTYPE -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_S60 -DQ_INTERNAL_QAPP_SRC -DQT_NO_DEBUG -DQT_NETWORK_LIB -DQT_CORE_LIB
+
+QT_INCPATH = \
+ mkspecs/qws/genode-generic-g++ \
+ src/3rdparty/harfbuzz/src \
+ src/gui \
+ src/gui/dialogs \
+ src/gui/image \
+
QT_SOURCES = \
qsoundqss_qws.cpp \
qcopchannel_qws.cpp \
@@ -52,7 +61,6 @@ QT_SOURCES = \
qpalette.cpp \
qshortcut.cpp \
qshortcutmap.cpp \
- qsound.cpp \
qstackedlayout.cpp \
qtooltip.cpp \
qguivariant.cpp \
@@ -77,6 +85,7 @@ QT_SOURCES = \
qwidget_qws.cpp \
qkeymapper_qws.cpp \
qsessionmanager_qws.cpp \
+ qsound.cpp \
qbitmap.cpp \
qicon.cpp \
qiconloader.cpp \
@@ -96,6 +105,7 @@ QT_SOURCES = \
qiconengineplugin.cpp \
qmovie.cpp \
qpixmap_raster.cpp \
+ qpixmap_blitter.cpp \
qnativeimage.cpp \
qimagepixmapcleanuphooks.cpp \
qvolatileimage.cpp \
@@ -113,6 +123,7 @@ QT_SOURCES = \
qbrush.cpp \
qcolor.cpp \
qcolor_p.cpp \
+ qcosmeticstroker.cpp \
qcssutil.cpp \
qdrawutil.cpp \
qemulationpaintengine.cpp \
@@ -134,6 +145,7 @@ QT_SOURCES = \
qprintengine_pdf.cpp \
qprintengine_ps.cpp \
qprinter.cpp \
+ qprinterinfo.cpp \
qrasterizer.cpp \
qregion.cpp \
qstroker.cpp \
@@ -147,6 +159,8 @@ QT_SOURCES = \
qdrawhelper.cpp \
qimagescale.cpp \
qgrayraster.c \
+ qpaintengine_blitter.cpp \
+ qblittable.cpp \
qgraphicssystem_qws.cpp \
qprinterinfo_unix.cpp \
qbackingstore.cpp \
@@ -182,11 +196,14 @@ QT_SOURCES = \
qzip.cpp \
qtextodfwriter.cpp \
qstatictext.cpp \
+ qrawfont.cpp \
+ qglyphrun.cpp \
qfont_qws.cpp \
qfontengine_qws.cpp \
qfontengine_ft.cpp \
qfontengine_qpf.cpp \
qabstractfontengine_qws.cpp \
+ qrawfont_ft.cpp \
qstyle.cpp \
qstylefactory.cpp \
qstyleoption.cpp \
@@ -281,6 +298,7 @@ QT_SOURCES = \
qprintpreviewdialog.cpp \
qabstractitemview.cpp \
qheaderview.cpp \
+ qidentityproxymodel.cpp \
qlistview.cpp \
qbsptree.cpp \
qtableview.cpp \
@@ -372,13 +390,13 @@ QT_SOURCES = \
moc_qshortcut.cpp \
moc_qsizepolicy.cpp \
moc_qpalette.cpp \
- moc_qsound.cpp \
- moc_qsound_p.cpp \
moc_qstackedlayout.cpp \
moc_qkeymapper_p.cpp \
moc_qsoftkeymanager_p.cpp \
moc_qguiplatformplugin_p.cpp \
moc_qeventdispatcher_qws_p.cpp \
+ moc_qsound.cpp \
+ moc_qsound_p.cpp \
moc_qiconengineplugin.cpp \
moc_qimageiohandler.cpp \
moc_qpictureformatplugin.cpp \
@@ -477,6 +495,24 @@ QT_SOURCES = \
qrc_qstyle.cpp \
qrc_qmessagebox.cpp
+QT_VPATH = \
+ src/gui/animation \
+ src/gui/dialogs \
+ src/gui/effects \
+ src/gui/embedded \
+ src/gui/graphicsview \
+ src/gui/image \
+ src/gui/inputmethod \
+ src/gui/itemviews \
+ src/gui/kernel \
+ src/gui/math3d \
+ src/gui/painting \
+ src/gui/statemachine \
+ src/gui/styles \
+ src/gui/text \
+ src/gui/util \
+ src/gui/widgets \
+
# some source files need to be generated by moc from other source/header files before
# they get #included again by the original source file in the compiling stage
@@ -512,8 +548,6 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
moc_qshortcut.cpp \
moc_qsizepolicy.cpp \
moc_qpalette.cpp \
- moc_qsound.cpp \
- moc_qsound_p.cpp \
moc_qstackedlayout.cpp \
moc_qwidget.cpp \
moc_qwidgetaction.cpp \
@@ -523,6 +557,8 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
moc_qsoftkeymanager_p.cpp \
moc_qguiplatformplugin_p.cpp \
moc_qeventdispatcher_qws_p.cpp \
+ moc_qsound.cpp \
+ moc_qsound_p.cpp \
moc_qiconengineplugin.cpp \
moc_qimageiohandler.cpp \
moc_qmovie.cpp \
@@ -640,6 +676,7 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
moc_qpagesetupdialog_unix_p.cpp \
moc_qabstractitemview.cpp \
moc_qheaderview.cpp \
+ moc_qidentityproxymodel.cpp \
moc_qlistview.cpp \
moc_qtableview.cpp \
moc_qtreeview.cpp \
diff --git a/qt4/lib/mk/qt_jscore.mk b/qt4/lib/mk/qt_jscore.mk
index 36a7daf06..8352ad949 100644
--- a/qt4/lib/mk/qt_jscore.mk
+++ b/qt4/lib/mk/qt_jscore.mk
@@ -2,9 +2,6 @@ include $(REP_DIR)/lib/import/import-qt_jscore.mk
SHARED_LIB = yes
-# extracted from src/3rdparty/webkit/JavaScriptCore/Makefile
-QT_DEFINES += -DBUILDING_QT__=1 -DWTF_USE_ACCELERATED_COMPOSITING -DNDEBUG -DBUILDING_QT__ -DBUILDING_JavaScriptCore -DBUILDING_WTF -DQT_NO_DEBUG -DQT_NETWORK_LIB -DQT_CORE_LIB
-
# additional defines for the Genode version
CC_OPT += -DSQLITE_NO_SYNC=1 -DSQLITE_THREADSAFE=0
@@ -16,85 +13,6 @@ CC_WARN =
include $(REP_DIR)/lib/mk/qt_jscore_generated.inc
-INC_DIR += $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/assembler \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/assembler \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/bytecode \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/bytecode \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/bytecompiler \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/bytecompiler \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/debugger \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/debugger \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/interpreter \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/interpreter \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/jit \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/jit \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/parser \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/parser \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/pcre \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/pcre \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/profiler \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/profiler \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/runtime \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/runtime \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/wtf \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/wtf \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/wtf/symbian \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/wtf/symbian \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/wtf/unicode \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/wtf/unicode \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/yarr \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/yarr \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/API \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/API \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/ForwardingHeaders \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/ForwardingHeaders \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/generated \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/generated
+include $(REP_DIR)/lib/mk/qt.inc
LIBS += qt_network qt_core libc libm
-
-
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/pcre
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/API
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/assembler
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/bytecode
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/bytecompiler
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/debugger
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/interpreter
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/jit
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/parser
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/profiler
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/runtime
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/wtf
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/wtf/qt
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/wtf/symbian
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/wtf/unicode
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/wtf/unicode/icu
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/yarr
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/generated
-
-
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/pcre
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/API
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/assembler
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/bytecode
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/bytecompiler
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/debugger
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/interpreter
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/jit
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/parser
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/profiler
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/runtime
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/wtf
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/wtf/qt
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/wtf/symbian
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/wtf/unicode
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/wtf/unicode/icu
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/yarr
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/generated
-
-include $(REP_DIR)/lib/mk/qt.inc
diff --git a/qt4/lib/mk/qt_jscore_generated.inc b/qt4/lib/mk/qt_jscore_generated.inc
index 253e2623f..edd7c7d53 100644
--- a/qt4/lib/mk/qt_jscore_generated.inc
+++ b/qt4/lib/mk/qt_jscore_generated.inc
@@ -1,9 +1,75 @@
+QT_DEFINES += -DNDEBUG -DBUILDING_QT__=1 -DNDEBUG -DQT_ASCII_CAST_WARNINGS -DBUILDING_JavaScriptCore -DBUILDING_WTF -DQT_NO_DEBUG -DQT_NETWORK_LIB -DQT_CORE_LIB
+
+QT_INCPATH = \
+ mkspecs/qws/genode-generic-g++ \
+ src/3rdparty/webkit/include \
+ src/3rdparty/webkit/Source \
+ src/3rdparty/webkit/Source/JavaScriptCore \
+ src/3rdparty/webkit/Source/JavaScriptCore/API \
+ src/3rdparty/webkit/Source/JavaScriptCore/assembler \
+ src/3rdparty/webkit/Source/JavaScriptCore/bytecode \
+ src/3rdparty/webkit/Source/JavaScriptCore/bytecompiler \
+ src/3rdparty/webkit/Source/JavaScriptCore/debugger \
+ src/3rdparty/webkit/Source/JavaScriptCore/dfg \
+ src/3rdparty/webkit/Source/JavaScriptCore/ForwardingHeaders \
+ src/3rdparty/webkit/Source/JavaScriptCore/generated \
+ src/3rdparty/webkit/Source/JavaScriptCore/heap \
+ src/3rdparty/webkit/Source/JavaScriptCore/interpreter \
+ src/3rdparty/webkit/Source/JavaScriptCore/jit \
+ src/3rdparty/webkit/Source/JavaScriptCore/parser \
+ src/3rdparty/webkit/Source/JavaScriptCore/profiler \
+ src/3rdparty/webkit/Source/JavaScriptCore/runtime \
+ src/3rdparty/webkit/Source/JavaScriptCore/wtf \
+ src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject \
+ src/3rdparty/webkit/Source/JavaScriptCore/wtf/symbian \
+ src/3rdparty/webkit/Source/JavaScriptCore/wtf/unicode \
+ src/3rdparty/webkit/Source/JavaScriptCore/yarr \
+ src/3rdparty/webkit/Source/ThirdParty \
+
QT_SOURCES = \
- pcre_compile.cpp \
- pcre_exec.cpp \
- pcre_tables.cpp \
- pcre_ucp_searchfuncs.cpp \
- pcre_xclass.cpp \
+ YarrInterpreter.cpp \
+ YarrPattern.cpp \
+ YarrSyntaxChecker.cpp \
+ Assertions.cpp \
+ ByteArray.cpp \
+ CryptographicallyRandomNumber.cpp \
+ CurrentTime.cpp \
+ DateMath.cpp \
+ dtoa.cpp \
+ DecimalNumber.cpp \
+ FastMalloc.cpp \
+ GOwnPtr.cpp \
+ GRefPtr.cpp \
+ HashTable.cpp \
+ MD5.cpp \
+ MainThread.cpp \
+ NullPtr.cpp \
+ OSRandomSource.cpp \
+ MainThreadQt.cpp \
+ StringQt.cpp \
+ ThreadingQt.cpp \
+ PageAllocationAligned.cpp \
+ PageBlock.cpp \
+ ParallelJobsGeneric.cpp \
+ RandomNumber.cpp \
+ RefCountedLeakCounter.cpp \
+ SHA1.cpp \
+ StackBounds.cpp \
+ TCSystemAlloc.cpp \
+ ThreadingNone.cpp \
+ Threading.cpp \
+ TypeTraits.cpp \
+ WTFThreadData.cpp \
+ AtomicString.cpp \
+ CString.cpp \
+ StringBuilder.cpp \
+ StringImpl.cpp \
+ StringStatics.cpp \
+ WTFString.cpp \
+ CollatorDefault.cpp \
+ CollatorICU.cpp \
+ UTF8.cpp \
+ OSAllocatorPosix.cpp \
JSBase.cpp \
JSCallbackConstructor.cpp \
JSCallbackFunction.cpp \
@@ -15,7 +81,9 @@ QT_SOURCES = \
JSValueRef.cpp \
OpaqueJSString.cpp \
ARMAssembler.cpp \
+ ARMv7Assembler.cpp \
MacroAssemblerARM.cpp \
+ MacroAssemblerSH4.cpp \
CodeBlock.cpp \
JumpTable.cpp \
Opcode.cpp \
@@ -23,28 +91,49 @@ QT_SOURCES = \
StructureStubInfo.cpp \
BytecodeGenerator.cpp \
NodesCodegen.cpp \
+ ConservativeRoots.cpp \
+ HandleHeap.cpp \
+ HandleStack.cpp \
+ Heap.cpp \
+ MachineStackMarker.cpp \
+ MarkStack.cpp \
+ MarkStackPosix.cpp \
+ MarkStackSymbian.cpp \
+ MarkStackWin.cpp \
+ MarkedBlock.cpp \
+ MarkedSpace.cpp \
DebuggerActivation.cpp \
DebuggerCallFrame.cpp \
Debugger.cpp \
+ DFGByteCodeParser.cpp \
+ DFGGraph.cpp \
+ DFGJITCodeGenerator.cpp \
+ DFGJITCompiler.cpp \
+ DFGNonSpeculativeJIT.cpp \
+ DFGOperations.cpp \
+ DFGSpeculativeJIT.cpp \
CallFrame.cpp \
Interpreter.cpp \
RegisterFile.cpp \
ExecutableAllocatorFixedVMPool.cpp \
- ExecutableAllocatorPosix.cpp \
- ExecutableAllocatorSymbian.cpp \
- ExecutableAllocatorWin.cpp \
ExecutableAllocator.cpp \
JITArithmetic.cpp \
+ JITArithmetic32_64.cpp \
JITCall.cpp \
+ JITCall32_64.cpp \
JIT.cpp \
JITOpcodes.cpp \
+ JITOpcodes32_64.cpp \
JITPropertyAccess.cpp \
JITPropertyAccess32_64.cpp \
JITStubs.cpp \
+ ThunkGenerators.cpp \
+ JSParser.cpp \
Lexer.cpp \
Nodes.cpp \
ParserArena.cpp \
Parser.cpp \
+ SourceProviderCache.cpp \
Profile.cpp \
ProfileGenerator.cpp \
ProfileNode.cpp \
@@ -57,7 +146,6 @@ QT_SOURCES = \
BooleanObject.cpp \
BooleanPrototype.cpp \
CallData.cpp \
- Collector.cpp \
CommonIdentifiers.cpp \
Completion.cpp \
ConstructData.cpp \
@@ -73,8 +161,8 @@ QT_SOURCES = \
Executable.cpp \
FunctionConstructor.cpp \
FunctionPrototype.cpp \
+ GCActivityCallback.cpp \
GetterSetter.cpp \
- GlobalEvalFunction.cpp \
Identifier.cpp \
InitializeThreading.cpp \
InternalFunction.cpp \
@@ -87,11 +175,10 @@ QT_SOURCES = \
JSGlobalData.cpp \
JSGlobalObject.cpp \
JSGlobalObjectFunctions.cpp \
- JSImmediate.cpp \
JSLock.cpp \
JSNotAnObject.cpp \
- JSNumberCell.cpp \
JSObject.cpp \
+ JSObjectWithGlobalObject.cpp \
JSONObject.cpp \
JSPropertyNameIterator.cpp \
JSStaticScopeObject.cpp \
@@ -101,10 +188,6 @@ QT_SOURCES = \
JSWrapperObject.cpp \
LiteralParser.cpp \
Lookup.cpp \
- MarkStackPosix.cpp \
- MarkStackSymbian.cpp \
- MarkStackWin.cpp \
- MarkStack.cpp \
MathObject.cpp \
NativeErrorConstructor.cpp \
NativeErrorPrototype.cpp \
@@ -117,46 +200,45 @@ QT_SOURCES = \
PropertyDescriptor.cpp \
PropertyNameArray.cpp \
PropertySlot.cpp \
- PrototypeFunction.cpp \
RegExpConstructor.cpp \
RegExp.cpp \
RegExpObject.cpp \
RegExpPrototype.cpp \
+ RegExpCache.cpp \
+ RopeImpl.cpp \
ScopeChain.cpp \
SmallStrings.cpp \
+ StrictEvalActivation.cpp \
StringConstructor.cpp \
StringObject.cpp \
StringPrototype.cpp \
+ StringRecursionChecker.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 \
- RegisterFileAllocatorSymbian.cpp \
- BlockAllocatorSymbian.cpp \
- ThreadingNone.cpp \
- Threading.cpp \
- TypeTraits.cpp \
- CollatorDefault.cpp \
- CollatorICU.cpp \
- UTF8.cpp \
- RegexCompiler.cpp \
- RegexInterpreter.cpp \
- RegexJIT.cpp \
- Grammar.cpp \
- TCSystemAlloc.cpp
+ YarrJIT.cpp
+
+QT_VPATH = \
+ src/3rdparty/webkit/Source/JavaScriptCore/API \
+ src/3rdparty/webkit/Source/JavaScriptCore/assembler \
+ src/3rdparty/webkit/Source/JavaScriptCore/bytecode \
+ src/3rdparty/webkit/Source/JavaScriptCore/bytecompiler \
+ src/3rdparty/webkit/Source/JavaScriptCore/debugger \
+ src/3rdparty/webkit/Source/JavaScriptCore/dfg \
+ src/3rdparty/webkit/Source/JavaScriptCore/heap \
+ src/3rdparty/webkit/Source/JavaScriptCore/interpreter \
+ src/3rdparty/webkit/Source/JavaScriptCore/jit \
+ src/3rdparty/webkit/Source/JavaScriptCore/parser \
+ src/3rdparty/webkit/Source/JavaScriptCore/profiler \
+ src/3rdparty/webkit/Source/JavaScriptCore/runtime \
+ src/3rdparty/webkit/Source/JavaScriptCore/wtf \
+ src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject \
+ src/3rdparty/webkit/Source/JavaScriptCore/wtf/qt \
+ src/3rdparty/webkit/Source/JavaScriptCore/wtf/text \
+ src/3rdparty/webkit/Source/JavaScriptCore/wtf/unicode \
+ src/3rdparty/webkit/Source/JavaScriptCore/wtf/unicode/icu \
+ src/3rdparty/webkit/Source/JavaScriptCore/yarr \
# some source files need to be generated by moc from other source/header files before
# they get #included again by the original source file in the compiling stage
diff --git a/qt4/lib/mk/qt_network.mk b/qt4/lib/mk/qt_network.mk
index a18ace644..7fb89963d 100644
--- a/qt4/lib/mk/qt_network.mk
+++ b/qt4/lib/mk/qt_network.mk
@@ -2,9 +2,6 @@ include $(REP_DIR)/lib/import/import-qt_network.mk
SHARED_LIB = yes
-# extracted from src/script/Makefile
-QT_DEFINES += -DQT_BUILD_NETWORK_LIB -DQT_NO_USING_NAMESPACE -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_FAST_OPERATOR_PLUS -DQT_USE_FAST_CONCATENATION -DQT_NO_DEBUG -DQT_CORE_LIB
-
# use default warning level to avoid noise when compiling contrib code
CC_WARN =
@@ -20,22 +17,6 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT = \
COMPILER_MOC_SOURCE_MAKE_ALL_FILES_FILTER_OUT = \
qftp.moc
-INC_DIR += $(REP_DIR)/include/qt4/QtNetwork/private \
- $(REP_DIR)/contrib/$(QT4)/include/QtNetwork/private
-
-LIBS += qt_core zlib libc
-
-vpath % $(REP_DIR)/include/qt4/QtNetwork
-vpath % $(REP_DIR)/include/qt4/QtNetwork/private
-
-vpath % $(REP_DIR)/src/lib/qt4/src/network/access
-vpath % $(REP_DIR)/src/lib/qt4/src/network/bearer
-vpath % $(REP_DIR)/src/lib/qt4/src/network/kernel
-vpath % $(REP_DIR)/src/lib/qt4/src/network/socket
-
-vpath % $(REP_DIR)/contrib/$(QT4)/src/network/access
-vpath % $(REP_DIR)/contrib/$(QT4)/src/network/bearer
-vpath % $(REP_DIR)/contrib/$(QT4)/src/network/kernel
-vpath % $(REP_DIR)/contrib/$(QT4)/src/network/socket
-
include $(REP_DIR)/lib/mk/qt.inc
+
+LIBS += qt_core zlib libc libssl
diff --git a/qt4/lib/mk/qt_network_generated.inc b/qt4/lib/mk/qt_network_generated.inc
index ee1f2c32e..9b64c7d3c 100644
--- a/qt4/lib/mk/qt_network_generated.inc
+++ b/qt4/lib/mk/qt_network_generated.inc
@@ -1,3 +1,10 @@
+QT_DEFINES += -DQT_BUILD_NETWORK_LIB -DQT_NO_USING_NAMESPACE -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_NO_DEBUG -DQT_CORE_LIB
+
+QT_INCPATH = \
+ mkspecs/qws/genode-generic-g++ \
+ src/network \
+ src/network/kernel \
+
QT_SOURCES = \
qftp.cpp \
qhttp.cpp \
@@ -6,11 +13,10 @@ QT_SOURCES = \
qhttpnetworkreply.cpp \
qhttpnetworkconnection.cpp \
qhttpnetworkconnectionchannel.cpp \
- qfilenetworkreply.cpp \
+ qnetworkaccessauthenticationmanager.cpp \
qnetworkaccessmanager.cpp \
qnetworkaccesscache.cpp \
qnetworkaccessbackend.cpp \
- qnetworkaccessdatabackend.cpp \
qnetworkaccessdebugpipebackend.cpp \
qnetworkaccessfilebackend.cpp \
qnetworkaccesscachebackend.cpp \
@@ -21,8 +27,12 @@ QT_SOURCES = \
qnetworkrequest.cpp \
qnetworkreply.cpp \
qnetworkreplyimpl.cpp \
+ qnetworkreplydataimpl.cpp \
+ qnetworkreplyfileimpl.cpp \
qabstractnetworkcache.cpp \
qnetworkdiskcache.cpp \
+ qhttpthreaddelegate.cpp \
+ qhttpmultipart.cpp \
qnetworksession.cpp \
qnetworkconfigmanager.cpp \
qnetworkconfiguration.cpp \
@@ -40,7 +50,6 @@ QT_SOURCES = \
qnetworkinterface_unix.cpp \
qnetworkproxy_generic.cpp \
qabstractsocketengine.cpp \
- qnativesocketengine.cpp \
qhttpsocketengine.cpp \
qsocks5socketengine.cpp \
qabstractsocket.cpp \
@@ -49,9 +58,19 @@ QT_SOURCES = \
qtcpserver.cpp \
qlocalsocket.cpp \
qlocalserver.cpp \
+ qnativesocketengine.cpp \
qnativesocketengine_unix.cpp \
qlocalsocket_unix.cpp \
qlocalserver_unix.cpp \
+ qssl.cpp \
+ qsslcertificate.cpp \
+ qsslconfiguration.cpp \
+ qsslcipher.cpp \
+ qsslerror.cpp \
+ qsslkey.cpp \
+ qsslsocket.cpp \
+ qsslsocket_openssl.cpp \
+ qsslsocket_openssl_symbols.cpp \
moc_qhttpnetworkreply_p.cpp \
moc_qnetworkaccesscache_p.cpp \
moc_qnetworkaccessbackend_p.cpp \
@@ -63,16 +82,25 @@ QT_SOURCES = \
moc_qnetworkreply.cpp \
moc_qabstractnetworkcache.cpp \
moc_qnetworkdiskcache.cpp \
+ moc_qhttpthreaddelegate_p.cpp \
+ moc_qhttpmultipart.cpp \
moc_qnetworkconfigmanager_p.cpp \
moc_qnetworksession_p.cpp \
moc_qbearerplugin_p.cpp \
moc_qhostinfo_p.cpp \
moc_qabstractsocketengine_p.cpp \
- moc_qnativesocketengine_p.cpp \
moc_qhttpsocketengine_p.cpp \
moc_qsocks5socketengine_p.cpp \
moc_qtcpsocket.cpp \
- moc_qudpsocket.cpp
+ moc_qudpsocket.cpp \
+ moc_qnativesocketengine_p.cpp
+
+QT_VPATH = \
+ src/network/access \
+ src/network/bearer \
+ src/network/kernel \
+ src/network/socket \
+ src/network/ssl \
# some source files need to be generated by moc from other source/header files before
# they get #included again by the original source file in the compiling stage
@@ -86,7 +114,6 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
moc_qhttpnetworkreply_p.cpp \
moc_qhttpnetworkconnection_p.cpp \
moc_qhttpnetworkconnectionchannel_p.cpp \
- moc_qfilenetworkreply_p.cpp \
moc_qnetworkaccessmanager.cpp \
moc_qnetworkaccesscache_p.cpp \
moc_qnetworkaccessbackend_p.cpp \
@@ -97,8 +124,12 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
moc_qnetworkcookiejar.cpp \
moc_qnetworkreply.cpp \
moc_qnetworkreplyimpl_p.cpp \
+ moc_qnetworkreplydataimpl_p.cpp \
+ moc_qnetworkreplyfileimpl_p.cpp \
moc_qabstractnetworkcache.cpp \
moc_qnetworkdiskcache.cpp \
+ moc_qhttpthreaddelegate_p.cpp \
+ moc_qhttpmultipart.cpp \
moc_qnetworksession.cpp \
moc_qnetworkconfigmanager.cpp \
moc_qnetworkconfigmanager_p.cpp \
@@ -107,7 +138,6 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
moc_qbearerplugin_p.cpp \
moc_qhostinfo_p.cpp \
moc_qabstractsocketengine_p.cpp \
- moc_qnativesocketengine_p.cpp \
moc_qhttpsocketengine_p.cpp \
moc_qsocks5socketengine_p.cpp \
moc_qabstractsocket.cpp \
@@ -115,7 +145,9 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
moc_qudpsocket.cpp \
moc_qtcpserver.cpp \
moc_qlocalserver.cpp \
- moc_qlocalsocket.cpp
+ moc_qlocalsocket.cpp \
+ moc_qnativesocketengine_p.cpp \
+ moc_qsslsocket.cpp
# source files generated from existing source files ('%.moc: %.cpp' rule in spec-qt4.mk)
# extracted from 'compiler_moc_source_make_all' rule
diff --git a/qt4/lib/mk/qt_script46.mk b/qt4/lib/mk/qt_script46.mk
deleted file mode 100644
index ab2a3e6a8..000000000
--- a/qt4/lib/mk/qt_script46.mk
+++ /dev/null
@@ -1,346 +0,0 @@
-include $(REP_DIR)/lib/import/import-qt_script.mk
-
-SHARED_LIB = yes
-
-REQUIRES += deprecated
-
-# extracted from src/script/Makefile
-QT_DEFINES += -DJSC=QTJSC -Djscyyparse=qtjscyyparse -Djscyylex=qtjscyylex -Djscyyerror=qtjscyyerror -DWTF=QTWTF -DQT_BUILD_SCRIPT_LIB -DQT_NO_USING_NAMESPACE -DQLALR_NO_QSCRIPTGRAMMAR_DEBUG_INFO -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DBUILDING_QT__=1 -DNDEBUG -DBUILDING_QT__ -DBUILDING_JavaScriptCore -DBUILDING_WTF -DWTF_USE_JAVASCRIPTCORE_BINDINGS=1 -DWTF_CHANGES=1 -DNDEBUG -DJS_EXPORT= -DJS_EXPORTDATA= -DQT_NO_DEBUG -DQT_CORE_LIB
-
-#CC_CXX_OPT += -pipe -Wreturn-type -fno-strict-aliasing -fvisibility=hidden -fvisibility-inlines-hidden -D_REENTRANT
-
-# use default warning level to avoid noise when compiling contrib code
-CC_WARN =
-
-# extracted from src/script/Makefile
-QT_SOURCES = \
- pcre_compile.cpp \
- pcre_exec.cpp \
- pcre_tables.cpp \
- pcre_ucp_searchfuncs.cpp \
- pcre_xclass.cpp \
- Assertions.cpp \
- ByteArray.cpp \
- HashTable.cpp \
- MainThread.cpp \
- RandomNumber.cpp \
- RefCountedLeakCounter.cpp \
- TypeTraits.cpp \
- CollatorDefault.cpp \
- CollatorICU.cpp \
- UTF8.cpp \
- JSBase.cpp \
- JSCallbackConstructor.cpp \
- JSCallbackFunction.cpp \
- JSCallbackObject.cpp \
- JSClassRef.cpp \
- JSContextRef.cpp \
- JSObjectRef.cpp \
- JSStringRef.cpp \
- JSValueRef.cpp \
- OpaqueJSString.cpp \
- InitializeThreading.cpp \
- JSGlobalData.cpp \
- JSGlobalObject.cpp \
- JSStaticScopeObject.cpp \
- JSVariableObject.cpp \
- JSActivation.cpp \
- JSNotAnObject.cpp \
- JSONObject.cpp \
- LiteralParser.cpp \
- MarkStack.cpp \
- TimeoutChecker.cpp \
- CodeBlock.cpp \
- StructureStubInfo.cpp \
- JumpTable.cpp \
- ARMAssembler.cpp \
- MacroAssemblerARM.cpp \
- JIT.cpp \
- JITCall.cpp \
- JITArithmetic.cpp \
- JITOpcodes.cpp \
- JITPropertyAccess.cpp \
- ExecutableAllocator.cpp \
- JITStubs.cpp \
- BytecodeGenerator.cpp \
- ExceptionHelpers.cpp \
- JSPropertyNameIterator.cpp \
- Interpreter.cpp \
- Opcode.cpp \
- SamplingTool.cpp \
- RegexCompiler.cpp \
- RegexInterpreter.cpp \
- RegexJIT.cpp \
- RegisterFile.cpp \
- ExecutableAllocatorPosix.cpp \
- MarkStackPosix.cpp \
- TCSystemAlloc.cpp \
- ArgList.cpp \
- Arguments.cpp \
- ArrayConstructor.cpp \
- ArrayPrototype.cpp \
- BooleanConstructor.cpp \
- BooleanObject.cpp \
- BooleanPrototype.cpp \
- CallData.cpp \
- Collector.cpp \
- CommonIdentifiers.cpp \
- ConstructData.cpp \
- CurrentTime.cpp \
- DateConstructor.cpp \
- DateConversion.cpp \
- DateInstance.cpp \
- DatePrototype.cpp \
- Debugger.cpp \
- DebuggerCallFrame.cpp \
- DebuggerActivation.cpp \
- dtoa.cpp \
- Error.cpp \
- ErrorConstructor.cpp \
- ErrorInstance.cpp \
- ErrorPrototype.cpp \
- CallFrame.cpp \
- Executable.cpp \
- FunctionConstructor.cpp \
- FunctionPrototype.cpp \
- GetterSetter.cpp \
- GlobalEvalFunction.cpp \
- Identifier.cpp \
- InternalFunction.cpp \
- Completion.cpp \
- JSArray.cpp \
- JSAPIValueWrapper.cpp \
- JSByteArray.cpp \
- JSCell.cpp \
- JSFunction.cpp \
- JSGlobalObjectFunctions.cpp \
- JSImmediate.cpp \
- JSLock.cpp \
- JSNumberCell.cpp \
- JSObject.cpp \
- JSString.cpp \
- JSValue.cpp \
- JSWrapperObject.cpp \
- Lexer.cpp \
- Lookup.cpp \
- MathObject.cpp \
- NativeErrorConstructor.cpp \
- NativeErrorPrototype.cpp \
- Nodes.cpp \
- NumberConstructor.cpp \
- NumberObject.cpp \
- NumberPrototype.cpp \
- ObjectConstructor.cpp \
- ObjectPrototype.cpp \
- Operations.cpp \
- Parser.cpp \
- ParserArena.cpp \
- PropertyDescriptor.cpp \
- PropertyNameArray.cpp \
- PropertySlot.cpp \
- PrototypeFunction.cpp \
- RegExp.cpp \
- RegExpConstructor.cpp \
- RegExpObject.cpp \
- RegExpPrototype.cpp \
- ScopeChain.cpp \
- SmallStrings.cpp \
- StringConstructor.cpp \
- StringObject.cpp \
- StringPrototype.cpp \
- Structure.cpp \
- StructureChain.cpp \
- UString.cpp \
- HeavyProfile.cpp \
- Profile.cpp \
- ProfileGenerator.cpp \
- ProfileNode.cpp \
- Profiler.cpp \
- TreeProfile.cpp \
- DateMath.cpp \
- FastMalloc.cpp \
- Threading.cpp \
- MainThreadQt.cpp \
- ThreadingQt.cpp \
- Grammar.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 \
- qscriptdeclarativeobject.cpp \
- qscriptdeclarativeclass.cpp \
- qscriptast.cpp \
- qscriptastvisitor.cpp \
- qscriptgrammar.cpp \
- qscriptsyntaxchecker.cpp \
- qscriptlexer.cpp \
- qscriptdate.cpp \
- moc_qscriptextensionplugin.cpp
-
-# some source files need to be generated by moc from other source/header files before
-# they get #included again by the original source file in the compiling stage
-
-# source files generated from existing header files ("moc_%.cpp: %.h" rule in spec-qt4.mk)
-# 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 spec-qt4.mk)
-# extracted from "compiler_moc_source_make_all" rule
-COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
- MainThreadQt.moc
-
-INC_DIR += $(REP_DIR)/src/lib/qt4/mkspecs/qws/genode-x86-g++ \
- $(REP_DIR)/include/qt4 \
- $(REP_DIR)/contrib/$(QT4)/include \
- $(REP_DIR)/include/qt4/QtCore \
- $(REP_DIR)/contrib/$(QT4)/include/QtCore \
- $(REP_DIR)/include/qt4/QtCore/private \
- $(REP_DIR)/contrib/$(QT4)/include/QtCore/private \
- $(REP_DIR)/include/qt4/QtScript \
- $(REP_DIR)/contrib/$(QT4)/include/QtScript \
- $(REP_DIR)/include/qt4/QtScript/private \
- $(REP_DIR)/contrib/$(QT4)/include/QtScript/private \
- $(REP_DIR)/src/lib/qt4/src/script \
- $(REP_DIR)/contrib/$(QT4)/src/script \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/assembler \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/assembler \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/bytecode \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/bytecode \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/debugger \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/debugger \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/interpreter \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/interpreter \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/jit \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/jit \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/parser \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/parser \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/profiler \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/profiler \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/runtime \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/runtime \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/wrec \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/wrec \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/wtf \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/wtf \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/yarr \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/yarr \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/API \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/API \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/ForwardingHeaders \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/ForwardingHeaders \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/javascriptcore/qt/Api \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/javascriptcore/qt/Api \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/pcre \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/pcre \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/javascriptcoreBuild/Release/JavaScriptCore/tmp \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/javascriptcoreBuild/Release/JavaScriptCore/tmp \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/parser \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/parser \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/debugger \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/debugger \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/runtime \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/runtime \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/wtf \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/wtf \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/unicode \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/unicode \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/interpreter \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/interprter \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/jit \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/jit \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/profiler \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/profiler \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/wrec \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/wrec \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/API \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/API \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/bytecode \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/bytecode \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/assembler \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/assembler \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/generated \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/generated \
- $(REP_DIR)/src/lib/qt4/src/corelib/global
-
-LIBS += qt_core libc
-
-vpath % $(REP_DIR)/include/qt4/QtScript
-vpath % $(REP_DIR)/include/qt4/QtScript/private
-
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/pcre
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/wtf
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode/icu
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/API
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/runtime
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/bytecode
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/assembler
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/jit
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/interpreter
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/bytecode
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/yarr
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/debugger
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/parser
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/profiler
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/javascriptcore/JavaScriptCore/generated
-vpath % $(REP_DIR)/src/lib/qt4/src/script/api
-vpath % $(REP_DIR)/src/lib/qt4/src/script/bridge
-vpath % $(REP_DIR)/src/lib/qt4/src/script/parser
-vpath % $(REP_DIR)/src/lib/qt4/src/script/utils
-
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/pcre
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/wtf
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode/icu
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/API
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/runtime
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/bytecode
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/assembler
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/jit
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/interpreter
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/bytecode
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/yarr
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/debugger
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/parser
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/profiler
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/javascriptcore/JavaScriptCore/generated
-vpath % $(REP_DIR)/contrib/$(QT4)/src/script/api
-vpath % $(REP_DIR)/contrib/$(QT4)/src/script/bridge
-vpath % $(REP_DIR)/contrib/$(QT4)/src/script/parser
-vpath % $(REP_DIR)/contrib/$(QT4)/src/script/utils
-
-include $(REP_DIR)/lib/mk/qt.inc
diff --git a/qt4/lib/mk/qt_scriptclassic.mk b/qt4/lib/mk/qt_scriptclassic.mk
index 1be0e6329..1294e3188 100644
--- a/qt4/lib/mk/qt_scriptclassic.mk
+++ b/qt4/lib/mk/qt_scriptclassic.mk
@@ -2,15 +2,14 @@ include $(REP_DIR)/lib/import/import-qt_scriptclassic.mk
SHARED_LIB = yes
-# extracted from src/script/Makefile
-QT_DEFINES += -DQT_BUILD_SCRIPT_LIB -DQT_NO_USING_NAMESPACE -DQLALR_NO_QSCRIPTGRAMMAR_DEBUG_INFO -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQ_SCRIPT_DIRECT_CODE -DQT_NO_DEBUG -DQT_CORE_LIB
-
# use default warning level to avoid noise when compiling contrib code
CC_WARN =
include $(REP_DIR)/lib/mk/qt_scriptclassic_generated.inc
-INC_DIR += $(REP_DIR)/src/lib/qt4/mkspecs/qws/genode-x86-g++ \
+include $(REP_DIR)/lib/mk/qt.inc
+
+INC_DIR += $(REP_DIR)/src/lib/qt4/mkspecs/qws/genode-generic-g++ \
$(REP_DIR)/include/qt4 \
$(REP_DIR)/contrib/include \
$(REP_DIR)/include/qt4/QtCore \
@@ -30,5 +29,3 @@ vpath % $(REP_DIR)/include/qt4/QtScript/private
vpath % $(REP_DIR)/src/lib/qt4/src/script
vpath % $(REP_DIR)/contrib/qtscriptclassic-1.0_1-opensource/src
-
-include $(REP_DIR)/lib/mk/qt.inc
diff --git a/qt4/lib/mk/qt_scripttools.mk b/qt4/lib/mk/qt_scripttools.mk
index 0eac88a8c..55c60b960 100644
--- a/qt4/lib/mk/qt_scripttools.mk
+++ b/qt4/lib/mk/qt_scripttools.mk
@@ -2,148 +2,14 @@ include $(REP_DIR)/lib/import/import-qt_scripttools.mk
SHARED_LIB = yes
-# extracted from src/script/Makefile
-QT_DEFINES += -DQT_BUILD_SCRIPTTOOLS_LIB -DQT_NO_USING_NAMESPACE -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_NO_DEBUG -DQT_SCRIPT_LIB -DQT_GUI_LIB -DQT_CORE_LIB
+include $(REP_DIR)/lib/mk/qt_scripttools_generated.inc
-# use default warning level to avoid noise when compiling contrib code
-CC_WARN =
+include $(REP_DIR)/lib/mk/qt.inc
-# extracted from src/script/Makefile
-QT_SOURCES = \
- qscriptdebuggervalue.cpp \
- qscriptdebuggervalueproperty.cpp \
- qscriptdebuggercommand.cpp \
- qscriptdebuggerresponse.cpp \
- qscriptdebuggerevent.cpp \
- qscriptdebuggercommandexecutor.cpp \
- qscriptdebuggercommandschedulerfrontend.cpp \
- qscriptdebuggerbackend.cpp \
- qscriptdebuggeragent.cpp \
- qscriptdebuggerfrontend.cpp \
- qscriptstdmessagehandler.cpp \
- qscriptenginedebuggerfrontend.cpp \
- qscriptdebuggerjob.cpp \
- qscriptdebuggercommandschedulerjob.cpp \
- qscriptvalueproperty.cpp \
- qscriptobjectsnapshot.cpp \
- qscriptscriptdata.cpp \
- qscriptxmlparser.cpp \
- qscriptbreakpointdata.cpp \
- qscriptdebugger.cpp \
- qscriptdebuggerconsole.cpp \
- qscriptdebuggerconsolecommand.cpp \
- qscriptdebuggerconsolecommandjob.cpp \
- qscriptdebuggerconsolecommandgroupdata.cpp \
- qscriptdebuggerconsolecommandmanager.cpp \
- qscriptcompletiontaskinterface.cpp \
- qscriptcompletiontask.cpp \
- qscriptdebuggerconsoleglobalobject.cpp \
- qscriptdebuggerscriptedconsolecommand.cpp \
- qscriptedit.cpp \
- qscriptsyntaxhighlighter.cpp \
- qscriptdebuggerconsolewidgetinterface.cpp \
- qscriptdebuggerconsolewidget.cpp \
- qscriptdebuggerstackwidgetinterface.cpp \
- qscriptdebuggerstackwidget.cpp \
- qscriptdebuggerstackmodel.cpp \
- qscriptdebuggerscriptswidgetinterface.cpp \
- qscriptdebuggerscriptswidget.cpp \
- qscriptdebuggerscriptsmodel.cpp \
- qscriptdebuggerlocalswidgetinterface.cpp \
- qscriptdebuggerlocalswidget.cpp \
- qscriptdebuggerlocalsmodel.cpp \
- qscriptdebuggercodewidgetinterface.cpp \
- qscriptdebuggercodewidget.cpp \
- qscriptdebuggercodeviewinterface.cpp \
- qscriptdebuggercodeview.cpp \
- qscriptdebuggercodefinderwidgetinterface.cpp \
- qscriptdebuggercodefinderwidget.cpp \
- qscriptdebugoutputwidgetinterface.cpp \
- qscriptdebugoutputwidget.cpp \
- qscriptbreakpointswidgetinterface.cpp \
- qscriptbreakpointswidget.cpp \
- qscriptbreakpointsmodel.cpp \
- qscripterrorlogwidgetinterface.cpp \
- qscripterrorlogwidget.cpp \
- qscriptdebuggerstandardwidgetfactory.cpp \
- qscriptenginedebugger.cpp \
- moc_qscriptcompletiontaskinterface_p.cpp \
- moc_qscriptcompletiontask_p.cpp \
- moc_qscriptdebuggerconsoleglobalobject_p.cpp \
- moc_qscriptedit_p.cpp \
- moc_qscriptdebuggerconsolewidgetinterface_p.cpp \
- moc_qscriptdebuggerstackwidgetinterface_p.cpp \
- moc_qscriptdebuggerscriptswidgetinterface_p.cpp \
- moc_qscriptdebuggerscriptsmodel_p.cpp \
- moc_qscriptdebuggerlocalswidgetinterface_p.cpp \
- moc_qscriptdebuggerlocalsmodel_p.cpp \
- moc_qscriptdebuggercodewidgetinterface_p.cpp \
- moc_qscriptdebuggercodeviewinterface_p.cpp \
- moc_qscriptdebuggercodefinderwidgetinterface_p.cpp \
- moc_qscriptdebugoutputwidgetinterface_p.cpp \
- moc_qscriptdebugoutputwidget_p.cpp \
- moc_qscriptbreakpointswidgetinterface_p.cpp \
- moc_qscriptbreakpointsmodel_p.cpp \
- moc_qscripterrorlogwidgetinterface_p.cpp \
- moc_qscripterrorlogwidget_p.cpp \
- qrc_scripttools_debugging.cpp
-
-# some source files need to be generated by moc from other source/header files before
-# they get #included again by the original source file in the compiling stage
-
-# source files generated from existing header files ("moc_%.cpp: %.h" rule in spec-qt4.mk)
-# extracted from "compiler_moc_header_make_all" target
-COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
- moc_qscriptdebugger_p.cpp \
- moc_qscriptcompletiontaskinterface_p.cpp \
- moc_qscriptcompletiontask_p.cpp \
- moc_qscriptdebuggerconsoleglobalobject_p.cpp \
- moc_qscriptedit_p.cpp \
- moc_qscriptdebuggerconsolewidgetinterface_p.cpp \
- moc_qscriptdebuggerconsolewidget_p.cpp \
- moc_qscriptdebuggerstackwidgetinterface_p.cpp \
- moc_qscriptdebuggerstackwidget_p.cpp \
- moc_qscriptdebuggerscriptswidgetinterface_p.cpp \
- moc_qscriptdebuggerscriptswidget_p.cpp \
- moc_qscriptdebuggerscriptsmodel_p.cpp \
- moc_qscriptdebuggerlocalswidgetinterface_p.cpp \
- moc_qscriptdebuggerlocalswidget_p.cpp \
- moc_qscriptdebuggerlocalsmodel_p.cpp \
- moc_qscriptdebuggercodewidgetinterface_p.cpp \
- moc_qscriptdebuggercodewidget_p.cpp \
- moc_qscriptdebuggercodeviewinterface_p.cpp \
- moc_qscriptdebuggercodeview_p.cpp \
- moc_qscriptdebuggercodefinderwidgetinterface_p.cpp \
- moc_qscriptdebuggercodefinderwidget_p.cpp \
- moc_qscriptdebugoutputwidgetinterface_p.cpp \
- moc_qscriptdebugoutputwidget_p.cpp \
- moc_qscriptbreakpointswidgetinterface_p.cpp \
- moc_qscriptbreakpointswidget_p.cpp \
- moc_qscriptbreakpointsmodel_p.cpp \
- moc_qscripterrorlogwidgetinterface_p.cpp \
- moc_qscripterrorlogwidget_p.cpp \
- moc_qscriptenginedebugger.cpp
-
-# source files generated from existing source files ("%.moc: %.cpp" rule in spec-qt4.mk)
-# extracted from "compiler_moc_source_make_all" rule
-COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
- qscriptdebuggerconsolewidget.moc \
- qscriptdebuggerlocalswidget.moc \
- qscriptbreakpointswidget.moc \
- qscriptenginedebugger.moc
-
-QT4_INC_DIR += $(REP_DIR)/include/qt4/QtScript/private \
- $(REP_DIR)/contrib/$(QT4)/include/QtScript/private \
- $(REP_DIR)/include/qt4/QtScriptTools/private \
- $(REP_DIR)/contrib/$(QT4)/include/QtScriptTools/private \
- $(REP_DIR)/src/lib/qt4/src/corelib/global
+INC_DIR += $(REP_DIR)/include/qt4/QtScriptTools/private \
+ $(REP_DIR)/contrib/$(QT4)/include/QtScriptTools/private
LIBS += qt_core libc
vpath % $(REP_DIR)/include/qt4/QtScriptTools
vpath % $(REP_DIR)/include/qt4/QtScriptTools/private
-
-vpath % $(REP_DIR)/src/lib/qt4/src/scripttools/debugging
-vpath % $(REP_DIR)/contrib/$(QT4)/src/scripttools/debugging
-
-include $(REP_DIR)/lib/mk/qt.inc
diff --git a/qt4/lib/mk/qt_scripttools_generated.inc b/qt4/lib/mk/qt_scripttools_generated.inc
new file mode 100644
index 000000000..7ed255321
--- /dev/null
+++ b/qt4/lib/mk/qt_scripttools_generated.inc
@@ -0,0 +1,134 @@
+QT_DEFINES += -DQT_BUILD_SCRIPTTOOLS_LIB -DQT_NO_USING_NAMESPACE -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_NO_DEBUG -DQT_SCRIPT_LIB -DQT_GUI_LIB -DQT_CORE_LIB
+
+QT_INCPATH = \
+ mkspecs/qws/genode-generic-g++ \
+ src/scripttools \
+
+QT_SOURCES = \
+ qscriptdebuggervalue.cpp \
+ qscriptdebuggervalueproperty.cpp \
+ qscriptdebuggercommand.cpp \
+ qscriptdebuggerresponse.cpp \
+ qscriptdebuggerevent.cpp \
+ qscriptdebuggercommandexecutor.cpp \
+ qscriptdebuggercommandschedulerfrontend.cpp \
+ qscriptdebuggerbackend.cpp \
+ qscriptdebuggeragent.cpp \
+ qscriptdebuggerfrontend.cpp \
+ qscriptstdmessagehandler.cpp \
+ qscriptenginedebuggerfrontend.cpp \
+ qscriptdebuggerjob.cpp \
+ qscriptdebuggercommandschedulerjob.cpp \
+ qscriptvalueproperty.cpp \
+ qscriptobjectsnapshot.cpp \
+ qscriptscriptdata.cpp \
+ qscriptxmlparser.cpp \
+ qscriptbreakpointdata.cpp \
+ qscriptdebugger.cpp \
+ qscriptdebuggerconsole.cpp \
+ qscriptdebuggerconsolecommand.cpp \
+ qscriptdebuggerconsolecommandjob.cpp \
+ qscriptdebuggerconsolecommandgroupdata.cpp \
+ qscriptdebuggerconsolecommandmanager.cpp \
+ qscriptcompletiontaskinterface.cpp \
+ qscriptcompletiontask.cpp \
+ qscriptdebuggerconsoleglobalobject.cpp \
+ qscriptdebuggerscriptedconsolecommand.cpp \
+ qscriptedit.cpp \
+ qscriptsyntaxhighlighter.cpp \
+ qscriptdebuggerconsolewidgetinterface.cpp \
+ qscriptdebuggerconsolewidget.cpp \
+ qscriptdebuggerstackwidgetinterface.cpp \
+ qscriptdebuggerstackwidget.cpp \
+ qscriptdebuggerstackmodel.cpp \
+ qscriptdebuggerscriptswidgetinterface.cpp \
+ qscriptdebuggerscriptswidget.cpp \
+ qscriptdebuggerscriptsmodel.cpp \
+ qscriptdebuggerlocalswidgetinterface.cpp \
+ qscriptdebuggerlocalswidget.cpp \
+ qscriptdebuggerlocalsmodel.cpp \
+ qscriptdebuggercodewidgetinterface.cpp \
+ qscriptdebuggercodewidget.cpp \
+ qscriptdebuggercodeviewinterface.cpp \
+ qscriptdebuggercodeview.cpp \
+ qscriptdebuggercodefinderwidgetinterface.cpp \
+ qscriptdebuggercodefinderwidget.cpp \
+ qscriptdebugoutputwidgetinterface.cpp \
+ qscriptdebugoutputwidget.cpp \
+ qscriptbreakpointswidgetinterface.cpp \
+ qscriptbreakpointswidget.cpp \
+ qscriptbreakpointsmodel.cpp \
+ qscripterrorlogwidgetinterface.cpp \
+ qscripterrorlogwidget.cpp \
+ qscriptdebuggerstandardwidgetfactory.cpp \
+ qscriptenginedebugger.cpp \
+ moc_qscriptcompletiontaskinterface_p.cpp \
+ moc_qscriptcompletiontask_p.cpp \
+ moc_qscriptdebuggerconsoleglobalobject_p.cpp \
+ moc_qscriptedit_p.cpp \
+ moc_qscriptdebuggerconsolewidgetinterface_p.cpp \
+ moc_qscriptdebuggerstackwidgetinterface_p.cpp \
+ moc_qscriptdebuggerscriptswidgetinterface_p.cpp \
+ moc_qscriptdebuggerscriptsmodel_p.cpp \
+ moc_qscriptdebuggerlocalswidgetinterface_p.cpp \
+ moc_qscriptdebuggerlocalsmodel_p.cpp \
+ moc_qscriptdebuggercodewidgetinterface_p.cpp \
+ moc_qscriptdebuggercodeviewinterface_p.cpp \
+ moc_qscriptdebuggercodefinderwidgetinterface_p.cpp \
+ moc_qscriptdebugoutputwidgetinterface_p.cpp \
+ moc_qscriptdebugoutputwidget_p.cpp \
+ moc_qscriptbreakpointswidgetinterface_p.cpp \
+ moc_qscriptbreakpointsmodel_p.cpp \
+ moc_qscripterrorlogwidgetinterface_p.cpp \
+ moc_qscripterrorlogwidget_p.cpp \
+ qrc_scripttools_debugging.cpp
+
+QT_VPATH = \
+ src/scripttools/debugging \
+
+# some source files need to be generated by moc from other source/header files before
+# they get #included again by the original source file in the compiling stage
+
+# source files generated from existing header files ('moc_%.cpp: %.h' rule in spec-qt4.mk)
+# extracted from 'compiler_moc_header_make_all' target
+
+COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
+ moc_qscriptdebugger_p.cpp \
+ moc_qscriptcompletiontaskinterface_p.cpp \
+ moc_qscriptcompletiontask_p.cpp \
+ moc_qscriptdebuggerconsoleglobalobject_p.cpp \
+ moc_qscriptedit_p.cpp \
+ moc_qscriptdebuggerconsolewidgetinterface_p.cpp \
+ moc_qscriptdebuggerconsolewidget_p.cpp \
+ moc_qscriptdebuggerstackwidgetinterface_p.cpp \
+ moc_qscriptdebuggerstackwidget_p.cpp \
+ moc_qscriptdebuggerscriptswidgetinterface_p.cpp \
+ moc_qscriptdebuggerscriptswidget_p.cpp \
+ moc_qscriptdebuggerscriptsmodel_p.cpp \
+ moc_qscriptdebuggerlocalswidgetinterface_p.cpp \
+ moc_qscriptdebuggerlocalswidget_p.cpp \
+ moc_qscriptdebuggerlocalsmodel_p.cpp \
+ moc_qscriptdebuggercodewidgetinterface_p.cpp \
+ moc_qscriptdebuggercodewidget_p.cpp \
+ moc_qscriptdebuggercodeviewinterface_p.cpp \
+ moc_qscriptdebuggercodeview_p.cpp \
+ moc_qscriptdebuggercodefinderwidgetinterface_p.cpp \
+ moc_qscriptdebuggercodefinderwidget_p.cpp \
+ moc_qscriptdebugoutputwidgetinterface_p.cpp \
+ moc_qscriptdebugoutputwidget_p.cpp \
+ moc_qscriptbreakpointswidgetinterface_p.cpp \
+ moc_qscriptbreakpointswidget_p.cpp \
+ moc_qscriptbreakpointsmodel_p.cpp \
+ moc_qscripterrorlogwidgetinterface_p.cpp \
+ moc_qscripterrorlogwidget_p.cpp \
+ moc_qscriptenginedebugger.cpp
+
+# source files generated from existing source files ('%.moc: %.cpp' rule in spec-qt4.mk)
+# extracted from 'compiler_moc_source_make_all' rule
+
+COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
+ qscriptdebuggerconsolewidget.moc \
+ qscriptdebuggerlocalswidget.moc \
+ qscriptbreakpointswidget.moc \
+ qscriptenginedebugger.moc
+
diff --git a/qt4/lib/mk/qt_svg.mk b/qt4/lib/mk/qt_svg.mk
index 04536aeee..58b4966bb 100644
--- a/qt4/lib/mk/qt_svg.mk
+++ b/qt4/lib/mk/qt_svg.mk
@@ -2,22 +2,14 @@ include $(REP_DIR)/lib/import/import-qt_svg.mk
SHARED_LIB = yes
-# extracted from src/svg/Makefile
-QT_DEFINES += -DQT_BUILD_SVG_LIB -DQT_NO_USING_NAMESPACE -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB
-
include $(REP_DIR)/lib/mk/qt_svg_generated.inc
+include $(REP_DIR)/lib/mk/qt.inc
+
INC_DIR += $(REP_DIR)/include/qt4/QtSvg/private \
- $(REP_DIR)/contrib/$(QT4)/include/QtSvg/private \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/harfbuzz/src
+ $(REP_DIR)/contrib/$(QT4)/include/QtSvg/private
LIBS += qt_core qt_gui zlib libc
vpath % $(REP_DIR)/include/qt4/QtSvg
vpath % $(REP_DIR)/include/qt4/QtSvg/private
-
-vpath % $(REP_DIR)/src/lib/qt4/src/svg
-
-vpath % $(REP_DIR)/contrib/$(QT4)/src/svg
-
-include $(REP_DIR)/lib/mk/qt.inc
diff --git a/qt4/lib/mk/qt_svg_generated.inc b/qt4/lib/mk/qt_svg_generated.inc
index 4a65a4c41..7e58fb76d 100644
--- a/qt4/lib/mk/qt_svg_generated.inc
+++ b/qt4/lib/mk/qt_svg_generated.inc
@@ -1,3 +1,10 @@
+QT_DEFINES += -DQT_BUILD_SVG_LIB -DQT_NO_USING_NAMESPACE -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB
+
+QT_INCPATH = \
+ mkspecs/qws/genode-generic-g++ \
+ src/3rdparty/harfbuzz/src \
+ src/svg \
+
QT_SOURCES = \
qsvggraphics.cpp \
qsvghandler.cpp \
@@ -12,6 +19,9 @@ QT_SOURCES = \
qsvggenerator.cpp \
moc_qsvgwidget.cpp
+QT_VPATH = \
+ src/svg \
+
# some source files need to be generated by moc from other source/header files before
# they get #included again by the original source file in the compiling stage
diff --git a/qt4/lib/mk/qt_ui_tools.mk b/qt4/lib/mk/qt_ui_tools.mk
index 5a2985e26..62b30140d 100644
--- a/qt4/lib/mk/qt_ui_tools.mk
+++ b/qt4/lib/mk/qt_ui_tools.mk
@@ -2,17 +2,11 @@ include $(REP_DIR)/lib/import/import-qt_ui_tools.mk
SHARED_LIB = yes
-# extracted from tools/designer/src/uitools/Makefile
-QT_DEFINES += -DQFORMINTERNAL_NAMESPACE -DQT_DESIGNER_STATIC -DQT_FORMBUILDER_NO_SCRIPT -DQT_DESIGNER -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB
-
CC_OPT += -Wno-unused-but-set-variable
include $(REP_DIR)/lib/mk/qt_ui_tools_generated.inc
-INC_DIR += $(REP_DIR)/src/lib/qt4/tools/designer/src/lib/uilib \
- $(REP_DIR)/contrib/$(QT4)/tools/designer/src/lib/uilib \
- $(REP_DIR)/src/lib/qt4/tools/designer/src/uitools \
- $(REP_DIR)/contrib/$(QT4)/tools/designer/src/uitools
+include $(REP_DIR)/lib/mk/qt.inc
LIBS += qt_core qt_gui qt_xml libc
@@ -24,5 +18,3 @@ vpath % $(REP_DIR)/src/lib/qt4/tools/designer/src/uitools
vpath % $(REP_DIR)/contrib/$(QT4)/tools/designer/src/lib/uilib
vpath % $(REP_DIR)/contrib/$(QT4)/tools/designer/src/uitools
-
-include $(REP_DIR)/lib/mk/qt.inc
diff --git a/qt4/lib/mk/qt_ui_tools_generated.inc b/qt4/lib/mk/qt_ui_tools_generated.inc
index c398c1626..05dfa08f4 100644
--- a/qt4/lib/mk/qt_ui_tools_generated.inc
+++ b/qt4/lib/mk/qt_ui_tools_generated.inc
@@ -1,3 +1,10 @@
+QT_DEFINES += -DQFORMINTERNAL_NAMESPACE -DQT_DESIGNER_STATIC -DQT_FORMBUILDER_NO_SCRIPT -DQT_DESIGNER -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB
+
+QT_INCPATH = \
+ mkspecs/qws/genode-generic-g++ \
+ tools/designer/src/lib/uilib \
+ tools/designer/src/uitools \
+
QT_SOURCES = \
abstractformbuilder.cpp \
formbuilder.cpp \
@@ -10,6 +17,10 @@ QT_SOURCES = \
moc_properties_p.cpp \
moc_quiloader.cpp
+QT_VPATH = \
+ tools/designer/src/lib/uilib \
+ tools/designer/src/uitools \
+
# some source files need to be generated by moc from other source/header files before
# they get #included again by the original source file in the compiling stage
diff --git a/qt4/lib/mk/qt_version.inc b/qt4/lib/mk/qt_version.inc
index 68326740a..865900522 100644
--- a/qt4/lib/mk/qt_version.inc
+++ b/qt4/lib/mk/qt_version.inc
@@ -1 +1 @@
-QT4 := qt-everywhere-opensource-src-4.7.4
+QT4 := qt-everywhere-opensource-src-4.8.4
diff --git a/qt4/lib/mk/qt_webcore.mk b/qt4/lib/mk/qt_webcore.mk
index 088767439..c3a683d77 100644
--- a/qt4/lib/mk/qt_webcore.mk
+++ b/qt4/lib/mk/qt_webcore.mk
@@ -2,9 +2,6 @@ include $(REP_DIR)/lib/import/import-qt_webcore.mk
SHARED_LIB = yes
-# extracted from src/3rdparty/webkit/WebCore/Makefile
-QT_DEFINES += -DBUILDING_QT__=1 -DWTF_USE_ACCELERATED_COMPOSITING -DNDEBUG -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_FAST_OPERATOR_PLUS -DQT_USE_FAST_CONCATENATION -DBUILD_WEBKIT -DENABLE_FAST_MOBILE_SCROLLING=1 -DBUILDING_QT__ -DBUILDING_JavaScriptCore -DBUILDING_WTF -DENABLE_VIDEO=0 -DENABLE_JAVASCRIPT_DEBUGGER=1 -DENABLE_DATABASE=1 -DENABLE_EVENTSOURCE=1 -DENABLE_OFFLINE_WEB_APPLICATIONS=1 -DENABLE_DOM_STORAGE=1 -DENABLE_ICONDATABASE=1 -DENABLE_CHANNEL_MESSAGING=1 -DENABLE_ORIENTATION_EVENTS=0 -DENABLE_SQLITE=1 -DENABLE_DASHBOARD_SUPPORT=0 -DENABLE_FILTERS=1 -DENABLE_XPATH=1 -DENABLE_WCSS=0 -DENABLE_WML=0 -DENABLE_SHARED_WORKERS=1 -DENABLE_WORKERS=1 -DENABLE_XHTMLMP=0 -DENABLE_DATAGRID=0 -DENABLE_RUBY=1 -DENABLE_SANDBOX=1 -DENABLE_PROGRESS_TAG=1 -DENABLE_BLOB_SLICE=0 -DENABLE_3D_RENDERING=1 -DENABLE_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_SVG_FOREIGN_OBJECT=1 -DENABLE_SVG_ANIMATION=1 -DENABLE_SVG_AS_IMAGE=1 -DENABLE_SVG_USE=1 -DENABLE_DATALIST=1 -DENABLE_TILED_BACKING_STORE=1 -DENABLE_NETSCAPE_PLUGIN_API=0 -DENABLE_WEB_SOCKETS=1 -DENABLE_XSLT=0 -DENABLE_QT_BEARER=1 -DENABLE_TOUCH_EVENTS=1 -DSQLITE_CORE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_OMIT_COMPLETE -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB
-
# additional defines for the Genode version
CC_OPT += -DSQLITE_NO_SYNC=1 -DSQLITE_THREADSAFE=0
@@ -18,266 +15,6 @@ CC_OPT_sqlite3 += -Wno-int-to-pointer-cast -Wno-pointer-to-int-cast
include $(REP_DIR)/lib/mk/qt_webcore_generated.inc
-INC_DIR += $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/platform/text \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/platform/text \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/assembler \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/assembler \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/interpreter \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/interpreter \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/runtime \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/runtime \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/jit \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/jit \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/bytecode \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/bytecode \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/wtf \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/wtf \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/wtf/unicode \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/wtf/unicode \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/parser \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/parser \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/debugger \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/debugger \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/wrec \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/wrec \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/generated \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/generated \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/bytecompiler \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/bytecompiler \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/profiler \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/profiler \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/ForwardingHeaders \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/ForwardingHeaders \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/API \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/API \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/pcre \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/pcre \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/editing \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/editing \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/dom \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/dom \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/platform \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/platform \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/html \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/html \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/html/canvas \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/html/canvas \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/platform/graphics \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/platform/graphics \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/platform/graphics/transforms \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/platform/graphics/transforms \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/css \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/css \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/generated \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/generated \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/rendering \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/rendering \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/loader \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/loader \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/platform/animation \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/platform/animation \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/platform/network \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/platform/network \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/platform/network/qt \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/platform/network/qt \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/rendering/style \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/rendering/style \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/svg \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/svg \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/svg/animation \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/svg/animation \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/svg/graphics \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/svg/graphics \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/svg/graphics/filters \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/svg/graphics/filters \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/history \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/history \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/page \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/page \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/page/animation \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/page/animation \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/platform/image-decoders \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/platform/image-decoders \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/platform/qt \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/platform/qt \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/platform/sql \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/platform/sql \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/platform/graphics/filters \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/platform/graphics/filters \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/platform/graphics/qt \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/platform/graphics/qt \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/platform/mock \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/platform/mock \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebKit/qt/Api/ \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebKit/qt/Api \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/bindings/js \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/bindings/js \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/inspector \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/inspector \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/bridge \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/bridge \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/bridge/c \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/bridge/c \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/bridge/jsc \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/bridge/jsc \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/bridge/qt \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/bridge/qt \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/storage \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/storage \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/plugins \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/plugins \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/loader/appcache \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/loader/appcache \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/loader/archive \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/loader/archive \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/loader/icon \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/loader/icon \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/xml \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/xml \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/xml \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/xml \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/workers \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/workers \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/notifications \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/notifications \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/accessibility \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/accessibility \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/websockets \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/websockets \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/sqlite \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/sqlite \
- $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/ \
- $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/ \
- $(REP_DIR)/src/lib/qt4/src/corelib/global
+include $(REP_DIR)/lib/mk/qt.inc
LIBS += qt_jscore qt_network qt_core libc libm
-
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/generated
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/bindings
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/bindings/js
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/bridge
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/bridge/c
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/bridge/jsc
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/bridge/qt
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/css
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/dom
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/dom/default
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/editing
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/editing/qt
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/history
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/history/qt
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/html
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/html/canvas
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/inspector
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/inspector/front-end
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/loader/appcache
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/loader/archive
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/loader
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/loader/icon
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/page
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/page/animation
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/page/qt
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/plugins
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/plugins/qt
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/platform
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/platform/qt
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/platform/animation
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/platform/text
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/platform/text/qt
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/platform/graphics
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/platform/graphics/filters
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/platform/graphics/qt
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/platform/graphics/transforms
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/platform/image-decoders/qt
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/platform/mock
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/platform/network
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/platform/network/qt
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/platform/sql
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/rendering
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/rendering/style
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/xml
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebKit/qt/WebCoreSupport
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebKit/qt/Api
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/sqlite
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/storage
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/svg
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/svg/animation
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/svg/graphics
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/svg/graphics/filters
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/svg/graphics/qt
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/workers
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/notifications
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/accessibility
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/accessibility/qt
-vpath % $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/WebCore/websockets
-
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/generated
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/bindings
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/bindings/js
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/bridge
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/bridge/c
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/bridge/jsc
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/bridge/qt
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/css
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/dom
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/dom/default
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/editing
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/editing/qt
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/history
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/history/qt
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/html
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/html/canvas
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/inspector
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/inspector/front-end
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/loader/appcache
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/loader/archive
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/loader
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/loader/icon
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/page
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/page/animation
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/page/qt
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/plugins
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/plugins/qt
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/platform
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/platform/qt
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/platform/animation
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/platform/text
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/platform/text/qt
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/platform/graphics
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/platform/graphics/filters
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/platform/graphics/qt
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/platform/graphics/transforms
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/platform/image-decoders/qt
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/platform/mock
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/platform/network
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/platform/network/qt
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/platform/sql
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/rendering
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/rendering/style
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/xml
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebKit/qt/WebCoreSupport
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebKit/qt/Api
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/sqlite
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/storage
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/svg
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/svg/animation
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/svg/graphics
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/svg/graphics/filters
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/svg/graphics/qt
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/workers
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/notifications
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/accessibility
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/accessibility/qt
-vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/websockets
-
-include $(REP_DIR)/lib/mk/qt.inc
diff --git a/qt4/lib/mk/qt_webcore_generated.inc b/qt4/lib/mk/qt_webcore_generated.inc
index cbabb06b4..cabe81ab0 100644
--- a/qt4/lib/mk/qt_webcore_generated.inc
+++ b/qt4/lib/mk/qt_webcore_generated.inc
@@ -1,382 +1,103 @@
+QT_DEFINES += -DNDEBUG -DBUILDING_QT__=1 -DNDEBUG -DQT_ASCII_CAST_WARNINGS -DENABLE_XSLT=0 -DENABLE_WEB_TIMING=0 -DENABLE_JAVASCRIPT_DEBUGGER=1 -DENABLE_DATABASE=1 -DENABLE_EVENTSOURCE=1 -DENABLE_OFFLINE_WEB_APPLICATIONS=1 -DENABLE_DOM_STORAGE=1 -DENABLE_ICONDATABASE=1 -DENABLE_CHANNEL_MESSAGING=1 -DENABLE_DIRECTORY_UPLOAD=0 -DENABLE_FILE_SYSTEM=0 -DENABLE_QUOTA=0 -DENABLE_SQLITE=1 -DENABLE_DASHBOARD_SUPPORT=0 -DENABLE_FILTERS=1 -DENABLE_XPATH=1 -DENABLE_WCSS=0 -DENABLE_SHARED_WORKERS=1 -DENABLE_WORKERS=1 -DENABLE_XHTMLMP=0 -DENABLE_DETAILS=1 -DENABLE_METER_TAG=1 -DENABLE_PROGRESS_TAG=1 -DENABLE_BLOB=1 -DENABLE_NOTIFICATIONS=1 -DENABLE_INPUT_SPEECH=0 -DENABLE_INSPECTOR=1 -DENABLE_3D_RENDERING=1 -DENABLE_WEB_AUDIO=0 -DENABLE_WEBGL=0 -DENABLE_MEDIA_STATISTICS=0 -DENABLE_VIDEO_TRACK=0 -DENABLE_TOUCH_ICON_LOADING=0 -DENABLE_ANIMATION_API=0 -DENABLE_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_SVG_FOREIGN_OBJECT=1 -DENABLE_SVG_ANIMATION=1 -DENABLE_SVG_AS_IMAGE=1 -DENABLE_SVG_USE=1 -DENABLE_DATALIST=1 -DENABLE_TILED_BACKING_STORE=1 -DENABLE_NETSCAPE_PLUGIN_API=0 -DWTF_USE_QT_BEARER=1 -DENABLE_TOUCH_EVENTS=1 -DENABLE_VIDEO=0 -DSQLITE_CORE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_OMIT_COMPLETE -DBUILDING_JavaScriptCore -DBUILDING_WTF -DBUILDING_WEBKIT -DQT_MAKEDLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB
+
+QT_INCPATH = \
+ mkspecs/qws/genode-generic-g++ \
+ src/3rdparty/sqlite \
+ src/3rdparty/webkit/include \
+ src/3rdparty/webkit/Source \
+ src/3rdparty/webkit/Source/JavaScriptCore \
+ src/3rdparty/webkit/Source/JavaScriptCore/API \
+ src/3rdparty/webkit/Source/JavaScriptCore/assembler \
+ src/3rdparty/webkit/Source/JavaScriptCore/bytecode \
+ src/3rdparty/webkit/Source/JavaScriptCore/bytecompiler \
+ src/3rdparty/webkit/Source/JavaScriptCore/debugger \
+ src/3rdparty/webkit/Source/JavaScriptCore/dfg \
+ src/3rdparty/webkit/Source/JavaScriptCore/ForwardingHeaders \
+ src/3rdparty/webkit/Source/JavaScriptCore/generated \
+ src/3rdparty/webkit/Source/JavaScriptCore/heap \
+ src/3rdparty/webkit/Source/JavaScriptCore/interpreter \
+ src/3rdparty/webkit/Source/JavaScriptCore/jit \
+ src/3rdparty/webkit/Source/JavaScriptCore/parser \
+ src/3rdparty/webkit/Source/JavaScriptCore/profiler \
+ src/3rdparty/webkit/Source/JavaScriptCore/runtime \
+ src/3rdparty/webkit/Source/JavaScriptCore/wtf \
+ src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject \
+ src/3rdparty/webkit/Source/JavaScriptCore/wtf/symbian \
+ src/3rdparty/webkit/Source/JavaScriptCore/wtf/unicode \
+ src/3rdparty/webkit/Source/JavaScriptCore/yarr \
+ src/3rdparty/webkit/Source/ThirdParty \
+ src/3rdparty/webkit/Source/WebCore \
+ src/3rdparty/webkit/Source/WebCore/accessibility \
+ src/3rdparty/webkit/Source/WebCore/bindings \
+ src/3rdparty/webkit/Source/WebCore/bindings/generic \
+ src/3rdparty/webkit/Source/WebCore/bindings/js \
+ src/3rdparty/webkit/Source/WebCore/bindings/js/specialization \
+ src/3rdparty/webkit/Source/WebCore/bridge \
+ src/3rdparty/webkit/Source/WebCore/bridge/c \
+ src/3rdparty/webkit/Source/WebCore/bridge/jsc \
+ src/3rdparty/webkit/Source/WebCore/bridge/qt \
+ src/3rdparty/webkit/Source/WebCore/css \
+ src/3rdparty/webkit/Source/WebCore/dom \
+ src/3rdparty/webkit/Source/WebCore/dom/default \
+ src/3rdparty/webkit/Source/WebCore/editing \
+ src/3rdparty/webkit/Source/WebCore/fileapi \
+ src/3rdparty/webkit/Source/WebCore/generated \
+ src/3rdparty/webkit/Source/WebCore/history \
+ src/3rdparty/webkit/Source/WebCore/html \
+ src/3rdparty/webkit/Source/WebCore/html/canvas \
+ src/3rdparty/webkit/Source/WebCore/html/parser \
+ src/3rdparty/webkit/Source/WebCore/html/shadow \
+ src/3rdparty/webkit/Source/WebCore/inspector \
+ src/3rdparty/webkit/Source/WebCore/loader \
+ src/3rdparty/webkit/Source/WebCore/loader/appcache \
+ src/3rdparty/webkit/Source/WebCore/loader/archive \
+ src/3rdparty/webkit/Source/WebCore/loader/cache \
+ src/3rdparty/webkit/Source/WebCore/loader/icon \
+ src/3rdparty/webkit/Source/WebCore/mathml \
+ src/3rdparty/webkit/Source/WebCore/notifications \
+ src/3rdparty/webkit/Source/WebCore/page \
+ src/3rdparty/webkit/Source/WebCore/page/animation \
+ src/3rdparty/webkit/Source/WebCore/page/qt \
+ src/3rdparty/webkit/Source/WebCore/platform \
+ src/3rdparty/webkit/Source/WebCore/platform/animation \
+ src/3rdparty/webkit/Source/WebCore/platform/audio \
+ src/3rdparty/webkit/Source/WebCore/platform/graphics \
+ src/3rdparty/webkit/Source/WebCore/platform/graphics/filters \
+ src/3rdparty/webkit/Source/WebCore/platform/graphics/filters/arm \
+ src/3rdparty/webkit/Source/WebCore/platform/graphics/qt \
+ src/3rdparty/webkit/Source/WebCore/platform/graphics/texmap \
+ src/3rdparty/webkit/Source/WebCore/platform/graphics/transforms \
+ src/3rdparty/webkit/Source/WebCore/platform/image-decoders \
+ src/3rdparty/webkit/Source/WebCore/platform/leveldb \
+ src/3rdparty/webkit/Source/WebCore/platform/mock \
+ src/3rdparty/webkit/Source/WebCore/platform/network \
+ src/3rdparty/webkit/Source/WebCore/platform/network/qt \
+ src/3rdparty/webkit/Source/WebCore/platform/qt \
+ src/3rdparty/webkit/Source/WebCore/platform/sql \
+ src/3rdparty/webkit/Source/WebCore/platform/text \
+ src/3rdparty/webkit/Source/WebCore/platform/text/transcoder \
+ src/3rdparty/webkit/Source/WebCore/plugins \
+ src/3rdparty/webkit/Source/WebCore/rendering \
+ src/3rdparty/webkit/Source/WebCore/rendering/mathml \
+ src/3rdparty/webkit/Source/WebCore/rendering/style \
+ src/3rdparty/webkit/Source/WebCore/rendering/svg \
+ src/3rdparty/webkit/Source/WebCore/storage \
+ src/3rdparty/webkit/Source/WebCore/svg \
+ src/3rdparty/webkit/Source/WebCore/svg/animation \
+ src/3rdparty/webkit/Source/WebCore/svg/graphics \
+ src/3rdparty/webkit/Source/WebCore/svg/graphics/filters \
+ src/3rdparty/webkit/Source/WebCore/svg/properties \
+ src/3rdparty/webkit/Source/WebCore/testing \
+ src/3rdparty/webkit/Source/WebCore/testing/js \
+ src/3rdparty/webkit/Source/WebCore/webaudio \
+ src/3rdparty/webkit/Source/WebCore/websockets \
+ src/3rdparty/webkit/Source/WebCore/wml \
+ src/3rdparty/webkit/Source/WebCore/workers \
+ src/3rdparty/webkit/Source/WebCore/xml \
+ src/3rdparty/webkit/Source/WebKit/qt/Api \
+ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport \
+
QT_SOURCES = \
- SVGNames.cpp \
- SVGElementFactory.cpp \
- JSSVGElementWrapperFactory.cpp \
- XLinkNames.cpp \
- JSCounter.cpp \
- JSCSSCharsetRule.cpp \
- JSCSSFontFaceRule.cpp \
- JSCSSImportRule.cpp \
- JSCSSMediaRule.cpp \
- JSCSSPageRule.cpp \
- JSCSSPrimitiveValue.cpp \
- JSCSSRule.cpp \
- JSCSSRuleList.cpp \
- JSCSSStyleDeclaration.cpp \
- JSCSSStyleRule.cpp \
- JSCSSStyleSheet.cpp \
- JSCSSValue.cpp \
- JSCSSValueList.cpp \
- JSCSSVariablesDeclaration.cpp \
- JSCSSVariablesRule.cpp \
- JSMediaList.cpp \
- JSRect.cpp \
- JSRGBColor.cpp \
- JSStyleMedia.cpp \
- JSStyleSheet.cpp \
- JSStyleSheetList.cpp \
- JSWebKitCSSKeyframeRule.cpp \
- JSWebKitCSSKeyframesRule.cpp \
- JSWebKitCSSMatrix.cpp \
- JSWebKitCSSTransformValue.cpp \
- JSAttr.cpp \
- JSBeforeLoadEvent.cpp \
- JSCharacterData.cpp \
- JSClientRect.cpp \
- JSClientRectList.cpp \
- JSClipboard.cpp \
- JSCDATASection.cpp \
- JSComment.cpp \
- JSCompositionEvent.cpp \
- JSCustomEvent.cpp \
- JSDocumentFragment.cpp \
- JSDocument.cpp \
- JSDocumentType.cpp \
- JSDOMCoreException.cpp \
- JSDOMImplementation.cpp \
- JSElement.cpp \
- JSEntity.cpp \
- JSEntityReference.cpp \
- JSErrorEvent.cpp \
- JSEvent.cpp \
- JSEventException.cpp \
- JSKeyboardEvent.cpp \
- JSMouseEvent.cpp \
- JSMessageChannel.cpp \
- JSMessageEvent.cpp \
- JSMessagePort.cpp \
- JSMutationEvent.cpp \
- JSNamedNodeMap.cpp \
- JSNode.cpp \
- JSNodeFilter.cpp \
- JSNodeIterator.cpp \
- JSNodeList.cpp \
- JSNotation.cpp \
- JSOverflowEvent.cpp \
- JSPageTransitionEvent.cpp \
- JSPopStateEvent.cpp \
- JSProcessingInstruction.cpp \
- JSProgressEvent.cpp \
- JSRangeException.cpp \
- JSRange.cpp \
- JSText.cpp \
- JSTextEvent.cpp \
- JSTouch.cpp \
- JSTouchEvent.cpp \
- JSTouchList.cpp \
- JSTreeWalker.cpp \
- JSUIEvent.cpp \
- JSWebKitAnimationEvent.cpp \
- JSWebKitTransitionEvent.cpp \
- JSWheelEvent.cpp \
- JSBlob.cpp \
- JSWebGLArray.cpp \
- JSWebGLArrayBuffer.cpp \
- JSWebGLByteArray.cpp \
- JSWebGLFloatArray.cpp \
- JSCanvasGradient.cpp \
- JSWebGLIntArray.cpp \
- JSCanvasPattern.cpp \
- JSCanvasRenderingContext.cpp \
- JSCanvasRenderingContext2D.cpp \
- JSWebGLActiveInfo.cpp \
- JSWebGLBuffer.cpp \
- JSWebGLContextAttributes.cpp \
- JSWebGLFramebuffer.cpp \
- JSWebGLProgram.cpp \
- JSWebGLRenderbuffer.cpp \
- JSWebGLRenderingContext.cpp \
- JSWebGLShader.cpp \
- JSWebGLShortArray.cpp \
- JSWebGLTexture.cpp \
- JSWebGLUniformLocation.cpp \
- JSWebGLUnsignedByteArray.cpp \
- JSWebGLUnsignedIntArray.cpp \
- JSWebGLUnsignedShortArray.cpp \
- JSDataGridColumn.cpp \
- JSDataGridColumnList.cpp \
- JSDOMFormData.cpp \
- JSFile.cpp \
- JSFileList.cpp \
- JSHTMLAllCollection.cpp \
- JSHTMLAudioElement.cpp \
- JSHTMLAnchorElement.cpp \
- JSHTMLAppletElement.cpp \
- JSHTMLAreaElement.cpp \
- JSHTMLBaseElement.cpp \
- JSHTMLBaseFontElement.cpp \
- JSHTMLBlockquoteElement.cpp \
- JSHTMLBodyElement.cpp \
- JSHTMLBRElement.cpp \
- JSHTMLButtonElement.cpp \
- JSHTMLCanvasElement.cpp \
- JSHTMLCollection.cpp \
- JSHTMLDataGridElement.cpp \
- JSHTMLDataGridCellElement.cpp \
- JSHTMLDataGridColElement.cpp \
- JSHTMLDataGridRowElement.cpp \
- JSHTMLDataListElement.cpp \
- JSHTMLDirectoryElement.cpp \
- JSHTMLDivElement.cpp \
- JSHTMLDListElement.cpp \
- JSHTMLDocument.cpp \
- JSHTMLElement.cpp \
- JSHTMLEmbedElement.cpp \
- JSHTMLFieldSetElement.cpp \
- JSHTMLFontElement.cpp \
- JSHTMLFormElement.cpp \
- JSHTMLFrameElement.cpp \
- JSHTMLFrameSetElement.cpp \
- JSHTMLHeadElement.cpp \
- JSHTMLHeadingElement.cpp \
- JSHTMLHRElement.cpp \
- JSHTMLHtmlElement.cpp \
- JSHTMLIFrameElement.cpp \
- JSHTMLImageElement.cpp \
- JSHTMLInputElement.cpp \
- JSHTMLIsIndexElement.cpp \
- JSHTMLLabelElement.cpp \
- JSHTMLLegendElement.cpp \
- JSHTMLLIElement.cpp \
- JSHTMLLinkElement.cpp \
- JSHTMLMapElement.cpp \
- JSHTMLMarqueeElement.cpp \
- JSHTMLMediaElement.cpp \
- JSHTMLMenuElement.cpp \
- JSHTMLMetaElement.cpp \
- JSHTMLModElement.cpp \
- JSHTMLObjectElement.cpp \
- JSHTMLOListElement.cpp \
- JSHTMLOptGroupElement.cpp \
- JSHTMLOptionElement.cpp \
- JSHTMLOptionsCollection.cpp \
- JSHTMLParagraphElement.cpp \
- JSHTMLParamElement.cpp \
- JSHTMLPreElement.cpp \
- JSHTMLProgressElement.cpp \
- JSHTMLQuoteElement.cpp \
- JSHTMLScriptElement.cpp \
- JSHTMLSelectElement.cpp \
- JSHTMLSourceElement.cpp \
- JSHTMLStyleElement.cpp \
- JSHTMLTableCaptionElement.cpp \
- JSHTMLTableCellElement.cpp \
- JSHTMLTableColElement.cpp \
- JSHTMLTableElement.cpp \
- JSHTMLTableRowElement.cpp \
- JSHTMLTableSectionElement.cpp \
- JSHTMLTextAreaElement.cpp \
- JSHTMLTitleElement.cpp \
- JSHTMLUListElement.cpp \
- JSHTMLVideoElement.cpp \
- JSImageData.cpp \
- JSMediaError.cpp \
- JSTextMetrics.cpp \
- JSTimeRanges.cpp \
- JSValidityState.cpp \
- JSVoidCallback.cpp \
- JSInjectedScriptHost.cpp \
- JSInspectorBackend.cpp \
- JSInspectorFrontendHost.cpp \
- JSJavaScriptCallFrame.cpp \
- JSDOMApplicationCache.cpp \
- JSBarInfo.cpp \
- JSConsole.cpp \
- JSCoordinates.cpp \
- JSDOMSelection.cpp \
- JSDOMWindow.cpp \
- JSEventSource.cpp \
- JSGeolocation.cpp \
- JSGeoposition.cpp \
- JSHistory.cpp \
- JSLocation.cpp \
- JSNavigator.cpp \
- JSPositionError.cpp \
- JSScreen.cpp \
- JSWebKitPoint.cpp \
- JSWorkerNavigator.cpp \
- JSPlugin.cpp \
- JSMimeType.cpp \
- JSPluginArray.cpp \
- JSMimeTypeArray.cpp \
- JSDatabase.cpp \
- JSStorage.cpp \
- JSStorageEvent.cpp \
- JSSQLError.cpp \
- JSSQLResultSet.cpp \
- JSSQLResultSetRowList.cpp \
- JSSQLTransaction.cpp \
- JSSVGZoomEvent.cpp \
- JSSVGAElement.cpp \
- JSSVGAltGlyphElement.cpp \
- JSSVGAngle.cpp \
- JSSVGAnimateColorElement.cpp \
- JSSVGAnimatedAngle.cpp \
- JSSVGAnimatedBoolean.cpp \
- JSSVGAnimatedEnumeration.cpp \
- JSSVGAnimatedInteger.cpp \
- JSSVGAnimatedLength.cpp \
- JSSVGAnimatedLengthList.cpp \
- JSSVGAnimatedNumber.cpp \
- JSSVGAnimatedNumberList.cpp \
- JSSVGAnimatedPreserveAspectRatio.cpp \
- JSSVGAnimatedRect.cpp \
- JSSVGAnimatedString.cpp \
- JSSVGAnimatedTransformList.cpp \
- JSSVGAnimateElement.cpp \
- JSSVGAnimateTransformElement.cpp \
- JSSVGAnimationElement.cpp \
- JSSVGCircleElement.cpp \
- JSSVGClipPathElement.cpp \
- JSSVGColor.cpp \
- JSSVGComponentTransferFunctionElement.cpp \
- JSSVGCursorElement.cpp \
- JSSVGDefsElement.cpp \
- JSSVGDescElement.cpp \
- JSSVGDocument.cpp \
- JSSVGElement.cpp \
- JSSVGElementInstance.cpp \
- JSSVGElementInstanceList.cpp \
- JSSVGEllipseElement.cpp \
- JSSVGException.cpp \
- JSSVGFEBlendElement.cpp \
- JSSVGFEColorMatrixElement.cpp \
- JSSVGFEComponentTransferElement.cpp \
- JSSVGFECompositeElement.cpp \
- JSSVGFEDiffuseLightingElement.cpp \
- JSSVGFEDisplacementMapElement.cpp \
- JSSVGFEDistantLightElement.cpp \
- JSSVGFEFloodElement.cpp \
- JSSVGFEFuncAElement.cpp \
- JSSVGFEFuncBElement.cpp \
- JSSVGFEFuncGElement.cpp \
- JSSVGFEFuncRElement.cpp \
- JSSVGFEGaussianBlurElement.cpp \
- JSSVGFEImageElement.cpp \
- JSSVGFEMergeElement.cpp \
- JSSVGFEMergeNodeElement.cpp \
- JSSVGFEMorphologyElement.cpp \
- JSSVGFEOffsetElement.cpp \
- JSSVGFEPointLightElement.cpp \
- JSSVGFESpecularLightingElement.cpp \
- JSSVGFESpotLightElement.cpp \
- JSSVGFETileElement.cpp \
- JSSVGFETurbulenceElement.cpp \
- JSSVGFilterElement.cpp \
- JSSVGFontElement.cpp \
- JSSVGFontFaceElement.cpp \
- JSSVGFontFaceFormatElement.cpp \
- JSSVGFontFaceNameElement.cpp \
- JSSVGFontFaceSrcElement.cpp \
- JSSVGFontFaceUriElement.cpp \
- JSSVGForeignObjectElement.cpp \
- JSSVGGElement.cpp \
- JSSVGGlyphElement.cpp \
- JSSVGGradientElement.cpp \
- JSSVGHKernElement.cpp \
- JSSVGImageElement.cpp \
- JSSVGLength.cpp \
- JSSVGLengthList.cpp \
- JSSVGLinearGradientElement.cpp \
- JSSVGLineElement.cpp \
- JSSVGMarkerElement.cpp \
- JSSVGMaskElement.cpp \
- JSSVGMatrix.cpp \
- JSSVGMetadataElement.cpp \
- JSSVGMissingGlyphElement.cpp \
- JSSVGNumber.cpp \
- JSSVGNumberList.cpp \
- JSSVGPaint.cpp \
- JSSVGPathElement.cpp \
- JSSVGPathSegArcAbs.cpp \
- JSSVGPathSegArcRel.cpp \
- JSSVGPathSegClosePath.cpp \
- JSSVGPathSegCurvetoCubicAbs.cpp \
- JSSVGPathSegCurvetoCubicRel.cpp \
- JSSVGPathSegCurvetoCubicSmoothAbs.cpp \
- JSSVGPathSegCurvetoCubicSmoothRel.cpp \
- JSSVGPathSegCurvetoQuadraticAbs.cpp \
- JSSVGPathSegCurvetoQuadraticRel.cpp \
- JSSVGPathSegCurvetoQuadraticSmoothAbs.cpp \
- JSSVGPathSegCurvetoQuadraticSmoothRel.cpp \
- JSSVGPathSeg.cpp \
- JSSVGPathSegLinetoAbs.cpp \
- JSSVGPathSegLinetoHorizontalAbs.cpp \
- JSSVGPathSegLinetoHorizontalRel.cpp \
- JSSVGPathSegLinetoRel.cpp \
- JSSVGPathSegLinetoVerticalAbs.cpp \
- JSSVGPathSegLinetoVerticalRel.cpp \
- JSSVGPathSegList.cpp \
- JSSVGPathSegMovetoAbs.cpp \
- JSSVGPathSegMovetoRel.cpp \
- JSSVGPatternElement.cpp \
- JSSVGPoint.cpp \
- JSSVGPointList.cpp \
- JSSVGPolygonElement.cpp \
- JSSVGPolylineElement.cpp \
- JSSVGPreserveAspectRatio.cpp \
- JSSVGRadialGradientElement.cpp \
- JSSVGRectElement.cpp \
- JSSVGRect.cpp \
- JSSVGRenderingIntent.cpp \
- JSSVGScriptElement.cpp \
- JSSVGSetElement.cpp \
- JSSVGStopElement.cpp \
- JSSVGStringList.cpp \
- JSSVGStyleElement.cpp \
- JSSVGSVGElement.cpp \
- JSSVGSwitchElement.cpp \
- JSSVGSymbolElement.cpp \
- JSSVGTextContentElement.cpp \
- JSSVGTextElement.cpp \
- JSSVGTextPathElement.cpp \
- JSSVGTextPositioningElement.cpp \
- JSSVGTitleElement.cpp \
- JSSVGTransform.cpp \
- JSSVGTransformList.cpp \
- JSSVGTRefElement.cpp \
- JSSVGTSpanElement.cpp \
- JSSVGUnitTypes.cpp \
- JSSVGUseElement.cpp \
- JSSVGViewElement.cpp \
- JSWebSocket.cpp \
- JSAbstractWorker.cpp \
- JSDedicatedWorkerContext.cpp \
- JSSharedWorker.cpp \
- JSSharedWorkerContext.cpp \
- JSWorker.cpp \
- JSWorkerContext.cpp \
- JSWorkerLocation.cpp \
- JSDOMParser.cpp \
- JSXMLHttpRequest.cpp \
- JSXMLHttpRequestException.cpp \
- JSXMLHttpRequestProgressEvent.cpp \
- JSXMLHttpRequestUpload.cpp \
- JSXMLSerializer.cpp \
- JSXPathNSResolver.cpp \
- JSXPathException.cpp \
- JSXPathExpression.cpp \
- JSXPathResult.cpp \
- JSXPathEvaluator.cpp \
- JSXSLTProcessor.cpp \
- CSSGrammar.cpp \
- HTMLNames.cpp \
- HTMLElementFactory.cpp \
- JSHTMLElementWrapperFactory.cpp \
- XMLNSNames.cpp \
- XMLNames.cpp \
- UserAgentStyleSheetsData.cpp \
- XPathGrammar.cpp \
AccessibilityImageMapLink.cpp \
AccessibilityMediaControls.cpp \
AccessibilityMenuList.cpp \
@@ -386,8 +107,10 @@ QT_SOURCES = \
AccessibilityList.cpp \
AccessibilityListBox.cpp \
AccessibilityListBoxOption.cpp \
+ AccessibilityProgressIndicator.cpp \
AccessibilityRenderObject.cpp \
AccessibilityScrollbar.cpp \
+ AccessibilityScrollView.cpp \
AccessibilitySlider.cpp \
AccessibilityARIAGrid.cpp \
AccessibilityARIAGridCell.cpp \
@@ -398,65 +121,97 @@ QT_SOURCES = \
AccessibilityTableHeaderContainer.cpp \
AccessibilityTableRow.cpp \
AXObjectCache.cpp \
- GCController.cpp \
+ ActiveDOMCallback.cpp \
+ RuntimeEnabledFeatures.cpp \
+ ScriptControllerBase.cpp \
+ CallbackFunction.cpp \
DOMObjectHashTableMap.cpp \
DOMWrapperWorld.cpp \
- JSCallbackData.cpp \
+ GCController.cpp \
+ JSArrayBufferCustom.cpp \
JSAttrCustom.cpp \
JSCDATASectionCustom.cpp \
- JSCanvasRenderingContextCustom.cpp \
- JSCanvasRenderingContext2DCustom.cpp \
- JSClipboardCustom.cpp \
- JSConsoleCustom.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 \
JSCustomPositionCallback.cpp \
JSCustomPositionErrorCallback.cpp \
JSCustomVoidCallback.cpp \
JSCustomXPathNSResolver.cpp \
- JSDataGridColumnListCustom.cpp \
- JSDataGridDataSource.cpp \
- JSDebugWrapperSet.cpp \
- JSDocumentCustom.cpp \
- JSDocumentFragmentCustom.cpp \
+ JSDOMBinding.cpp \
JSDOMFormDataCustom.cpp \
JSDOMGlobalObject.cpp \
+ JSDOMImplementationCustom.cpp \
+ JSDOMMimeTypeArrayCustom.cpp \
+ JSDOMPluginArrayCustom.cpp \
+ JSDOMPluginCustom.cpp \
+ JSDOMStringMapCustom.cpp \
+ JSDOMTokenListCustom.cpp \
JSDOMWindowBase.cpp \
JSDOMWindowCustom.cpp \
JSDOMWindowShell.cpp \
JSDOMWrapper.cpp \
+ JSDataViewCustom.cpp \
+ JSDesktopNotificationsCustom.cpp \
+ JSDeviceMotionEventCustom.cpp \
+ JSDeviceOrientationEventCustom.cpp \
+ JSDocumentCustom.cpp \
JSElementCustom.cpp \
+ JSErrorHandler.cpp \
JSEventCustom.cpp \
- JSEventSourceConstructor.cpp \
+ JSEventListener.cpp \
JSEventSourceCustom.cpp \
JSEventTarget.cpp \
JSExceptionBase.cpp \
+ JSFileReaderCustom.cpp \
+ JSFloat32ArrayCustom.cpp \
JSGeolocationCustom.cpp \
- JSHistoryCustom.cpp \
+ JSHTMLAllCollectionCustom.cpp \
JSHTMLAppletElementCustom.cpp \
JSHTMLCanvasElementCustom.cpp \
- JSHTMLAllCollectionCustom.cpp \
JSHTMLCollectionCustom.cpp \
- JSHTMLDataGridElementCustom.cpp \
JSHTMLDocumentCustom.cpp \
JSHTMLElementCustom.cpp \
JSHTMLEmbedElementCustom.cpp \
JSHTMLFormElementCustom.cpp \
JSHTMLFrameElementCustom.cpp \
JSHTMLFrameSetElementCustom.cpp \
- JSHTMLIFrameElementCustom.cpp \
JSHTMLInputElementCustom.cpp \
+ JSHTMLLinkElementCustom.cpp \
JSHTMLObjectElementCustom.cpp \
JSHTMLOptionsCollectionCustom.cpp \
+ JSHTMLOutputElementCustom.cpp \
JSHTMLSelectElementCustom.cpp \
+ JSHTMLStyleElementCustom.cpp \
+ JSHistoryCustom.cpp \
JSImageConstructor.cpp \
JSImageDataCustom.cpp \
JSInjectedScriptHostCustom.cpp \
+ JSInjectedScriptManager.cpp \
JSInspectorFrontendHostCustom.cpp \
+ JSInt16ArrayCustom.cpp \
+ JSInt32ArrayCustom.cpp \
+ JSInt8ArrayCustom.cpp \
+ JSLazyEventListener.cpp \
JSLocationCustom.cpp \
+ JSMainThreadExecState.cpp \
+ JSMediaListCustom.cpp \
+ JSMemoryInfoCustom.cpp \
+ JSMessageChannelCustom.cpp \
+ JSMessageEventCustom.cpp \
+ JSMessagePortCustom.cpp \
JSNamedNodeMapCustom.cpp \
JSNavigatorCustom.cpp \
JSNodeCustom.cpp \
@@ -465,57 +220,59 @@ QT_SOURCES = \
JSNodeIteratorCustom.cpp \
JSNodeListCustom.cpp \
JSOptionConstructor.cpp \
+ JSPluginElementFunctions.cpp \
+ JSProcessingInstructionCustom.cpp \
+ JSScriptProfileNodeCustom.cpp \
JSStyleSheetCustom.cpp \
JSStyleSheetListCustom.cpp \
JSTextCustom.cpp \
+ JSTouchCustom.cpp \
+ JSTouchListCustom.cpp \
JSTreeWalkerCustom.cpp \
- JSWebKitCSSMatrixConstructor.cpp \
- JSWebKitPointConstructor.cpp \
- JSXMLHttpRequestConstructor.cpp \
+ JSUint16ArrayCustom.cpp \
+ JSUint32ArrayCustom.cpp \
+ JSUint8ArrayCustom.cpp \
+ JSWebKitAnimationCustom.cpp \
+ JSWebKitAnimationListCustom.cpp \
+ JSWebKitCSSKeyframeRuleCustom.cpp \
+ JSWebKitCSSKeyframesRuleCustom.cpp \
+ JSWebKitCSSMatrixCustom.cpp \
+ JSWebKitPointCustom.cpp \
JSXMLHttpRequestCustom.cpp \
JSXMLHttpRequestUploadCustom.cpp \
- JSPluginCustom.cpp \
- JSPluginArrayCustom.cpp \
- JSMessageChannelConstructor.cpp \
- JSMessageChannelCustom.cpp \
- JSMessageEventCustom.cpp \
- JSMessagePortCustom.cpp \
- JSMimeTypeArrayCustom.cpp \
- JSDOMBinding.cpp \
- JSEventListener.cpp \
- JSLazyEventListener.cpp \
- JSPluginElementFunctions.cpp \
- JSPopStateEventCustom.cpp \
- JavaScriptProfile.cpp \
- JavaScriptProfileNode.cpp \
- ScriptArray.cpp \
+ PageScriptDebugServer.cpp \
+ ScheduledAction.cpp \
ScriptCachedFrameData.cpp \
- ScriptCallFrame.cpp \
- ScriptCallStack.cpp \
+ ScriptCallStackFactory.cpp \
ScriptController.cpp \
+ ScriptControllerQt.cpp \
ScriptDebugServer.cpp \
ScriptEventListener.cpp \
ScriptFunctionCall.cpp \
+ ScriptGCEvent.cpp \
ScriptObject.cpp \
- ScriptProfiler.cpp \
+ ScriptProfile.cpp \
ScriptState.cpp \
ScriptValue.cpp \
- ScheduledAction.cpp \
SerializedScriptValue.cpp \
- ScriptControllerBase.cpp \
IdentifierRep.cpp \
NP_jsobject.cpp \
- npruntime.cpp \
- runtime_array.cpp \
- runtime_method.cpp \
- runtime_object.cpp \
- runtime_root.cpp \
CRuntimeObject.cpp \
c_class.cpp \
c_instance.cpp \
c_runtime.cpp \
c_utility.cpp \
BridgeJSC.cpp \
+ npruntime.cpp \
+ qt_class.cpp \
+ qt_instance.cpp \
+ qt_pixmapruntime.cpp \
+ qt_runtime.cpp \
+ runtime_array.cpp \
+ runtime_method.cpp \
+ runtime_object.cpp \
+ runtime_root.cpp \
+ WebCoreTestSupport.cpp \
CSSBorderImageValue.cpp \
CSSCanvasValue.cpp \
CSSCharsetRule.cpp \
@@ -528,26 +285,30 @@ QT_SOURCES = \
CSSFontFaceSource.cpp \
CSSFunctionValue.cpp \
CSSGradientValue.cpp \
- CSSHelper.cpp \
CSSImageValue.cpp \
CSSImageGeneratorValue.cpp \
CSSImportRule.cpp \
CSSInheritedValue.cpp \
CSSInitialValue.cpp \
+ CSSLineBoxContainValue.cpp \
CSSMediaRule.cpp \
CSSMutableStyleDeclaration.cpp \
+ CSSOMUtils.cpp \
CSSPageRule.cpp \
CSSParser.cpp \
CSSParserValues.cpp \
CSSPrimitiveValue.cpp \
+ CSSPrimitiveValueCache.cpp \
CSSProperty.cpp \
CSSPropertyLonghand.cpp \
+ CSSPropertySourceData.cpp \
CSSReflectValue.cpp \
CSSRule.cpp \
CSSRuleList.cpp \
CSSSelector.cpp \
CSSSelectorList.cpp \
CSSSegmentedFontFace.cpp \
+ CSSStyleApplyProperty.cpp \
CSSStyleDeclaration.cpp \
CSSStyleRule.cpp \
CSSStyleSelector.cpp \
@@ -555,9 +316,6 @@ QT_SOURCES = \
CSSTimingFunctionValue.cpp \
CSSUnicodeRangeValue.cpp \
CSSValueList.cpp \
- CSSVariableDependentValue.cpp \
- CSSVariablesDeclaration.cpp \
- CSSVariablesRule.cpp \
FontFamilyValue.cpp \
FontValue.cpp \
MediaFeatureNames.cpp \
@@ -565,6 +323,9 @@ QT_SOURCES = \
MediaQuery.cpp \
MediaQueryEvaluator.cpp \
MediaQueryExp.cpp \
+ MediaQueryList.cpp \
+ MediaQueryListListener.cpp \
+ MediaQueryMatcher.cpp \
RGBColor.cpp \
ShadowValue.cpp \
StyleBase.cpp \
@@ -579,10 +340,10 @@ QT_SOURCES = \
ActiveDOMObject.cpp \
Attr.cpp \
Attribute.cpp \
+ BeforeProcessEvent.cpp \
BeforeTextInsertedEvent.cpp \
BeforeUnloadEvent.cpp \
CDATASection.cpp \
- CanvasSurface.cpp \
CharacterData.cpp \
CheckedRadioButtons.cpp \
ChildNodeList.cpp \
@@ -596,24 +357,39 @@ QT_SOURCES = \
ContainerNode.cpp \
CSSMappedAttributeDeclaration.cpp \
CustomEvent.cpp \
+ DecodedDataDocumentParser.cpp \
+ DeviceMotionController.cpp \
+ DeviceMotionData.cpp \
+ DeviceMotionEvent.cpp \
+ DeviceOrientation.cpp \
+ DeviceOrientationController.cpp \
+ DeviceOrientationEvent.cpp \
Document.cpp \
DocumentFragment.cpp \
+ DocumentMarkerController.cpp \
+ DocumentOrderedMap.cpp \
+ DocumentParser.cpp \
DocumentType.cpp \
DOMImplementation.cpp \
+ DOMStringList.cpp \
+ DOMStringMap.cpp \
+ DatasetDOMStringMap.cpp \
DynamicNodeList.cpp \
EditingText.cpp \
Element.cpp \
- Entity.cpp \
EntityReference.cpp \
ErrorEvent.cpp \
Event.cpp \
+ EventContext.cpp \
+ EventDispatcher.cpp \
EventNames.cpp \
EventTarget.cpp \
+ EventQueue.cpp \
ExceptionBase.cpp \
ExceptionCode.cpp \
+ IconURL.cpp \
InputElement.cpp \
KeyboardEvent.cpp \
- MappedAttribute.cpp \
MessageChannel.cpp \
MessageEvent.cpp \
MessagePort.cpp \
@@ -621,8 +397,7 @@ QT_SOURCES = \
MouseEvent.cpp \
MouseRelatedEvent.cpp \
MutationEvent.cpp \
- NamedAttrMap.cpp \
- NamedMappedAttrMap.cpp \
+ NamedNodeMap.cpp \
NameNodeList.cpp \
Node.cpp \
NodeFilterCondition.cpp \
@@ -631,8 +406,10 @@ QT_SOURCES = \
Notation.cpp \
OptionGroupElement.cpp \
OptionElement.cpp \
+ StaticHashSetNodeList.cpp \
OverflowEvent.cpp \
PageTransitionEvent.cpp \
+ PendingScript.cpp \
PopStateEvent.cpp \
Position.cpp \
PositionIterator.cpp \
@@ -641,10 +418,14 @@ QT_SOURCES = \
QualifiedName.cpp \
Range.cpp \
RegisteredEventListener.cpp \
+ ScopedEventQueue.cpp \
+ ScriptableDocumentParser.cpp \
ScriptElement.cpp \
ScriptExecutionContext.cpp \
+ ScriptRunner.cpp \
SelectElement.cpp \
SelectorNodeList.cpp \
+ ShadowRoot.cpp \
SpaceSplitString.cpp \
StaticNodeList.cpp \
StyledElement.cpp \
@@ -656,17 +437,22 @@ QT_SOURCES = \
TouchEvent.cpp \
TouchList.cpp \
Traversal.cpp \
+ TreeScope.cpp \
TreeWalker.cpp \
UIEvent.cpp \
UIEventWithKeyState.cpp \
+ UserGestureIndicator.cpp \
+ UserTypingGestureIndicator.cpp \
ViewportArguments.cpp \
WebKitAnimationEvent.cpp \
WebKitTransitionEvent.cpp \
WheelEvent.cpp \
- XMLTokenizer.cpp \
- XMLTokenizerQt.cpp \
+ WindowEventContext.cpp \
+ XMLDocumentParser.cpp \
+ XMLDocumentParserQt.cpp \
PlatformMessagePortChannel.cpp \
AppendNodeCommand.cpp \
+ ApplyBlockElementCommand.cpp \
ApplyStyleCommand.cpp \
BreakBlockquoteCommand.cpp \
CompositeEditCommand.cpp \
@@ -676,6 +462,7 @@ QT_SOURCES = \
DeleteFromTextNodeCommand.cpp \
DeleteSelectionCommand.cpp \
EditCommand.cpp \
+ EditingStyle.cpp \
Editor.cpp \
EditorCommand.cpp \
FormatBlockCommand.cpp \
@@ -690,6 +477,7 @@ QT_SOURCES = \
InsertTextCommand.cpp \
JoinTextNodesCommand.cpp \
markup.cpp \
+ MarkupAccumulator.cpp \
MergeIdenticalElementsCommand.cpp \
ModifySelectionListLevel.cpp \
MoveSelectionCommand.cpp \
@@ -701,11 +489,13 @@ QT_SOURCES = \
ReplaceSelectionCommand.cpp \
SelectionController.cpp \
SetNodeAttributeCommand.cpp \
- SmartReplace.cpp \
SmartReplaceICU.cpp \
+ SpellChecker.cpp \
+ SpellingCorrectionController.cpp \
SplitElementCommand.cpp \
SplitTextNodeCommand.cpp \
SplitTextNodeContainingElementCommand.cpp \
+ TextCheckingHelper.cpp \
TextIterator.cpp \
TypingCommand.cpp \
UnlinkCommand.cpp \
@@ -713,63 +503,77 @@ QT_SOURCES = \
VisibleSelection.cpp \
visible_units.cpp \
WrapContentsInDummySpanCommand.cpp \
- BackForwardList.cpp \
+ Blob.cpp \
+ BlobURL.cpp \
+ File.cpp \
+ FileList.cpp \
+ FileReader.cpp \
+ FileReaderLoader.cpp \
+ FileReaderSync.cpp \
+ FileStreamProxy.cpp \
+ FileThread.cpp \
+ ThreadableBlobRegistry.cpp \
+ WebKitBlobBuilder.cpp \
+ BackForwardController.cpp \
+ BackForwardListImpl.cpp \
CachedFrame.cpp \
CachedPage.cpp \
HistoryItem.cpp \
HistoryItemQt.cpp \
PageCache.cpp \
- Blob.cpp \
- CanvasGradient.cpp \
- CanvasPattern.cpp \
- CanvasPixelArray.cpp \
- CanvasRenderingContext.cpp \
- CanvasRenderingContext2D.cpp \
- CanvasStyle.cpp \
+ BaseButtonInputType.cpp \
+ BaseCheckableInputType.cpp \
+ BaseDateAndTimeInputType.cpp \
+ BaseTextInputType.cpp \
+ ButtonInputType.cpp \
+ CheckboxInputType.cpp \
+ ClassList.cpp \
CollectionCache.cpp \
- DataGridColumn.cpp \
- DataGridColumnList.cpp \
- DateComponents.cpp \
- DOMDataGridDataSource.cpp \
+ ColorInputType.cpp \
DOMFormData.cpp \
- File.cpp \
- FileList.cpp \
+ DOMSettableTokenList.cpp \
+ DOMTokenList.cpp \
+ DOMURL.cpp \
+ DateInputType.cpp \
+ DateTimeInputType.cpp \
+ DateTimeLocalInputType.cpp \
+ EmailInputType.cpp \
+ FTPDirectoryDocument.cpp \
+ FileInputType.cpp \
+ FormAssociatedElement.cpp \
FormDataList.cpp \
HTMLAllCollection.cpp \
HTMLAnchorElement.cpp \
HTMLAppletElement.cpp \
HTMLAreaElement.cpp \
+ HTMLBRElement.cpp \
HTMLBaseElement.cpp \
HTMLBaseFontElement.cpp \
HTMLBlockquoteElement.cpp \
HTMLBodyElement.cpp \
- HTMLBRElement.cpp \
HTMLButtonElement.cpp \
HTMLCanvasElement.cpp \
HTMLCollection.cpp \
- HTMLDataGridElement.cpp \
- HTMLDataGridCellElement.cpp \
- HTMLDataGridColElement.cpp \
- HTMLDataGridRowElement.cpp \
+ HTMLDListElement.cpp \
HTMLDataListElement.cpp \
HTMLDirectoryElement.cpp \
+ HTMLDetailsElement.cpp \
HTMLDivElement.cpp \
- HTMLDListElement.cpp \
HTMLDocument.cpp \
HTMLElement.cpp \
HTMLEmbedElement.cpp \
HTMLFieldSetElement.cpp \
HTMLFontElement.cpp \
HTMLFormCollection.cpp \
+ HTMLFormControlElement.cpp \
HTMLFormElement.cpp \
- HTMLFrameElementBase.cpp \
HTMLFrameElement.cpp \
+ HTMLFrameElementBase.cpp \
HTMLFrameOwnerElement.cpp \
HTMLFrameSetElement.cpp \
- HTMLFormControlElement.cpp \
+ HTMLHRElement.cpp \
HTMLHeadElement.cpp \
HTMLHeadingElement.cpp \
- HTMLHRElement.cpp \
HTMLHtmlElement.cpp \
HTMLIFrameElement.cpp \
HTMLImageElement.cpp \
@@ -777,24 +581,25 @@ QT_SOURCES = \
HTMLInputElement.cpp \
HTMLIsIndexElement.cpp \
HTMLKeygenElement.cpp \
+ HTMLLIElement.cpp \
HTMLLabelElement.cpp \
HTMLLegendElement.cpp \
- HTMLLIElement.cpp \
HTMLLinkElement.cpp \
HTMLMapElement.cpp \
HTMLMarqueeElement.cpp \
HTMLMenuElement.cpp \
HTMLMetaElement.cpp \
+ HTMLMeterElement.cpp \
HTMLModElement.cpp \
HTMLNameCollection.cpp \
- HTMLObjectElement.cpp \
HTMLOListElement.cpp \
+ HTMLObjectElement.cpp \
HTMLOptGroupElement.cpp \
HTMLOptionElement.cpp \
HTMLOptionsCollection.cpp \
+ HTMLOutputElement.cpp \
HTMLParagraphElement.cpp \
HTMLParamElement.cpp \
- HTMLParser.cpp \
HTMLParserErrorCodes.cpp \
HTMLPlugInElement.cpp \
HTMLPlugInImageElement.cpp \
@@ -804,6 +609,7 @@ QT_SOURCES = \
HTMLScriptElement.cpp \
HTMLSelectElement.cpp \
HTMLStyleElement.cpp \
+ HTMLSummaryElement.cpp \
HTMLTableCaptionElement.cpp \
HTMLTableCellElement.cpp \
HTMLTableColElement.cpp \
@@ -814,137 +620,244 @@ QT_SOURCES = \
HTMLTableSectionElement.cpp \
HTMLTextAreaElement.cpp \
HTMLTitleElement.cpp \
- HTMLTokenizer.cpp \
HTMLUListElement.cpp \
HTMLViewSourceDocument.cpp \
+ HiddenInputType.cpp \
ImageData.cpp \
- PreloadScanner.cpp \
+ ImageDocument.cpp \
+ ImageInputType.cpp \
+ InputType.cpp \
+ IsIndexInputType.cpp \
+ LabelsNodeList.cpp \
+ MediaDocument.cpp \
+ MonthInputType.cpp \
+ NumberInputType.cpp \
+ PasswordInputType.cpp \
+ PluginDocument.cpp \
+ RadioInputType.cpp \
+ RangeInputType.cpp \
+ ResetInputType.cpp \
+ SearchInputType.cpp \
StepRange.cpp \
+ SubmitInputType.cpp \
+ TelephoneInputType.cpp \
+ TextDocument.cpp \
+ TextFieldInputType.cpp \
+ TextInputType.cpp \
+ TimeInputType.cpp \
+ URLInputType.cpp \
+ ValidationMessage.cpp \
ValidityState.cpp \
+ WeekInputType.cpp \
+ ArrayBuffer.cpp \
+ ArrayBufferView.cpp \
+ CanvasGradient.cpp \
+ CanvasPattern.cpp \
+ CanvasPixelArray.cpp \
+ CanvasRenderingContext.cpp \
+ CanvasRenderingContext2D.cpp \
+ CanvasStyle.cpp \
+ DataView.cpp \
+ Float32Array.cpp \
+ Int16Array.cpp \
+ Int32Array.cpp \
+ Int8Array.cpp \
+ Uint16Array.cpp \
+ Uint32Array.cpp \
+ Uint8Array.cpp \
+ CSSPreloadScanner.cpp \
+ HTMLConstructionSite.cpp \
+ HTMLDocumentParser.cpp \
+ HTMLElementStack.cpp \
+ HTMLEntityParser.cpp \
+ HTMLEntitySearch.cpp \
+ HTMLFormattingElementList.cpp \
+ HTMLMetaCharsetParser.cpp \
+ HTMLParserIdioms.cpp \
+ HTMLParserScheduler.cpp \
+ HTMLPreloadScanner.cpp \
+ HTMLScriptRunner.cpp \
+ HTMLSourceTracker.cpp \
+ HTMLTokenizer.cpp \
+ HTMLTreeBuilder.cpp \
+ HTMLViewSourceParser.cpp \
+ TextDocumentParser.cpp \
+ TextViewSourceParser.cpp \
+ XSSFilter.cpp \
+ DetailsMarkerControl.cpp \
+ MediaControls.cpp \
+ MediaControlRootElement.cpp \
+ MeterShadowElement.cpp \
+ ProgressShadowElement.cpp \
+ SliderThumbElement.cpp \
+ TextControlInnerElements.cpp \
ConsoleMessage.cpp \
+ DOMNodeHighlighter.cpp \
+ EventsCollector.cpp \
InjectedScript.cpp \
InjectedScriptHost.cpp \
- InspectorBackend.cpp \
+ InjectedScriptManager.cpp \
+ InspectorAgent.cpp \
+ InspectorApplicationCacheAgent.cpp \
+ InspectorCSSAgent.cpp \
+ InspectorClient.cpp \
+ InspectorConsoleAgent.cpp \
InspectorController.cpp \
+ InspectorDatabaseAgent.cpp \
InspectorDatabaseResource.cpp \
+ InspectorDebuggerAgent.cpp \
InspectorDOMAgent.cpp \
+ InspectorDOMDebuggerAgent.cpp \
+ InspectorDOMStorageAgent.cpp \
InspectorDOMStorageResource.cpp \
- InspectorFrontend.cpp \
InspectorFrontendClientLocal.cpp \
InspectorFrontendHost.cpp \
- InspectorResource.cpp \
+ InspectorFrontendProxy.cpp \
+ InspectorInstrumentation.cpp \
+ InspectorPageAgent.cpp \
+ InspectorProfilerAgent.cpp \
+ InspectorResourceAgent.cpp \
+ InspectorRuntimeAgent.cpp \
+ InspectorState.cpp \
+ InspectorStyleSheet.cpp \
InspectorTimelineAgent.cpp \
+ InspectorValues.cpp \
+ InspectorWorkerAgent.cpp \
+ PageDebuggerAgent.cpp \
+ ScriptArguments.cpp \
+ ScriptCallFrame.cpp \
+ ScriptCallStack.cpp \
TimelineRecordFactory.cpp \
- ArchiveFactory.cpp \
+ WorkerDebuggerAgent.cpp \
+ WorkerInspectorController.cpp \
ArchiveResource.cpp \
ArchiveResourceCollection.cpp \
- Cache.cpp \
+ MemoryCache.cpp \
CachedCSSStyleSheet.cpp \
CachedFont.cpp \
CachedImage.cpp \
CachedResourceClientWalker.cpp \
CachedResourceHandle.cpp \
+ CachedResourceRequest.cpp \
CachedResource.cpp \
CachedScript.cpp \
CachedXSLStyleSheet.cpp \
CrossOriginAccessControl.cpp \
CrossOriginPreflightResultCache.cpp \
- DocLoader.cpp \
+ CachedResourceLoader.cpp \
DocumentLoader.cpp \
DocumentThreadableLoader.cpp \
+ DocumentWriter.cpp \
FormState.cpp \
+ FormSubmission.cpp \
FrameLoader.cpp \
+ FrameLoaderStateMachine.cpp \
HistoryController.cpp \
- FTPDirectoryDocument.cpp \
FTPDirectoryParser.cpp \
+ IconDatabaseBase.cpp \
IconLoader.cpp \
- ImageDocument.cpp \
ImageLoader.cpp \
- loader.cpp \
MainResourceLoader.cpp \
- MediaDocument.cpp \
NavigationAction.cpp \
NetscapePlugInStreamLoader.cpp \
+ PingLoader.cpp \
PlaceholderDocument.cpp \
- PluginDocument.cpp \
PolicyCallback.cpp \
PolicyChecker.cpp \
ProgressTracker.cpp \
- RedirectScheduler.cpp \
- Request.cpp \
+ NavigationScheduler.cpp \
ResourceLoader.cpp \
ResourceLoadNotifier.cpp \
+ ResourceLoadScheduler.cpp \
+ SinkDocument.cpp \
+ SubframeLoader.cpp \
SubresourceLoader.cpp \
- TextDocument.cpp \
TextResourceDecoder.cpp \
ThreadableLoader.cpp \
+ Notification.cpp \
+ NotificationCenter.cpp \
AnimationBase.cpp \
AnimationController.cpp \
CompositeAnimation.cpp \
ImplicitAnimation.cpp \
KeyframeAnimation.cpp \
+ WebKitAnimation.cpp \
+ WebKitAnimationList.cpp \
BarInfo.cpp \
Chrome.cpp \
Console.cpp \
+ ContentSecurityPolicy.cpp \
ContextMenuController.cpp \
+ Crypto.cpp \
DOMSelection.cpp \
DOMTimer.cpp \
DOMWindow.cpp \
- Navigator.cpp \
- NavigatorBase.cpp \
DragController.cpp \
EventHandler.cpp \
EventSource.cpp \
FocusController.cpp \
Frame.cpp \
+ FrameActionScheduler.cpp \
FrameTree.cpp \
FrameView.cpp \
Geolocation.cpp \
GeolocationController.cpp \
GeolocationPositionCache.cpp \
+ GroupSettings.cpp \
History.cpp \
Location.cpp \
+ MemoryInfo.cpp \
MouseEventWithHitTestResults.cpp \
+ Navigator.cpp \
+ NavigatorBase.cpp \
OriginAccessEntry.cpp \
Page.cpp \
PageGroup.cpp \
PageGroupLoadDeferrer.cpp \
+ PageSerializer.cpp \
+ Performance.cpp \
+ PerformanceNavigation.cpp \
+ PerformanceTiming.cpp \
PluginHalter.cpp \
PrintContext.cpp \
- SecurityOrigin.cpp \
Screen.cpp \
+ SecurityOrigin.cpp \
Settings.cpp \
SpatialNavigation.cpp \
+ SuspendableTimer.cpp \
UserContentURLPattern.cpp \
WindowFeatures.cpp \
- XSSAuditor.cpp \
PluginData.cpp \
- PluginArray.cpp \
- Plugin.cpp \
+ DOMPluginArray.cpp \
+ DOMPlugin.cpp \
PluginMainThreadScheduler.cpp \
- MimeType.cpp \
- MimeTypeArray.cpp \
+ DOMMimeType.cpp \
+ DOMMimeTypeArray.cpp \
Animation.cpp \
AnimationList.cpp \
Arena.cpp \
- AtomicString.cpp \
Base64.cpp \
BidiContext.cpp \
+ Hyphenation.cpp \
+ LocalizedDateNone.cpp \
+ LocalizedNumberNone.cpp \
ContentType.cpp \
- ContextMenu.cpp \
CrossThreadCopier.cpp \
- CString.cpp \
- DeprecatedPtrListImpl.cpp \
+ DateComponents.cpp \
+ DefaultLocalizationStrategy.cpp \
DragData.cpp \
DragImage.cpp \
FileChooser.cpp \
+ FileStream.cpp \
+ FileSystem.cpp \
GeolocationService.cpp \
- RGBA32BufferQt.cpp \
+ ImageFrameQt.cpp \
FontDescription.cpp \
FontFallbackList.cpp \
FontFamily.cpp \
BitmapImage.cpp \
Color.cpp \
+ ContextShadow.cpp \
FloatPoint3D.cpp \
FloatPoint.cpp \
FloatQuad.cpp \
@@ -956,6 +869,7 @@ QT_SOURCES = \
GeneratedImage.cpp \
Gradient.cpp \
GraphicsContext.cpp \
+ GraphicsLayer.cpp \
GraphicsTypes.cpp \
Image.cpp \
ImageBuffer.cpp \
@@ -964,8 +878,10 @@ QT_SOURCES = \
Path.cpp \
PathTraversalState.cpp \
Pattern.cpp \
- Pen.cpp \
+ RoundedIntRect.cpp \
SegmentedFontData.cpp \
+ ShadowBlur.cpp \
+ SVGGlyph.cpp \
SimpleFontData.cpp \
TiledBackingStore.cpp \
AffineTransform.cpp \
@@ -978,13 +894,24 @@ QT_SOURCES = \
SkewTransformOperation.cpp \
TransformOperations.cpp \
TranslateTransformOperation.cpp \
+ KillRingNone.cpp \
KURL.cpp \
+ Language.cpp \
Length.cpp \
+ LineEnding.cpp \
+ LevelDBDatabase.cpp \
+ LevelDBIterator.cpp \
LinkHash.cpp \
Logging.cpp \
MIMETypeRegistry.cpp \
+ DeviceOrientationClientMock.cpp \
+ GeolocationClientMock.cpp \
GeolocationServiceMock.cpp \
+ SpeechInputClientMock.cpp \
AuthenticationChallengeBase.cpp \
+ BlobData.cpp \
+ BlobRegistryImpl.cpp \
+ BlobResourceHandle.cpp \
Credential.cpp \
FormData.cpp \
FormDataBuilder.cpp \
@@ -992,23 +919,29 @@ QT_SOURCES = \
HTTPParsers.cpp \
NetworkStateNotifier.cpp \
ProtectionSpace.cpp \
+ ProxyServer.cpp \
ResourceErrorBase.cpp \
ResourceHandle.cpp \
ResourceRequestBase.cpp \
ResourceResponseBase.cpp \
RegularExpression.cpp \
+ RuntimeApplicationChecks.cpp \
+ SchemeRegistry.cpp \
+ ScrollableArea.cpp \
+ ScrollAnimator.cpp \
Scrollbar.cpp \
ScrollbarThemeComposite.cpp \
ScrollView.cpp \
SegmentedString.cpp \
SharedBuffer.cpp \
+ SharedBufferCRLFLineReader.cpp \
String.cpp \
- StringBuilder.cpp \
- StringImpl.cpp \
+ TextBoundaries.cpp \
TextCodec.cpp \
TextCodecLatin1.cpp \
TextCodecUserDefined.cpp \
TextCodecUTF16.cpp \
+ TextCodecUTF8.cpp \
TextEncoding.cpp \
TextEncodingDetectorNone.cpp \
TextEncodingRegistry.cpp \
@@ -1017,10 +950,14 @@ QT_SOURCES = \
ThreadTimers.cpp \
Timer.cpp \
UnicodeRange.cpp \
+ FontTranscoder.cpp \
+ UUID.cpp \
Widget.cpp \
+ PlatformStrategies.cpp \
+ LocalizedStrings.cpp \
+ IFrameShimSupport.cpp \
PluginDatabase.cpp \
PluginDebug.cpp \
- PluginInfoStore.cpp \
PluginPackage.cpp \
PluginStream.cpp \
PluginView.cpp \
@@ -1043,30 +980,38 @@ QT_SOURCES = \
RenderBoxModelObject.cpp \
RenderBR.cpp \
RenderButton.cpp \
+ RenderCombineText.cpp \
RenderCounter.cpp \
- RenderDataGrid.cpp \
+ RenderDetails.cpp \
+ RenderDetailsMarker.cpp \
RenderEmbeddedObject.cpp \
RenderFieldset.cpp \
RenderFileUploadControl.cpp \
RenderFlexibleBox.cpp \
RenderFrame.cpp \
+ RenderFrameBase.cpp \
RenderFrameSet.cpp \
RenderHTMLCanvas.cpp \
+ RenderIFrame.cpp \
RenderImage.cpp \
- RenderImageGeneratedContent.cpp \
+ RenderImageResource.cpp \
+ RenderImageResourceStyleImage.cpp \
RenderInline.cpp \
RenderLayer.cpp \
+ RenderLayerBacking.cpp \
+ RenderLayerCompositor.cpp \
RenderLineBoxList.cpp \
RenderListBox.cpp \
RenderListItem.cpp \
RenderListMarker.cpp \
RenderMarquee.cpp \
RenderMenuList.cpp \
+ RenderMeter.cpp \
RenderObject.cpp \
RenderObjectChildList.cpp \
RenderPart.cpp \
- RenderPartObject.cpp \
RenderProgress.cpp \
+ RenderQuote.cpp \
RenderReplaced.cpp \
RenderReplica.cpp \
RenderRuby.cpp \
@@ -1077,6 +1022,7 @@ QT_SOURCES = \
RenderScrollbarPart.cpp \
RenderScrollbarTheme.cpp \
RenderSlider.cpp \
+ RenderSummary.cpp \
RenderTable.cpp \
RenderTableCell.cpp \
RenderTableCol.cpp \
@@ -1093,16 +1039,15 @@ QT_SOURCES = \
RenderWidget.cpp \
RenderWordBreak.cpp \
RootInlineBox.cpp \
- SVGRenderTreeAsText.cpp \
ScrollBehavior.cpp \
- TextControlInnerElements.cpp \
+ ShadowElement.cpp \
TransformState.cpp \
- BindingURI.cpp \
ContentData.cpp \
CounterDirectives.cpp \
FillLayer.cpp \
KeyframeList.cpp \
NinePieceImage.cpp \
+ QuotesData.cpp \
RenderStyle.cpp \
ShadowData.cpp \
StyleBackgroundData.cpp \
@@ -1118,22 +1063,19 @@ QT_SOURCES = \
StyleSurroundData.cpp \
StyleTransformData.cpp \
StyleVisualData.cpp \
+ Internals.cpp \
DOMParser.cpp \
XMLHttpRequest.cpp \
XMLHttpRequestProgressEventThrottle.cpp \
XMLHttpRequestUpload.cpp \
XMLSerializer.cpp \
AccessibilityObjectQt.cpp \
- ScriptControllerQt.cpp \
- qt_class.cpp \
- qt_instance.cpp \
- qt_pixmapruntime.cpp \
- qt_runtime.cpp \
DragControllerQt.cpp \
EventHandlerQt.cpp \
FrameQt.cpp \
TransformationMatrixQt.cpp \
ColorQt.cpp \
+ ContextShadowQt.cpp \
FontQt.cpp \
FontPlatformDataQt.cpp \
FloatPointQt.cpp \
@@ -1150,11 +1092,17 @@ QT_SOURCES = \
PathQt.cpp \
PatternQt.cpp \
StillImageQt.cpp \
+ MIMESniffing.cpp \
+ CredentialStorageQt.cpp \
ResourceHandleQt.cpp \
ResourceRequestQt.cpp \
DnsPrefetchHelper.cpp \
+ ProxyServerQt.cpp \
+ QtMIMETypeSniffer.cpp \
QNetworkReplyHandler.cpp \
EditorQt.cpp \
+ SmartReplaceQt.cpp \
+ Cursor.cpp \
ClipboardQt.cpp \
ContextMenuItemQt.cpp \
ContextMenuQt.cpp \
@@ -1172,7 +1120,6 @@ QT_SOURCES = \
SimpleFontDataQt.cpp \
TileQt.cpp \
KURLQt.cpp \
- Localizations.cpp \
MIMETypeRegistryQt.cpp \
PasteboardQt.cpp \
PlatformKeyboardEventQt.cpp \
@@ -1180,46 +1127,20 @@ QT_SOURCES = \
PlatformScreenQt.cpp \
PlatformTouchEventQt.cpp \
PlatformTouchPointQt.cpp \
- PopupMenuQt.cpp \
- QtAbstractWebPopup.cpp \
RenderThemeQt.cpp \
ScrollbarQt.cpp \
ScrollbarThemeQt.cpp \
ScrollViewQt.cpp \
- SearchPopupMenuQt.cpp \
SharedTimerQt.cpp \
SoundQt.cpp \
LoggingQt.cpp \
- StringQt.cpp \
+ LanguageQt.cpp \
TemporaryLinkStubsQt.cpp \
TextBoundariesQt.cpp \
TextBreakIteratorQt.cpp \
TextCodecQt.cpp \
WheelEventQt.cpp \
WidgetQt.cpp \
- PluginDataQt.cpp \
- QtFallbackWebPopup.cpp \
- ChromeClientQt.cpp \
- ContextMenuClientQt.cpp \
- DragClientQt.cpp \
- EditorClientQt.cpp \
- EditCommandQt.cpp \
- FrameLoaderClientQt.cpp \
- InspectorClientQt.cpp \
- qwebframe.cpp \
- qgraphicswebview.cpp \
- qwebpage.cpp \
- qwebview.cpp \
- qwebelement.cpp \
- qwebhistory.cpp \
- qwebsettings.cpp \
- qwebhistoryinterface.cpp \
- qwebplugindatabase.cpp \
- qwebpluginfactory.cpp \
- qwebsecurityorigin.cpp \
- qwebdatabase.cpp \
- qwebinspector.cpp \
- qwebkitversion.cpp \
PluginPackageNone.cpp \
PluginViewNone.cpp \
sqlite3.c \
@@ -1229,8 +1150,10 @@ QT_SOURCES = \
SQLiteStatement.cpp \
SQLiteTransaction.cpp \
SQLValue.cpp \
+ AbstractDatabase.cpp \
Database.cpp \
DatabaseAuthorizer.cpp \
+ DatabaseSync.cpp \
ChangeVersionWrapper.cpp \
DatabaseTask.cpp \
DatabaseThread.cpp \
@@ -1240,17 +1163,15 @@ QT_SOURCES = \
SQLResultSet.cpp \
SQLResultSetRowList.cpp \
SQLStatement.cpp \
+ SQLStatementSync.cpp \
SQLTransaction.cpp \
SQLTransactionClient.cpp \
SQLTransactionCoordinator.cpp \
- JSCustomSQLStatementCallback.cpp \
+ SQLTransactionSync.cpp \
JSCustomSQLStatementErrorCallback.cpp \
- JSCustomSQLTransactionCallback.cpp \
- JSCustomSQLTransactionErrorCallback.cpp \
- JSDatabaseCallback.cpp \
- JSDatabaseCustom.cpp \
JSSQLResultSetRowListCustom.cpp \
JSSQLTransactionCustom.cpp \
+ JSSQLTransactionSyncCustom.cpp \
JSStorageCustom.cpp \
LocalStorageTask.cpp \
LocalStorageThread.cpp \
@@ -1263,16 +1184,16 @@ QT_SOURCES = \
StorageNamespace.cpp \
StorageNamespaceImpl.cpp \
StorageSyncManager.cpp \
+ StorageTracker.cpp \
IconDatabase.cpp \
IconRecord.cpp \
PageURLRecord.cpp \
- JSAbstractWorkerCustom.cpp \
JSDedicatedWorkerContextCustom.cpp \
- JSWorkerConstructor.cpp \
JSWorkerContextBase.cpp \
JSWorkerContextCustom.cpp \
JSWorkerCustom.cpp \
WorkerScriptController.cpp \
+ WorkerScriptDebugServer.cpp \
WorkerThreadableLoader.cpp \
WorkerNavigator.cpp \
AbstractWorker.cpp \
@@ -1285,7 +1206,6 @@ QT_SOURCES = \
WorkerRunLoop.cpp \
WorkerThread.cpp \
WorkerScriptLoader.cpp \
- JSSharedWorkerConstructor.cpp \
JSSharedWorkerCustom.cpp \
DefaultSharedWorkerRepository.cpp \
SharedWorker.cpp \
@@ -1296,7 +1216,6 @@ QT_SOURCES = \
XPathExpression.cpp \
XPathExpressionNode.cpp \
XPathFunctions.cpp \
- XPathNamespace.cpp \
XPathNodeSet.cpp \
XPathNSResolver.cpp \
XPathParser.cpp \
@@ -1307,27 +1226,99 @@ QT_SOURCES = \
XPathUtil.cpp \
XPathValue.cpp \
XPathVariableReference.cpp \
+ DistantLightSource.cpp \
FEBlend.cpp \
FEColorMatrix.cpp \
FEComponentTransfer.cpp \
FEComposite.cpp \
+ FEConvolveMatrix.cpp \
+ FEDiffuseLighting.cpp \
+ FEDisplacementMap.cpp \
+ FEDropShadow.cpp \
+ FEFlood.cpp \
FEGaussianBlur.cpp \
+ FELighting.cpp \
+ FEMerge.cpp \
+ FEMorphology.cpp \
+ FEOffset.cpp \
+ FESpecularLighting.cpp \
+ FETile.cpp \
+ FETurbulence.cpp \
FilterEffect.cpp \
+ LightSource.cpp \
+ PointLightSource.cpp \
+ SpotLightSource.cpp \
SourceAlpha.cpp \
SourceGraphic.cpp \
+ FELightingNEON.cpp \
+ FEGaussianBlurNEON.cpp \
NetworkStateNotifierQt.cpp \
JSSVGElementInstanceCustom.cpp \
JSSVGLengthCustom.cpp \
- JSSVGMatrixCustom.cpp \
JSSVGPathSegCustom.cpp \
- JSSVGPathSegListCustom.cpp \
SVGCSSComputedStyleDeclaration.cpp \
SVGCSSParser.cpp \
SVGCSSStyleSelector.cpp \
SVGRenderStyle.cpp \
SVGRenderStyleDefs.cpp \
- SVGZoomEvent.cpp \
PointerEventsHitRules.cpp \
+ RenderSVGPath.cpp \
+ SMILTime.cpp \
+ SMILTimeContainer.cpp \
+ SVGSMILElement.cpp \
+ SVGFEImage.cpp \
+ SVGFilter.cpp \
+ SVGFilterBuilder.cpp \
+ SVGImage.cpp \
+ SVGPathSegListPropertyTearOff.cpp \
+ RenderSVGBlock.cpp \
+ RenderSVGContainer.cpp \
+ RenderSVGForeignObject.cpp \
+ RenderSVGGradientStop.cpp \
+ RenderSVGHiddenContainer.cpp \
+ RenderSVGImage.cpp \
+ RenderSVGInline.cpp \
+ RenderSVGInlineText.cpp \
+ RenderSVGModelObject.cpp \
+ RenderSVGResource.cpp \
+ RenderSVGResourceClipper.cpp \
+ RenderSVGResourceContainer.cpp \
+ RenderSVGResourceFilter.cpp \
+ RenderSVGResourceFilterPrimitive.cpp \
+ RenderSVGResourceGradient.cpp \
+ RenderSVGResourceLinearGradient.cpp \
+ RenderSVGResourceMarker.cpp \
+ RenderSVGResourceMasker.cpp \
+ RenderSVGResourcePattern.cpp \
+ RenderSVGResourceRadialGradient.cpp \
+ RenderSVGResourceSolidColor.cpp \
+ RenderSVGRoot.cpp \
+ RenderSVGShadowTreeRootContainer.cpp \
+ RenderSVGTSpan.cpp \
+ RenderSVGText.cpp \
+ RenderSVGTextPath.cpp \
+ RenderSVGTransformableContainer.cpp \
+ RenderSVGViewportContainer.cpp \
+ SVGImageBufferTools.cpp \
+ SVGInlineFlowBox.cpp \
+ SVGInlineTextBox.cpp \
+ SVGMarkerLayoutInfo.cpp \
+ SVGRenderSupport.cpp \
+ SVGRenderTreeAsText.cpp \
+ SVGResources.cpp \
+ SVGResourcesCache.cpp \
+ SVGResourcesCycleSolver.cpp \
+ SVGRootInlineBox.cpp \
+ SVGShadowTreeElements.cpp \
+ SVGTextChunk.cpp \
+ SVGTextChunkBuilder.cpp \
+ SVGTextLayoutAttributes.cpp \
+ SVGTextLayoutAttributesBuilder.cpp \
+ SVGTextLayoutEngine.cpp \
+ SVGTextLayoutEngineBaseline.cpp \
+ SVGTextLayoutEngineSpacing.cpp \
+ SVGTextMetrics.cpp \
+ SVGTextQuery.cpp \
SVGDocumentExtensions.cpp \
SVGImageLoader.cpp \
ColorDistance.cpp \
@@ -1335,8 +1326,6 @@ QT_SOURCES = \
SVGAltGlyphElement.cpp \
SVGAngle.cpp \
SVGAnimateColorElement.cpp \
- SVGAnimatedPathData.cpp \
- SVGAnimatedPoints.cpp \
SVGAnimateElement.cpp \
SVGAnimateMotionElement.cpp \
SVGAnimateTransformElement.cpp \
@@ -1358,9 +1347,11 @@ QT_SOURCES = \
SVGFEColorMatrixElement.cpp \
SVGFEComponentTransferElement.cpp \
SVGFECompositeElement.cpp \
+ SVGFEConvolveMatrixElement.cpp \
SVGFEDiffuseLightingElement.cpp \
SVGFEDisplacementMapElement.cpp \
SVGFEDistantLightElement.cpp \
+ SVGFEDropShadowElement.cpp \
SVGFEFloodElement.cpp \
SVGFEFuncAElement.cpp \
SVGFEFuncBElement.cpp \
@@ -1409,18 +1400,19 @@ QT_SOURCES = \
SVGNumberList.cpp \
SVGPaint.cpp \
SVGParserUtilities.cpp \
+ SVGPathBlender.cpp \
+ SVGPathBuilder.cpp \
+ SVGPathByteStreamBuilder.cpp \
+ SVGPathByteStreamSource.cpp \
SVGPathElement.cpp \
- SVGPathSegArc.cpp \
- SVGPathSegClosePath.cpp \
- SVGPathSegCurvetoCubic.cpp \
- SVGPathSegCurvetoCubicSmooth.cpp \
- SVGPathSegCurvetoQuadratic.cpp \
- SVGPathSegCurvetoQuadraticSmooth.cpp \
- SVGPathSegLineto.cpp \
- SVGPathSegLinetoHorizontal.cpp \
- SVGPathSegLinetoVertical.cpp \
+ SVGPathParser.cpp \
+ SVGPathParserFactory.cpp \
SVGPathSegList.cpp \
- SVGPathSegMoveto.cpp \
+ SVGPathSegListBuilder.cpp \
+ SVGPathSegListSource.cpp \
+ SVGPathStringBuilder.cpp \
+ SVGPathStringSource.cpp \
+ SVGPathTraversalStateBuilder.cpp \
SVGPatternElement.cpp \
SVGPointList.cpp \
SVGPolyElement.cpp \
@@ -1457,61 +1449,11 @@ QT_SOURCES = \
SVGUseElement.cpp \
SVGViewElement.cpp \
SVGViewSpec.cpp \
+ SVGVKernElement.cpp \
SVGZoomAndPan.cpp \
- SMILTime.cpp \
- SMILTimeContainer.cpp \
- SVGSMILElement.cpp \
- SVGFEConvolveMatrix.cpp \
- SVGFEDiffuseLighting.cpp \
- SVGFEDisplacementMap.cpp \
- SVGFEFlood.cpp \
- SVGFEImage.cpp \
- SVGFEMerge.cpp \
- SVGFEMorphology.cpp \
- SVGFEOffset.cpp \
- SVGFESpecularLighting.cpp \
- SVGFETile.cpp \
- SVGFETurbulence.cpp \
- SVGFilter.cpp \
- SVGFilterBuilder.cpp \
- SVGLightSource.cpp \
- SVGImage.cpp \
- SVGPaintServer.cpp \
- SVGPaintServerGradient.cpp \
- SVGPaintServerLinearGradient.cpp \
- SVGPaintServerPattern.cpp \
- SVGPaintServerRadialGradient.cpp \
- SVGPaintServerSolid.cpp \
- SVGResource.cpp \
- SVGResourceFilter.cpp \
- SVGResourceMarker.cpp \
- RenderForeignObject.cpp \
- RenderPath.cpp \
- RenderSVGBlock.cpp \
- RenderSVGContainer.cpp \
- RenderSVGGradientStop.cpp \
- RenderSVGHiddenContainer.cpp \
- RenderSVGImage.cpp \
- RenderSVGInline.cpp \
- RenderSVGInlineText.cpp \
- RenderSVGModelObject.cpp \
- RenderSVGResourceClipper.cpp \
- RenderSVGResourceMasker.cpp \
- RenderSVGRoot.cpp \
- RenderSVGShadowTreeRootContainer.cpp \
- RenderSVGText.cpp \
- RenderSVGTextPath.cpp \
- RenderSVGTransformableContainer.cpp \
- RenderSVGTSpan.cpp \
- RenderSVGViewportContainer.cpp \
- SVGCharacterLayoutInfo.cpp \
- SVGInlineFlowBox.cpp \
- SVGInlineTextBox.cpp \
- SVGMarkerLayoutInfo.cpp \
- SVGRenderSupport.cpp \
- SVGRootInlineBox.cpp \
- SVGShadowTreeElements.cpp \
+ SVGZoomEvent.cpp \
JSJavaScriptCallFrameCustom.cpp \
+ ScriptProfiler.cpp \
JavaScriptCallFrame.cpp \
ApplicationCache.cpp \
ApplicationCacheGroup.cpp \
@@ -1521,30 +1463,74 @@ QT_SOURCES = \
DOMApplicationCache.cpp \
ManifestParser.cpp \
JSDOMApplicationCacheCustom.cpp \
- WebSocket.cpp \
- WebSocketChannel.cpp \
- WebSocketHandshake.cpp \
- WebSocketHandshakeRequest.cpp \
- ThreadableWebSocketChannel.cpp \
- SocketStreamErrorBase.cpp \
- SocketStreamHandleBase.cpp \
- SocketStreamHandleQt.cpp \
- JSWebSocketCustom.cpp \
- JSWebSocketConstructor.cpp \
- WorkerThreadableWebSocketChannel.cpp \
- GraphicsLayer.cpp \
GraphicsLayerQt.cpp \
- RenderLayerBacking.cpp \
- RenderLayerCompositor.cpp \
- moc_qwebplugindatabase_p.cpp \
- moc_QtFallbackWebPopup.cpp \
- moc_DnsPrefetchHelper.cpp \
- moc_qwebframe.cpp \
- moc_qwebhistoryinterface.cpp \
- moc_qwebpluginfactory.cpp \
- moc_qwebinspector.cpp \
- qrc_WebCore.cpp \
- qrc_WebKit.cpp
+ moc_QtMIMETypeSniffer.cpp \
+ moc_DnsPrefetchHelper.cpp
+
+QT_VPATH = \
+ src/3rdparty/sqlite \
+ src/3rdparty/webkit/Source/WebCore/accessibility \
+ src/3rdparty/webkit/Source/WebCore/accessibility/qt \
+ src/3rdparty/webkit/Source/WebCore/bindings \
+ src/3rdparty/webkit/Source/WebCore/bindings/generic \
+ src/3rdparty/webkit/Source/WebCore/bindings/js \
+ src/3rdparty/webkit/Source/WebCore/bridge \
+ src/3rdparty/webkit/Source/WebCore/bridge/c \
+ src/3rdparty/webkit/Source/WebCore/bridge/jsc \
+ src/3rdparty/webkit/Source/WebCore/bridge/qt \
+ src/3rdparty/webkit/Source/WebCore/css \
+ src/3rdparty/webkit/Source/WebCore/dom \
+ src/3rdparty/webkit/Source/WebCore/dom/default \
+ src/3rdparty/webkit/Source/WebCore/editing \
+ src/3rdparty/webkit/Source/WebCore/editing/qt \
+ src/3rdparty/webkit/Source/WebCore/fileapi \
+ src/3rdparty/webkit/Source/WebCore/history \
+ src/3rdparty/webkit/Source/WebCore/history/qt \
+ src/3rdparty/webkit/Source/WebCore/html \
+ src/3rdparty/webkit/Source/WebCore/html/canvas \
+ src/3rdparty/webkit/Source/WebCore/html/parser \
+ src/3rdparty/webkit/Source/WebCore/html/shadow \
+ src/3rdparty/webkit/Source/WebCore/inspector \
+ src/3rdparty/webkit/Source/WebCore/loader \
+ src/3rdparty/webkit/Source/WebCore/loader/appcache \
+ src/3rdparty/webkit/Source/WebCore/loader/archive \
+ src/3rdparty/webkit/Source/WebCore/loader/cache \
+ src/3rdparty/webkit/Source/WebCore/loader/icon \
+ src/3rdparty/webkit/Source/WebCore/notifications \
+ src/3rdparty/webkit/Source/WebCore/page \
+ src/3rdparty/webkit/Source/WebCore/page/animation \
+ src/3rdparty/webkit/Source/WebCore/page/qt \
+ src/3rdparty/webkit/Source/WebCore/platform \
+ src/3rdparty/webkit/Source/WebCore/platform/animation \
+ src/3rdparty/webkit/Source/WebCore/platform/graphics \
+ src/3rdparty/webkit/Source/WebCore/platform/graphics/filters \
+ src/3rdparty/webkit/Source/WebCore/platform/graphics/filters/arm \
+ src/3rdparty/webkit/Source/WebCore/platform/graphics/qt \
+ src/3rdparty/webkit/Source/WebCore/platform/graphics/transforms \
+ src/3rdparty/webkit/Source/WebCore/platform/image-decoders/qt \
+ src/3rdparty/webkit/Source/WebCore/platform/leveldb \
+ src/3rdparty/webkit/Source/WebCore/platform/mock \
+ src/3rdparty/webkit/Source/WebCore/platform/network \
+ src/3rdparty/webkit/Source/WebCore/platform/network/qt \
+ src/3rdparty/webkit/Source/WebCore/platform/qt \
+ src/3rdparty/webkit/Source/WebCore/platform/sql \
+ src/3rdparty/webkit/Source/WebCore/platform/text \
+ src/3rdparty/webkit/Source/WebCore/platform/text/qt \
+ src/3rdparty/webkit/Source/WebCore/platform/text/transcoder \
+ src/3rdparty/webkit/Source/WebCore/plugins \
+ src/3rdparty/webkit/Source/WebCore/rendering \
+ src/3rdparty/webkit/Source/WebCore/rendering/style \
+ src/3rdparty/webkit/Source/WebCore/rendering/svg \
+ src/3rdparty/webkit/Source/WebCore/storage \
+ src/3rdparty/webkit/Source/WebCore/svg \
+ src/3rdparty/webkit/Source/WebCore/svg/animation \
+ src/3rdparty/webkit/Source/WebCore/svg/graphics \
+ src/3rdparty/webkit/Source/WebCore/svg/graphics/filters \
+ src/3rdparty/webkit/Source/WebCore/svg/properties \
+ src/3rdparty/webkit/Source/WebCore/testing \
+ src/3rdparty/webkit/Source/WebCore/testing/js \
+ src/3rdparty/webkit/Source/WebCore/workers \
+ src/3rdparty/webkit/Source/WebCore/xml \
# 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
@@ -1553,26 +1539,15 @@ QT_SOURCES = \
# extracted from 'compiler_moc_header_make_all' target
COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
+ moc_QtMIMETypeSniffer.cpp \
moc_QNetworkReplyHandler.cpp \
- moc_qwebplugindatabase_p.cpp \
- moc_QtFallbackWebPopup.cpp \
- moc_FrameLoaderClientQt.cpp \
moc_DnsPrefetchHelper.cpp \
- moc_NetworkStateNotifierPrivate.cpp \
- moc_SocketStreamHandlePrivate.cpp \
- moc_qwebframe.cpp \
- moc_qgraphicswebview.cpp \
- moc_qwebpage.cpp \
- moc_qwebview.cpp \
- moc_qwebhistoryinterface.cpp \
- moc_qwebpluginfactory.cpp \
- moc_qwebinspector.cpp
+ moc_NetworkStateNotifierPrivate.cpp
# source files generated from existing source files ('%.moc: %.cpp' rule in spec-qt4.mk)
# extracted from 'compiler_moc_source_make_all' rule
COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
SharedTimerQt.moc \
- InspectorClientQt.moc \
GraphicsLayerQt.moc
diff --git a/qt4/lib/mk/qt_webkit.mk b/qt4/lib/mk/qt_webkit.mk
new file mode 100644
index 000000000..f98dde23a
--- /dev/null
+++ b/qt4/lib/mk/qt_webkit.mk
@@ -0,0 +1,23 @@
+include $(REP_DIR)/lib/import/import-qt_webkit.mk
+
+SHARED_LIB = yes
+
+# additional defines for the Genode version
+CC_OPT += -DSQLITE_NO_SYNC=1 -DSQLITE_THREADSAFE=0
+
+# enable C++ functions that use C99 math functions (disabled by default in the Genode tool chain)
+CC_CXX_OPT += -D_GLIBCXX_USE_C99_MATH
+
+# use default warning level to avoid noise when compiling contrib code
+CC_WARN = -Wno-deprecated-declarations
+
+CC_OPT_sqlite3 += -Wno-int-to-pointer-cast -Wno-pointer-to-int-cast
+
+include $(REP_DIR)/lib/mk/qt_webkit_generated.inc
+
+include $(REP_DIR)/lib/mk/qt.inc
+
+LIBS += qt_webcore qt_jscore qt_network qt_core libc libm
+
+vpath %.qrc $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/Source/WebCore
+vpath %.qrc $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/Source/WebCore/inspector/front-end
diff --git a/qt4/lib/mk/qt_webkit_generated.inc b/qt4/lib/mk/qt_webkit_generated.inc
new file mode 100644
index 000000000..31d07f3e2
--- /dev/null
+++ b/qt4/lib/mk/qt_webkit_generated.inc
@@ -0,0 +1,674 @@
+QT_DEFINES += -DBUILDING_WEBKIT -DNDEBUG -DBUILDING_QT__=1 -DNDEBUG -DQT_ASCII_CAST_WARNINGS -DBUILDING_JavaScriptCore -DBUILDING_WTF -DENABLE_XSLT=0 -DENABLE_WEB_TIMING=0 -DENABLE_JAVASCRIPT_DEBUGGER=1 -DENABLE_DATABASE=1 -DENABLE_EVENTSOURCE=1 -DENABLE_OFFLINE_WEB_APPLICATIONS=1 -DENABLE_DOM_STORAGE=1 -DENABLE_ICONDATABASE=1 -DENABLE_CHANNEL_MESSAGING=1 -DENABLE_DIRECTORY_UPLOAD=0 -DENABLE_FILE_SYSTEM=0 -DENABLE_QUOTA=0 -DENABLE_SQLITE=1 -DENABLE_DASHBOARD_SUPPORT=0 -DENABLE_FILTERS=1 -DENABLE_XPATH=1 -DENABLE_WCSS=0 -DENABLE_SHARED_WORKERS=1 -DENABLE_WORKERS=1 -DENABLE_XHTMLMP=0 -DENABLE_DETAILS=1 -DENABLE_METER_TAG=1 -DENABLE_PROGRESS_TAG=1 -DENABLE_BLOB=1 -DENABLE_NOTIFICATIONS=1 -DENABLE_INPUT_SPEECH=0 -DENABLE_INSPECTOR=1 -DENABLE_3D_RENDERING=1 -DENABLE_WEB_AUDIO=0 -DENABLE_WEBGL=0 -DENABLE_MEDIA_STATISTICS=0 -DENABLE_VIDEO_TRACK=0 -DENABLE_TOUCH_ICON_LOADING=0 -DENABLE_ANIMATION_API=0 -DENABLE_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_SVG_FOREIGN_OBJECT=1 -DENABLE_SVG_ANIMATION=1 -DENABLE_SVG_AS_IMAGE=1 -DENABLE_SVG_USE=1 -DENABLE_DATALIST=1 -DENABLE_TILED_BACKING_STORE=1 -DENABLE_NETSCAPE_PLUGIN_API=0 -DWTF_USE_QT_BEARER=1 -DENABLE_TOUCH_EVENTS=1 -DENABLE_VIDEO=0 -DSQLITE_CORE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_OMIT_COMPLETE -DENABLE_XSLT=0 -DENABLE_WEB_TIMING=0 -DQT_NO_CAST_TO_ASCII -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB
+
+QT_INCPATH = \
+ mkspecs/qws/genode-generic-g++ \
+ src/3rdparty/sqlite \
+ src/3rdparty/webkit/include \
+ src/3rdparty/webkit/Source \
+ src/3rdparty/webkit/Source/JavaScriptCore \
+ src/3rdparty/webkit/Source/JavaScriptCore/API \
+ src/3rdparty/webkit/Source/JavaScriptCore/assembler \
+ src/3rdparty/webkit/Source/JavaScriptCore/bytecode \
+ src/3rdparty/webkit/Source/JavaScriptCore/bytecompiler \
+ src/3rdparty/webkit/Source/JavaScriptCore/debugger \
+ src/3rdparty/webkit/Source/JavaScriptCore/dfg \
+ src/3rdparty/webkit/Source/JavaScriptCore/ForwardingHeaders \
+ src/3rdparty/webkit/Source/JavaScriptCore/generated \
+ src/3rdparty/webkit/Source/JavaScriptCore/heap \
+ src/3rdparty/webkit/Source/JavaScriptCore/interpreter \
+ src/3rdparty/webkit/Source/JavaScriptCore/jit \
+ src/3rdparty/webkit/Source/JavaScriptCore/parser \
+ src/3rdparty/webkit/Source/JavaScriptCore/profiler \
+ src/3rdparty/webkit/Source/JavaScriptCore/runtime \
+ src/3rdparty/webkit/Source/JavaScriptCore/wtf \
+ src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject \
+ src/3rdparty/webkit/Source/JavaScriptCore/wtf/symbian \
+ src/3rdparty/webkit/Source/JavaScriptCore/wtf/unicode \
+ src/3rdparty/webkit/Source/JavaScriptCore/yarr \
+ src/3rdparty/webkit/Source/ThirdParty \
+ src/3rdparty/webkit/Source/WebCore \
+ src/3rdparty/webkit/Source/WebCore/accessibility \
+ src/3rdparty/webkit/Source/WebCore/bindings \
+ src/3rdparty/webkit/Source/WebCore/bindings/generic \
+ src/3rdparty/webkit/Source/WebCore/bindings/js \
+ src/3rdparty/webkit/Source/WebCore/bindings/js/specialization \
+ src/3rdparty/webkit/Source/WebCore/bridge \
+ src/3rdparty/webkit/Source/WebCore/bridge/c \
+ src/3rdparty/webkit/Source/WebCore/bridge/jsc \
+ src/3rdparty/webkit/Source/WebCore/bridge/qt \
+ src/3rdparty/webkit/Source/WebCore/css \
+ src/3rdparty/webkit/Source/WebCore/dom \
+ src/3rdparty/webkit/Source/WebCore/dom/default \
+ src/3rdparty/webkit/Source/WebCore/editing \
+ src/3rdparty/webkit/Source/WebCore/fileapi \
+ src/3rdparty/webkit/Source/WebCore/generated \
+ src/3rdparty/webkit/Source/WebCore/history \
+ src/3rdparty/webkit/Source/WebCore/html \
+ src/3rdparty/webkit/Source/WebCore/html/canvas \
+ src/3rdparty/webkit/Source/WebCore/html/parser \
+ src/3rdparty/webkit/Source/WebCore/html/shadow \
+ src/3rdparty/webkit/Source/WebCore/inspector \
+ src/3rdparty/webkit/Source/WebCore/loader \
+ src/3rdparty/webkit/Source/WebCore/loader/appcache \
+ src/3rdparty/webkit/Source/WebCore/loader/archive \
+ src/3rdparty/webkit/Source/WebCore/loader/cache \
+ src/3rdparty/webkit/Source/WebCore/loader/icon \
+ src/3rdparty/webkit/Source/WebCore/mathml \
+ src/3rdparty/webkit/Source/WebCore/notifications \
+ src/3rdparty/webkit/Source/WebCore/page \
+ src/3rdparty/webkit/Source/WebCore/page/animation \
+ src/3rdparty/webkit/Source/WebCore/page/qt \
+ src/3rdparty/webkit/Source/WebCore/platform \
+ src/3rdparty/webkit/Source/WebCore/platform/animation \
+ src/3rdparty/webkit/Source/WebCore/platform/audio \
+ src/3rdparty/webkit/Source/WebCore/platform/graphics \
+ src/3rdparty/webkit/Source/WebCore/platform/graphics/filters \
+ src/3rdparty/webkit/Source/WebCore/platform/graphics/filters/arm \
+ src/3rdparty/webkit/Source/WebCore/platform/graphics/qt \
+ src/3rdparty/webkit/Source/WebCore/platform/graphics/texmap \
+ src/3rdparty/webkit/Source/WebCore/platform/graphics/transforms \
+ src/3rdparty/webkit/Source/WebCore/platform/image-decoders \
+ src/3rdparty/webkit/Source/WebCore/platform/leveldb \
+ src/3rdparty/webkit/Source/WebCore/platform/mock \
+ src/3rdparty/webkit/Source/WebCore/platform/network \
+ src/3rdparty/webkit/Source/WebCore/platform/network/qt \
+ src/3rdparty/webkit/Source/WebCore/platform/qt \
+ src/3rdparty/webkit/Source/WebCore/platform/sql \
+ src/3rdparty/webkit/Source/WebCore/platform/text \
+ src/3rdparty/webkit/Source/WebCore/platform/text/transcoder \
+ src/3rdparty/webkit/Source/WebCore/plugins \
+ src/3rdparty/webkit/Source/WebCore/rendering \
+ src/3rdparty/webkit/Source/WebCore/rendering/mathml \
+ src/3rdparty/webkit/Source/WebCore/rendering/style \
+ src/3rdparty/webkit/Source/WebCore/rendering/svg \
+ src/3rdparty/webkit/Source/WebCore/storage \
+ src/3rdparty/webkit/Source/WebCore/svg \
+ src/3rdparty/webkit/Source/WebCore/svg/animation \
+ src/3rdparty/webkit/Source/WebCore/svg/graphics \
+ src/3rdparty/webkit/Source/WebCore/svg/graphics/filters \
+ src/3rdparty/webkit/Source/WebCore/svg/properties \
+ src/3rdparty/webkit/Source/WebCore/testing \
+ src/3rdparty/webkit/Source/WebCore/testing/js \
+ src/3rdparty/webkit/Source/WebCore/webaudio \
+ src/3rdparty/webkit/Source/WebCore/websockets \
+ src/3rdparty/webkit/Source/WebCore/wml \
+ src/3rdparty/webkit/Source/WebCore/workers \
+ src/3rdparty/webkit/Source/WebCore/xml \
+ src/3rdparty/webkit/Source/WebKit/qt \
+ src/3rdparty/webkit/Source/WebKit/qt/Api \
+ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport \
+
+QT_SOURCES = \
+ MathMLNames.cpp \
+ MathMLElementFactory.cpp \
+ SVGNames.cpp \
+ SVGElementFactory.cpp \
+ JSSVGElementWrapperFactory.cpp \
+ XLinkNames.cpp \
+ CSSPropertyNames.cpp \
+ CSSValueKeywords.cpp \
+ JSCounter.cpp \
+ JSCSSCharsetRule.cpp \
+ JSCSSFontFaceRule.cpp \
+ JSCSSImportRule.cpp \
+ JSCSSMediaRule.cpp \
+ JSCSSPageRule.cpp \
+ JSCSSPrimitiveValue.cpp \
+ JSCSSRule.cpp \
+ JSCSSRuleList.cpp \
+ JSCSSStyleDeclaration.cpp \
+ JSCSSStyleRule.cpp \
+ JSCSSStyleSheet.cpp \
+ JSCSSValue.cpp \
+ JSCSSValueList.cpp \
+ JSMediaList.cpp \
+ JSMediaQueryList.cpp \
+ JSRect.cpp \
+ JSRGBColor.cpp \
+ JSStyleMedia.cpp \
+ JSStyleSheet.cpp \
+ JSStyleSheetList.cpp \
+ JSWebKitCSSKeyframeRule.cpp \
+ JSWebKitCSSKeyframesRule.cpp \
+ JSWebKitCSSMatrix.cpp \
+ JSWebKitCSSTransformValue.cpp \
+ JSAttr.cpp \
+ JSBeforeLoadEvent.cpp \
+ JSBeforeProcessEvent.cpp \
+ JSCharacterData.cpp \
+ JSClientRect.cpp \
+ JSClientRectList.cpp \
+ JSClipboard.cpp \
+ JSCDATASection.cpp \
+ JSComment.cpp \
+ JSCompositionEvent.cpp \
+ JSCustomEvent.cpp \
+ JSDataTransferItem.cpp \
+ JSDataTransferItems.cpp \
+ JSDeviceMotionEvent.cpp \
+ JSDeviceOrientationEvent.cpp \
+ JSDocumentFragment.cpp \
+ JSDocument.cpp \
+ JSDocumentType.cpp \
+ JSDOMCoreException.cpp \
+ JSDOMImplementation.cpp \
+ JSDOMStringList.cpp \
+ JSDOMStringMap.cpp \
+ JSElement.cpp \
+ JSEntity.cpp \
+ JSEntityReference.cpp \
+ JSErrorEvent.cpp \
+ JSEvent.cpp \
+ JSEventException.cpp \
+ JSHashChangeEvent.cpp \
+ JSKeyboardEvent.cpp \
+ JSMouseEvent.cpp \
+ JSMessageChannel.cpp \
+ JSMessageEvent.cpp \
+ JSMessagePort.cpp \
+ JSMutationEvent.cpp \
+ JSNamedNodeMap.cpp \
+ JSNode.cpp \
+ JSNodeFilter.cpp \
+ JSNodeIterator.cpp \
+ JSNodeList.cpp \
+ JSNotation.cpp \
+ JSOverflowEvent.cpp \
+ JSPageTransitionEvent.cpp \
+ JSPopStateEvent.cpp \
+ JSProcessingInstruction.cpp \
+ JSProgressEvent.cpp \
+ JSRangeException.cpp \
+ JSRange.cpp \
+ JSStringCallback.cpp \
+ JSText.cpp \
+ JSTextEvent.cpp \
+ JSTouch.cpp \
+ JSTouchEvent.cpp \
+ JSTouchList.cpp \
+ JSTreeWalker.cpp \
+ JSUIEvent.cpp \
+ JSWebKitAnimationEvent.cpp \
+ JSWebKitTransitionEvent.cpp \
+ JSWheelEvent.cpp \
+ JSBlob.cpp \
+ JSDirectoryEntry.cpp \
+ JSDirectoryEntrySync.cpp \
+ JSDirectoryReader.cpp \
+ JSDirectoryReaderSync.cpp \
+ JSDOMFileSystem.cpp \
+ JSDOMFileSystemSync.cpp \
+ JSEntriesCallback.cpp \
+ JSEntry.cpp \
+ JSEntryArray.cpp \
+ JSEntryArraySync.cpp \
+ JSEntryCallback.cpp \
+ JSEntrySync.cpp \
+ JSErrorCallback.cpp \
+ JSFile.cpp \
+ JSFileCallback.cpp \
+ JSFileEntry.cpp \
+ JSFileEntrySync.cpp \
+ JSFileError.cpp \
+ JSFileException.cpp \
+ JSFileList.cpp \
+ JSFileReader.cpp \
+ JSFileReaderSync.cpp \
+ JSFileSystemCallback.cpp \
+ JSFileWriter.cpp \
+ JSFileWriterCallback.cpp \
+ JSWebKitFlags.cpp \
+ JSMetadata.cpp \
+ JSMetadataCallback.cpp \
+ JSWebKitBlobBuilder.cpp \
+ JSArrayBufferView.cpp \
+ JSArrayBuffer.cpp \
+ JSDataView.cpp \
+ JSInt8Array.cpp \
+ JSFloat32Array.cpp \
+ JSCanvasGradient.cpp \
+ JSInt32Array.cpp \
+ JSCanvasPattern.cpp \
+ JSCanvasRenderingContext.cpp \
+ JSCanvasRenderingContext2D.cpp \
+ JSOESStandardDerivatives.cpp \
+ JSOESTextureFloat.cpp \
+ JSOESVertexArrayObject.cpp \
+ JSWebGLActiveInfo.cpp \
+ JSWebGLBuffer.cpp \
+ JSWebGLContextAttributes.cpp \
+ JSWebGLFramebuffer.cpp \
+ JSWebGLProgram.cpp \
+ JSWebGLRenderbuffer.cpp \
+ JSWebGLRenderingContext.cpp \
+ JSWebGLShader.cpp \
+ JSInt16Array.cpp \
+ JSWebGLTexture.cpp \
+ JSWebGLUniformLocation.cpp \
+ JSWebGLVertexArrayObjectOES.cpp \
+ JSWebKitLoseContext.cpp \
+ JSUint8Array.cpp \
+ JSUint32Array.cpp \
+ JSUint16Array.cpp \
+ JSDOMFormData.cpp \
+ JSDOMSettableTokenList.cpp \
+ JSDOMTokenList.cpp \
+ JSDOMURL.cpp \
+ JSHTMLAllCollection.cpp \
+ JSHTMLAudioElement.cpp \
+ JSHTMLAnchorElement.cpp \
+ JSHTMLAppletElement.cpp \
+ JSHTMLAreaElement.cpp \
+ JSHTMLBaseElement.cpp \
+ JSHTMLBaseFontElement.cpp \
+ JSHTMLBlockquoteElement.cpp \
+ JSHTMLBodyElement.cpp \
+ JSHTMLBRElement.cpp \
+ JSHTMLButtonElement.cpp \
+ JSHTMLCanvasElement.cpp \
+ JSHTMLCollection.cpp \
+ JSHTMLDataListElement.cpp \
+ JSHTMLDetailsElement.cpp \
+ JSHTMLDirectoryElement.cpp \
+ JSHTMLDivElement.cpp \
+ JSHTMLDListElement.cpp \
+ JSHTMLDocument.cpp \
+ JSHTMLElement.cpp \
+ JSHTMLEmbedElement.cpp \
+ JSHTMLFieldSetElement.cpp \
+ JSHTMLFontElement.cpp \
+ JSHTMLFormElement.cpp \
+ JSHTMLFrameElement.cpp \
+ JSHTMLFrameSetElement.cpp \
+ JSHTMLHeadElement.cpp \
+ JSHTMLHeadingElement.cpp \
+ JSHTMLHRElement.cpp \
+ JSHTMLHtmlElement.cpp \
+ JSHTMLIFrameElement.cpp \
+ JSHTMLImageElement.cpp \
+ JSHTMLInputElement.cpp \
+ JSHTMLIsIndexElement.cpp \
+ JSHTMLKeygenElement.cpp \
+ JSHTMLLabelElement.cpp \
+ JSHTMLLegendElement.cpp \
+ JSHTMLLIElement.cpp \
+ JSHTMLLinkElement.cpp \
+ JSHTMLMapElement.cpp \
+ JSHTMLMarqueeElement.cpp \
+ JSHTMLMediaElement.cpp \
+ JSHTMLMenuElement.cpp \
+ JSHTMLMetaElement.cpp \
+ JSHTMLMeterElement.cpp \
+ JSHTMLModElement.cpp \
+ JSHTMLObjectElement.cpp \
+ JSHTMLOListElement.cpp \
+ JSHTMLOptGroupElement.cpp \
+ JSHTMLOptionElement.cpp \
+ JSHTMLOptionsCollection.cpp \
+ JSHTMLOutputElement.cpp \
+ JSHTMLParagraphElement.cpp \
+ JSHTMLParamElement.cpp \
+ JSHTMLPreElement.cpp \
+ JSHTMLProgressElement.cpp \
+ JSHTMLQuoteElement.cpp \
+ JSHTMLScriptElement.cpp \
+ JSHTMLSelectElement.cpp \
+ JSHTMLSourceElement.cpp \
+ JSHTMLStyleElement.cpp \
+ JSHTMLTableCaptionElement.cpp \
+ JSHTMLTableCellElement.cpp \
+ JSHTMLTableColElement.cpp \
+ JSHTMLTableElement.cpp \
+ JSHTMLTableRowElement.cpp \
+ JSHTMLTableSectionElement.cpp \
+ JSHTMLTextAreaElement.cpp \
+ JSHTMLTitleElement.cpp \
+ JSHTMLTrackElement.cpp \
+ JSHTMLUListElement.cpp \
+ JSHTMLVideoElement.cpp \
+ JSImageData.cpp \
+ JSMediaError.cpp \
+ JSTextMetrics.cpp \
+ JSTimeRanges.cpp \
+ JSValidityState.cpp \
+ JSVoidCallback.cpp \
+ JSInjectedScriptHost.cpp \
+ JSInspectorFrontendHost.cpp \
+ JSJavaScriptCallFrame.cpp \
+ JSScriptProfile.cpp \
+ JSScriptProfileNode.cpp \
+ JSDOMApplicationCache.cpp \
+ JSNotification.cpp \
+ JSNotificationCenter.cpp \
+ JSBarInfo.cpp \
+ JSConsole.cpp \
+ JSCoordinates.cpp \
+ JSCrypto.cpp \
+ JSDOMSelection.cpp \
+ JSDOMWindow.cpp \
+ JSEventSource.cpp \
+ JSGeolocation.cpp \
+ JSGeoposition.cpp \
+ JSHistory.cpp \
+ JSLocation.cpp \
+ JSMemoryInfo.cpp \
+ JSNavigator.cpp \
+ JSNavigatorUserMediaError.cpp \
+ JSNavigatorUserMediaErrorCallback.cpp \
+ JSNavigatorUserMediaSuccessCallback.cpp \
+ JSPerformance.cpp \
+ JSPerformanceNavigation.cpp \
+ JSPerformanceTiming.cpp \
+ JSPositionError.cpp \
+ JSScreen.cpp \
+ JSSpeechInputEvent.cpp \
+ JSSpeechInputResult.cpp \
+ JSSpeechInputResultList.cpp \
+ JSWebKitAnimation.cpp \
+ JSWebKitAnimationList.cpp \
+ JSWebKitPoint.cpp \
+ JSWorkerNavigator.cpp \
+ JSDOMPlugin.cpp \
+ JSDOMMimeType.cpp \
+ JSDOMPluginArray.cpp \
+ JSDOMMimeTypeArray.cpp \
+ JSDatabase.cpp \
+ JSDatabaseCallback.cpp \
+ JSDatabaseSync.cpp \
+ JSIDBAny.cpp \
+ JSIDBCursor.cpp \
+ JSIDBDatabaseError.cpp \
+ JSIDBDatabaseException.cpp \
+ JSIDBDatabase.cpp \
+ JSIDBFactory.cpp \
+ JSIDBIndex.cpp \
+ JSIDBKey.cpp \
+ JSIDBKeyRange.cpp \
+ JSIDBObjectStore.cpp \
+ JSIDBRequest.cpp \
+ JSIDBTransaction.cpp \
+ JSStorage.cpp \
+ JSStorageEvent.cpp \
+ JSStorageInfo.cpp \
+ JSStorageInfoErrorCallback.cpp \
+ JSStorageInfoUsageCallback.cpp \
+ JSSQLError.cpp \
+ JSSQLException.cpp \
+ JSSQLResultSet.cpp \
+ JSSQLResultSetRowList.cpp \
+ JSSQLStatementCallback.cpp \
+ JSSQLStatementErrorCallback.cpp \
+ JSSQLTransaction.cpp \
+ JSSQLTransactionCallback.cpp \
+ JSSQLTransactionErrorCallback.cpp \
+ JSSQLTransactionSync.cpp \
+ JSSQLTransactionSyncCallback.cpp \
+ JSSVGZoomEvent.cpp \
+ JSSVGAElement.cpp \
+ JSSVGAltGlyphElement.cpp \
+ JSSVGAngle.cpp \
+ JSSVGAnimateColorElement.cpp \
+ JSSVGAnimatedAngle.cpp \
+ JSSVGAnimatedBoolean.cpp \
+ JSSVGAnimatedEnumeration.cpp \
+ JSSVGAnimatedInteger.cpp \
+ JSSVGAnimatedLength.cpp \
+ JSSVGAnimatedLengthList.cpp \
+ JSSVGAnimatedNumber.cpp \
+ JSSVGAnimatedNumberList.cpp \
+ JSSVGAnimatedPreserveAspectRatio.cpp \
+ JSSVGAnimatedRect.cpp \
+ JSSVGAnimatedString.cpp \
+ JSSVGAnimatedTransformList.cpp \
+ JSSVGAnimateElement.cpp \
+ JSSVGAnimateTransformElement.cpp \
+ JSSVGAnimationElement.cpp \
+ JSSVGCircleElement.cpp \
+ JSSVGClipPathElement.cpp \
+ JSSVGColor.cpp \
+ JSSVGComponentTransferFunctionElement.cpp \
+ JSSVGCursorElement.cpp \
+ JSSVGDefsElement.cpp \
+ JSSVGDescElement.cpp \
+ JSSVGDocument.cpp \
+ JSSVGElement.cpp \
+ JSSVGElementInstance.cpp \
+ JSSVGElementInstanceList.cpp \
+ JSSVGEllipseElement.cpp \
+ JSSVGException.cpp \
+ JSSVGFEBlendElement.cpp \
+ JSSVGFEColorMatrixElement.cpp \
+ JSSVGFEComponentTransferElement.cpp \
+ JSSVGFECompositeElement.cpp \
+ JSSVGFEConvolveMatrixElement.cpp \
+ JSSVGFEDiffuseLightingElement.cpp \
+ JSSVGFEDisplacementMapElement.cpp \
+ JSSVGFEDistantLightElement.cpp \
+ JSSVGFEDropShadowElement.cpp \
+ JSSVGFEFloodElement.cpp \
+ JSSVGFEFuncAElement.cpp \
+ JSSVGFEFuncBElement.cpp \
+ JSSVGFEFuncGElement.cpp \
+ JSSVGFEFuncRElement.cpp \
+ JSSVGFEGaussianBlurElement.cpp \
+ JSSVGFEImageElement.cpp \
+ JSSVGFEMergeElement.cpp \
+ JSSVGFEMergeNodeElement.cpp \
+ JSSVGFEMorphologyElement.cpp \
+ JSSVGFEOffsetElement.cpp \
+ JSSVGFEPointLightElement.cpp \
+ JSSVGFESpecularLightingElement.cpp \
+ JSSVGFESpotLightElement.cpp \
+ JSSVGFETileElement.cpp \
+ JSSVGFETurbulenceElement.cpp \
+ JSSVGFilterElement.cpp \
+ JSSVGFontElement.cpp \
+ JSSVGFontFaceElement.cpp \
+ JSSVGFontFaceFormatElement.cpp \
+ JSSVGFontFaceNameElement.cpp \
+ JSSVGFontFaceSrcElement.cpp \
+ JSSVGFontFaceUriElement.cpp \
+ JSSVGForeignObjectElement.cpp \
+ JSSVGGElement.cpp \
+ JSSVGGlyphElement.cpp \
+ JSSVGGradientElement.cpp \
+ JSSVGHKernElement.cpp \
+ JSSVGImageElement.cpp \
+ JSSVGLength.cpp \
+ JSSVGLengthList.cpp \
+ JSSVGLinearGradientElement.cpp \
+ JSSVGLineElement.cpp \
+ JSSVGMarkerElement.cpp \
+ JSSVGMaskElement.cpp \
+ JSSVGMatrix.cpp \
+ JSSVGMetadataElement.cpp \
+ JSSVGMissingGlyphElement.cpp \
+ JSSVGNumber.cpp \
+ JSSVGNumberList.cpp \
+ JSSVGPaint.cpp \
+ JSSVGPathElement.cpp \
+ JSSVGPathSegArcAbs.cpp \
+ JSSVGPathSegArcRel.cpp \
+ JSSVGPathSegClosePath.cpp \
+ JSSVGPathSegCurvetoCubicAbs.cpp \
+ JSSVGPathSegCurvetoCubicRel.cpp \
+ JSSVGPathSegCurvetoCubicSmoothAbs.cpp \
+ JSSVGPathSegCurvetoCubicSmoothRel.cpp \
+ JSSVGPathSegCurvetoQuadraticAbs.cpp \
+ JSSVGPathSegCurvetoQuadraticRel.cpp \
+ JSSVGPathSegCurvetoQuadraticSmoothAbs.cpp \
+ JSSVGPathSegCurvetoQuadraticSmoothRel.cpp \
+ JSSVGPathSeg.cpp \
+ JSSVGPathSegLinetoAbs.cpp \
+ JSSVGPathSegLinetoHorizontalAbs.cpp \
+ JSSVGPathSegLinetoHorizontalRel.cpp \
+ JSSVGPathSegLinetoRel.cpp \
+ JSSVGPathSegLinetoVerticalAbs.cpp \
+ JSSVGPathSegLinetoVerticalRel.cpp \
+ JSSVGPathSegList.cpp \
+ JSSVGPathSegMovetoAbs.cpp \
+ JSSVGPathSegMovetoRel.cpp \
+ JSSVGPatternElement.cpp \
+ JSSVGPoint.cpp \
+ JSSVGPointList.cpp \
+ JSSVGPolygonElement.cpp \
+ JSSVGPolylineElement.cpp \
+ JSSVGPreserveAspectRatio.cpp \
+ JSSVGRadialGradientElement.cpp \
+ JSSVGRectElement.cpp \
+ JSSVGRect.cpp \
+ JSSVGRenderingIntent.cpp \
+ JSSVGScriptElement.cpp \
+ JSSVGSetElement.cpp \
+ JSSVGStopElement.cpp \
+ JSSVGStringList.cpp \
+ JSSVGStyleElement.cpp \
+ JSSVGSVGElement.cpp \
+ JSSVGSwitchElement.cpp \
+ JSSVGSymbolElement.cpp \
+ JSSVGTextContentElement.cpp \
+ JSSVGTextElement.cpp \
+ JSSVGTextPathElement.cpp \
+ JSSVGTextPositioningElement.cpp \
+ JSSVGTitleElement.cpp \
+ JSSVGTransform.cpp \
+ JSSVGTransformList.cpp \
+ JSSVGTRefElement.cpp \
+ JSSVGTSpanElement.cpp \
+ JSSVGUnitTypes.cpp \
+ JSSVGUseElement.cpp \
+ JSSVGViewElement.cpp \
+ JSSVGVKernElement.cpp \
+ JSInternals.cpp \
+ JSAudioBuffer.cpp \
+ JSAudioBufferSourceNode.cpp \
+ JSAudioChannelMerger.cpp \
+ JSAudioChannelSplitter.cpp \
+ JSAudioContext.cpp \
+ JSAudioDestinationNode.cpp \
+ JSAudioGain.cpp \
+ JSAudioGainNode.cpp \
+ JSAudioListener.cpp \
+ JSAudioNode.cpp \
+ JSAudioPannerNode.cpp \
+ JSAudioParam.cpp \
+ JSAudioProcessingEvent.cpp \
+ JSAudioSourceNode.cpp \
+ JSConvolverNode.cpp \
+ JSDelayNode.cpp \
+ JSHighPass2FilterNode.cpp \
+ JSJavaScriptAudioNode.cpp \
+ JSLowPass2FilterNode.cpp \
+ JSRealtimeAnalyserNode.cpp \
+ JSWebSocket.cpp \
+ JSAbstractWorker.cpp \
+ JSDedicatedWorkerContext.cpp \
+ JSSharedWorker.cpp \
+ JSSharedWorkerContext.cpp \
+ JSWorker.cpp \
+ JSWorkerContext.cpp \
+ JSWorkerLocation.cpp \
+ JSDOMParser.cpp \
+ JSXMLHttpRequest.cpp \
+ JSXMLHttpRequestException.cpp \
+ JSXMLHttpRequestProgressEvent.cpp \
+ JSXMLHttpRequestUpload.cpp \
+ JSXMLSerializer.cpp \
+ JSXPathNSResolver.cpp \
+ JSXPathException.cpp \
+ JSXPathExpression.cpp \
+ JSXPathResult.cpp \
+ JSXPathEvaluator.cpp \
+ JSXSLTProcessor.cpp \
+ InspectorFrontend.cpp \
+ InspectorBackendDispatcher.cpp \
+ CSSGrammar.cpp \
+ HTMLNames.cpp \
+ HTMLElementFactory.cpp \
+ JSHTMLElementWrapperFactory.cpp \
+ XMLNSNames.cpp \
+ XMLNames.cpp \
+ HTMLEntityTable.cpp \
+ DocTypeStrings.cpp \
+ ColorData.cpp \
+ UserAgentStyleSheetsData.cpp \
+ XPathGrammar.cpp \
+ qwebframe.cpp \
+ qgraphicswebview.cpp \
+ qwebpage.cpp \
+ qwebview.cpp \
+ qwebelement.cpp \
+ qwebhistory.cpp \
+ qwebsettings.cpp \
+ qwebhistoryinterface.cpp \
+ qwebplugindatabase.cpp \
+ qwebpluginfactory.cpp \
+ qwebsecurityorigin.cpp \
+ qwebscriptworld.cpp \
+ qwebdatabase.cpp \
+ qwebinspector.cpp \
+ qwebkitversion.cpp \
+ QtFallbackWebPopup.cpp \
+ ChromeClientQt.cpp \
+ ContextMenuClientQt.cpp \
+ DragClientQt.cpp \
+ DumpRenderTreeSupportQt.cpp \
+ EditorClientQt.cpp \
+ EditCommandQt.cpp \
+ FrameLoaderClientQt.cpp \
+ FrameNetworkingContextQt.cpp \
+ GeolocationPermissionClientQt.cpp \
+ InspectorClientQt.cpp \
+ InspectorServerQt.cpp \
+ NotificationPresenterClientQt.cpp \
+ PageClientQt.cpp \
+ PopupMenuQt.cpp \
+ QtPlatformPlugin.cpp \
+ SearchPopupMenuQt.cpp \
+ WebPlatformStrategies.cpp \
+ IconDatabaseClientQt.cpp \
+ moc_qwebkitplatformplugin.cpp \
+ moc_qwebhistoryinterface.cpp \
+ moc_qwebpluginfactory.cpp \
+ moc_qwebinspector.cpp \
+ moc_qwebplugindatabase_p.cpp \
+ moc_InspectorServerQt.cpp \
+ moc_QtFallbackWebPopup.cpp \
+ qrc_WebCore.cpp \
+ qrc_WebKit.cpp \
+ qrc_InspectorBackendStub.cpp
+
+QT_VPATH = \
+ src/3rdparty/webkit/Source/WebCore/generated \
+ src/3rdparty/webkit/Source/WebKit/qt/Api \
+ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport \
+
+# some source files need to be generated by moc from other source/header files before
+# they get #included again by the original source file in the compiling stage
+
+# source files generated from existing header files ('moc_%.cpp: %.h' rule in spec-qt4.mk)
+# extracted from 'compiler_moc_header_make_all' target
+
+COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
+ moc_qwebframe.cpp \
+ moc_qgraphicswebview.cpp \
+ moc_qwebkitplatformplugin.cpp \
+ moc_qwebpage.cpp \
+ moc_qwebview.cpp \
+ moc_qwebhistoryinterface.cpp \
+ moc_qwebpluginfactory.cpp \
+ moc_qwebinspector.cpp \
+ moc_qwebplugindatabase_p.cpp \
+ moc_InspectorServerQt.cpp \
+ moc_QtFallbackWebPopup.cpp \
+ moc_FrameLoaderClientQt.cpp \
+ moc_NotificationPresenterClientQt.cpp \
+ moc_PopupMenuQt.cpp \
+ moc_IconDatabaseClientQt.cpp
+
+# source files generated from existing source files ('%.moc: %.cpp' rule in spec-qt4.mk)
+# extracted from 'compiler_moc_source_make_all' rule
+
+COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
+ InspectorClientQt.moc
+
diff --git a/qt4/lib/mk/qt_xml.mk b/qt4/lib/mk/qt_xml.mk
index a472db4ec..914d7066f 100644
--- a/qt4/lib/mk/qt_xml.mk
+++ b/qt4/lib/mk/qt_xml.mk
@@ -2,11 +2,10 @@ include $(REP_DIR)/lib/import/import-qt_xml.mk
SHARED_LIB = yes
-# extracted from src/xml/Makefile
-QT_DEFINES += -DQT_BUILD_XML_LIB -DQT_NO_USING_NAMESPACE -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_NO_DEBUG -DQT_CORE_LIB
-
include $(REP_DIR)/lib/mk/qt_xml_generated.inc
+include $(REP_DIR)/lib/mk/qt.inc
+
INC_DIR += $(REP_DIR)/include/qt4/QtXml/private \
$(REP_DIR)/contrib/$(QT4)/include/QtXml/private \
@@ -14,11 +13,3 @@ LIBS += qt_core libc
vpath % $(REP_DIR)/include/qt4/QtXml
vpath % $(REP_DIR)/include/qt4/QtXml/private
-
-vpath % $(REP_DIR)/src/lib/qt4/src/xml/dom
-vpath % $(REP_DIR)/src/lib/qt4/src/xml/sax
-
-vpath % $(REP_DIR)/contrib/$(QT4)/src/xml/dom
-vpath % $(REP_DIR)/contrib/$(QT4)/src/xml/sax
-
-include $(REP_DIR)/lib/mk/qt.inc
diff --git a/qt4/lib/mk/qt_xml_generated.inc b/qt4/lib/mk/qt_xml_generated.inc
index 63d900878..c732cf022 100644
--- a/qt4/lib/mk/qt_xml_generated.inc
+++ b/qt4/lib/mk/qt_xml_generated.inc
@@ -1,7 +1,17 @@
+QT_DEFINES += -DQT_BUILD_XML_LIB -DQT_NO_USING_NAMESPACE -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_NO_DEBUG -DQT_CORE_LIB
+
+QT_INCPATH = \
+ mkspecs/qws/genode-generic-g++ \
+ src/xml \
+
QT_SOURCES = \
qdom.cpp \
qxml.cpp
+QT_VPATH = \
+ src/xml/dom \
+ src/xml/sax \
+
# some source files need to be generated by moc from other source/header files before
# they get #included again by the original source file in the compiling stage
diff --git a/qt4/run/previewer.run b/qt4/run/previewer.run
index a0154c3f4..d6e980f21 100644
--- a/qt4/run/previewer.run
+++ b/qt4/run/previewer.run
@@ -112,6 +112,7 @@ set boot_modules {
qt_jscore.lib.so
qt_network.lib.so
qt_webcore.lib.so
+ qt_webkit.lib.so
zlib.lib.so
stdcxx.lib.so
}
diff --git a/qt4/src/app/qt_avplay/style.qrc b/qt4/src/app/qt_avplay/style.qrc
index 0adacff03..77f0e343b 100644
--- a/qt4/src/app/qt_avplay/style.qrc
+++ b/qt4/src/app/qt_avplay/style.qrc
@@ -2,9 +2,9 @@
style.qss
-../../../contrib/qt-everywhere-opensource-src-4.7.4/examples/network/torrent/icons/player_play.png
-../../../contrib/qt-everywhere-opensource-src-4.7.4/examples/network/torrent/icons/player_pause.png
-../../../contrib/qt-everywhere-opensource-src-4.7.4/examples/network/torrent/icons/player_stop.png
-../../../contrib/qt-everywhere-opensource-src-4.7.4/demos/mobile/guitartuner/src/mycomponents/images/volume.png
+../../../contrib/qt-everywhere-opensource-src-4.8.4/examples/network/torrent/icons/player_play.png
+../../../contrib/qt-everywhere-opensource-src-4.8.4/examples/network/torrent/icons/player_pause.png
+../../../contrib/qt-everywhere-opensource-src-4.8.4/examples/network/torrent/icons/player_stop.png
+../../../contrib/qt-everywhere-opensource-src-4.8.4/demos/mobile/guitartuner/src/mycomponents/images/volume.png
diff --git a/qt4/src/app/tmpl/target_final.inc b/qt4/src/app/tmpl/target_final.inc
index 77a9fa81e..1e14213df 100644
--- a/qt4/src/app/tmpl/target_final.inc
+++ b/qt4/src/app/tmpl/target_final.inc
@@ -57,5 +57,5 @@ endif
# QtWebKit
ifeq ($(findstring webkit, $(QT)), webkit)
-LIBS += qt_webcore
+LIBS += qt_webcore qt_webkit
endif
diff --git a/qt4/src/lib/dejavusans/dejavusans.qrc b/qt4/src/lib/dejavusans/dejavusans.qrc
index e77ee7e61..ebe85b3ac 100644
--- a/qt4/src/lib/dejavusans/dejavusans.qrc
+++ b/qt4/src/lib/dejavusans/dejavusans.qrc
@@ -1,6 +1,6 @@
-../../../contrib/qt-everywhere-opensource-src-4.7.4/lib/fonts/DejaVuSans.ttf
+../../../contrib/qt-everywhere-opensource-src-4.8.4/lib/fonts/DejaVuSans.ttf
diff --git a/qt4/src/lib/qt4/mkspecs/genode-g++/qmake.conf b/qt4/src/lib/qt4/mkspecs/genode-g++/qmake.conf
index 4b218960c..f69dc492f 100644
--- a/qt4/src/lib/qt4/mkspecs/genode-g++/qmake.conf
+++ b/qt4/src/lib/qt4/mkspecs/genode-g++/qmake.conf
@@ -9,6 +9,7 @@ CONFIG += qt warn_on release incremental link_prl
QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
-include(../common/g++.conf)
include(../common/linux.conf)
+include(../common/gcc-base-unix.conf)
+include(../common/g++-unix.conf)
load(qt_config)
diff --git a/qt4/src/lib/qt4/mkspecs/genode-g++/qplatformdefs.h b/qt4/src/lib/qt4/mkspecs/genode-g++/qplatformdefs.h
index 65ac4a5d7..84dee1eca 100644
--- a/qt4/src/lib/qt4/mkspecs/genode-g++/qplatformdefs.h
+++ b/qt4/src/lib/qt4/mkspecs/genode-g++/qplatformdefs.h
@@ -67,6 +67,7 @@
#include
#include
#include
+#include
#include
#include
@@ -82,10 +83,13 @@
#endif
#define QT_USE_XOPEN_LFS_EXTENSIONS
-#include "../../../../../contrib/qt-everywhere-opensource-src-4.7.4/mkspecs/common/posix/qplatformdefs.h"
+#include "../../../../../contrib/qt-everywhere-opensource-src-4.8.4/mkspecs/common/posix/qplatformdefs.h"
+#undef QT_OPEN_LARGEFILE
#undef QT_SOCKLEN_T
+#define QT_OPEN_LARGEFILE 0
+
#if (defined(__GLIBC__) && (__GLIBC__ >= 2)) || defined(Q_OS_GENODE)
#define QT_SOCKLEN_T socklen_t
#else
diff --git a/qt4/src/lib/qt4/mkspecs/qws/genode-x86-g++/qmake.conf b/qt4/src/lib/qt4/mkspecs/qws/genode-generic-g++/qmake.conf
similarity index 63%
rename from qt4/src/lib/qt4/mkspecs/qws/genode-x86-g++/qmake.conf
rename to qt4/src/lib/qt4/mkspecs/qws/genode-generic-g++/qmake.conf
index 7e28d4eb4..55011ec52 100644
--- a/qt4/src/lib/qt4/mkspecs/qws/genode-x86-g++/qmake.conf
+++ b/qt4/src/lib/qt4/mkspecs/qws/genode-generic-g++/qmake.conf
@@ -2,8 +2,9 @@
# qmake configuration for building with linux-g++
#
-include(../../common/g++.conf)
include(../../common/linux.conf)
+include(../../common/gcc-base-unix.conf)
+include(../../common/g++-unix.conf)
include(../../common/qws.conf)
load(qt_config)
diff --git a/qt4/src/lib/qt4/mkspecs/qws/genode-x86-g++/qplatformdefs.h b/qt4/src/lib/qt4/mkspecs/qws/genode-generic-g++/qplatformdefs.h
similarity index 100%
rename from qt4/src/lib/qt4/mkspecs/qws/genode-x86-g++/qplatformdefs.h
rename to qt4/src/lib/qt4/mkspecs/qws/genode-generic-g++/qplatformdefs.h
diff --git a/qt4/src/lib/qt4/patches/previewer_example.patch b/qt4/src/lib/qt4/patches/previewer_example.patch
new file mode 100644
index 000000000..579bedee2
--- /dev/null
+++ b/qt4/src/lib/qt4/patches/previewer_example.patch
@@ -0,0 +1,37 @@
+previewer_example.patch
+
+From: Christian Prochaska
+
+
+---
+ examples/webkit/previewer/main.cpp | 1 +
+ examples/webkit/previewer/previewer.pro | 7 -------
+ 2 files changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/examples/webkit/previewer/main.cpp b/examples/webkit/previewer/main.cpp
+index 99220b3..0587e9a 100644
+--- a/examples/webkit/previewer/main.cpp
++++ b/examples/webkit/previewer/main.cpp
+@@ -49,6 +49,7 @@ int main(int argc, char * argv[])
+ #if defined Q_OS_SYMBIAN || defined Q_WS_HILDON || defined Q_WS_MAEMO_5 || defined Q_WS_SIMULATOR
+ mainWindow.showMaximized();
+ #else
++ mainWindow.move(200, 200);
+ mainWindow.show();
+ #endif
+ return app.exec();
+diff --git a/examples/webkit/previewer/previewer.pro b/examples/webkit/previewer/previewer.pro
+index 371695e..2808b70 100644
+--- a/examples/webkit/previewer/previewer.pro
++++ b/examples/webkit/previewer/previewer.pro
+@@ -12,10 +12,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/webkit/previewer
+ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro images
+ sources.path = $$[QT_INSTALL_EXAMPLES]/webkit/previewer
+ INSTALLS += target sources
+-
+-symbian {
+- TARGET.UID3 = 0xA000CF6F
+- include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+- TARGET.CAPABILITY = NetworkServices
+-}
+-maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri)
diff --git a/qt4/src/lib/qt4/patches/qt4_connection_close.patch b/qt4/src/lib/qt4/patches/qt4_connection_close.patch
new file mode 100644
index 000000000..40ff2c48b
--- /dev/null
+++ b/qt4/src/lib/qt4/patches/qt4_connection_close.patch
@@ -0,0 +1,26 @@
+network: set the 'Connection' HTTP header field to 'Close'
+
+From: Christian Prochaska
+
+With the 'Keep-Alive' setting, loading the genode.org website with Arora
+took a long time. There appeared to be no indication that all needed data
+had been received.
+
+From: Christian Prochaska
+---
+ src/network/access/qhttpnetworkconnection.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
+index 350c307..419e456 100644
+--- a/src/network/access/qhttpnetworkconnection.cpp
++++ b/src/network/access/qhttpnetworkconnection.cpp
+@@ -217,7 +217,7 @@ void QHttpNetworkConnectionPrivate::prepareRequest(HttpMessagePair &messagePair)
+ #endif
+ value = request.headerField("connection");
+ if (value.isEmpty())
+- request.setHeaderField("Connection", "Keep-Alive");
++ request.setHeaderField("Connection", "Close");
+ #ifndef QT_NO_NETWORKPROXY
+ }
+ #endif
diff --git a/qt4/src/lib/qt4/qt4_genode.patch b/qt4/src/lib/qt4/patches/qt4_genode.patch
similarity index 64%
rename from qt4/src/lib/qt4/qt4_genode.patch
rename to qt4/src/lib/qt4/patches/qt4_genode.patch
index 23b7dd1ae..fca16deb3 100644
--- a/qt4/src/lib/qt4/qt4_genode.patch
+++ b/qt4/src/lib/qt4/patches/qt4_genode.patch
@@ -1,10 +1,64 @@
+qt4_genode.patch
+
+From: Christian Prochaska
+
+
+---
+ include/QtCore/qconfig.h | 2 -
+ .../JavaScriptCore/runtime/Collector.cpp | 21 +++++++
+ .../JavaScriptCore/wtf/FastMalloc.cpp | 2 -
+ .../javascriptcore/JavaScriptCore/wtf/Platform.h | 19 +++++-
+ .../JavaScriptCore/wtf/TCSystemAlloc.cpp | 21 +++++++
+ src/3rdparty/webkit/Source/JavaScriptCore/config.h | 2 -
+ .../Source/JavaScriptCore/wtf/FastMalloc.cpp | 4 +
+ .../webkit/Source/JavaScriptCore/wtf/Platform.h | 25 +++++++-
+ .../Source/JavaScriptCore/wtf/StackBounds.cpp | 12 ++++
+ .../Source/JavaScriptCore/wtf/TCSystemAlloc.cpp | 21 +++++++
+ .../Source/WebCore/generated/JSDOMWindow.cpp | 4 +
+ .../Source/WebCore/generated/JSWorkerContext.cpp | 4 +
+ .../webkit/Source/WebCore/loader/icon/IconRecord.h | 2 -
+ src/3rdparty/webkit/Source/WebCore/page/Page.h | 2 -
+ .../platform/network/ResourceResponseBase.h | 2 -
+ src/corelib/codecs/qtextcodec.cpp | 2 -
+ src/corelib/global/qglobal.cpp | 6 ++
+ src/corelib/global/qglobal.h | 5 +-
+ src/corelib/io/qprocess.cpp | 63 ++++++++++++++++++++
+ src/corelib/io/qprocess_p.h | 45 ++++++++++++++
+ src/corelib/io/qresource.cpp | 2 -
+ src/corelib/kernel/qcoreapplication.cpp | 10 +++
+ src/corelib/kernel/qtranslator.cpp | 2 -
+ src/corelib/plugin/qpluginloader.cpp | 43 ++++++++++++-
+ src/corelib/plugin/qpluginloader.h | 13 +++-
+ src/corelib/thread/qmutex_p.h | 10 +++
+ src/corelib/thread/qthread.cpp | 5 ++
+ src/corelib/thread/qthread_p.h | 56 +++++++++++++++++-
+ src/corelib/tools/qdatetime.cpp | 12 ++++
+ src/gui/dialogs/qfiledialog.cpp | 2 -
+ src/gui/embedded/qscreendriverfactory_qws.cpp | 14 ++++
+ src/gui/embedded/qwindowsystem_qws.cpp | 9 +++
+ src/gui/image/qpnghandler.cpp | 33 +++++++---
+ src/gui/image/qxpmhandler.cpp | 8 +++
+ src/gui/kernel/qapplication.cpp | 64 ++++++++++++++++++--
+ src/gui/kernel/qapplication_qws.cpp | 14 ++++
+ src/gui/kernel/qeventdispatcher_qws.cpp | 20 ++++++
+ src/gui/kernel/qeventdispatcher_qws_p.h | 12 ++++
+ src/gui/text/qfontdatabase_qws.cpp | 37 ++++++++++++
+ src/gui/text/qfontengine_qws.cpp | 25 ++++++++
+ src/network/access/qnetworkaccessfilebackend.cpp | 5 ++
+ src/network/kernel/qhostinfo_unix.cpp | 7 ++
+ tools/designer/src/lib/uilib/formbuilder.cpp | 5 +-
+ tools/designer/src/uitools/quiloader.cpp | 3 +
+ 44 files changed, 618 insertions(+), 57 deletions(-)
+
diff --git a/include/QtCore/qconfig.h b/include/QtCore/qconfig.h
+index aa8a3d6..1c65764 100644
--- a/include/QtCore/qconfig.h
+++ b/include/QtCore/qconfig.h
-@@ -1,1 +1,1 @@
+@@ -1 +1 @@
-#include "../../src/corelib/global/qconfig.h"
+#include "../../../src/corelib/global/qconfig.h"
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp
+index 6af1784..2f3b102 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp
@@ -62,6 +62,13 @@
@@ -21,7 +75,7 @@ diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp b/
#elif OS(UNIX)
#include
-@@ -207,6 +214,15 @@
+@@ -204,6 +211,15 @@ NEVER_INLINE CollectorBlock* Heap::allocateBlock()
void* address = _aligned_malloc(BLOCK_SIZE, BLOCK_SIZE);
#endif
memset(address, 0, BLOCK_SIZE);
@@ -37,7 +91,7 @@ diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp b/
#elif HAVE(POSIX_MEMALIGN)
void* address;
posix_memalign(&address, BLOCK_SIZE, BLOCK_SIZE);
-@@ -297,6 +313,9 @@
+@@ -294,6 +310,9 @@ NEVER_INLINE void Heap::freeBlockPtr(CollectorBlock* block)
#else
_aligned_free(block);
#endif
@@ -47,7 +101,7 @@ diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp b/
#elif HAVE(POSIX_MEMALIGN)
free(block);
#else
-@@ -638,6 +657,8 @@
+@@ -644,6 +663,8 @@ static inline void* currentThreadStackBase()
thread_info threadInfo;
get_thread_info(find_thread(NULL), &threadInfo);
return threadInfo.stack_end;
@@ -57,6 +111,7 @@ diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp b/
AtomicallyInitializedStatic(Mutex&, mutex = *new Mutex);
MutexLocker locker(mutex);
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp
+index d95f078..6aa56b6 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp
@@ -97,7 +97,7 @@
@@ -69,6 +124,7 @@ diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp b/src
#else
#define USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY 1
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+index e95ac7f..19ad5e2 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
@@ -454,6 +454,13 @@
@@ -85,7 +141,7 @@ diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rd
/* Operating environments */
/* FIXME: these are all mixes of OS, operating environment and policy choices. */
-@@ -684,13 +691,13 @@
+@@ -698,13 +705,13 @@
#endif
#endif /* !defined(HAVE_ACCESSIBILITY) */
@@ -101,7 +157,7 @@ diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rd
#define HAVE_TM_GMTOFF 1
#define HAVE_TM_ZONE 1
#define HAVE_TIMEGM 1
-@@ -765,6 +772,12 @@
+@@ -779,6 +786,12 @@
#define HAVE_SYS_PARAM_H 1
#define HAVE_SYS_TIME_H 1
@@ -114,7 +170,7 @@ diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rd
#else
/* FIXME: is this actually used or do other platforms generate their own config.h? */
-@@ -915,7 +928,7 @@
+@@ -929,7 +942,7 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */
#elif CPU(X86) && OS(WINDOWS) && COMPILER(MSVC)
#define ENABLE_JIT 1
#define WTF_USE_JIT_STUB_ARGUMENT_REGISTER 1
@@ -124,6 +180,7 @@ diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rd
#define WTF_USE_JIT_STUB_ARGUMENT_VA_LIST 1
#elif CPU(X86_64) && OS(LINUX) && GCC_VERSION >= 40100
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/TCSystemAlloc.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/TCSystemAlloc.cpp
+index ff2ac2b..370c600 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/TCSystemAlloc.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/TCSystemAlloc.cpp
@@ -56,6 +56,12 @@
@@ -139,7 +196,7 @@ diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/TCSystemAlloc.cpp b/
#ifndef MAP_ANONYMOUS
#define MAP_ANONYMOUS MAP_ANON
#endif
-@@ -379,6 +385,21 @@
+@@ -379,6 +385,21 @@ void* TCMalloc_SystemAlloc(size_t size, size_t *actual_size, size_t alignment) {
}
#endif
@@ -161,74 +218,40 @@ diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/TCSystemAlloc.cpp b/
// nothing worked - reset failure flags and try again
devmem_failure = false;
sbrk_failure = false;
-diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp
---- a/src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp
-+++ b/src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp
-@@ -62,6 +62,13 @@
+diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/config.h b/src/3rdparty/webkit/Source/JavaScriptCore/config.h
+index 394bba5..805b01d 100644
+--- a/src/3rdparty/webkit/Source/JavaScriptCore/config.h
++++ b/src/3rdparty/webkit/Source/JavaScriptCore/config.h
+@@ -80,7 +80,7 @@
- #include
-
-+#elif OS(GENODE)
-+
-+#include
-+#include
-+#include
-+#include
-+
- #elif OS(UNIX)
-
- #include
-@@ -207,6 +214,15 @@
- void* address = _aligned_malloc(BLOCK_SIZE, BLOCK_SIZE);
#endif
- memset(address, 0, BLOCK_SIZE);
-+#elif OS(GENODE)
-+ void* real_address = malloc(sizeof(Genode::addr_t) + BLOCK_SIZE + BLOCK_SIZE);
-+ Genode::addr_t address = reinterpret_cast(real_address);
-+ address += sizeof(Genode::addr_t);
-+ address = Genode::align_addr(address, Genode::log2(BLOCK_SIZE));
-+ address -= sizeof(Genode::addr_t);
-+ *(Genode::addr_t*)address = (Genode::addr_t)real_address;
-+ address += sizeof(Genode::addr_t);
-+ memset(reinterpret_cast(address), 0, BLOCK_SIZE);
- #elif HAVE(POSIX_MEMALIGN)
- void* address;
- posix_memalign(&address, BLOCK_SIZE, BLOCK_SIZE);
-@@ -297,6 +313,9 @@
- #else
- _aligned_free(block);
+
+-#if OS(UNIX) || OS(WINDOWS)
++#if (OS(UNIX) || OS(WINDOWS)) && !OS(GENODE)
+ #define WTF_USE_OS_RANDOMNESS 1
+ #endif
+
+diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/FastMalloc.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/FastMalloc.cpp
+index 86b123d..fdeb5c9 100644
+--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/FastMalloc.cpp
++++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/FastMalloc.cpp
+@@ -97,7 +97,11 @@
#endif
-+#elif OS(GENODE)
-+ void *real_address = (void*)*(Genode::addr_t*)((Genode::addr_t)block - sizeof(Genode::addr_t));
-+ free(real_address);
- #elif HAVE(POSIX_MEMALIGN)
- free(block);
- #else
-@@ -579,6 +598,8 @@
- thread_info threadInfo;
- get_thread_info(find_thread(NULL), &threadInfo);
- return threadInfo.stack_end;
-+#elif OS(GENODE)
-+ return Genode::Thread_qt::myself()->stack_top();
- #elif OS(UNIX)
- AtomicallyInitializedStatic(Mutex&, mutex = *new Mutex);
- MutexLocker locker(mutex);
-diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp b/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp
---- a/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp
-+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp
-@@ -97,7 +97,7 @@
// Use a background thread to periodically scavenge memory to release back to the system
- // https://bugs.webkit.org/show_bug.cgi?id=27900: don't turn this on for Tiger until we have figured out why it caused a crash.
--#if defined(BUILDING_ON_TIGER)
-+#if defined(BUILDING_ON_TIGER) || OS(GENODE)
- #define USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY 0
- #else
++#if OS(GENODE)
++#define USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY 0
++#else
#define USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY 1
-diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
---- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
-+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
-@@ -427,6 +427,13 @@
++#endif /* OS(GENODE) */
+
+ #ifndef NDEBUG
+ namespace WTF {
+diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
+index a8298c4..7727df2 100644
+--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
++++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
+@@ -480,6 +480,13 @@
#define WTF_OS_UNIX 1
#endif
@@ -242,7 +265,16 @@ diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h b/src/3rdparty/we
/* Operating environments */
/* FIXME: these are all mixes of OS, operating environment and policy choices. */
-@@ -679,13 +686,13 @@
+@@ -581,7 +588,7 @@
+ #define WTF_USE_PTHREAD_BASED_QT 1
+ #endif
+
+-#if (PLATFORM(GTK) || PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(WIN) || (PLATFORM(QT) && (OS(DARWIN) || USE(PTHREAD_BASED_QT)) && !ENABLE(SINGLE_THREADED))) && !OS(QNX) && !defined(ENABLE_JSC_MULTIPLE_THREADS)
++#if (PLATFORM(GTK) || PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(WIN) || (PLATFORM(QT) && (OS(DARWIN) || USE(PTHREAD_BASED_QT)) && !ENABLE(SINGLE_THREADED))) && !OS(QNX) && !defined(ENABLE_JSC_MULTIPLE_THREADS) && !OS(GENODE)
+ #define ENABLE_JSC_MULTIPLE_THREADS 1
+ #endif
+
+@@ -756,7 +763,7 @@
#endif
#endif /* !defined(HAVE_ACCESSIBILITY) */
@@ -251,6 +283,8 @@ diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h b/src/3rdparty/we
#define HAVE_SIGNAL_H 1
#endif
+@@ -768,7 +775,7 @@
+
#if !OS(WINDOWS) && !OS(SOLARIS) && !OS(QNX) \
&& !OS(SYMBIAN) && !OS(HAIKU) && !OS(RVCT) \
- && !OS(ANDROID) && !PLATFORM(BREWMP)
@@ -258,7 +292,7 @@ diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h b/src/3rdparty/we
#define HAVE_TM_GMTOFF 1
#define HAVE_TM_ZONE 1
#define HAVE_TIMEGM 1
-@@ -764,6 +771,12 @@
+@@ -851,6 +858,13 @@
#define HAVE_SYS_PARAM_H 1
#define HAVE_SYS_TIME_H 1
@@ -267,22 +301,57 @@ diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h b/src/3rdparty/we
+#define HAVE_MMAP 0
+#define HAVE_SBRK 0
+#define HAVE_SYS_TIME_H 1
++#define USE_SYSTEM_MALLOC 1
+
#else
/* FIXME: is this actually used or do other platforms generate their own config.h? */
-@@ -933,7 +946,7 @@
- #elif CPU(X86) && OS(WINDOWS) && COMPILER(MSVC)
- #define ENABLE_JIT 1
- #define WTF_USE_JIT_STUB_ARGUMENT_REGISTER 1
--#elif CPU(X86) && OS(LINUX) && GCC_VERSION >= 40100
-+#elif CPU(X86) && OS(LINUX) && GCC_VERSION >= 40100 && !OS(GENODE)
- #define ENABLE_JIT 1
- #define WTF_USE_JIT_STUB_ARGUMENT_VA_LIST 1
- #elif CPU(X86_64) && OS(LINUX) && GCC_VERSION >= 40100
-diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/TCSystemAlloc.cpp b/src/3rdparty/webkit/JavaScriptCore/wtf/TCSystemAlloc.cpp
---- a/src/3rdparty/webkit/JavaScriptCore/wtf/TCSystemAlloc.cpp
-+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/TCSystemAlloc.cpp
+@@ -1024,6 +1038,11 @@
+ #define ENABLE_JIT 0
+ #endif
+
++/* Disable JIT for Genode */
++#if OS(GENODE)
++#define ENABLE_JIT 0
++#endif
++
+ /* The JIT is enabled by default on all x86, x64-64, ARM & MIPS platforms. */
+ #if !defined(ENABLE_JIT) \
+ && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(MIPS)) \
+diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/StackBounds.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/StackBounds.cpp
+index 6b61270..f117e48 100644
+--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/StackBounds.cpp
++++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/StackBounds.cpp
+@@ -48,6 +48,10 @@
+ #include
+ #include
+
++#elif OS(GENODE)
++
++#include
++
+ #elif OS(UNIX)
+
+ #include
+@@ -154,6 +158,14 @@ void StackBounds::initialize()
+ m_bound = estimateStackBound(m_origin);
+ }
+
++#elif OS(GENODE)
++
++void StackBounds::initialize()
++{
++ m_bound = Genode::Thread_base::myself()->stack_base();
++ m_origin = Genode::Thread_base::myself()->stack_top();
++}
++
+ #elif OS(UNIX)
+
+ void StackBounds::initialize()
+diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/TCSystemAlloc.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/TCSystemAlloc.cpp
+index 3cb59e8..0731d43 100644
+--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/TCSystemAlloc.cpp
++++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/TCSystemAlloc.cpp
@@ -56,6 +56,12 @@
#include
#endif
@@ -296,7 +365,7 @@ diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/TCSystemAlloc.cpp b/src/3rdp
#ifndef MAP_ANONYMOUS
#define MAP_ANONYMOUS MAP_ANON
#endif
-@@ -379,6 +385,21 @@
+@@ -379,6 +385,21 @@ void* TCMalloc_SystemAlloc(size_t size, size_t *actual_size, size_t alignment) {
}
#endif
@@ -318,10 +387,108 @@ diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/TCSystemAlloc.cpp b/src/3rdp
// nothing worked - reset failure flags and try again
devmem_failure = false;
sbrk_failure = false;
+diff --git a/src/3rdparty/webkit/Source/WebCore/generated/JSDOMWindow.cpp b/src/3rdparty/webkit/Source/WebCore/generated/JSDOMWindow.cpp
+index 6fa2ad3..d30fcc1 100644
+--- a/src/3rdparty/webkit/Source/WebCore/generated/JSDOMWindow.cpp
++++ b/src/3rdparty/webkit/Source/WebCore/generated/JSDOMWindow.cpp
+@@ -746,7 +746,9 @@ static const HashTableValue JSDOMWindowTableValues[456] =
+ { "MessageChannel", DontDelete, (intptr_t)static_cast(jsDOMWindowMessageChannelConstructor), (intptr_t)setJSDOMWindowMessageChannelConstructor THUNK_GENERATOR(0) },
+ { "Worker", DontDelete, (intptr_t)static_cast(jsDOMWindowWorkerConstructor), (intptr_t)setJSDOMWindowWorkerConstructor THUNK_GENERATOR(0) },
+ { "SharedWorker", DontDelete, (intptr_t)static_cast(jsDOMWindowSharedWorkerConstructor), (intptr_t)setJSDOMWindowSharedWorkerConstructor THUNK_GENERATOR(0) },
++#if ENABLE(WEB_SOCKETS)
+ { "WebSocket", DontDelete, (intptr_t)static_cast(jsDOMWindowWebSocketConstructor), (intptr_t)setJSDOMWindowWebSocketConstructor THUNK_GENERATOR(0) },
++#endif
+ { "Plugin", DontDelete, (intptr_t)static_cast(jsDOMWindowPluginConstructor), (intptr_t)setJSDOMWindowPluginConstructor THUNK_GENERATOR(0) },
+ { "PluginArray", DontDelete, (intptr_t)static_cast(jsDOMWindowPluginArrayConstructor), (intptr_t)setJSDOMWindowPluginArrayConstructor THUNK_GENERATOR(0) },
+ { "MimeType", DontDelete, (intptr_t)static_cast(jsDOMWindowMimeTypeConstructor), (intptr_t)setJSDOMWindowMimeTypeConstructor THUNK_GENERATOR(0) },
+@@ -4442,6 +4444,7 @@ JSValue jsDOMWindowSharedWorkerConstructor(ExecState* exec, JSValue slotBase, co
+ }
+
+
++#if ENABLE(WEB_SOCKETS)
+ JSValue jsDOMWindowWebSocketConstructor(ExecState* exec, JSValue slotBase, const Identifier&)
+ {
+ JSDOMWindow* castedThis = static_cast(asObject(slotBase));
+@@ -4449,6 +4452,7 @@ JSValue jsDOMWindowWebSocketConstructor(ExecState* exec, JSValue slotBase, const
+ return jsUndefined();
+ return castedThis->webSocket(exec);
+ }
++#endif
+
+
+ JSValue jsDOMWindowPluginConstructor(ExecState* exec, JSValue slotBase, const Identifier&)
+diff --git a/src/3rdparty/webkit/Source/WebCore/generated/JSWorkerContext.cpp b/src/3rdparty/webkit/Source/WebCore/generated/JSWorkerContext.cpp
+index 3a96654..997d192 100644
+--- a/src/3rdparty/webkit/Source/WebCore/generated/JSWorkerContext.cpp
++++ b/src/3rdparty/webkit/Source/WebCore/generated/JSWorkerContext.cpp
+@@ -91,7 +91,9 @@ static const HashTableValue JSWorkerContextTableValues[25] =
+ { "MessageChannel", DontDelete, (intptr_t)static_cast(jsWorkerContextMessageChannelConstructor), (intptr_t)setJSWorkerContextMessageChannelConstructor THUNK_GENERATOR(0) },
+ { "EventSource", DontDelete, (intptr_t)static_cast(jsWorkerContextEventSourceConstructor), (intptr_t)setJSWorkerContextEventSourceConstructor THUNK_GENERATOR(0) },
+ { "XMLHttpRequest", DontDelete, (intptr_t)static_cast(jsWorkerContextXMLHttpRequestConstructor), (intptr_t)setJSWorkerContextXMLHttpRequestConstructor THUNK_GENERATOR(0) },
++#if ENABLE(WEB_SOCKETS)
+ { "WebSocket", DontDelete, (intptr_t)static_cast(jsWorkerContextWebSocketConstructor), (intptr_t)setJSWorkerContextWebSocketConstructor THUNK_GENERATOR(0) },
++#endif
+ { "WebKitBlobBuilder", DontDelete, (intptr_t)static_cast(jsWorkerContextWebKitBlobBuilderConstructor), (intptr_t)setJSWorkerContextWebKitBlobBuilderConstructor THUNK_GENERATOR(0) },
+ { "FileReader", DontDelete, (intptr_t)static_cast(jsWorkerContextFileReaderConstructor), (intptr_t)setJSWorkerContextFileReaderConstructor THUNK_GENERATOR(0) },
+ { "FileReaderSync", DontDelete, (intptr_t)static_cast(jsWorkerContextFileReaderSyncConstructor), (intptr_t)setJSWorkerContextFileReaderSyncConstructor THUNK_GENERATOR(0) },
+@@ -276,11 +278,13 @@ JSValue jsWorkerContextXMLHttpRequestConstructor(ExecState* exec, JSValue slotBa
+ }
+
+
++#if ENABLE(WEB_SOCKETS)
+ JSValue jsWorkerContextWebSocketConstructor(ExecState* exec, JSValue slotBase, const Identifier&)
+ {
+ JSWorkerContext* castedThis = static_cast(asObject(slotBase));
+ return castedThis->webSocket(exec);
+ }
++#endif
+
+
+ JSValue jsWorkerContextWebKitBlobBuilderConstructor(ExecState* exec, JSValue slotBase, const Identifier&)
+diff --git a/src/3rdparty/webkit/Source/WebCore/loader/icon/IconRecord.h b/src/3rdparty/webkit/Source/WebCore/loader/icon/IconRecord.h
+index 50ef7f7..9511153 100644
+--- a/src/3rdparty/webkit/Source/WebCore/loader/icon/IconRecord.h
++++ b/src/3rdparty/webkit/Source/WebCore/loader/icon/IconRecord.h
+@@ -38,7 +38,7 @@
+ #include
+ #include
+
+-#if OS(SOLARIS)
++#if OS(SOLARIS) || OS(GENODE)
+ #include // For time_t structure.
+ #endif
+
+diff --git a/src/3rdparty/webkit/Source/WebCore/page/Page.h b/src/3rdparty/webkit/Source/WebCore/page/Page.h
+index bdea870..6f400be 100644
+--- a/src/3rdparty/webkit/Source/WebCore/page/Page.h
++++ b/src/3rdparty/webkit/Source/WebCore/page/Page.h
+@@ -29,7 +29,7 @@
+ #include
+ #include
+
+-#if OS(SOLARIS)
++#if OS(SOLARIS) || OS(GENODE)
+ #include // For time_t structure.
+ #endif
+
+diff --git a/src/3rdparty/webkit/Source/WebCore/platform/network/ResourceResponseBase.h b/src/3rdparty/webkit/Source/WebCore/platform/network/ResourceResponseBase.h
+index 250411c..c2a0fd4 100644
+--- a/src/3rdparty/webkit/Source/WebCore/platform/network/ResourceResponseBase.h
++++ b/src/3rdparty/webkit/Source/WebCore/platform/network/ResourceResponseBase.h
+@@ -35,7 +35,7 @@
+ #include
+ #include
+
+-#if OS(SOLARIS)
++#if OS(SOLARIS) || OS(GENODE)
+ #include // For time_t structure.
+ #endif
+
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
+index ca5c879..85c2da1 100644
--- a/src/corelib/codecs/qtextcodec.cpp
+++ b/src/corelib/codecs/qtextcodec.cpp
-@@ -91,7 +91,7 @@
+@@ -92,7 +92,7 @@
#include
#endif
@@ -331,9 +498,10 @@ diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.c
#endif
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
+index b929776..1ecdda7 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
-@@ -89,6 +89,10 @@
+@@ -94,6 +94,10 @@ _LIT(qt_S60Filter, "Series60v?.*.sis");
_LIT(qt_symbianSystemInstallDir, "z:\\system\\install\\");
#endif
@@ -344,19 +512,20 @@ diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
QT_BEGIN_NAMESPACE
-@@ -2253,6 +2257,8 @@
- RDebug::Print(format, hbuffer);
+@@ -2285,6 +2289,8 @@ void qt_message_output(QtMsgType msgType, const char *buf)
+ TPtrC8 part(ptr.Mid(i, qMin(maxBlockSize, ptr.Length()-i)));
+ RDebug::Printf(format, &part);
}
- delete hbuffer;
+#elif defined(Q_OS_GENODE)
+ PDBG("%s", buf);
#else
fprintf(stderr, "%s\n", buf);
fflush(stderr);
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
+index 1117c79..e5a85de 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
-@@ -143,6 +143,7 @@
+@@ -147,6 +147,7 @@ namespace QT_NAMESPACE {}
/*
The operating system, must be one of: (Q_OS_x)
@@ -364,7 +533,7 @@ diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
DARWIN - Darwin OS (synonym for Q_OS_MAC)
SYMBIAN - Symbian
MSDOS - MS-DOS and Windows
-@@ -175,7 +176,9 @@
+@@ -178,7 +179,9 @@ namespace QT_NAMESPACE {}
UNIX - Any UNIX BSD/SYSV system
*/
@@ -376,9 +545,10 @@ diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
# define Q_OS_BSD4
# ifdef __LP64__
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp
+index 2e63854..6eb8144 100644
--- a/src/corelib/io/qprocess.cpp
+++ b/src/corelib/io/qprocess.cpp
-@@ -100,6 +100,10 @@
+@@ -100,6 +100,10 @@ QT_END_NAMESPACE
#ifdef Q_OS_SYMBIAN
#include
#endif
@@ -389,7 +559,7 @@ diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp
#ifndef QT_NO_PROCESS
-@@ -762,6 +766,65 @@
+@@ -780,6 +784,65 @@ QProcessPrivate::QProcessPrivate()
symbianProcess = NULL;
processLaunched = false;
#endif
@@ -456,9 +626,10 @@ diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp
/*! \internal
diff --git a/src/corelib/io/qprocess_p.h b/src/corelib/io/qprocess_p.h
+index e1d4cbb..2ffb3aa 100644
--- a/src/corelib/io/qprocess_p.h
+++ b/src/corelib/io/qprocess_p.h
-@@ -71,6 +71,11 @@
+@@ -71,6 +71,11 @@ typedef int Q_PIPE;
#ifndef QT_NO_PROCESS
@@ -470,9 +641,9 @@ diff --git a/src/corelib/io/qprocess_p.h b/src/corelib/io/qprocess_p.h
QT_BEGIN_NAMESPACE
class QSocketNotifier;
-@@ -96,6 +101,28 @@
- QStringList toList() const;
- };
+@@ -194,6 +199,28 @@ template<> Q_INLINE_TEMPLATE void QSharedDataPointer
+ d = x;
+ }
+#ifdef Q_OS_GENODE
+
@@ -499,16 +670,16 @@ diff --git a/src/corelib/io/qprocess_p.h b/src/corelib/io/qprocess_p.h
class QProcessPrivate : public QIODevicePrivate
{
public:
-@@ -203,7 +230,7 @@
+@@ -301,7 +328,7 @@ public:
QWinEventNotifier *processFinishedNotifier;
void startProcess();
--#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
-+#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) && !defined(Q_OS_GENODE)
+-#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) && !defined(Q_OS_QNX)
++#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) && !defined(Q_OS_QNX) && !defined(Q_OS_GENODE)
void execChild(const char *workingDirectory, char **path, char **argv, char **envp);
- #endif
- bool processStarted();
-@@ -228,6 +255,22 @@
+ #elif defined(Q_OS_QNX)
+ pid_t spawnChild(const char *workingDirectory, char **argv, char **envp);
+@@ -328,6 +355,22 @@ public:
int serial;
#endif
@@ -532,33 +703,36 @@ diff --git a/src/corelib/io/qprocess_p.h b/src/corelib/io/qprocess_p.h
bool waitForReadyRead(int msecs = 30000);
bool waitForBytesWritten(int msecs = 30000);
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
+index d7b9d16..6352584 100644
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
-@@ -928,7 +928,7 @@
+@@ -928,7 +928,7 @@ public:
}
};
--#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
-+#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) && !defined(Q_OS_GENODE)
+-#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) && !defined (Q_OS_NACL) && !defined(Q_OS_INTEGRITY)
++#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) && !defined (Q_OS_NACL) && !defined(Q_OS_INTEGRITY) && !defined(Q_OS_GENODE)
#define QT_USE_MMAP
#endif
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
+index bb07d74..fcd8465 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
-@@ -76,7 +76,11 @@
- # if !defined(QT_NO_GLIB)
- # include "qeventdispatcher_glib_p.h"
- # endif
+@@ -82,8 +82,12 @@
+ # if !defined(QT_NO_GLIB)
+ # include "qeventdispatcher_glib_p.h"
+ # endif
+# ifdef Q_OS_GENODE
-+# include "qeventdispatcher_genode_p.h"
++# include "qeventdispatcher_genode_p.h"
+# else
- # include "qeventdispatcher_unix_p.h"
+ # include "qeventdispatcher_unix_p.h"
+ # endif
+# endif
#endif
#ifdef Q_OS_WIN
-@@ -374,7 +378,11 @@
+@@ -500,8 +504,12 @@ void QCoreApplicationPrivate::createEventDispatcher()
eventDispatcher = new QEventDispatcherGlib(q);
else
# endif
@@ -566,11 +740,12 @@ diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcorea
+ eventDispatcher = new QEventDispatcherGenode(q);
+# else
eventDispatcher = new QEventDispatcherUNIX(q);
+ # endif
+# endif
#elif defined(Q_OS_WIN)
eventDispatcher = new QEventDispatcherWin32(q);
#else
-@@ -587,7 +595,7 @@
+@@ -738,7 +746,7 @@ void QCoreApplication::init()
{
Q_D(QCoreApplication);
@@ -580,18 +755,20 @@ diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcorea
qt_locale_initialized = true;
#endif
diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp
+index 0dbb388..73f03b6 100644
--- a/src/corelib/kernel/qtranslator.cpp
+++ b/src/corelib/kernel/qtranslator.cpp
-@@ -56,7 +56,7 @@
- #include "qhash.h"
- #include "qtranslator_p.h"
+@@ -60,7 +60,7 @@
+ #include "qlocale.h"
+ #include "qresource.h"
--#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
-+#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) && !defined(Q_OS_GENODE)
+-#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) && !defined(Q_OS_INTEGRITY)
++#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) && !defined(Q_OS_INTEGRITY) && !defined(Q_OS_GENODE)
#define QT_USE_MMAP
#include "private/qcore_unix_p.h"
#endif
diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp
+index 1ec331d..59f870f 100644
--- a/src/corelib/plugin/qpluginloader.cpp
+++ b/src/corelib/plugin/qpluginloader.cpp
@@ -53,7 +53,7 @@
@@ -603,7 +780,7 @@ diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginlo
QT_BEGIN_NAMESPACE
-@@ -139,7 +139,11 @@
+@@ -139,7 +139,11 @@ QT_BEGIN_NAMESPACE
Constructs a plugin loader with the given \a parent.
*/
QPluginLoader::QPluginLoader(QObject *parent)
@@ -616,7 +793,7 @@ diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginlo
{
}
-@@ -157,7 +161,11 @@
+@@ -157,7 +161,11 @@ QPluginLoader::QPluginLoader(QObject *parent)
\sa setFileName()
*/
QPluginLoader::QPluginLoader(const QString &fileName, QObject *parent)
@@ -629,7 +806,7 @@ diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginlo
{
setFileName(fileName);
}
-@@ -172,8 +180,10 @@
+@@ -172,8 +180,10 @@ QPluginLoader::QPluginLoader(const QString &fileName, QObject *parent)
*/
QPluginLoader::~QPluginLoader()
{
@@ -640,18 +817,21 @@ diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginlo
}
/*!
-@@ -200,8 +210,10 @@
+@@ -200,9 +210,13 @@ QObject *QPluginLoader::instance()
{
if (!load())
return 0;
-+#ifndef Q_OS_GENODE
- if (d->instance)
- return d->instance();
++#ifdef Q_OS_GENODE
++ return 0;
++#else
+ if (!d->inst && d->instance)
+ d->inst = d->instance();
+ return d->inst.data();
+#endif
- return 0;
}
-@@ -217,6 +229,7 @@
+ /*!
+@@ -217,6 +231,7 @@ QObject *QPluginLoader::instance()
*/
bool QPluginLoader::load()
{
@@ -659,7 +839,7 @@ diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginlo
if (!d || d->fileName.isEmpty())
return false;
if (did_load)
-@@ -225,6 +238,9 @@
+@@ -225,6 +240,9 @@ bool QPluginLoader::load()
return false;
did_load = true;
return d->loadPlugin();
@@ -669,7 +849,7 @@ diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginlo
}
-@@ -246,12 +262,14 @@
+@@ -246,12 +264,14 @@ bool QPluginLoader::load()
*/
bool QPluginLoader::unload()
{
@@ -684,7 +864,7 @@ diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginlo
return false;
}
-@@ -262,7 +280,11 @@
+@@ -262,7 +282,11 @@ bool QPluginLoader::unload()
*/
bool QPluginLoader::isLoaded() const
{
@@ -696,7 +876,7 @@ diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginlo
}
/*!
-@@ -285,6 +307,7 @@
+@@ -285,6 +309,7 @@ bool QPluginLoader::isLoaded() const
*/
void QPluginLoader::setFileName(const QString &fileName)
{
@@ -704,7 +884,7 @@ diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginlo
#if defined(QT_SHARED)
QLibrary::LoadHints lh;
if (d) {
-@@ -348,13 +371,17 @@
+@@ -348,13 +373,17 @@ void QPluginLoader::setFileName(const QString &fileName)
}
Q_UNUSED(fileName);
#endif
@@ -722,7 +902,7 @@ diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginlo
}
/*!
-@@ -364,7 +391,11 @@
+@@ -364,7 +393,11 @@ QString QPluginLoader::fileName() const
*/
QString QPluginLoader::errorString() const
{
@@ -734,7 +914,7 @@ diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginlo
}
typedef QList StaticInstanceFunctionList;
-@@ -383,7 +414,7 @@
+@@ -383,7 +416,7 @@ Q_GLOBAL_STATIC(StaticInstanceFunctionList, staticInstanceFunctionList)
\sa QLibrary::loadHints
*/
@@ -743,7 +923,7 @@ diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginlo
void QPluginLoader::setLoadHints(QLibrary::LoadHints loadHints)
{
if (!d) {
-@@ -402,7 +433,7 @@
+@@ -402,7 +435,7 @@ QLibrary::LoadHints QPluginLoader::loadHints() const
}
return d->loadHints;
}
@@ -753,6 +933,7 @@ diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginlo
\relates QPluginLoader
\since 4.4
diff --git a/src/corelib/plugin/qpluginloader.h b/src/corelib/plugin/qpluginloader.h
+index ad8f230..7033cc3 100644
--- a/src/corelib/plugin/qpluginloader.h
+++ b/src/corelib/plugin/qpluginloader.h
@@ -49,21 +49,23 @@
@@ -782,7 +963,7 @@ diff --git a/src/corelib/plugin/qpluginloader.h b/src/corelib/plugin/qpluginload
public:
explicit QPluginLoader(QObject *parent = 0);
explicit QPluginLoader(const QString &fileName, QObject *parent = 0);
-@@ -81,12 +83,15 @@
+@@ -81,12 +83,15 @@ public:
QString fileName() const;
QString errorString() const;
@@ -800,9 +981,10 @@ diff --git a/src/corelib/plugin/qpluginloader.h b/src/corelib/plugin/qpluginload
Q_DISABLE_COPY(QPluginLoader)
};
diff --git a/src/corelib/thread/qmutex_p.h b/src/corelib/thread/qmutex_p.h
+index 036a17d..f012256 100644
--- a/src/corelib/thread/qmutex_p.h
+++ b/src/corelib/thread/qmutex_p.h
-@@ -59,6 +59,12 @@
+@@ -64,6 +64,12 @@
QT_BEGIN_NAMESPACE
@@ -812,15 +994,15 @@ diff --git a/src/corelib/thread/qmutex_p.h b/src/corelib/thread/qmutex_p.h
+#include
+#endif
+
- class QMutexPrivate {
+ class QMutexPrivate : public QMutexData {
public:
QMutexPrivate(QMutex::RecursionMode mode);
-@@ -74,10 +80,12 @@
+@@ -79,10 +85,12 @@ public:
Qt::HANDLE owner;
uint count;
--#if defined(Q_OS_UNIX)
-+#if defined(Q_OS_UNIX) && !defined(Q_OS_GENODE)
+-#if defined(Q_OS_UNIX) && !defined(Q_OS_LINUX) && !defined(Q_OS_SYMBIAN)
++#if defined(Q_OS_UNIX) && !defined(Q_OS_LINUX) && !defined(Q_OS_SYMBIAN) && !defined(Q_OS_GENODE)
volatile bool wakeup;
pthread_mutex_t mutex;
pthread_cond_t cond;
@@ -828,22 +1010,12 @@ diff --git a/src/corelib/thread/qmutex_p.h b/src/corelib/thread/qmutex_p.h
+ Genode::Timed_semaphore sem;
#elif defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
HANDLE event;
- #endif
+ #elif defined(Q_OS_SYMBIAN)
diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp
+index 2b818ff..4651268 100644
--- a/src/corelib/thread/qthread.cpp
+++ b/src/corelib/thread/qthread.cpp
-@@ -150,8 +150,10 @@
- QAdoptedThread::~QAdoptedThread()
- {
- #ifndef QT_NO_THREAD
-+#ifndef Q_OS_GENODE
- QThreadPrivate::finish(this);
- #endif
-+#endif
- // fprintf(stderr, "~QAdoptedThread = %p\n", this);
- }
-
-@@ -177,7 +179,12 @@
+@@ -175,7 +175,12 @@ QThreadPrivate::QThreadPrivate(QThreadData *d)
stackSize(0), priority(QThread::InheritPriority), data(d)
{
#if defined (Q_OS_UNIX)
@@ -857,6 +1029,7 @@ diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp
handle = 0;
id = 0;
diff --git a/src/corelib/thread/qthread_p.h b/src/corelib/thread/qthread_p.h
+index 1ba89cc..c543f45 100644
--- a/src/corelib/thread/qthread_p.h
+++ b/src/corelib/thread/qthread_p.h
@@ -54,6 +54,10 @@
@@ -870,7 +1043,7 @@ diff --git a/src/corelib/thread/qthread_p.h b/src/corelib/thread/qthread_p.h
#include "qplatformdefs.h"
#include "QtCore/qthread.h"
#include "QtCore/qmutex.h"
-@@ -136,6 +140,56 @@
+@@ -158,6 +162,56 @@ public:
static QThread *threadForId(int id);
#ifdef Q_OS_UNIX
@@ -927,18 +1100,20 @@ diff --git a/src/corelib/thread/qthread_p.h b/src/corelib/thread/qthread_p.h
pthread_t thread_id;
QWaitCondition thread_done;
-@@ -145,6 +199,7 @@
+@@ -167,7 +221,7 @@ public:
#else
static void finish(void *);
#endif
+-
+#endif // Q_OS_GENODE
#endif // Q_OS_UNIX
#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
+index 167a6c5..1f55fd3 100644
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/tools/qdatetime.cpp
-@@ -3086,6 +3086,9 @@
+@@ -3108,6 +3108,9 @@ QTime QTime::currentTime()
// posix compliant system
struct timeval tv;
gettimeofday(&tv, 0);
@@ -948,7 +1123,7 @@ diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
time_t ltime = tv.tv_sec;
struct tm *t = 0;
-@@ -3100,6 +3103,7 @@
+@@ -3122,6 +3125,7 @@ QTime QTime::currentTime()
Q_CHECK_PTR(t);
ct.mds = msecsFromDecomposed(t->tm_hour, t->tm_min, t->tm_sec, tv.tv_usec / 1000);
@@ -956,7 +1131,7 @@ diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
return ct;
}
-@@ -3984,6 +3988,10 @@
+@@ -4008,6 +4012,10 @@ static QDate adjustDate(QDate date)
static QDateTimePrivate::Spec utcToLocal(QDate &date, QTime &time)
{
@@ -967,7 +1142,7 @@ diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
QDate fakeDate = adjustDate(date);
// won't overflow because of fakeDate
-@@ -4058,6 +4066,10 @@
+@@ -4096,6 +4104,10 @@ static QDateTimePrivate::Spec utcToLocal(QDate &date, QTime &time)
static void localToUtc(QDate &date, QTime &time, int isdst)
{
@@ -978,20 +1153,34 @@ diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
if (!date.isValid())
return;
+diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp
+index 2dd342a..e6a5c17 100644
+--- a/src/gui/dialogs/qfiledialog.cpp
++++ b/src/gui/dialogs/qfiledialog.cpp
+@@ -880,7 +880,7 @@ Q_AUTOTEST_EXPORT QString qt_tildeExpansion(const QString &path, bool *expanded
+ if (!path.startsWith(QLatin1Char('~')))
+ return path;
+ QString ret = path;
+-#if !defined(Q_OS_INTEGRITY)
++#if !defined(Q_OS_INTEGRITY) && !defined(Q_OS_GENODE)
+ QStringList tokens = ret.split(QDir::separator());
+ if (tokens.first() == QLatin1String("~")) {
+ ret.replace(0, 1, QDir::homePath());
diff --git a/src/gui/embedded/qscreendriverfactory_qws.cpp b/src/gui/embedded/qscreendriverfactory_qws.cpp
+index 6726064..5726a90 100644
--- a/src/gui/embedded/qscreendriverfactory_qws.cpp
+++ b/src/gui/embedded/qscreendriverfactory_qws.cpp
-@@ -47,6 +47,9 @@
- #include "qscreentransformed_qws.h"
- #include "qscreenvfb_qws.h"
+@@ -49,6 +49,9 @@
#include "qscreenmulti_qws_p.h"
+ #include "qscreenqnx_qws.h"
+ #include "qscreenintegrityfb_qws.h"
+#ifdef Q_OS_GENODE
+#include "qscreennitpicker_qws.h"
+#endif
- #include "qscreenqnx_qws.h"
#include
#include "private/qfactoryloader_p.h"
-@@ -136,6 +139,12 @@
+ #include "qscreendriverplugin_qws.h"
+@@ -141,6 +144,12 @@ QScreen *QScreenDriverFactory::create(const QString& key, int displayId)
if (driver == QLatin1String("multi"))
return new QMultiScreen(displayId);
#endif
@@ -1004,7 +1193,7 @@ diff --git a/src/gui/embedded/qscreendriverfactory_qws.cpp b/src/gui/embedded/qs
#if !defined(Q_OS_WIN32) || defined(QT_MAKEDLL)
#ifndef QT_NO_LIBRARY
-@@ -174,6 +183,11 @@
+@@ -182,6 +191,11 @@ QStringList QScreenDriverFactory::keys()
#ifndef QT_NO_QWS_MULTISCREEN
list << QLatin1String("Multi");
#endif
@@ -1017,9 +1206,10 @@ diff --git a/src/gui/embedded/qscreendriverfactory_qws.cpp b/src/gui/embedded/qs
#if !defined(Q_OS_WIN32) || defined(QT_MAKEDLL)
#ifndef QT_NO_LIBRARY
diff --git a/src/gui/embedded/qwindowsystem_qws.cpp b/src/gui/embedded/qwindowsystem_qws.cpp
+index 9027232..2ea5695 100644
--- a/src/gui/embedded/qwindowsystem_qws.cpp
+++ b/src/gui/embedded/qwindowsystem_qws.cpp
-@@ -3362,8 +3362,15 @@
+@@ -3360,8 +3360,15 @@ QWSWindow* QWSServerPrivate::findWindow(int windowid, QWSClient* client)
void QWSServerPrivate::raiseWindow(QWSWindow *changingw, int /*alt*/)
{
Q_Q(QWSServer);
@@ -1037,9 +1227,10 @@ diff --git a/src/gui/embedded/qwindowsystem_qws.cpp b/src/gui/embedded/qwindowsy
changingw->d->state = QWSWindow::Raising;
// Expose regions previously overlapped by transparent windows
diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
+index e90c61c..35828fa 100644
--- a/src/gui/image/qpnghandler.cpp
+++ b/src/gui/image/qpnghandler.cpp
-@@ -174,7 +174,7 @@
+@@ -199,7 +199,7 @@ void CALLBACK_CALL_TYPE iod_read_fn(png_structp png_ptr, png_bytep data, png_siz
}
}
@@ -1048,7 +1239,7 @@ diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
static
void CALLBACK_CALL_TYPE qpiw_write_fn(png_structp png_ptr, png_bytep data, png_size_t length)
{
-@@ -193,6 +193,7 @@
+@@ -218,6 +218,7 @@ static
void CALLBACK_CALL_TYPE qpiw_flush_fn(png_structp /* png_ptr */)
{
}
@@ -1056,7 +1247,7 @@ diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
#if defined(Q_C_CALLBACKS)
}
-@@ -201,12 +202,13 @@
+@@ -226,12 +227,13 @@ void CALLBACK_CALL_TYPE qpiw_flush_fn(png_structp /* png_ptr */)
static
void setup_qt(QImage& image, png_structp png_ptr, png_infop info_ptr, float screen_gamma=0.0)
{
@@ -1071,7 +1262,7 @@ diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
png_uint_32 width;
png_uint_32 height;
int bit_depth;
-@@ -384,13 +386,13 @@
+@@ -442,13 +444,13 @@ bool Q_INTERNAL_WIN_NO_THROW QPngHandlerPrivate::readPngHeader()
png_ptr = 0;
return false;
}
@@ -1087,7 +1278,7 @@ diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
png_set_read_fn(png_ptr, this, iod_read_fn);
png_read_info(png_ptr, info_ptr);
-@@ -442,6 +444,7 @@
+@@ -472,6 +474,7 @@ bool Q_INTERNAL_WIN_NO_THROW QPngHandlerPrivate::readPngImage(QImage *outImage)
}
row_pointers = 0;
@@ -1095,7 +1286,7 @@ diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
if (setjmp(png_jmpbuf(png_ptr))) {
png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
delete [] row_pointers;
-@@ -449,7 +452,7 @@
+@@ -479,7 +482,7 @@ bool Q_INTERNAL_WIN_NO_THROW QPngHandlerPrivate::readPngImage(QImage *outImage)
state = Error;
return false;
}
@@ -1104,7 +1295,7 @@ diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
setup_qt(*outImage, png_ptr, info_ptr, gamma);
if (outImage->isNull()) {
-@@ -480,9 +483,9 @@
+@@ -510,9 +513,9 @@ bool Q_INTERNAL_WIN_NO_THROW QPngHandlerPrivate::readPngImage(QImage *outImage)
png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)
if (outImage->depth()==32 && png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
QRgb trans = 0xFF000000 | qRgb(
@@ -1117,7 +1308,7 @@ diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
for (uint y=0; ywidth; x++) {
if (((uint**)jt)[y][x] == trans) {
-@@ -620,7 +623,7 @@
+@@ -637,7 +640,7 @@ void QPNGImageWriter::setGamma(float g)
gamma = g;
}
@@ -1126,7 +1317,7 @@ diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
#ifndef QT_NO_IMAGE_TEXT
static void set_text(const QImage &image, png_structp png_ptr, png_infop info_ptr,
const QString &description)
-@@ -685,6 +688,7 @@
+@@ -713,6 +716,7 @@ static void set_text(const QImage &image, png_structp png_ptr, png_infop info_pt
delete [] text_ptr;
}
#endif
@@ -1134,7 +1325,7 @@ diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
bool QPNGImageWriter::writeImage(const QImage& image, int off_x, int off_y)
{
-@@ -694,6 +698,8 @@
+@@ -722,6 +726,8 @@ bool QPNGImageWriter::writeImage(const QImage& image, int off_x, int off_y)
bool Q_INTERNAL_WIN_NO_THROW QPNGImageWriter::writeImage(const QImage& image, int quality_in, const QString &description,
int off_x_in, int off_y_in)
{
@@ -1143,7 +1334,7 @@ diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
#ifdef QT_NO_IMAGE_TEXT
Q_UNUSED(description);
#endif
-@@ -717,12 +723,12 @@
+@@ -745,12 +751,12 @@ bool Q_INTERNAL_WIN_NO_THROW QPNGImageWriter::writeImage(const QImage& image, in
png_destroy_write_struct(&png_ptr, 0);
return false;
}
@@ -1158,7 +1349,7 @@ diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
int quality = quality_in;
if (quality >= 0) {
if (quality > 9) {
-@@ -747,9 +753,11 @@
+@@ -775,9 +781,11 @@ bool Q_INTERNAL_WIN_NO_THROW QPNGImageWriter::writeImage(const QImage& image, in
image.depth() == 1 ? 1 : 8, // per channel
color_type, 0, 0, 0); // sets #channels
@@ -1170,7 +1361,7 @@ diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
png_color_8 sig_bit;
sig_bit.red = 8;
-@@ -875,6 +883,9 @@
+@@ -903,6 +911,9 @@ bool Q_INTERNAL_WIN_NO_THROW QPNGImageWriter::writeImage(const QImage& image, in
png_destroy_write_struct(&png_ptr, &info_ptr);
return true;
@@ -1181,9 +1372,10 @@ diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
static bool write_png_image(const QImage &image, QIODevice *device,
diff --git a/src/gui/image/qxpmhandler.cpp b/src/gui/image/qxpmhandler.cpp
+index ec545c2..1fe727d 100644
--- a/src/gui/image/qxpmhandler.cpp
+++ b/src/gui/image/qxpmhandler.cpp
-@@ -866,8 +866,16 @@
+@@ -848,8 +848,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
@@ -1201,141 +1393,142 @@ diff --git a/src/gui/image/qxpmhandler.cpp b/src/gui/image/qxpmhandler.cpp
return true;
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
+index d0db0d9..edc6800 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
-@@ -728,11 +728,23 @@
+@@ -733,11 +733,23 @@ void QApplicationPrivate::process_cmdline()
*/
QApplication::QApplication(int &argc, char **argv)
-- : QCoreApplication(*new QApplicationPrivate(argc, argv, GuiClient))
+- : QCoreApplication(*new QApplicationPrivate(argc, argv, GuiClient, 0x040000))
+ : QCoreApplication(*new QApplicationPrivate(argc, argv,
+#ifndef Q_OS_GENODE
+ GuiClient
+#else
+ GuiServer
+#endif
-+ ))
++ , 0x040000))
{ Q_D(QApplication); d->construct(); }
QApplication::QApplication(int &argc, char **argv, int _internal)
-- : QCoreApplication(*new QApplicationPrivate(argc, argv, GuiClient))
+- : QCoreApplication(*new QApplicationPrivate(argc, argv, GuiClient, _internal))
+ : QCoreApplication(*new QApplicationPrivate(argc, argv,
+#ifndef Q_OS_GENODE
+ GuiClient
+#else
+ GuiServer
+#endif
-+ ))
- { Q_D(QApplication); d->construct(); QApplicationPrivate::app_compile_version = _internal;}
++ , _internal))
+ { Q_D(QApplication); d->construct(); }
-@@ -762,11 +774,23 @@
+@@ -767,11 +779,23 @@ QApplication::QApplication(int &argc, char **argv, int _internal)
*/
QApplication::QApplication(int &argc, char **argv, bool GUIenabled )
-- : QCoreApplication(*new QApplicationPrivate(argc, argv, GUIenabled ? GuiClient : Tty))
+- : QCoreApplication(*new QApplicationPrivate(argc, argv, GUIenabled ? GuiClient : Tty, 0x040000))
+ : QCoreApplication(*new QApplicationPrivate(argc, argv, GUIenabled ?
+#ifndef Q_OS_GENODE
+ GuiClient
+#else
+ GuiServer
+#endif
-+ : Tty))
++ : Tty, 0x040000))
{ Q_D(QApplication); d->construct(); }
QApplication::QApplication(int &argc, char **argv, bool GUIenabled , int _internal)
-- : QCoreApplication(*new QApplicationPrivate(argc, argv, GUIenabled ? GuiClient : Tty))
+- : QCoreApplication(*new QApplicationPrivate(argc, argv, GUIenabled ? GuiClient : Tty, _internal))
+ : QCoreApplication(*new QApplicationPrivate(argc, argv, GUIenabled ?
+#ifndef Q_OS_GENODE
+ GuiClient
+#else
+ GuiServer
+#endif
-+ : Tty))
- { Q_D(QApplication); d->construct(); QApplicationPrivate::app_compile_version = _internal;}
++ : Tty, _internal))
+ { Q_D(QApplication); d->construct();}
-@@ -896,7 +920,13 @@
+@@ -905,7 +929,13 @@ static char *aargv[] = { (char*)"unknown", 0 };
This function is only available on X11.
*/
QApplication::QApplication(Display* dpy, Qt::HANDLE visual, Qt::HANDLE colormap)
-- : QCoreApplication(*new QApplicationPrivate(aargc, aargv, GuiClient))
+- : QCoreApplication(*new QApplicationPrivate(aargc, aargv, GuiClient, 0x040000))
+ : QCoreApplication(*new QApplicationPrivate(aargc, aargv,
+#ifndef Q_OS_GENODE
+ GuiClient
+#else
+ GuiServer
+#endif
-+ ))
++ , 0x040000))
{
if (! dpy)
qWarning("QApplication: Invalid Display* argument");
-@@ -905,7 +935,13 @@
+@@ -914,7 +944,13 @@ QApplication::QApplication(Display* dpy, Qt::HANDLE visual, Qt::HANDLE colormap)
}
QApplication::QApplication(Display* dpy, Qt::HANDLE visual, Qt::HANDLE colormap, int _internal)
-- : QCoreApplication(*new QApplicationPrivate(aargc, aargv, GuiClient))
-+ : QCoreApplication(*new QApplicationPrivate(aargc, aargv,
+- : QCoreApplication(*new QApplicationPrivate(aargc, aargv, GuiClient, _internal))
++ : QCoreApplication(*new QApplicationPrivate(aargc, aargv,
+#ifndef Q_OS_GENODE
+ GuiClient
+#else
+ GuiServer
+#endif
-+ ))
++ , _internal))
{
if (! dpy)
qWarning("QApplication: Invalid Display* argument");
-@@ -930,7 +966,13 @@
+@@ -939,7 +975,13 @@ QApplication::QApplication(Display* dpy, Qt::HANDLE visual, Qt::HANDLE colormap,
*/
QApplication::QApplication(Display *dpy, int &argc, char **argv,
Qt::HANDLE visual, Qt::HANDLE colormap)
-- : QCoreApplication(*new QApplicationPrivate(argc, argv, GuiClient))
+- : QCoreApplication(*new QApplicationPrivate(argc, argv, GuiClient, 0x040000))
+ : QCoreApplication(*new QApplicationPrivate(argc, argv,
+#ifndef Q_OS_GENODE
+ GuiClient
+#else
+ GuiServer
+#endif
-+ ))
++ , 0x040000))
{
if (! dpy)
qWarning("QApplication: Invalid Display* argument");
-@@ -940,7 +982,13 @@
+@@ -949,7 +991,13 @@ QApplication::QApplication(Display *dpy, int &argc, char **argv,
QApplication::QApplication(Display *dpy, int &argc, char **argv,
Qt::HANDLE visual, Qt::HANDLE colormap, int _internal)
-- : QCoreApplication(*new QApplicationPrivate(argc, argv, GuiClient))
-+ : QCoreApplication(*new QApplicationPrivate(argc, argv,
+- : QCoreApplication(*new QApplicationPrivate(argc, argv, GuiClient, _internal))
++ : QCoreApplication(*new QApplicationPrivate(argc, argv,
+#ifndef Q_OS_GENODE
+ GuiClient
+#else
+ GuiServer
+#endif
-+ ))
++ , _internal))
{
if (! dpy)
qWarning("QApplication: Invalid Display* argument");
diff --git a/src/gui/kernel/qapplication_qws.cpp b/src/gui/kernel/qapplication_qws.cpp
+index 3ac3544..25851d5 100644
--- a/src/gui/kernel/qapplication_qws.cpp
+++ b/src/gui/kernel/qapplication_qws.cpp
-@@ -203,7 +203,7 @@
- return result;
- result = QT_VFB_DATADIR(qws_display_id);
- QByteArray dataDir = result.toLocal8Bit();
--
+@@ -196,6 +196,7 @@ QString qws_dataDir()
+ WaitForFileSystemInitialization();
+ #endif
+
+#ifndef Q_OS_GENODE
if (QT_MKDIR(dataDir, 0700)) {
if (errno != EEXIST) {
qFatal("Cannot create Qt for Embedded Linux data directory: %s", dataDir.constData());
-@@ -224,6 +224,7 @@
+@@ -216,6 +217,7 @@ QString qws_dataDir()
if ((buf.st_mode & 0677) != 0600)
qFatal("Qt for Embedded Linux data directory has incorrect permissions: %s", dataDir.constData());
#endif
-+#endif
++#endif /* Q_OS_GENODE */
- result.append("/");
+ result.append(QLatin1Char('/'));
return result;
-@@ -471,7 +472,11 @@
+@@ -463,7 +465,11 @@ void QApplicationPrivate::createEventDispatcher()
#endif
eventDispatcher = (q->type() != QApplication::Tty
? new QEventDispatcherQWS(q)
@@ -1347,7 +1540,7 @@ diff --git a/src/gui/kernel/qapplication_qws.cpp b/src/gui/kernel/qapplication_q
}
// Single-process stuff. This should maybe move into qwindowsystem_qws.cpp
-@@ -2894,9 +2899,15 @@
+@@ -2896,9 +2902,15 @@ int QApplication::qwsProcessEvent(QWSEvent* event)
// The server has grabbed the mouse for us.
// Remember which of my widgets has it.
qt_pressGrab = w;
@@ -1365,6 +1558,7 @@ diff --git a/src/gui/kernel/qapplication_qws.cpp b/src/gui/kernel/qapplication_q
if (widget->raiseOnClick())
widget->raise();
diff --git a/src/gui/kernel/qeventdispatcher_qws.cpp b/src/gui/kernel/qeventdispatcher_qws.cpp
+index e26aabc..e64776e 100644
--- a/src/gui/kernel/qeventdispatcher_qws.cpp
+++ b/src/gui/kernel/qeventdispatcher_qws.cpp
@@ -46,7 +46,11 @@
@@ -1379,7 +1573,7 @@ diff --git a/src/gui/kernel/qeventdispatcher_qws.cpp b/src/gui/kernel/qeventdisp
#ifndef QT_NO_THREAD
# include "qmutex.h"
#endif
-@@ -57,7 +61,11 @@
+@@ -57,7 +61,11 @@ QT_BEGIN_NAMESPACE
QT_USE_NAMESPACE
@@ -1391,7 +1585,7 @@ diff --git a/src/gui/kernel/qeventdispatcher_qws.cpp b/src/gui/kernel/qeventdisp
{
Q_DECLARE_PUBLIC(QEventDispatcherQWS)
public:
-@@ -68,7 +76,11 @@
+@@ -68,7 +76,11 @@ public:
QEventDispatcherQWS::QEventDispatcherQWS(QObject *parent)
@@ -1403,7 +1597,7 @@ diff --git a/src/gui/kernel/qeventdispatcher_qws.cpp b/src/gui/kernel/qeventdisp
{ }
QEventDispatcherQWS::~QEventDispatcherQWS()
-@@ -129,7 +141,11 @@
+@@ -129,7 +141,11 @@ bool QEventDispatcherQWS::processEvents(QEventLoop::ProcessEventsFlags flags)
QWSServer::processEventQueue();
}
@@ -1415,7 +1609,7 @@ diff --git a/src/gui/kernel/qeventdispatcher_qws.cpp b/src/gui/kernel/qeventdisp
return true;
}
return (nevents > 0);
-@@ -158,11 +174,11 @@
+@@ -158,11 +174,11 @@ void QEventDispatcherQWS::flush()
(void)qt_fbdpy->eventPending(); // flush
}
@@ -1430,6 +1624,7 @@ diff --git a/src/gui/kernel/qeventdispatcher_qws.cpp b/src/gui/kernel/qeventdisp
+#endif
QT_END_NAMESPACE
diff --git a/src/gui/kernel/qeventdispatcher_qws_p.h b/src/gui/kernel/qeventdispatcher_qws_p.h
+index 703057d..64b0469 100644
--- a/src/gui/kernel/qeventdispatcher_qws_p.h
+++ b/src/gui/kernel/qeventdispatcher_qws_p.h
@@ -53,13 +53,23 @@
@@ -1456,7 +1651,7 @@ diff --git a/src/gui/kernel/qeventdispatcher_qws_p.h b/src/gui/kernel/qeventdisp
{
Q_OBJECT
Q_DECLARE_PRIVATE(QEventDispatcherQWS)
-@@ -77,8 +87,10 @@
+@@ -77,8 +87,10 @@ public:
void closingDown();
protected:
@@ -1468,13 +1663,13 @@ diff --git a/src/gui/kernel/qeventdispatcher_qws_p.h b/src/gui/kernel/qeventdisp
QT_END_NAMESPACE
diff --git a/src/gui/text/qfontdatabase_qws.cpp b/src/gui/text/qfontdatabase_qws.cpp
+index ec925e9..7afcd0a 100644
--- a/src/gui/text/qfontdatabase_qws.cpp
+++ b/src/gui/text/qfontdatabase_qws.cpp
-@@ -382,12 +382,51 @@
+@@ -393,6 +393,43 @@ static void initializeDb()
}
#endif
-- QDir dir(fontpath, QLatin1String("*.qpf2"));
+
+ QDir dir(fontpath, QLatin1String("*.qpf"));
+ for (int i=0; iaddQPF2File(file);
- }
-+#endif
- #endif //QT_FONTS_ARE_RESOURCES
-
-
diff --git a/src/gui/text/qfontengine_qws.cpp b/src/gui/text/qfontengine_qws.cpp
+index 9b89fae..ec242b7 100644
--- a/src/gui/text/qfontengine_qws.cpp
+++ b/src/gui/text/qfontengine_qws.cpp
-@@ -390,6 +390,23 @@
+@@ -304,6 +304,23 @@ QFontEngineQPF1::QFontEngineQPF1(const QFontDef&, const QString &fn)
{
cache_cost = 1;
@@ -1547,27 +1735,45 @@ diff --git a/src/gui/text/qfontengine_qws.cpp b/src/gui/text/qfontengine_qws.cpp
+
+#else
+
- int f = QT_OPEN( QFile::encodeName(fn), O_RDONLY, 0);
- Q_ASSERT(f>=0);
- QT_STATBUF st;
-@@ -411,9 +428,13 @@
- qFatal("Failed to mmap %s",QFile::encodeName(fn).data());
- QT_CLOSE(f);
+ int fd = QT_OPEN(QFile::encodeName(fn).constData(), O_RDONLY, 0);
+ if (fd == -1)
+ qFatal("Failed to open '%s'", QFile::encodeName(fn).constData());
+@@ -312,7 +329,11 @@ QFontEngineQPF1::QFontEngineQPF1(const QFontDef&, const QString &fn)
+ if (QT_FSTAT(fd, &st) != 0)
+ qFatal("Failed to stat '%s'", QFile::encodeName(fn).constData());
+#endif /* Q_OS_GENODE */
+
d = new QFontEngineQPF1Data;
++
+#ifndef Q_OS_GENODE
- d->mmapStart = data;
+ d->mmapStart = 0;
d->mmapLength = st.st_size;
-+#endif
- memcpy(reinterpret_cast(&d->fm),data,sizeof(d->fm));
- data += sizeof(d->fm);
+@@ -338,7 +359,7 @@ QFontEngineQPF1::QFontEngineQPF1(const QFontDef&, const QString &fn)
+
+ if (d->mmapStart) {
+ uchar* data = d->mmapStart;
+-
++#endif /* Q_OS_GENODE */
+ memcpy(reinterpret_cast(&d->fm), data, sizeof(d->fm));
+ data += sizeof(d->fm);
+
+@@ -356,7 +377,9 @@ QFontEngineQPF1::QFontEngineQPF1(const QFontDef&, const QString &fn)
+ << "underlinepos" << d->fm.underlinepos
+ << "underlinewidth" << d->fm.underlinewidth;
+ #endif
++#ifndef Q_OS_GENODE
+ }
++#endif /* Q_OS_GENODE */
+ }
+
+ QFontEngineQPF1::~QFontEngineQPF1()
diff --git a/src/network/access/qnetworkaccessfilebackend.cpp b/src/network/access/qnetworkaccessfilebackend.cpp
+index 8ec6a15..65ad5be 100644
--- a/src/network/access/qnetworkaccessfilebackend.cpp
+++ b/src/network/access/qnetworkaccessfilebackend.cpp
-@@ -106,6 +106,7 @@
+@@ -114,6 +114,7 @@ void QNetworkAccessFileBackend::open()
url.setPath(QLatin1String("/"));
setUrl(url);
@@ -1575,7 +1781,7 @@ diff --git a/src/network/access/qnetworkaccessfilebackend.cpp b/src/network/acce
QString fileName = url.toLocalFile();
if (fileName.isEmpty()) {
if (url.scheme() == QLatin1String("qrc"))
-@@ -113,6 +114,10 @@
+@@ -121,6 +122,10 @@ void QNetworkAccessFileBackend::open()
else
fileName = url.toString(QUrl::RemoveAuthority | QUrl::RemoveFragment | QUrl::RemoveQuery);
}
@@ -1587,9 +1793,10 @@ diff --git a/src/network/access/qnetworkaccessfilebackend.cpp b/src/network/acce
if (operation() == QNetworkAccessManager::GetOperation) {
diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp
+index 6909340..93a6c56 100644
--- a/src/network/kernel/qhostinfo_unix.cpp
+++ b/src/network/kernel/qhostinfo_unix.cpp
-@@ -148,6 +148,11 @@
+@@ -147,6 +147,11 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
QHostAddress address;
if (address.setAddress(hostName)) {
// Reverse lookup
@@ -1599,9 +1806,9 @@ diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinf
+ return results;
+#else
// Reverse lookups using getnameinfo are broken on darwin, use gethostbyaddr instead.
- #if !defined (QT_NO_GETADDRINFO) && !defined (Q_OS_DARWIN) && !defined (Q_OS_SYMBIAN)
+ #if !defined (QT_NO_GETADDRINFO) && !defined (Q_OS_DARWIN)
sockaddr_in sa4;
-@@ -182,7 +187,7 @@
+@@ -181,7 +186,7 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
if (ent)
results.setHostName(QString::fromLatin1(ent->h_name));
#endif
@@ -1611,6 +1818,7 @@ diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinf
results.setHostName(address.toString());
results.setAddresses(QList() << address);
diff --git a/tools/designer/src/lib/uilib/formbuilder.cpp b/tools/designer/src/lib/uilib/formbuilder.cpp
+index db9c59d..df797f0 100644
--- a/tools/designer/src/lib/uilib/formbuilder.cpp
+++ b/tools/designer/src/lib/uilib/formbuilder.cpp
@@ -44,6 +44,8 @@
@@ -1622,7 +1830,7 @@ diff --git a/tools/designer/src/lib/uilib/formbuilder.cpp b/tools/designer/src/l
#include
#include
-@@ -493,7 +495,7 @@
+@@ -493,7 +495,7 @@ static void insertPlugins(QObject *o, QMapbuilder.loader = this;
@@ -1651,7 +1860,7 @@ diff --git a/tools/designer/src/uitools/quiloader.cpp b/tools/designer/src/uitoo
QStringList paths;
foreach (const QString &path, QApplication::libraryPaths()) {
QString libPath = path;
-@@ -640,6 +640,7 @@
+@@ -640,6 +640,7 @@ QUiLoader::QUiLoader(QObject *parent)
}
d->builder.setPluginPath(paths);
diff --git a/qt4/src/lib/qt4/qt4_lwip_connect_semantics_adaption.patch b/qt4/src/lib/qt4/patches/qt4_lwip_connect_semantics_adaption.patch
similarity index 78%
rename from qt4/src/lib/qt4/qt4_lwip_connect_semantics_adaption.patch
rename to qt4/src/lib/qt4/patches/qt4_lwip_connect_semantics_adaption.patch
index 313ccb670..0fe82d893 100644
--- a/qt4/src/lib/qt4/qt4_lwip_connect_semantics_adaption.patch
+++ b/qt4/src/lib/qt4/patches/qt4_lwip_connect_semantics_adaption.patch
@@ -1,7 +1,17 @@
+qt4_lwip_connect_semantics_adaption.patch
+
+From: Christian Prochaska
+
+
+---
+ src/network/socket/qnativesocketengine_unix.cpp | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp
+index b4e5126..9093abd 100644
--- a/src/network/socket/qnativesocketengine_unix.cpp
+++ b/src/network/socket/qnativesocketengine_unix.cpp
-@@ -388,6 +388,22 @@
+@@ -430,6 +430,22 @@ bool QNativeSocketEnginePrivate::nativeConnect(const QHostAddress &addr, quint16
case EISCONN:
socketState = QAbstractSocket::ConnectedState;
break;
diff --git a/qt4/src/lib/qt4/qt4_no_exit_on_window_close.patch b/qt4/src/lib/qt4/patches/qt4_no_exit_on_window_close.patch
similarity index 74%
rename from qt4/src/lib/qt4/qt4_no_exit_on_window_close.patch
rename to qt4/src/lib/qt4/patches/qt4_no_exit_on_window_close.patch
index 56e19c950..6cbc6b562 100644
--- a/qt4/src/lib/qt4/qt4_no_exit_on_window_close.patch
+++ b/qt4/src/lib/qt4/patches/qt4_no_exit_on_window_close.patch
@@ -1,7 +1,17 @@
+Don't quit the program if the last window gets closed.
+
+From: Christian Prochaska
+
+
+---
+ src/gui/kernel/qwidget.cpp | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
+index 3a0261e..8667688 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
-@@ -7596,6 +7596,26 @@
+@@ -7929,6 +7929,26 @@ bool QWidgetPrivate::close_helper(CloseMode mode)
QPointer that = q;
QPointer parentWidget = q->parentWidget();
diff --git a/qt4/src/lib/qt4/patches/qt4_no_search_for_resolv_lib.patch b/qt4/src/lib/qt4/patches/qt4_no_search_for_resolv_lib.patch
new file mode 100644
index 000000000..12d58efcb
--- /dev/null
+++ b/qt4/src/lib/qt4/patches/qt4_no_search_for_resolv_lib.patch
@@ -0,0 +1,29 @@
+Don't search for the "resolv" lib at runtime.
+
+From: Christian Prochaska
+
+
+---
+ src/network/kernel/qhostinfo_unix.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp
+index 93a6c56..cc13a22 100644
+--- a/src/network/kernel/qhostinfo_unix.cpp
++++ b/src/network/kernel/qhostinfo_unix.cpp
+@@ -94,6 +94,7 @@ static res_state_ptr local_res = 0;
+
+ static void resolveLibrary()
+ {
++#ifndef Q_OS_GENODE
+ #ifndef QT_NO_LIBRARY
+ QLibrary lib(QLatin1String("resolv"));
+ lib.setLoadHints(QLibrary::ImprovedSearchHeuristics);
+@@ -119,6 +120,7 @@ static void resolveLibrary()
+ local_res_ninit = 0;
+ }
+ #endif
++#endif /* Q_OS_GENODE */
+ }
+
+ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
diff --git a/qt4/src/lib/qt4/qt4_nonblocking_sockets.patch b/qt4/src/lib/qt4/patches/qt4_nonblocking_sockets.patch
similarity index 60%
rename from qt4/src/lib/qt4/qt4_nonblocking_sockets.patch
rename to qt4/src/lib/qt4/patches/qt4_nonblocking_sockets.patch
index f6a7c04e4..df53e3bbf 100644
--- a/qt4/src/lib/qt4/qt4_nonblocking_sockets.patch
+++ b/qt4/src/lib/qt4/patches/qt4_nonblocking_sockets.patch
@@ -1,7 +1,17 @@
+Use 'ioctl()' to set nonblocking socket mode.
+
+From: Christian Prochaska
+
+
+---
+ src/network/socket/qnativesocketengine_unix.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp
+index 9093abd..9f852a5 100644
--- a/src/network/socket/qnativesocketengine_unix.cpp
+++ b/src/network/socket/qnativesocketengine_unix.cpp
-@@ -282,7 +282,7 @@
+@@ -296,7 +296,7 @@ bool QNativeSocketEnginePrivate::setOption(QNativeSocketEngine::SocketOption opt
break;
case QNativeSocketEngine::NonBlockingSocketOption: {
// Make the socket nonblocking.
@@ -10,12 +20,3 @@ diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socke
int flags = ::fcntl(socketDescriptor, F_GETFL, 0);
if (flags == -1) {
#ifdef QNATIVESOCKETENGINE_DEBUG
-@@ -296,7 +296,7 @@
- #endif
- return false;
- }
--#else // Q_OS_VXWORKS
-+#else // Q_OS_VXWORKS || Q_OS_GENODE
- int onoff = 1;
- #ifdef Q_OS_SYMBIAN
- if (::ioctl(socketDescriptor, FIONBIO, &onoff) < 0) {
diff --git a/qt4/src/lib/qt4/qt4_renderwidget.patch b/qt4/src/lib/qt4/patches/qt4_renderwidget.patch
similarity index 56%
rename from qt4/src/lib/qt4/qt4_renderwidget.patch
rename to qt4/src/lib/qt4/patches/qt4_renderwidget.patch
index 366e2ad5d..4158e2777 100644
--- a/qt4/src/lib/qt4/qt4_renderwidget.patch
+++ b/qt4/src/lib/qt4/patches/qt4_renderwidget.patch
@@ -1,9 +1,17 @@
- revert a change introduced in Qt 4.7 that caused the mouse mask not being updated when loading a Nitpicker plugin in Arora
-diff --git a/src/3rdparty/webkit/WebCore/rendering/RenderWidget.cpp b/src/3rdparty/webkit/WebCore/rendering/RenderWidget.cpp
---- a/src/3rdparty/webkit/WebCore/rendering/RenderWidget.cpp
-+++ b/src/3rdparty/webkit/WebCore/rendering/RenderWidget.cpp
-@@ -265,6 +265,11 @@
+From: Christian Prochaska
+
+
+---
+ .../Source/WebCore/rendering/RenderWidget.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/RenderWidget.cpp b/src/3rdparty/webkit/Source/WebCore/rendering/RenderWidget.cpp
+index 5a00374..025f921 100644
+--- a/src/3rdparty/webkit/Source/WebCore/rendering/RenderWidget.cpp
++++ b/src/3rdparty/webkit/Source/WebCore/rendering/RenderWidget.cpp
+@@ -291,6 +291,11 @@ void RenderWidget::paint(PaintInfo& paintInfo, int tx, int ty)
}
if (m_widget) {
diff --git a/qt4/src/lib/qt4/patches/qt4_serialized_dns_lookup.patch b/qt4/src/lib/qt4/patches/qt4_serialized_dns_lookup.patch
new file mode 100644
index 000000000..6f9045f33
--- /dev/null
+++ b/qt4/src/lib/qt4/patches/qt4_serialized_dns_lookup.patch
@@ -0,0 +1,26 @@
+Serialize DNS lookups
+
+From: Christian Prochaska
+
+'getaddrinfo()' is currently not thread-safe on Genode
+---
+ src/network/kernel/qhostinfo.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp
+index 4a5589d..6725d43 100644
+--- a/src/network/kernel/qhostinfo.cpp
++++ b/src/network/kernel/qhostinfo.cpp
+@@ -543,7 +543,12 @@ QHostInfoLookupManager::QHostInfoLookupManager() : mutex(QMutex::Recursive), was
+ {
+ moveToThread(QCoreApplicationPrivate::mainThread());
+ connect(QCoreApplication::instance(), SIGNAL(destroyed()), SLOT(waitForThreadPoolDone()), Qt::DirectConnection);
++#ifdef Q_OS_GENODE
++ /* 'getaddrinfo()' is currently not thread-safe on Genode */
++ threadPool.setMaxThreadCount(1);
++#else
+ threadPool.setMaxThreadCount(5); // do 5 DNS lookups in parallel
++#endif
+ }
+
+ QHostInfoLookupManager::~QHostInfoLookupManager()
diff --git a/qt4/src/lib/qt4/patches/qt4_ssl_peer_verification.patch b/qt4/src/lib/qt4/patches/qt4_ssl_peer_verification.patch
new file mode 100644
index 000000000..5150dc484
--- /dev/null
+++ b/qt4/src/lib/qt4/patches/qt4_ssl_peer_verification.patch
@@ -0,0 +1,27 @@
+Disable SSL peer verification
+
+From: Christian Prochaska
+
+With enabled peer verification, currently often a 'handshake error'
+occurs. This patch disables the peer verification until a fix for
+the handshake problem has been found.
+---
+ src/network/ssl/qsslconfiguration_p.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/network/ssl/qsslconfiguration_p.h b/src/network/ssl/qsslconfiguration_p.h
+index 9c634f2..62ae400 100644
+--- a/src/network/ssl/qsslconfiguration_p.h
++++ b/src/network/ssl/qsslconfiguration_p.h
+@@ -81,7 +81,11 @@ class QSslConfigurationPrivate: public QSharedData
+ public:
+ QSslConfigurationPrivate()
+ : protocol(QSsl::SecureProtocols),
++#ifdef Q_OS_GENODE
++ peerVerifyMode(QSslSocket::VerifyNone),
++#else
+ peerVerifyMode(QSslSocket::AutoVerifyPeer),
++#endif
+ peerVerifyDepth(0),
+ sslOptions(QSsl::SslOptionDisableEmptyFragments
+ |QSsl::SslOptionDisableLegacyRenegotiation
diff --git a/qt4/src/lib/qt4/qt4_virtual_deletelater.patch b/qt4/src/lib/qt4/patches/qt4_virtual_deletelater.patch
similarity index 58%
rename from qt4/src/lib/qt4/qt4_virtual_deletelater.patch
rename to qt4/src/lib/qt4/patches/qt4_virtual_deletelater.patch
index 3e5e1c8a1..b8c6b965c 100644
--- a/qt4/src/lib/qt4/qt4_virtual_deletelater.patch
+++ b/qt4/src/lib/qt4/patches/qt4_virtual_deletelater.patch
@@ -1,7 +1,17 @@
+qt4_virtual_deletelater.patch
+
+From: Christian Prochaska
+
+
+---
+ src/corelib/kernel/qobject.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h
+index 1974bef..ba6c83b 100644
--- a/src/corelib/kernel/qobject.h
+++ b/src/corelib/kernel/qobject.h
-@@ -253,7 +253,7 @@
+@@ -276,7 +276,7 @@ public:
{ return const_cast(this)->qt_metacast(classname) != 0; }
public Q_SLOTS:
diff --git a/qt4/src/lib/qt4/patches/qt4_webkit_crash.patch b/qt4/src/lib/qt4/patches/qt4_webkit_crash.patch
new file mode 100644
index 000000000..a43d9ae4a
--- /dev/null
+++ b/qt4/src/lib/qt4/patches/qt4_webkit_crash.patch
@@ -0,0 +1,38 @@
+Webkit: print an error message before crashing
+
+From: Christian Prochaska
+
+
+---
+ .../webkit/Source/JavaScriptCore/wtf/Assertions.h | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Assertions.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Assertions.h
+index 862158b..77adac3 100644
+--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Assertions.h
++++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Assertions.h
+@@ -50,6 +50,10 @@
+ #include
+ #endif
+
++#if OS(GENODE)
++#include
++#endif
++
+ #if OS(SYMBIAN)
+ #include
+ #include
+@@ -179,6 +183,13 @@ WTF_EXPORT_PRIVATE void WTFLogVerbose(const char* file, int line, const char* fu
+ *(int *)(uintptr_t)0xbbadbeef = 0; \
+ ((void(*)())0)(); /* More reliable, but doesn't say BBADBEEF */ \
+ } while(false)
++#elif OS(GENODE)
++#define CRASH() do { \
++ PERR("WebKit CRASH in '%s'", WTF_PRETTY_FUNCTION); \
++ PERR(" in %s:%d", __FILE__, __LINE__); \
++ *(int *)(uintptr_t)0xbbadbeef = 0; \
++ ((void(*)())0)(); /* More reliable, but doesn't say BBADBEEF */ \
++} while(false)
+ #else
+ #define CRASH() do { \
+ WTFReportBacktrace(); \
diff --git a/qt4/src/lib/qt4/patches/qt4_webkit_munmap.patch b/qt4/src/lib/qt4/patches/qt4_webkit_munmap.patch
new file mode 100644
index 000000000..e3e82996d
--- /dev/null
+++ b/qt4/src/lib/qt4/patches/qt4_webkit_munmap.patch
@@ -0,0 +1,34 @@
+Webkit: don't crash because of unimplemented partial unmap
+
+From: Christian Prochaska
+
+
+---
+ .../Source/JavaScriptCore/wtf/OSAllocatorPosix.cpp | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/OSAllocatorPosix.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/OSAllocatorPosix.cpp
+index 5ba5410..e17316f 100644
+--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/OSAllocatorPosix.cpp
++++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/OSAllocatorPosix.cpp
+@@ -150,9 +150,20 @@ void OSAllocator::decommit(void* address, size_t bytes)
+
+ void OSAllocator::releaseDecommitted(void* address, size_t bytes)
+ {
++#if OS(GENODE)
++ /*
++ * 'releaseDecommitted()' sometimes gets called with a start address
++ * different than the one returned by 'mmap()' to release only a part of the
++ * allocated memory. This feature is currently not supported by Genode's
++ * 'munmap()' implementation, so we don't crash on purpose if the result of
++ * 'munmap()' is -1.
++ */
++ munmap(address, bytes);
++#else
+ int result = munmap(address, bytes);
+ if (result == -1)
+ CRASH();
++#endif
+ }
+
+ } // namespace WTF
diff --git a/qt4/src/lib/qt4/patches/qt4_webkit_websockets.patch b/qt4/src/lib/qt4/patches/qt4_webkit_websockets.patch
new file mode 100644
index 000000000..3c48c5f1b
--- /dev/null
+++ b/qt4/src/lib/qt4/patches/qt4_webkit_websockets.patch
@@ -0,0 +1,22 @@
+Webkit: disable websockets
+
+From: Christian Prochaska
+
+
+---
+ src/3rdparty/webkit/Source/WebCore/features.pri | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/3rdparty/webkit/Source/WebCore/features.pri b/src/3rdparty/webkit/Source/WebCore/features.pri
+index f04d0b4..67f3b33 100644
+--- a/src/3rdparty/webkit/Source/WebCore/features.pri
++++ b/src/3rdparty/webkit/Source/WebCore/features.pri
+@@ -106,7 +106,7 @@ contains(DEFINES, ENABLE_SINGLE_THREADED=1) {
+ }
+
+ # Web Socket support.
+-!contains(DEFINES, ENABLE_WEB_SOCKETS=.): DEFINES += ENABLE_WEB_SOCKETS=1
++#!contains(DEFINES, ENABLE_WEB_SOCKETS=.): DEFINES += ENABLE_WEB_SOCKETS=1
+
+ # Web Timing support.
+ !contains(DEFINES, ENABLE_WEB_TIMING=.): DEFINES += ENABLE_WEB_TIMING=1
diff --git a/qt4/src/lib/qt4/patches/qt_update.patch b/qt4/src/lib/qt4/patches/qt_update.patch
new file mode 100644
index 000000000..9b17f6bbf
--- /dev/null
+++ b/qt4/src/lib/qt4/patches/qt_update.patch
@@ -0,0 +1,103 @@
+qt_update.patch
+
+From: Christian Prochaska
+
+
+---
+ configure | 12 ++++++------
+ mkspecs/genode-g++/qmake.conf | 1 +
+ mkspecs/genode-g++/qplatformdefs.h | 1 +
+ mkspecs/qws/genode-generic-g++/qmake.conf | 1 +
+ mkspecs/qws/genode-generic-g++/qplatformdefs.h | 1 +
+ src/corelib/global/qconfig-genode.h | 1 +
+ 6 files changed, 11 insertions(+), 6 deletions(-)
+ create mode 120000 mkspecs/genode-g++/qmake.conf
+ create mode 120000 mkspecs/genode-g++/qplatformdefs.h
+ create mode 120000 mkspecs/qws/genode-generic-g++/qmake.conf
+ create mode 120000 mkspecs/qws/genode-generic-g++/qplatformdefs.h
+ create mode 120000 src/corelib/global/qconfig-genode.h
+
+diff --git a/configure b/configure
+index e3d464b..259a128 100755
+--- a/configure
++++ b/configure
+@@ -793,14 +793,14 @@ CFG_WEBKIT=auto # (yes|no|auto|debug)
+ CFG_JAVASCRIPTCORE_JIT=auto
+ CFG_STACK_PROTECTOR_STRONG=auto
+
+-CFG_GFX_AVAILABLE="linuxfb transformed qvfb vnc multiscreen directfb"
++CFG_GFX_AVAILABLE="linuxfb transformed qvfb vnc multiscreen directfb nitpicker"
+ CFG_GFX_ON="linuxfb multiscreen"
+ CFG_GFX_PLUGIN_AVAILABLE=
+ CFG_GFX_PLUGIN=
+ CFG_GFX_OFF=
+-CFG_KBD_AVAILABLE="tty linuxinput qvfb"
++CFG_KBD_AVAILABLE="tty linuxinput qvfb nitpicker"
+ CFG_KBD_ON="tty" #default, see QMakeVar above
+-CFG_MOUSE_AVAILABLE="pc linuxtp linuxinput tslib qvfb"
++CFG_MOUSE_AVAILABLE="pc linuxtp linuxinput tslib qvfb nitpicker"
+ CFG_MOUSE_ON="pc linuxtp" #default, see QMakeVar above
+
+ if [ -f "$relpath/src/gui/embedded/qscreenqnx_qws.cpp" ]; then
+@@ -856,7 +856,7 @@ CFG_SSE4_1=auto
+ CFG_SSE4_2=auto
+ CFG_AVX=auto
+ CFG_REDUCE_RELOCATIONS=no
+-CFG_IPV6=auto
++CFG_IPV6=no
+ CFG_NAS=no
+ CFG_QWS_DEPTHS=all
+ CFG_USER_BUILD_KEY=
+@@ -869,10 +869,10 @@ CFG_ARMFPA=auto
+ CFG_IWMMXT=no
+ CFG_NEON=auto
+ CFG_CLOCK_GETTIME=auto
+-CFG_CLOCK_MONOTONIC=auto
++CFG_CLOCK_MONOTONIC=no
+ CFG_MREMAP=auto
+ CFG_GETADDRINFO=auto
+-CFG_IPV6IFNAME=auto
++CFG_IPV6IFNAME=no
+ CFG_GETIFADDRS=auto
+ CFG_INOTIFY=auto
+ CFG_RPATH=yes
+diff --git a/mkspecs/genode-g++/qmake.conf b/mkspecs/genode-g++/qmake.conf
+new file mode 120000
+index 0000000..a771e53
+--- /dev/null
++++ b/mkspecs/genode-g++/qmake.conf
+@@ -0,0 +1 @@
++/home/christian/projects/genode/genode/qt4/src/lib/qt4/mkspecs/genode-g++/qmake.conf
+\ No newline at end of file
+diff --git a/mkspecs/genode-g++/qplatformdefs.h b/mkspecs/genode-g++/qplatformdefs.h
+new file mode 120000
+index 0000000..16442bd
+--- /dev/null
++++ b/mkspecs/genode-g++/qplatformdefs.h
+@@ -0,0 +1 @@
++/home/christian/projects/genode/genode/qt4/src/lib/qt4/mkspecs/genode-g++/qplatformdefs.h
+\ No newline at end of file
+diff --git a/mkspecs/qws/genode-generic-g++/qmake.conf b/mkspecs/qws/genode-generic-g++/qmake.conf
+new file mode 120000
+index 0000000..1e8bd9b
+--- /dev/null
++++ b/mkspecs/qws/genode-generic-g++/qmake.conf
+@@ -0,0 +1 @@
++/home/christian/projects/genode/genode/qt4/src/lib/qt4/mkspecs/qws/genode-generic-g++/qmake.conf
+\ No newline at end of file
+diff --git a/mkspecs/qws/genode-generic-g++/qplatformdefs.h b/mkspecs/qws/genode-generic-g++/qplatformdefs.h
+new file mode 120000
+index 0000000..b0f6b49
+--- /dev/null
++++ b/mkspecs/qws/genode-generic-g++/qplatformdefs.h
+@@ -0,0 +1 @@
++/home/christian/projects/genode/genode/qt4/src/lib/qt4/mkspecs/qws/genode-generic-g++/qplatformdefs.h
+\ No newline at end of file
+diff --git a/src/corelib/global/qconfig-genode.h b/src/corelib/global/qconfig-genode.h
+new file mode 120000
+index 0000000..5309d22
+--- /dev/null
++++ b/src/corelib/global/qconfig-genode.h
+@@ -0,0 +1 @@
++../../../../../include/qt4/QtCore/qconfig-genode.h
+\ No newline at end of file
diff --git a/qt4/src/lib/qt4/patches/series b/qt4/src/lib/qt4/patches/series
new file mode 100644
index 000000000..9dbac2bf6
--- /dev/null
+++ b/qt4/src/lib/qt4/patches/series
@@ -0,0 +1,16 @@
+qt_update.patch
+previewer_example.patch
+textedit_example.patch
+qt4_genode.patch
+qt4_connection_close.patch
+qt4_lwip_connect_semantics_adaption.patch
+qt4_no_exit_on_window_close.patch
+qt4_no_search_for_resolv_lib.patch
+qt4_nonblocking_sockets.patch
+qt4_renderwidget.patch
+qt4_virtual_deletelater.patch
+qt4_webkit_crash.patch
+qt4_webkit_munmap.patch
+qt4_webkit_websockets.patch
+qt4_ssl_peer_verification.patch
+qt4_serialized_dns_lookup.patch
diff --git a/qt4/src/lib/qt4/textedit_example.patch b/qt4/src/lib/qt4/patches/textedit_example.patch
similarity index 82%
rename from qt4/src/lib/qt4/textedit_example.patch
rename to qt4/src/lib/qt4/patches/textedit_example.patch
index 030f9e840..5f9e47dc2 100644
--- a/qt4/src/lib/qt4/textedit_example.patch
+++ b/qt4/src/lib/qt4/patches/textedit_example.patch
@@ -1,4 +1,16 @@
+textedit_example.patch
+
+From: Christian Prochaska
+
+
+---
+ demos/textedit/main.cpp | 23 ++++++++++++++++++++++-
+ demos/textedit/textedit.cpp | 8 ++++----
+ demos/textedit/textedit.pro | 5 -----
+ 3 files changed, 26 insertions(+), 10 deletions(-)
+
diff --git a/demos/textedit/main.cpp b/demos/textedit/main.cpp
+index 0fc0b57..4fe6bfc 100644
--- a/demos/textedit/main.cpp
+++ b/demos/textedit/main.cpp
@@ -39,16 +39,37 @@
@@ -41,9 +53,10 @@ diff --git a/demos/textedit/main.cpp b/demos/textedit/main.cpp
return a.exec();
}
diff --git a/demos/textedit/textedit.cpp b/demos/textedit/textedit.cpp
+index 8b179c0..4fa4b1a 100644
--- a/demos/textedit/textedit.cpp
+++ b/demos/textedit/textedit.cpp
-@@ -463,7 +463,7 @@
+@@ -463,7 +463,7 @@ void TextEdit::fileNew()
void TextEdit::fileOpen()
{
QString fn = QFileDialog::getOpenFileName(this, tr("Open File..."),
@@ -52,7 +65,7 @@ diff --git a/demos/textedit/textedit.cpp b/demos/textedit/textedit.cpp
if (!fn.isEmpty())
load(fn);
}
-@@ -483,11 +483,11 @@
+@@ -483,11 +483,11 @@ bool TextEdit::fileSave()
bool TextEdit::fileSaveAs()
{
QString fn = QFileDialog::getSaveFileName(this, tr("Save as..."),
@@ -68,9 +81,10 @@ diff --git a/demos/textedit/textedit.cpp b/demos/textedit/textedit.cpp
return fileSave();
}
diff --git a/demos/textedit/textedit.pro b/demos/textedit/textedit.pro
+index 9669ec8..bef1154 100644
--- a/demos/textedit/textedit.pro
+++ b/demos/textedit/textedit.pro
-@@ -8,10 +8,6 @@
+@@ -8,10 +8,6 @@ SOURCES = textedit.cpp \
main.cpp
RESOURCES += textedit.qrc
@@ -81,7 +95,7 @@ diff --git a/demos/textedit/textedit.pro b/demos/textedit/textedit.pro
# install
target.path = $$[QT_INSTALL_DEMOS]/textedit
-@@ -19,4 +15,3 @@
+@@ -19,4 +15,3 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.doc images
sources.path = $$[QT_INSTALL_DEMOS]/textedit
INSTALLS += target sources
diff --git a/qt4/src/lib/qt4/previewer_example.patch b/qt4/src/lib/qt4/previewer_example.patch
deleted file mode 100644
index 7c65f2f03..000000000
--- a/qt4/src/lib/qt4/previewer_example.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/examples/webkit/previewer/previewer.pro b/examples/webkit/previewer/previewer.pro
---- a/examples/webkit/previewer/previewer.pro
-+++ b/examples/webkit/previewer/previewer.pro
-@@ -11,8 +11,3 @@
- sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro images
- sources.path = $$[QT_INSTALL_EXAMPLES]/webkit/previewer
- INSTALLS += target sources
--
--symbian {
-- TARGET.UID3 = 0xA000CF6F
-- include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
--}
-diff --git a/examples/webkit/previewer/previewer.pro b/examples/webkit/previewer/main.cpp
---- a/examples/webkit/previewer/main.cpp
-+++ b/examples/webkit/previewer/main.cpp
-@@ -47,6 +47,7 @@
- {
- QApplication app(argc, argv);
- MainWindow mainWindow;
-+ mainWindow.move(200, 200);
- mainWindow.show();
- return app.exec();
- }
diff --git a/qt4/src/lib/qt4/qt4_include_time_h.patch b/qt4/src/lib/qt4/qt4_include_time_h.patch
deleted file mode 100644
index 4f8014f1c..000000000
--- a/qt4/src/lib/qt4/qt4_include_time_h.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-- include time.h where time_t is used
-
-diff --git a/src/3rdparty/webkit/WebCore/loader/icon/IconRecord.h b/src/3rdparty/webkit/WebCore/loader/icon/IconRecord.h
---- a/src/3rdparty/webkit/WebCore/loader/icon/IconRecord.h
-+++ b/src/3rdparty/webkit/WebCore/loader/icon/IconRecord.h
-@@ -38,6 +38,8 @@
- #include "PlatformString.h"
- #include "StringHash.h"
-
-+#include
-+
- namespace WebCore {
-
- class IconDataSnapshot;
-diff --git a/src/3rdparty/webkit/WebCore/page/Page.h b/src/3rdparty/webkit/WebCore/page/Page.h
---- a/src/3rdparty/webkit/WebCore/page/Page.h
-+++ b/src/3rdparty/webkit/WebCore/page/Page.h
-@@ -27,6 +27,8 @@
- #include
- #include
-
-+#include
-+
- #if PLATFORM(MAC)
- #include "SchedulePair.h"
- #endif
-diff --git a/src/3rdparty/webkit/WebCore/platform/network/ResourceResponseBase.h b/src/3rdparty/webkit/WebCore/platform/network/ResourceResponseBase.h
---- a/src/3rdparty/webkit/WebCore/platform/network/ResourceResponseBase.h
-+++ b/src/3rdparty/webkit/WebCore/platform/network/ResourceResponseBase.h
-@@ -30,6 +30,8 @@
- #include "HTTPHeaderMap.h"
- #include "KURL.h"
-
-+#include
-+
- #include
-
- namespace WebCore {
diff --git a/qt4/src/lib/qt4/qt4_no_search_for_resolv_lib.patch b/qt4/src/lib/qt4/qt4_no_search_for_resolv_lib.patch
deleted file mode 100644
index b5ccf8468..000000000
--- a/qt4/src/lib/qt4/qt4_no_search_for_resolv_lib.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp
---- a/src/network/kernel/qhostinfo_unix.cpp
-+++ b/src/network/kernel/qhostinfo_unix.cpp
-@@ -94,6 +94,7 @@
-
- static void resolveLibrary()
- {
-+#ifndef Q_OS_GENODE
- #ifndef QT_NO_LIBRARY
- QLibrary lib(QLatin1String("resolv"));
- if (!lib.load())
-@@ -118,6 +119,7 @@
- local_res_ninit = 0;
- }
- #endif
-+#endif
- }
-
- QHostInfo QHostInfoAgent::fromName(const QString &hostName)
diff --git a/qt4/src/lib/qt4/src/corelib/thread/qmutex_genode.cpp b/qt4/src/lib/qt4/src/corelib/thread/qmutex_genode.cpp
index 65043be0e..508bfa021 100644
--- a/qt4/src/lib/qt4/src/corelib/thread/qmutex_genode.cpp
+++ b/qt4/src/lib/qt4/src/corelib/thread/qmutex_genode.cpp
@@ -52,7 +52,7 @@
#include
QMutexPrivate::QMutexPrivate(QMutex::RecursionMode mode)
- : recursive(mode == QMutex::Recursive), contenders(0), owner(0), count(0)
+ : QMutexData(mode), maximumSpinTime(MaximumSpinTimeThreshold), averageWaitTime(0), owner(0), count(0)
{
}
@@ -60,24 +60,32 @@ QMutexPrivate::~QMutexPrivate()
{
}
-ulong QMutexPrivate::self()
-{ return (ulong) QThread::currentThreadId(); }
-
bool QMutexPrivate::wait(int timeout)
{
+ bool result;
+
+ if (contenders.fetchAndAddAcquire(1) == 0) {
+ // lock acquired without waiting
+ return true;
+ }
+
if (timeout == 0) {
- return false; /* timed out */
+ result = false; /* timed out */
} else if (timeout < 0) {
sem.down();
- return true; /* woken up */
+ result = true; /* woken up */
} else {
try {
sem.down(timeout);
+ result = true;
} catch(Genode::Timeout_exception) {
- return false;
+ result = false;
}
- return true;
}
+
+ contenders.deref();
+
+ return result;
}
void QMutexPrivate::wakeUp()
diff --git a/qt4/src/lib/qt4/src/corelib/thread/qthread_genode.cpp b/qt4/src/lib/qt4/src/corelib/thread/qthread_genode.cpp
index 003b49bf8..24564ea51 100644
--- a/qt4/src/lib/qt4/src/corelib/thread/qthread_genode.cpp
+++ b/qt4/src/lib/qt4/src/corelib/thread/qthread_genode.cpp
@@ -94,6 +94,7 @@ QThreadData *QThreadData::current()
QThreadPrivate::tls.insert(QThread::currentThreadId(), tls_elem);
data->thread = new QAdoptedThread(data);
+ data->threadId = QThread::currentThreadId();
data->deref();
}
if (!QCoreApplicationPrivate::theMainThread)
@@ -136,7 +137,7 @@ void QThreadPrivate::createEventDispatcher(QThreadData *data)
void QThreadPrivate::start(QThread *thr)
{
thr->d_func()->thread_id = QThread::currentThreadId();
-
+
QThread::setTerminationEnabled(false);
QThreadData *data = QThreadData::get2(thr);
@@ -221,7 +222,11 @@ Qt::HANDLE QThread::currentThreadId()
*/
int QThread::idealThreadCount()
{
- return -1;
+ return 1;
+}
+
+void QThread::yieldCurrentThread()
+{
}
/*!
diff --git a/qt4/tool/lib_mk_file_generator/README b/qt4/tool/lib_mk_file_generator/README
new file mode 100644
index 000000000..7d49ba7d0
--- /dev/null
+++ b/qt4/tool/lib_mk_file_generator/README
@@ -0,0 +1,10 @@
+The scripts in this directory have been used to generate the
+'lib/mk/qt_*_generated.inc' files.
+
+Usage:
+
+- create a build directory in the 'contrib' directory
+- copy the scripts into this build directory
+- change into the build directory
+- execute the 'create_generated_incs' script
+- move the generated files into the 'lib/mk/' directory
diff --git a/qt4/tool/lib_mk_file_generator/create_generated_inc b/qt4/tool/lib_mk_file_generator/create_generated_inc
new file mode 100755
index 000000000..540039fad
--- /dev/null
+++ b/qt4/tool/lib_mk_file_generator/create_generated_inc
@@ -0,0 +1,122 @@
+#!/bin/bash
+
+function extract_defines()
+{
+ sed -e '/DEFINES =/!d' \
+ -e 's/DEFINES = /QT_DEFINES += /' Makefile > defines.inc
+
+ echo -e "" >> defines.inc
+}
+
+function extract_incpath()
+{
+ sed -e '/INCPATH =/!d' \
+ -e 's/INCPATH = //' \
+ -e 's/ / \\\n/g' \
+ Makefile | sort -u > incpath.inc.tmp
+
+ echo -e "QT_INCPATH = \\" > incpath.inc
+
+ sed -e '/\/qt-everywhere-opensource-src.*\//!d' \
+ -e 's/.*\/qt-everywhere-opensource-src-[^\/]*\// /' \
+ incpath.inc.tmp >> incpath.inc
+
+ echo -e "" >> incpath.inc
+}
+
+
+function extract_sources()
+{
+ sed \
+ -e ':a;N;$!ba;s/\n//g' \
+ -e 's/OBJECTS .*//' \
+ -e 's/.*SOURCES =/QT_SOURCES = \\/' \
+ -e 's/\\/\\\n/g' \
+ -e 's/\.cpp \.moc/\.cpp \\\n/' \
+ Makefile > sources.inc.tmp
+
+ sed -e 's/.*\// /' \
+ sources.inc.tmp > sources.inc
+
+ echo -e "" >> sources.inc
+}
+
+
+function extract_vpath()
+{
+ sed \
+ -e ':a;N;$!ba;s/\n//g' \
+ -e 's/OBJECTS .*//' \
+ -e 's/.*SOURCES =//' \
+ -e 's/\\/\\\n/g' \
+ -e 's/\.cpp \.moc/\.cpp \\\n/' \
+ Makefile > vpath.inc.tmp
+
+ echo -e "QT_VPATH = \\" > vpath.inc
+
+ sed -e '/\/qt-everywhere-opensource-src.*\//!d' \
+ -e 's/.*\/qt-everywhere-opensource-src-[^\/]*\// /' \
+ -e 's/\/[^\/]* [\\]*$/ \\/' \
+ vpath.inc.tmp | sort -u >> vpath.inc
+
+ echo -e "" >> vpath.inc
+}
+
+
+function extract_compiler_moc_header_make_all()
+{
+ sed -e '/compiler_moc_header_make_all:/!d' \
+ -e 's/compiler_moc_header_make_all:/COMPILER_MOC_HEADER_MAKE_ALL_FILES = \\\n /' \
+ -e 's/\.moc\/release-static-emb-x86_64\///g' \
+ -e 's/\.cpp /\.cpp \\\n /g' \
+ Makefile > compiler_moc_header_make_all.inc.tmp
+
+ sed -e 's/.*\// /' \
+ compiler_moc_header_make_all.inc.tmp > compiler_moc_header_make_all.inc
+
+ echo -e "" >> compiler_moc_header_make_all.inc
+}
+
+
+function extract_compiler_moc_source_make_all()
+{
+ sed -e '/compiler_moc_source_make_all:/!d' \
+ -e 's/compiler_moc_source_make_all:/COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \\\n /' \
+ -e 's/\.moc\/release-static-emb-x86_64\///g' \
+ -e 's/\.moc /\.moc \\\n /g' \
+ Makefile > compiler_moc_source_make_all.inc.tmp
+
+ sed -e 's/.*\// /' \
+ compiler_moc_source_make_all.inc.tmp > compiler_moc_source_make_all.inc
+
+ echo -e "" >> compiler_moc_source_make_all.inc
+}
+
+
+extract_defines
+extract_incpath
+extract_sources
+extract_vpath
+extract_compiler_moc_header_make_all
+extract_compiler_moc_source_make_all
+
+cat defines.inc > $1_generated.inc
+
+cat incpath.inc >> $1_generated.inc
+
+cat sources.inc >> $1_generated.inc
+
+cat vpath.inc >> $1_generated.inc
+
+echo -e "# some source files need to be generated by moc from other source/header files before" >> $1_generated.inc
+echo -e "# they get #included again by the original source file in the compiling stage\n" >> $1_generated.inc
+
+echo -e "# source files generated from existing header files ('moc_%.cpp: %.h' rule in spec-qt4.mk)" >> $1_generated.inc
+echo -e "# extracted from 'compiler_moc_header_make_all' target\n" >> $1_generated.inc
+
+cat compiler_moc_header_make_all.inc >> $1_generated.inc
+
+echo -e "# source files generated from existing source files ('%.moc: %.cpp' rule in spec-qt4.mk)" >> $1_generated.inc
+echo -e "# extracted from 'compiler_moc_source_make_all' rule\n" >> $1_generated.inc
+
+cat compiler_moc_source_make_all.inc >> $1_generated.inc
diff --git a/qt4/tool/lib_mk_file_generator/create_generated_incs b/qt4/tool/lib_mk_file_generator/create_generated_incs
new file mode 100755
index 000000000..dda605773
--- /dev/null
+++ b/qt4/tool/lib_mk_file_generator/create_generated_incs
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+./genode_qt_configure
+cd src/corelib && ../../create_generated_inc qt_core && cp qt_core_generated.inc ../.. && cd ../..
+cd src/gui && ../../create_generated_inc qt_gui && cp qt_gui_generated.inc ../.. && cd ../..
+cd src/network && ../../create_generated_inc qt_network && cp qt_network_generated.inc ../.. && cd ../..
+cd src/scripttools && ../../create_generated_inc qt_scripttools && cp qt_scripttools_generated.inc ../.. && cd ../..
+cd src/svg && ../../create_generated_inc qt_svg && cp qt_svg_generated.inc ../.. && cd ../..
+cd src/xml && ../../create_generated_inc qt_xml && cp qt_xml_generated.inc ../.. && cd ../..
+cd src/3rdparty/webkit/Source/JavaScriptCore && ../../../../../create_generated_inc qt_jscore && cp qt_jscore_generated.inc ../../../../.. && cd ../../../../..
+cd src/3rdparty/webkit/Source/WebCore && ../../../../../create_generated_inc qt_webcore && cp qt_webcore_generated.inc ../../../../.. && cd ../../../../..
+cd src/3rdparty/webkit/Source/WebKit/qt && ../../../../../../create_generated_inc qt_webkit && cp qt_webkit_generated.inc ../../../../../.. && cd ../../../../../..
+cd tools/designer/src/uitools && ../../../../create_generated_inc qt_ui_tools && cp qt_ui_tools_generated.inc ../../../.. && cd ../../../..
diff --git a/qt4/tool/lib_mk_file_generator/genode_qt_configure b/qt4/tool/lib_mk_file_generator/genode_qt_configure
new file mode 100755
index 000000000..f6e99b90d
--- /dev/null
+++ b/qt4/tool/lib_mk_file_generator/genode_qt_configure
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+../qt-everywhere-opensource-src-4.8.4/configure \
+ -opensource \
+ -confirm-license \
+ -qconfig genode \
+ -xplatform qws/genode-generic-g++ \
+ -embedded x86 \
+ -static \
+ -no-separate-debug-info \
+ -depths 8,16,32 \
+ -openssl-linked \
+ -no-qt3support \
+ -no-accessibility \
+ -no-phonon \
+ -no-libtiff \
+ -no-libmng \
+ -no-nis \
+ -no-cups \
+ -no-iconv \
+ -no-dbus \
+ -no-freetype \
+ -no-largefile \
+ -no-gfx-linuxfb \
+ -no-gfx-multiscreen \
+ -qt-gfx-nitpicker \
+ -no-mouse-linuxtp \
+ -no-mouse-pc \
+ -qt-mouse-nitpicker \
+ -no-kbd-tty \
+ -qt-kbd-nitpicker \
+ -no-mmx \
+ -no-3dnow \
+ -no-sse \
+ -no-sse2 \
+ -no-sse3 \
+ -no-ssse3 \
+ -no-sse4.1 \
+ -no-sse4.2 \
+ -no-avx \
+ -no-neon \
+ -make tools \
+ -nomake examples \
+ -nomake demos \
+ -fast
diff --git a/qt4/tool/qmake/Makefile b/qt4/tool/qmake/Makefile
index bccb9ca34..4223c291e 100644
--- a/qt4/tool/qmake/Makefile
+++ b/qt4/tool/qmake/Makefile
@@ -2,21 +2,19 @@
# \brief Makefile for building QMake for Genode
# \author Christian Prochaska
# \author Norman Feske
-# \date 2009-05-12
+# \date 2013-03-27
#
# This file is based on the generated Makefile created by qt4's configure.
#
-CC_1 = gcc
-CC = $(CC_1)
-CXX_1 = g++
-CXX = $(CXX_1)
-QMAKE_CFLAGS_1 = -pipe
-QMAKE_CFLAGS = $(QMAKE_CFLAGS_1) $(QMAKE_CFLAGS_2)
-QMAKE_CXXFLAGS_1 = $(QMAKE_CFLAGS)
-QMAKE_CXXFLAGS = $(QMAKE_CXXFLAGS_1) $(QMAKE_CXXFLAGS_2)
-QMAKE_LFLAGS_1 =
-QMAKE_LFLAGS = $(QMAKE_LFLAGS_1)
+########################################################################
+## This file was autogenerated by configure, all changes will be lost ##
+########################################################################
+CC = gcc
+CXX = g++
+QMAKE_CFLAGS = -pipe
+QMAKE_CXXFLAGS = -pipe
+QMAKE_LFLAGS =
# Genode repository
REP_DIR := ../..
@@ -34,6 +32,7 @@ vpath %.cpp $(CONTRIB_DIR)/qmake/generators/mac
vpath %.cpp $(CONTRIB_DIR)/qmake/generators/unix
vpath %.cpp $(CONTRIB_DIR)/qmake/generators/win32
vpath %.cpp $(CONTRIB_DIR)/qmake/generators/symbian
+vpath %.cpp $(CONTRIB_DIR)/qmake/generators/integrity
vpath %.cpp $(CONTRIB_DIR)/src/corelib/codecs
vpath %.cpp $(CONTRIB_DIR)/src/corelib/tools
vpath %.cpp $(CONTRIB_DIR)/src/corelib/global
@@ -44,12 +43,12 @@ vpath %.cpp $(CONTRIB_DIR)/src/corelib/xml
vpath %.cpp $(CONTRIB_DIR)/tools/shared/symbian
vpath %.cpp $(CONTRIB_DIR)/tools/shared/windows
+QCONFIG_CPP_PATH = ../../../../src/lib/qt4/src/corelib/global
SOURCE_PATH = $(CONTRIB_DIR)
BUILD_PATH = .
-QCONFIG_CPP_PATH = ../../../../src/lib/qt4/src/corelib/global
QTOBJS =
QTSRCS =
-+QMAKESPEC = ../../src/lib/qt4/mkspecs/qws/genode-x86-g++
+QMAKESPEC = ../../src/lib/qt4/mkspecs/qws/genode-generic-g++
LFLAGS = $(QMAKE_LFLAGS)
#qmake code
@@ -58,16 +57,18 @@ OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o \
meta.o makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \
borland_bmake.o msvc_vcproj.o msvc_vcxproj.o msvc_nmake.o msvc_objectmodel.o msbuild_objectmodel.o \
symmake.o initprojectdeploy_symbian.o symmake_abld.o symmake_sbsv2.o \
- symbiancommon.o registry.o epocroot.o
+ symbiancommon.o registry.o epocroot.o gbuild.o
#qt code
QOBJS=qtextcodec.o qutfcodec.o qstring.o qtextstream.o qiodevice.o qmalloc.o qglobal.o \
qbytearray.o qbytearraymatcher.o qdatastream.o qbuffer.o qlist.o qfile.o \
- qfsfileengine_unix.o qfsfileengine_iterator_unix.o qfsfileengine.o \
+ qfilesystementry.o qfilesystemengine_unix.o qfilesystemengine.o qfilesystemiterator_unix.o \
+ qfsfileengine_unix.o qfsfileengine.o \
qfsfileengine_iterator.o qregexp.o qvector.o qbitarray.o qdir.o qdiriterator.o quuid.o qhash.o \
qfileinfo.o qdatetime.o qstringlist.o qabstractfileengine.o qtemporaryfile.o \
- qmap.o qmetatype.o qsettings.o qlibraryinfo.o qvariant.o qvsnprintf.o \
- qlocale.o qlinkedlist.o qurl.o qnumeric.o qcryptographichash.o qxmlstream.o qxmlutils.o \
+ qmap.o qmetatype.o qsettings.o qsystemerror.o qlibraryinfo.o qvariant.o qvsnprintf.o \
+ qlocale.o qlocale_tools.o qlocale_unix.o qlinkedlist.o qnumeric.o qcryptographichash.o \
+ qxmlstream.o qxmlutils.o \
$(QTOBJS)
@@ -84,6 +85,7 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp generators/makefile.cpp ge
$(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp \
generators/symbian/symmake_abld.cpp generators/symbian/symmake_sbsv2.cpp \
generaters/symbian/symbiancommon.cpp \
+ generators/integrity/gbuild.cpp \
$(SOURCE_PATH)/src/corelib/codecs/qtextcodec.cpp $(SOURCE_PATH)/src/corelib/codecs/qutfcodec.cpp \
$(SOURCE_PATH)/src/corelib/tools/qstring.cpp $(SOURCE_PATH)/src/corelib/io/qfile.cpp \
$(SOURCE_PATH)/src/corelib/io/qtextstream.cpp $(SOURCE_PATH)/src/corelib/io/qiodevice.cpp \
@@ -91,16 +93,22 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp generators/makefile.cpp ge
$(SOURCE_PATH)/src/corelib/global/qglobal.cpp $(SOURCE_PATH)/src/corelib/tools/qregexp.cpp \
$(SOURCE_PATH)/src/corelib/tools/qbytearray.cpp $(SOURCE_PATH)/src/corelib/tools/qbytearraymatcher.cpp \
$(SOURCE_PATH)/src/corelib/io/qdatastream.cpp $(SOURCE_PATH)/src/corelib/io/qbuffer.cpp \
+ $(SOURCE_PATH)/src/corelib/io/qfilesystementry.cpp $(SOURCE_PATH)/src/corelib/io/qfilesystemengine_unix.cpp \
+ $(SOURCE_PATH)/src/corelib/io/qfilesystemengine_mac.cpp \
+ $(SOURCE_PATH)/src/corelib/io/qfilesystemengine.cpp $(SOURCE_PATH)/src/corelib/io/qfilesystemiterator_unix.cpp \
$(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp $(SOURCE_PATH)/src/corelib/io/qabstractfileengine.cpp \
- $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator_unix.cpp $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator.cpp \
+ $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator.cpp \
$(SOURCE_PATH)/src/corelib/io/qfsfileengine.cpp $(SOURCE_PATH)/src/corelib/tools/qlist.cpp \
$(SOURCE_PATH)/src/corelib/tools/qvector.cpp $(SOURCE_PATH)/src/corelib/tools/qbitarray.cpp \
$(SOURCE_PATH)/src/corelib/io/qdiriterator.cpp \
$(SOURCE_PATH)/src/corelib/io/qdir.cpp $(SOURCE_PATH)/src/corelib/plugin/quuid.cpp \
$(SOURCE_PATH)/src/corelib/io/qfileinfo.cpp $(SOURCE_PATH)/src/corelib/tools/qdatetime.cpp \
$(SOURCE_PATH)/src/corelib/tools/qstringlist.cpp $(SOURCE_PATH)/src/corelib/tools/qmap.cpp \
- $(SOURCE_PATH)/src/corelib/global/qconfig.cpp $(SOURCE_PATH)/src/corelib/io/qurl.cpp \
- $(SOURCE_PATH)/src/corelib/tools/qlocale.cpp $(SOURCE_PATH)/src/corelib/tools/qlinkedlist.cpp \
+ $(SOURCE_PATH)/src/corelib/global/qconfig.cpp \
+ $(SOURCE_PATH)/src/corelib/tools/qlocale.cpp \
+ $(SOURCE_PATH)/src/corelib/tools/qlocale_tools.cpp \
+ $(SOURCE_PATH)/src/corelib/tools/qlocale_unix.cpp \
+ $(SOURCE_PATH)/src/corelib/tools/qlinkedlist.cpp \
$(SOURCE_PATH)/src/corelib/tools/qhash.cpp $(SOURCE_PATH)/src/corelib/kernel/qcore_mac.cpp \
$(SOURCE_PATH)/src/corelib/io/qtemporaryfile.cpp $(SOURCE_PATH)/src/corelib/kernel/qmetatype.cpp \
$(SOURCE_PATH)/src/corelib/io/qsettings.cpp $(SOURCE_PATH)/src/corelib/kernel/qvariant.cpp \
@@ -108,9 +116,11 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp generators/makefile.cpp ge
$(SOURCE_PATH)/src/corelib/tools/qvsnprintf.cpp $(SOURCE_PATH)/src/corelib/global/qnumeric.cpp \
$(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp \
$(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp \
+ $(SOURCE_PATH)/src/corelib/kernel/qsystemerror.cpp \
$(QTSRCS)
-CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac -Igenerators/symbian \
+CPPFLAGS = -g -I. -Igenerators -Igenerators/unix -Igenerators/win32 \
+ -Igenerators/mac -Igenerators/symbian -Igenerators/integrity \
-I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
-I$(REP_DIR)/include/qt4 -I$(REP_DIR)/include/qt4/QtCore \
-I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore \
@@ -118,14 +128,14 @@ CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/ma
-I$(SOURCE_PATH)/tools/shared \
-I$(QCONFIG_CPP_PATH) \
-DQT_NO_PCRE \
- -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED \
+ -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DQLIBRARYINFO_EPOCROOT \
-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL \
-DQT_NO_COMPRESS -I$(QMAKESPEC) -DHAVE_QCONFIG_CPP -DQT_NO_THREAD -DQT_NO_QOBJECT \
- -DQT_NO_GEOM_VARIANT $(OPENSOURCE_CXXFLAGS)
+ -DQT_NO_GEOM_VARIANT -DQT_NO_DEPRECATED $(OPENSOURCE_CXXFLAGS)
# extensions of the CPPFLAGS needed for the out-of-tree build
CPPFLAGS += -I$(CONTRIB_DIR)/qmake
-CPPFLAGS += $(addprefix -I$(CONTRIB_DIR)/qmake/, generators generators/symbian generators/unix generators/win32 generators/mac)
+CPPFLAGS += $(addprefix -I$(CONTRIB_DIR)/qmake/, generators generators/symbian generators/unix generators/win32 generators/mac generators/integrity)
CPPFLAGS += -I$(REP_DIR)/src/lib/qt4/src/corelib/global
# enable automatic dependency generation