ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update Qt to version 4.8.4 

Fixes #703.
This commit is contained in:
Christian Prochaska 2013-05-02 17:59:56 +02:00 committed by Norman Feske
parent 028ef7d776
commit ac8633e0e9
67 changed files with 2949 additions and 2103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
base/include/base/thread.h
View File

@ -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
*

7
ports/run/arora.run
View File

@ -53,7 +53,7 @@ append_if [have_spec sdl] config {
append_if [have_spec pci] config {
<start name="pci_drv">
<resource name="RAM" quantum="1M"/>
<resource name="RAM" quantum="2M"/>
<provides><service name="PCI"/></provides>
</start>}
@ -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

2
ports/src/app/arora/target.mk
View File

@ -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

17
qt4/Makefile
View File

@ -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)

3
qt4/include/qt4/QtCore/qconfig-genode.h
View File

@ -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

12
qt4/include/qt4/QtCore/qconfig.h
View File

@ -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)

2
qt4/lib/import/import-qt4.inc
View File

@ -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 \

3
qt4/lib/import/import-qt_webkit.mk Normal file
View File

@ -0,0 +1,3 @@
IMPORT_QT4_INC=$(call select_from_repositories,lib/import/import-qt4.inc)
include $(IMPORT_QT4_INC)

8
qt4/lib/mk/qt.inc
View File

@ -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))

44
qt4/lib/mk/qt_core.mk
View File

@ -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

39
qt4/lib/mk/qt_core_generated.inc
View File

@ -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 \

50
qt4/lib/mk/qt_gui.mk
View File

@ -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

47
qt4/lib/mk/qt_gui_generated.inc
View File

@ -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 \

84
qt4/lib/mk/qt_jscore.mk
View File

@ -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

168
qt4/lib/mk/qt_jscore_generated.inc
View File

@ -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

23
qt4/lib/mk/qt_network.mk
View File

@ -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

48
qt4/lib/mk/qt_network_generated.inc
View File

@ -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

346
qt4/lib/mk/qt_script46.mk
View File

@ -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

9
qt4/lib/mk/qt_scriptclassic.mk
View File

@ -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

142
qt4/lib/mk/qt_scripttools.mk
View File

@ -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

134
qt4/lib/mk/qt_scripttools_generated.inc Normal file
View File

@ -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

14
qt4/lib/mk/qt_svg.mk
View File

@ -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

10
qt4/lib/mk/qt_svg_generated.inc
View File

@ -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

10
qt4/lib/mk/qt_ui_tools.mk
View File

@ -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

11
qt4/lib/mk/qt_ui_tools_generated.inc
View File

@ -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

2
qt4/lib/mk/qt_version.inc
View File

@ -1 +1 @@
QT4 := qt-everywhere-opensource-src-4.7.4
QT4 := qt-everywhere-opensource-src-4.8.4

265
qt4/lib/mk/qt_webcore.mk
View File

@ -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

1265
qt4/lib/mk/qt_webcore_generated.inc
View File

File diff suppressed because it is too large Load Diff

23
qt4/lib/mk/qt_webkit.mk Normal file
View File

@ -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

674
qt4/lib/mk/qt_webkit_generated.inc Normal file
View File

@ -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

13
qt4/lib/mk/qt_xml.mk
View File

@ -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

10
qt4/lib/mk/qt_xml_generated.inc
View File

@ -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

1
qt4/run/previewer.run
View File

@ -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
}

8
qt4/src/app/qt_avplay/style.qrc
View File

@ -2,9 +2,9 @@
<RCC version="1.0">
<qresource prefix="/">
<file>style.qss</file>
<file alias="player_play.png">../../../contrib/qt-everywhere-opensource-src-4.7.4/examples/network/torrent/icons/player_play.png</file>
<file alias="player_pause.png">../../../contrib/qt-everywhere-opensource-src-4.7.4/examples/network/torrent/icons/player_pause.png</file>
<file alias="player_stop.png">../../../contrib/qt-everywhere-opensource-src-4.7.4/examples/network/torrent/icons/player_stop.png</file>
<file alias="volume.png">../../../contrib/qt-everywhere-opensource-src-4.7.4/demos/mobile/guitartuner/src/mycomponents/images/volume.png</file>
<file alias="player_play.png">../../../contrib/qt-everywhere-opensource-src-4.8.4/examples/network/torrent/icons/player_play.png</file>
<file alias="player_pause.png">../../../contrib/qt-everywhere-opensource-src-4.8.4/examples/network/torrent/icons/player_pause.png</file>
<file alias="player_stop.png">../../../contrib/qt-everywhere-opensource-src-4.8.4/examples/network/torrent/icons/player_stop.png</file>
<file alias="volume.png">../../../contrib/qt-everywhere-opensource-src-4.8.4/demos/mobile/guitartuner/src/mycomponents/images/volume.png</file>
</qresource>
</RCC>

2
qt4/src/app/tmpl/target_final.inc
View File

@ -57,5 +57,5 @@ endif
# QtWebKit
ifeq ($(findstring webkit, $(QT)), webkit)
LIBS += qt_webcore
LIBS += qt_webcore qt_webkit
endif

2
qt4/src/lib/dejavusans/dejavusans.qrc
View File

@ -1,6 +1,6 @@
<!DOCTYPE RCC>
<RCC version="1.0">
<qresource prefix="/qt/fonts">
<file alias="DejaVuSans.ttf">../../../contrib/qt-everywhere-opensource-src-4.7.4/lib/fonts/DejaVuSans.ttf</file>
<file alias="DejaVuSans.ttf">../../../contrib/qt-everywhere-opensource-src-4.8.4/lib/fonts/DejaVuSans.ttf</file>
</qresource>
</RCC>

3
qt4/src/lib/qt4/mkspecs/genode-g++/qmake.conf
View File

@ -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)

6
qt4/src/lib/qt4/mkspecs/genode-g++/qplatformdefs.h
View File

@ -67,6 +67,7 @@
#include <grp.h>
#include <pwd.h>
#include <signal.h>
#include <time.h>
#include <sys/types.h>
#include <sys/ioctl.h>
@ -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

3
qt4/src/lib/qt4/mkspecs/qws/genode-x86-g++/qmake.conf → qt4/src/lib/qt4/mkspecs/qws/genode-generic-g++/qmake.conf
View File

@ -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)

0
qt4/src/lib/qt4/mkspecs/qws/genode-x86-g++/qplatformdefs.h → qt4/src/lib/qt4/mkspecs/qws/genode-generic-g++/qplatformdefs.h
View File

37
qt4/src/lib/qt4/patches/previewer_example.patch Normal file
View File

@ -0,0 +1,37 @@
previewer_example.patch
From: Christian Prochaska <christian.prochaska@genode-labs.com>
---
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)

26
qt4/src/lib/qt4/patches/qt4_connection_close.patch Normal file
View File

@ -0,0 +1,26 @@
network: set the 'Connection' HTTP header field to 'Close'
From: Christian Prochaska <christian.prochaska@genode-labs.com>
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 <christian.prochaska@genode-labs.com>
---
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

721
qt4/src/lib/qt4/qt4_genode.patch → qt4/src/lib/qt4/patches/qt4_genode.patch
View File

File diff suppressed because it is too large Load Diff

12
qt4/src/lib/qt4/qt4_lwip_connect_semantics_adaption.patch → qt4/src/lib/qt4/patches/qt4_lwip_connect_semantics_adaption.patch
View File

@ -1,7 +1,17 @@
qt4_lwip_connect_semantics_adaption.patch
From: Christian Prochaska <christian.prochaska@genode-labs.com>
---
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;

12
qt4/src/lib/qt4/qt4_no_exit_on_window_close.patch → qt4/src/lib/qt4/patches/qt4_no_exit_on_window_close.patch
View File

@ -1,7 +1,17 @@
Don't quit the program if the last window gets closed.
From: Christian Prochaska <christian.prochaska@genode-labs.com>
---
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<QWidget> that = q;
QPointer<QWidget> parentWidget = q->parentWidget();

29
qt4/src/lib/qt4/patches/qt4_no_search_for_resolv_lib.patch Normal file
View File

@ -0,0 +1,29 @@
Don't search for the "resolv" lib at runtime.
From: Christian Prochaska <christian.prochaska@genode-labs.com>
---
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)

21
qt4/src/lib/qt4/qt4_nonblocking_sockets.patch → qt4/src/lib/qt4/patches/qt4_nonblocking_sockets.patch
View File

@ -1,7 +1,17 @@
Use 'ioctl()' to set nonblocking socket mode.
From: Christian Prochaska <christian.prochaska@genode-labs.com>
---
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) {

16
qt4/src/lib/qt4/qt4_renderwidget.patch → qt4/src/lib/qt4/patches/qt4_renderwidget.patch
View File

@ -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 <christian.prochaska@genode-labs.com>
---
.../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) {

26
qt4/src/lib/qt4/patches/qt4_serialized_dns_lookup.patch Normal file
View File

@ -0,0 +1,26 @@
Serialize DNS lookups
From: Christian Prochaska <christian.prochaska@genode-labs.com>
'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()

27
qt4/src/lib/qt4/patches/qt4_ssl_peer_verification.patch Normal file
View File

@ -0,0 +1,27 @@
Disable SSL peer verification
From: Christian Prochaska <christian.prochaska@genode-labs.com>
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

12
qt4/src/lib/qt4/qt4_virtual_deletelater.patch → qt4/src/lib/qt4/patches/qt4_virtual_deletelater.patch
View File

@ -1,7 +1,17 @@
qt4_virtual_deletelater.patch
From: Christian Prochaska <christian.prochaska@genode-labs.com>
---
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<QObject *>(this)->qt_metacast(classname) != 0; }
public Q_SLOTS:

38
qt4/src/lib/qt4/patches/qt4_webkit_crash.patch Normal file
View File

@ -0,0 +1,38 @@
Webkit: print an error message before crashing
From: Christian Prochaska <christian.prochaska@genode-labs.com>
---
.../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 <inttypes.h>
#endif
+#if OS(GENODE)
+#include <base/printf.h>
+#endif
+
#if OS(SYMBIAN)
#include <e32def.h>
#include <e32debug.h>
@@ -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(); \

34
qt4/src/lib/qt4/patches/qt4_webkit_munmap.patch Normal file
View File

@ -0,0 +1,34 @@
Webkit: don't crash because of unimplemented partial unmap
From: Christian Prochaska <christian.prochaska@genode-labs.com>
---
.../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

22
qt4/src/lib/qt4/patches/qt4_webkit_websockets.patch Normal file
View File

@ -0,0 +1,22 @@
Webkit: disable websockets
From: Christian Prochaska <christian.prochaska@genode-labs.com>
---
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

103
qt4/src/lib/qt4/patches/qt_update.patch Normal file
View File

@ -0,0 +1,103 @@
qt_update.patch
From: Christian Prochaska <christian.prochaska@genode-labs.com>
---
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

16
qt4/src/lib/qt4/patches/series Normal file
View File

@ -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

22
qt4/src/lib/qt4/textedit_example.patch → qt4/src/lib/qt4/patches/textedit_example.patch
View File

@ -1,4 +1,16 @@
textedit_example.patch
From: Christian Prochaska <christian.prochaska@genode-labs.com>
---
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

23
qt4/src/lib/qt4/previewer_example.patch
View File

@ -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();
}

38
qt4/src/lib/qt4/qt4_include_time_h.patch
View File

@ -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 <time.h>
+
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 <wtf/HashSet.h>
#include <wtf/Noncopyable.h>
+#include <time.h>
+
#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 <time.h>
+
#include <wtf/PassOwnPtr.h>
namespace WebCore {

19
qt4/src/lib/qt4/qt4_no_search_for_resolv_lib.patch
View File

@ -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)

24
qt4/src/lib/qt4/src/corelib/thread/qmutex_genode.cpp
View File

@ -52,7 +52,7 @@
#include <timer_session/client.h>
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()

9
qt4/src/lib/qt4/src/corelib/thread/qthread_genode.cpp
View File

@ -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()
{
}
/*!

10
qt4/tool/lib_mk_file_generator/README Normal file
View File

@ -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

122
qt4/tool/lib_mk_file_generator/create_generated_inc Executable file
View File

@ -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

13
qt4/tool/lib_mk_file_generator/create_generated_incs Executable file
View File

@ -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 ../../../..

45
qt4/tool/lib_mk_file_generator/genode_qt_configure Executable file
View File

@ -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

58
qt4/tool/qmake/Makefile
View File

@ -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