diff --git a/doc/challenges.txt b/doc/challenges.txt index 442c2c7b7..8072ed96f 100644 --- a/doc/challenges.txt +++ b/doc/challenges.txt @@ -107,7 +107,7 @@ Applications and library infrastructure independent trusted component facilitating Genode secure GUI server (Nitpicker). -:Graphical on-target IPC tracing tool using Qt4: +:Graphical on-target IPC tracing tool using Qt: Analysing the interaction of components of a multi-server operating system such as Genode is important to discover bottlenecks of the system and for @@ -130,7 +130,7 @@ Applications and library infrastructure communication and control flows between those processes, and to visualize the interaction of threads with the kernel's scheduler. - Since Qt4 is available natively on Genode, the creation of both offline and + Since Qt is available natively on Genode, the creation of both offline and on-target analysis tools has become feasible. The first step of this project is creating an interactive on-target tool, that displays the interaction of communicating threads as captured on the running system. The tool should @@ -140,9 +140,9 @@ Applications and library infrastructure Application frameworks ###################### -:Running the Meego application stack on Genode using Qt4: +:Running the Meego application stack on Genode using Qt: - With Genode 11.02, Qt4 4.7.1 has become available. The most prominent feature + With Genode 11.02, Qt has become available. The most prominent feature of this version is the new QML language to design GUIs using a declarative language. This technique is targeted specifically to mobile applications and other touch-based devices. The goal of this project is to run the Meego @@ -152,18 +152,18 @@ Application frameworks interface. The immediate goal of the first step is running one Meego example application natively on Genode. -:Python Qt4 bindings: +:Python Qt bindings: - With the Python interpreter and the port of the Qt4 framework, the principle + With the Python interpreter and the port of the Qt framework, the principle components for Python-based GUIs on Genode are available. However, the glue between both components is missing. The incentive of this work is supplementing our Python port with the modules needed for real applications and porting the - Qt4 bindings to Genode. This would bring Genode one step closer to executing + Qt bindings to Genode. This would bring Genode one step closer to executing modern Python-based GUI applications (in particular KDE4 applications). :Evaluation of porting GTK+ to Genode: - With Qt4, we have demonstrated the feasibility to run a highly-complex + With Qt, we have demonstrated the feasibility to run a highly-complex application framework via Genode on a wide range of microkernels. That leaves the question of looking into the other major toolkit in town, namely GTK+ as used by Firefox and the Gnome desktop. @@ -243,7 +243,7 @@ Device drivers The efforts towards enabling mobile application stacks such as Meego and Android on Genode must be accompanied by a revision of Genode's 'Input' session interface to accommodate multi-touch input devices. First, existing - APIs such as multi-touch support in X11, Qt4, and Android should be analysed. + APIs such as multi-touch support in X11, Qt, and Android should be analysed. Based on these findings, we expect a proposal for changing Genode's input interface. The interface extension should be validated by a example driver implementing the interface as well as an example applications. diff --git a/doc/components.txt b/doc/components.txt index 47807fb91..579c4ff8d 100644 --- a/doc/components.txt +++ b/doc/components.txt @@ -483,9 +483,6 @@ Libraries: :'libports/lib/mk/lua': Runtime for the Lua scripting language. -:'qt4': - Qt4 framework, using nitpicker session and NIC session as back end. - :'libports/lib/mk/qt5_*': Qt5 framework, using nitpicker session and NIC session as back end. @@ -520,20 +517,17 @@ located in their respective directory. Example program for using OpenGL via the Gallium3D graphics stack. :'ports/src/app/arora': - Arora is a Qt4-based web browser using the Webkit engine. + Arora is a Qt-based web browser using the Webkit engine. :'ports/src/app/gdb_monitor': Application that allows the debugging of a process via GDB over a remote connection. -:'qt4/src/app/qt_launchpad': - Graphical application starter implemented using Qt4. +:'libports/src/app/qt5/qt_launchpad': + Graphical application starter implemented using Qt. -:'qt4/src/app/examples/': - Several example applications that come with Qt4. - -:'libports/src/app/qt5': - Qt5 examples including qt_launchpad and qt_avplay. +:'libports/src/app/qt5/examples/': + Several example applications that come with Qt. :'os/src/app/xvfb': Is a proxy application that enables the integration of a virtual X server diff --git a/repos/README b/repos/README index bf462f55d..9283c39dd 100644 --- a/repos/README +++ b/repos/README @@ -114,13 +114,6 @@ but build upon of each other: The repository contains a server that uses a rump kernel to provide various NetBSD file systems to Genode. -:'qt4': - - This source-code repository contains the Genode version of Qt4 framework. - Please find more information about using Qt4 with Genode in the repository's - 'README' file. Please note that the Qt4 support is deprecated. Use Qt5 - as contained in 'libports' instead. - :'ports': This source-code repository hosts ports of 3rd-party applications to diff --git a/repos/base/mk/lib.mk b/repos/base/mk/lib.mk index 1683d34ff..8520ce7f6 100644 --- a/repos/base/mk/lib.mk +++ b/repos/base/mk/lib.mk @@ -128,7 +128,7 @@ include $(BASE_DIR)/mk/generic.mk # # Use $(OBJECTS) instead of $^ for specifying the list of objects to include # in the archive because $^ may also contain non-object phony targets, e.g., -# used by the integration of Qt4's meta-object compiler into the Genode +# used by the integration of Qt's meta-object compiler into the Genode # build system. # $(LIB_A): $(OBJECTS) diff --git a/repos/gems/README b/repos/gems/README index 37ba9c12f..989acfb25 100644 --- a/repos/gems/README +++ b/repos/gems/README @@ -1,6 +1,6 @@ This directory is a source-code repository containing Genode-specific services and applications. In contrast to the components that come with the 'os' repository, programs contained in 'gems' are able to leverage -the functionalities provided by higher-level repositories such as -'libports', and 'qt4'. To use the 'gems' repository, make sure to -also add those repositories to your build configuraion. +the functionalities provided by higher-level repositories such as 'libports'. +To use the 'gems' repository, make sure to also add those repositories to your +build configuraion. diff --git a/repos/libports/lib/mk/qt5_scriptclassic_generated.inc b/repos/libports/lib/mk/qt5_scriptclassic_generated.inc index 7a51aec13..88a0aed26 100644 --- a/repos/libports/lib/mk/qt5_scriptclassic_generated.inc +++ b/repos/libports/lib/mk/qt5_scriptclassic_generated.inc @@ -46,14 +46,14 @@ QT_SOURCES = \ # 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) +# source files generated from existing header files ('moc_%.cpp: %.h' rule in spec-qt5.mk) # extracted from 'compiler_moc_header_make_all' target COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ moc_qscriptengine.cpp \ moc_qscriptextensionplugin.cpp -# source files generated from existing source files ('%.moc: %.cpp' rule in spec-qt4.mk) +# source files generated from existing source files ('%.moc: %.cpp' rule in spec-qt5.mk) # extracted from 'compiler_moc_source_make_all' rule COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ diff --git a/repos/libports/src/app/qt5/examples/calculatorform/target.mk b/repos/libports/src/app/qt5/examples/calculatorform/target.mk index b8981bc2d..da0862faf 100644 --- a/repos/libports/src/app/qt5/examples/calculatorform/target.mk +++ b/repos/libports/src/app/qt5/examples/calculatorform/target.mk @@ -1,4 +1,4 @@ -# identify the qt4 repository by searching for a file that is unique for qt4 +# identify the qt repository by searching for a file that is unique for qt QT5_REP_DIR := $(call select_from_repositories,lib/import/import-qt5.inc) QT5_REP_DIR := $(realpath $(dir $(QT5_REP_DIR))../..) diff --git a/repos/libports/src/app/qt5/examples/previewer/target.mk b/repos/libports/src/app/qt5/examples/previewer/target.mk index cd42c42d9..6782de693 100644 --- a/repos/libports/src/app/qt5/examples/previewer/target.mk +++ b/repos/libports/src/app/qt5/examples/previewer/target.mk @@ -1,4 +1,4 @@ -# identify the qt4 repository by searching for a file that is unique for qt4 +# identify the qt repository by searching for a file that is unique for qt QT5_REP_DIR := $(call select_from_repositories,lib/import/import-qt5.inc) QT5_REP_DIR := $(realpath $(dir $(QT5_REP_DIR))../..) diff --git a/repos/libports/src/app/qt5/examples/textedit/target.mk b/repos/libports/src/app/qt5/examples/textedit/target.mk index a576c8288..0488441d9 100644 --- a/repos/libports/src/app/qt5/examples/textedit/target.mk +++ b/repos/libports/src/app/qt5/examples/textedit/target.mk @@ -1,4 +1,4 @@ -# identify the qt4 repository by searching for a file that is unique for qt4 +# identify the qt repository by searching for a file that is unique for qt QT5_REP_DIR := $(call select_from_repositories,lib/import/import-qt5.inc) QT5_REP_DIR := $(realpath $(dir $(QT5_REP_DIR))../..) diff --git a/repos/libports/src/app/qt5/qt_avplay/avplay_policy.h b/repos/libports/src/app/qt5/qt_avplay/avplay_policy.h index 958938275..3d2d1668e 100644 --- a/repos/libports/src/app/qt5/qt_avplay/avplay_policy.h +++ b/repos/libports/src/app/qt5/qt_avplay/avplay_policy.h @@ -14,7 +14,7 @@ #ifndef _AVPLAY_POLICY_H_ #define _AVPLAY_POLICY_H_ -/* Qt4 includes */ +/* Qt includes */ #include #include #include diff --git a/repos/libports/src/app/qt5/qt_avplay/framebuffer_session_component.h b/repos/libports/src/app/qt5/qt_avplay/framebuffer_session_component.h index cd51abb04..4bd630c59 100644 --- a/repos/libports/src/app/qt5/qt_avplay/framebuffer_session_component.h +++ b/repos/libports/src/app/qt5/qt_avplay/framebuffer_session_component.h @@ -20,7 +20,7 @@ #include #include -/* Qt4 includes */ +/* Qt includes */ #include diff --git a/repos/libports/src/app/qt5/qt_avplay/target.mk b/repos/libports/src/app/qt5/qt_avplay/target.mk index 6957d551c..07c1bf8aa 100644 --- a/repos/libports/src/app/qt5/qt_avplay/target.mk +++ b/repos/libports/src/app/qt5/qt_avplay/target.mk @@ -1,4 +1,4 @@ -# identify the qt4 repository by searching for a file that is unique for qt4 +# identify the qt repository by searching for a file that is unique for qt QT5_REP_DIR := $(call select_from_repositories,lib/import/import-qt5.inc) QT5_REP_DIR := $(realpath $(dir $(QT5_REP_DIR))../..) diff --git a/repos/libports/src/app/qt5/tmpl/target.mk.example b/repos/libports/src/app/qt5/tmpl/target.mk.example index 2e7ce237a..f5dd6ca8d 100644 --- a/repos/libports/src/app/qt5/tmpl/target.mk.example +++ b/repos/libports/src/app/qt5/tmpl/target.mk.example @@ -1,4 +1,4 @@ -# identify the qt4 repository by searching for a file that is unique for qt4 +# identify the qt repository by searching for a file that is unique for qt QT5_REP_DIR := $(call select_from_repositories,lib/import/import-qt5.inc) QT5_REP_DIR := $(realpath $(dir $(QT5_REP_DIR))../..) diff --git a/repos/libports/src/app/qt5/tmpl/target_final.inc b/repos/libports/src/app/qt5/tmpl/target_final.inc index 8353ac893..454310925 100644 --- a/repos/libports/src/app/qt5/tmpl/target_final.inc +++ b/repos/libports/src/app/qt5/tmpl/target_final.inc @@ -61,7 +61,7 @@ LIBS += qt5_xml endif # QtUiTools -# Qt4 documentation says: CONFIG += uitools +# Qt documentation says: CONFIG += uitools ifeq ($(findstring uitools, $(CONFIG)), uitools) LIBS += qt5_ui_tools endif diff --git a/repos/ports/README b/repos/ports/README index 53f6c2223..e86e9dea7 100644 --- a/repos/ports/README +++ b/repos/ports/README @@ -10,6 +10,4 @@ Dependencies from other repositories Application provided by the 'ports' repository typically expect a rich runtime environment, including shared libraries provided by the 'libports' -repository. Hence, 'ports' depends on 'libports'. Furthermore, applications -may require additional repositories. For example, the Arora web browser depends -on the 'qt4' repository. +repository. Hence, 'ports' depends on 'libports'. diff --git a/repos/ports/run/arora.run b/repos/ports/run/arora.run index c229bd60e..a286283c1 100644 --- a/repos/ports/run/arora.run +++ b/repos/ports/run/arora.run @@ -86,49 +86,30 @@ append boot_modules { nitpicker_plugin.tar } -if {[have_spec qt4_deprecated]} { - # - # Qt4-specific boot modules - # - append boot_modules { - qt_core.lib.so - qt_gui.lib.so - qt_jscore.lib.so - qt_network.lib.so - 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 - } -} else { - # - # Qt5-specific boot modules - # - append boot_modules { - gallium.lib.so - icu.lib.so - pthread.lib.so - qt5_core.lib.so - qt5_gui.lib.so - qt5_jscore.lib.so - qt5_network.lib.so - qt5_qnitpickerviewwidget.lib.so - qt5_qpluginwidget.lib.so - qt5_ui_tools.lib.so - qt5_webcore.lib.so - qt5_webkit.lib.so - qt5_xml.lib.so - qt5_printsupport.lib.so - qt5_scriptclassic.lib.so - qt5_sql.lib.so - qt5_webkitwidgets.lib.so - qt5_widgets.lib.so - qt5_wtf.lib.so - qt5_fs_arora.tar - } +# +# Qt5-specific boot modules +# +append boot_modules { + gallium.lib.so + icu.lib.so + pthread.lib.so + qt5_core.lib.so + qt5_gui.lib.so + qt5_jscore.lib.so + qt5_network.lib.so + qt5_qnitpickerviewwidget.lib.so + qt5_qpluginwidget.lib.so + qt5_ui_tools.lib.so + qt5_webcore.lib.so + qt5_webkit.lib.so + qt5_xml.lib.so + qt5_printsupport.lib.so + qt5_scriptclassic.lib.so + qt5_sql.lib.so + qt5_webkitwidgets.lib.so + qt5_widgets.lib.so + qt5_wtf.lib.so + qt5_fs_arora.tar } build_boot_image $boot_modules diff --git a/repos/ports/src/app/arora/demo/intro.html b/repos/ports/src/app/arora/demo/intro.html index 769847e2f..164e7eacc 100644 --- a/repos/ports/src/app/arora/demo/intro.html +++ b/repos/ports/src/app/arora/demo/intro.html @@ -63,7 +63,7 @@ div.annotation p { font-style:italic; } Arora has become one of our most advanced workloads, stressing the base system, the dynamic linker, the TCP/IP stack, and device drivers. We chose Arora among the available web browsers because we already - had Qt4 running on Genode. Porting Arora seemed an evolutionary step, which + had Qt running on Genode. Porting Arora seemed an evolutionary step, which actually turned out to be the case.

diff --git a/repos/ports/src/app/arora/target.mk b/repos/ports/src/app/arora/target.mk index 6a53a6adc..2557d2aa8 100644 --- a/repos/ports/src/app/arora/target.mk +++ b/repos/ports/src/app/arora/target.mk @@ -1,15 +1,5 @@ ARORA = arora-0.11.0 -ifeq ($(filter-out $(SPECS),qt4_deprecated),) -# identify the Qt repository by searching for a file that is unique for Qt4 -QT_REP_DIR := $(call select_from_repositories,lib/import/import-qt4.inc) -ifneq ($(QT_REP_DIR),) -QT_TMPL_DIR = $(QT_REP_DIR)/src/app/tmpl -LIBS += qpluginwidget qnitpickerviewwidget -else -REQUIRES += qt4 -endif -else # identify the Qt repository by searching for a file that is unique for Qt5 QT_REP_DIR := $(call select_from_repositories,lib/import/import-qt5.inc) ifneq ($(QT_REP_DIR),) @@ -18,7 +8,6 @@ LIBS += qt5_printsupport qt5_qpluginwidget qt5_qnitpickerviewwidget else REQUIRES += qt5 endif -endif QT_REP_DIR := $(realpath $(dir $(QT_REP_DIR))../..) diff --git a/repos/qt4/Makefile b/repos/qt4/Makefile deleted file mode 100644 index 35316bb93..000000000 --- a/repos/qt4/Makefile +++ /dev/null @@ -1,78 +0,0 @@ -# -# \brief Download and prepare Qt4 source code -# \author Christian Prochaska -# \author Norman Feske -# \date 2009-05-11 -# - -VERBOSE ?= @ -ECHO = @echo -DOWNLOAD_DIR = download -CONTRIB_DIR = contrib -PATCHES_DIR = src/lib/qt4/patches - -REP_DIR := $(realpath .) - -include $(REP_DIR)/lib/mk/qt_version.inc - -QT4_URL = http://download.qt-project.org/archive/qt/4.8/4.8.4 -QT4_TGZ = $(QT4).tar.gz - -QTSCRIPTCLASSIC_URL = ftp://ftp.informatik.hu-berlin.de/pub/Mirrors/ftp.troll.no/QT/qt/solutions/lgpl/ -QTSCRIPTCLASSIC = qtscriptclassic-1.0_1-opensource -QTSCRIPTCLASSIC_TGZ = $(QTSCRIPTCLASSIC).tar.gz - -PATCHES = $(shell cat $(PATCHES_DIR)/series) - -# -# Utility to check if a tool is installed -# -check_tool = $(if $(shell which $(1)),,$(error Need to have '$(1)' installed.)) - -$(call check_tool,wget) -$(call check_tool,patch) - -help: - $(ECHO) - $(ECHO) "Prepare the Qt4 repository" - $(ECHO) - $(ECHO) "--- available commands ---" - $(ECHO) "prepare - download and extract the Qt4 source code archive and build the host tools" - $(ECHO) "clean - clean everything except downloaded archives" - $(ECHO) "cleanall - clean everything including downloaded archives" - $(ECHO) - -prepare: $(CONTRIB_DIR)/$(QT4) $(CONTRIB_DIR)/$(QTSCRIPTCLASSIC) tools - -$(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 - -$(CONTRIB_DIR)/$(QTSCRIPTCLASSIC): $(CONTRIB_DIR) $(DOWNLOAD_DIR)/$(QTSCRIPTCLASSIC_TGZ) - $(VERBOSE)tar xzf $(DOWNLOAD_DIR)/$(QTSCRIPTCLASSIC_TGZ) -C $(CONTRIB_DIR) - $(VERBOSE)touch $(CONTRIB_DIR)/$(QTSCRIPTCLASSIC) - -$(CONTRIB_DIR): - $(VERBOSE)mkdir -p $(CONTRIB_DIR) - -$(DOWNLOAD_DIR)/$(QT4_TGZ): $(DOWNLOAD_DIR) - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(QT4_URL)/$(QT4_TGZ) && touch $@ - -$(DOWNLOAD_DIR)/$(QTSCRIPTCLASSIC_TGZ): $(DOWNLOAD_DIR) - $(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(QTSCRIPTCLASSIC_URL)/$(QTSCRIPTCLASSIC_TGZ) && touch $@ - -$(DOWNLOAD_DIR): - $(VERBOSE)mkdir -p $(DOWNLOAD_DIR) - -tools: - $(VERBOSE)make -C tool - -clean: - $(VERBOSE)make -C tool clean - $(VERBOSE)rm -rf $(CONTRIB_DIR) - -cleanall: clean - $(VERBOSE)make -C tool distclean - $(VERBOSE)rm -rf $(DOWNLOAD_DIR) diff --git a/repos/qt4/README b/repos/qt4/README deleted file mode 100644 index c35e29667..000000000 --- a/repos/qt4/README +++ /dev/null @@ -1,27 +0,0 @@ -This repository contains the Qt4 toolkit für Genode - -Qt4 is a tool kit for developing platform-independent applications. It -comprises a complete platform-abstraction layer and a rich GUI tool kit. -With this repository, native Qt4 applications can be compiled and -natively executed for the Genode OS Framework. This way, Qt4 becomes -available on all base platforms supported by Genode. - -Usage ------ - -For using Qt4 for your Genode applications, you first need to download and -prepare the original Qt4 source codes and build a few Qt4 tools such as -the meta-object compiler (moc) and the resource compiler. The top-level -makefile found in this directory automates this task. Just issue: - -! make prepare - -To include the 'qt4' repository into the Genode build process, -add the 'qt4/' directory to the 'REPOSITORIES' declaration of the -'etc/build.conf' file within your build directory. - -Since the Genode release 9.11, Qt4 depends on the 'libports' repository, -specifically on the 'freetype2' and 'jpeg' libraries. Please make sure -that you called the top-level Makefile of the 'libports' repository -for those preparing those libraries and that your 'REPOSITORIES' declaration -contains the 'libports' repository. diff --git a/repos/qt4/include/genode/thread_qt.h b/repos/qt4/include/genode/thread_qt.h deleted file mode 100644 index 6cd1b7dc2..000000000 --- a/repos/qt4/include/genode/thread_qt.h +++ /dev/null @@ -1,116 +0,0 @@ -/* - * \brief Thread with configurable stack size - * \author Christian Prochaska - * \date 2008-06-11 - */ - -/* - * Copyright (C) 2008-2013 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU General Public License version 2. - */ - -#ifndef _INCLUDE__BASE__THREAD_QT_H_ -#define _INCLUDE__BASE__THREAD_QT_H_ - -#include -#include -#include - -enum { DEFAULT_STACK_SIZE = 4096*100 }; - -namespace Genode { - - struct Thread_entry - { - virtual void entry() = 0; - }; - - - class Thread_qt : public Thread_entry - { - private: - - class Genode_thread : Thread_base - { - private: - - Thread_entry *_thread_entry; - - /** - * Thread_base interface - */ - void entry() { _thread_entry->entry(); } - - public: - - Genode_thread(const char *name, - size_t stack_size, - Thread_entry *thread_entry) - : - Thread_base(0, name, stack_size), - _thread_entry(thread_entry) - { - /* start Genode thread */ - start(); - } - }; - - protected: - - const char *_name; - unsigned int _stack_size; - Genode_thread *_thread; - - public: - - /** - * Constructor - * - * \param name Thread name (for debugging) - */ - explicit Thread_qt(const char *name = "Qt ") - : - _name(name), - _stack_size(DEFAULT_STACK_SIZE), - _thread(0) { } - - ~Thread_qt() - { - if (_thread) - destroy(env()->heap(), _thread); - } - - /** - * Set the thread's stack size - don't call when the thread is running! - */ - bool set_stack_size(unsigned int stack_size) - { - /* error, if thread is already running */ - if (_thread) - return false; - - _stack_size = stack_size; - return true; - } - - /** - * Start execution of the thread - */ - void start() - { - /* prevent double calls of 'start' */ - if (_thread) return; - - _thread = new (env()->heap()) Genode_thread(_name, _stack_size, this); - } - - static Thread_base *myself() - { - return Thread_base::myself(); - } - }; -} - -#endif /* _INCLUDE__BASE__THREAD_QT_H_ */ diff --git a/repos/qt4/include/qnitpickerviewwidget/qnitpickerviewwidget.h b/repos/qt4/include/qnitpickerviewwidget/qnitpickerviewwidget.h deleted file mode 100644 index 0ffb74936..000000000 --- a/repos/qt4/include/qnitpickerviewwidget/qnitpickerviewwidget.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * \brief A Qt Widget that shows a nitpicker view - * \author Christian Prochaska - * \date 2010-08-26 - */ - -/* - * Copyright (C) 2010-2013 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU General Public License version 2. - */ - -#ifndef QNITPICKERVIEWWIDGET_H -#define QNITPICKERVIEWWIDGET_H - -#include -#include - -#include -#include - -class QNitpickerViewWidget : public QWidget -{ - Q_OBJECT - -private: - QHash _scrollbars; - -private slots: - void windowEvent(QWSWindow *window, - QWSServer::WindowEvent eventType); - void valueChanged(); - void destroyed(QObject *obj = 0); - -protected: - Nitpicker::View_client *vc; - int orig_w; - int orig_h; - int orig_buf_x; - int orig_buf_y; - - virtual void showEvent(QShowEvent *event); - virtual void hideEvent(QHideEvent *event); - virtual void paintEvent(QPaintEvent *event); - -public: - QNitpickerViewWidget(QWidget *parent =0); - ~QNitpickerViewWidget(); - void setNitpickerView(Nitpicker::View_capability view, int buf_x, int buf_y, int w, int h); -}; - -#endif // QNITPICKERVIEWWIDGET_H diff --git a/repos/qt4/include/qpluginwidget/qpluginwidget.h b/repos/qt4/include/qpluginwidget/qpluginwidget.h deleted file mode 100644 index 54ea29add..000000000 --- a/repos/qt4/include/qpluginwidget/qpluginwidget.h +++ /dev/null @@ -1,107 +0,0 @@ -/* - * \brief A Qt Widget that can load a plugin application and show its Nitpicker view - * \author Christian Prochaska - * \date 2010-08-26 - */ - -/* - * Copyright (C) 2010-2013 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU General Public License version 2. - */ - -#ifndef QPLUGINWIDGET_H -#define QPLUGINWIDGET_H - -#include -#include - -#include - -#include - - -enum Plugin_loading_state -{ - LOADING, - LOADED, - NETWORK_ERROR, - INFLATE_ERROR, - QUOTA_EXCEEDED_ERROR, - ROM_CONNECTION_FAILED_EXCEPTION, - TIMEOUT_EXCEPTION -}; - -class QPluginWidget; - -/* separate class, because meta object features are not supported in nested classes */ -class PluginStarter : public QThread -{ - Q_OBJECT - - private: - QUrl _plugin_url; - QByteArray _args; - int _max_width; - int _max_height; - - Loader::Connection *_pc; - enum Plugin_loading_state _plugin_loading_state; - QString _plugin_loading_error_string; - - QNetworkAccessManager *_qnam; - QNetworkReply *_reply; - - void _start_plugin(QString &file_name, QByteArray const &file_buf); - - protected slots: - void networkReplyFinished(); - - public: - PluginStarter(QUrl plugin_url, QString &args, - int max_width, int max_height); - - void run(); - enum Plugin_loading_state plugin_loading_state() { return _plugin_loading_state; } - QString &plugin_loading_error_string() { return _plugin_loading_error_string; } - Nitpicker::View_capability plugin_view(int *w, int *h, int *buf_x, int *buf_y); - - signals: - void finished(); -}; - - -class QPluginWidget : public QNitpickerViewWidget -{ - Q_OBJECT - - private: - - enum Plugin_loading_state _plugin_loading_state; - QString _plugin_loading_error_string; - - PluginStarter *_plugin_starter; - - int _max_width; - int _max_height; - - static QPluginWidget *_last; - - public: - enum { RAM_QUOTA = 5*1024*1024 }; - - void cleanup(); - - protected: - virtual void paintEvent(QPaintEvent *event); - - protected slots: - void pluginStartFinished(); - - public: - QPluginWidget(QWidget *parent, QUrl plugin_url, QString &args, int max_width = -1, int max_height = -1); - ~QPluginWidget(); -}; - -#endif // QPLUGINWIDGET_H diff --git a/repos/qt4/include/qt4/QtCore/private/qeventdispatcher_genode_p.h b/repos/qt4/include/qt4/QtCore/private/qeventdispatcher_genode_p.h deleted file mode 100644 index 648092f1b..000000000 --- a/repos/qt4/include/qt4/QtCore/private/qeventdispatcher_genode_p.h +++ /dev/null @@ -1,208 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QEVENTDISPATCHER_GENODE_P_H -#define QEVENTDISPATCHER_GENODE_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include "QtCore/qabstracteventdispatcher.h" -#include "QtCore/qlist.h" -#include "private/qabstracteventdispatcher_p.h" -#include "private/qcore_unix_p.h" -#include "private/qpodlist_p.h" -#include "QtCore/qvarlengtharray.h" - -#if defined(Q_OS_VXWORKS) -# include -#else -# include -# if !defined(Q_OS_HPUX) || defined(__ia64) -# include -# endif -#endif - -QT_BEGIN_NAMESPACE - -// internal timer info -struct QTimerInfo { - int id; // - timer identifier - timeval interval; // - timer interval - timeval timeout; // - when to sent event - QObject *obj; // - object to receive event - bool inTimerEvent; -}; - -class QTimerInfoList : public QList -{ -#if ((_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC)) || defined(QT_BOOTSTRAPPED) - timeval previousTime; - clock_t previousTicks; - int ticksPerSecond; - int msPerTick; - - bool timeChanged(timeval *delta); -#endif - - // state variables used by activateTimers() - QTimerInfo *firstTimerInfo, *currentTimerInfo; - -public: - QTimerInfoList(); - - timeval currentTime; - timeval updateCurrentTime(); - - // must call updateCurrentTime() first! - void repairTimersIfNeeded(); - - bool timerWait(timeval &); - void timerInsert(QTimerInfo *); - void timerRepair(const timeval &); - - void registerTimer(int timerId, int interval, QObject *object); - bool unregisterTimer(int timerId); - bool unregisterTimers(QObject *object); - QList > registeredTimers(QObject *object) const; - - int activateTimers(); -}; - -struct QSockNot -{ - QSocketNotifier *obj; - int fd; - fd_set *queue; -}; - -class QSockNotType -{ -public: - QSockNotType(); - ~QSockNotType(); - - typedef QPodList List; - - List list; - fd_set select_fds; - fd_set enabled_fds; - fd_set pending_fds; - -}; - -class QEventDispatcherGenodePrivate; - -class Q_CORE_EXPORT QEventDispatcherGenode : public QAbstractEventDispatcher -{ - Q_OBJECT - Q_DECLARE_PRIVATE(QEventDispatcherGenode) - -public: - explicit QEventDispatcherGenode(QObject *parent = 0); - ~QEventDispatcherGenode(); - - bool processEvents(QEventLoop::ProcessEventsFlags flags); - bool hasPendingEvents(); - - void registerSocketNotifier(QSocketNotifier *notifier); - void unregisterSocketNotifier(QSocketNotifier *notifier); - - void registerTimer(int timerId, int interval, QObject *object); - bool unregisterTimer(int timerId); - bool unregisterTimers(QObject *object); - QList registeredTimers(QObject *object) const; - - void wakeUp(); - void interrupt(); - void flush(); - -protected: - QEventDispatcherGenode(QEventDispatcherGenodePrivate &dd, QObject *parent = 0); - - void setSocketNotifierPending(QSocketNotifier *notifier); - - int activateTimers(); - int activateSocketNotifiers(); - - virtual int select(int nfds, - fd_set *readfds, fd_set *writefds, fd_set *exceptfds, - timeval *timeout); -}; - -class Q_CORE_EXPORT QEventDispatcherGenodePrivate : public QAbstractEventDispatcherPrivate -{ - Q_DECLARE_PUBLIC(QEventDispatcherGenode) - -public: - QEventDispatcherGenodePrivate(); - ~QEventDispatcherGenodePrivate(); - - int doSelect(QEventLoop::ProcessEventsFlags flags, timeval *timeout); - - bool mainThread; - int thread_pipe[2]; - - // highest fd for all socket notifiers - int sn_highest; - // 3 socket notifier types - read, write and exception - QSockNotType sn_vec[3]; - - QTimerInfoList timerList; - - // pending socket notifiers list - QSockNotType::List sn_pending_list; - - QAtomicInt wakeUps; - bool interrupt; -}; - -QT_END_NAMESPACE - -#endif // QEVENTDISPATCHER_GENODE_P_H diff --git a/repos/qt4/include/qt4/QtCore/qconfig-genode.h b/repos/qt4/include/qt4/QtCore/qconfig-genode.h deleted file mode 100644 index fa61b022d..000000000 --- a/repos/qt4/include/qt4/QtCore/qconfig-genode.h +++ /dev/null @@ -1,588 +0,0 @@ -/* Data structures */ -//#ifndef QT_NO_QUUID_STRING -//# define QT_NO_QUUID_STRING -//#endif -#ifndef QT_NO_STL -# define QT_NO_STL -#endif -//#ifndef QT_NO_TEXTDATE -//# define QT_NO_TEXTDATE -//#endif -//#ifndef QT_NO_DATESTRING -//# define QT_NO_DATESTRING -//#endif - -/* Dialogs */ -//#ifndef QT_NO_COLORDIALOG -//# define QT_NO_COLORDIALOG -//#endif -//#ifndef QT_NO_ERRORMESSAGE -//# define QT_NO_ERRORMESSAGE -//#endif -//#ifndef QT_NO_FILEDIALOG -//# define QT_NO_FILEDIALOG -//#endif -//#ifndef QT_NO_FONTDIALOG -//# define QT_NO_FONTDIALOG -//#endif -//#ifndef QT_NO_INPUTDIALOG -//# define QT_NO_INPUTDIALOG -//#endif -//#ifndef QT_NO_MESSAGEBOX -//# define QT_NO_MESSAGEBOX -//#endif -#ifndef QT_NO_PRINTDIALOG -# define QT_NO_PRINTDIALOG -#endif -#ifndef QT_NO_PRINTPREVIEWDIALOG -# define QT_NO_PRINTPREVIEWDIALOG -#endif -//#ifndef QT_NO_PROGRESSDIALOG -//# define QT_NO_PROGRESSDIALOG -//#endif -//#ifndef QT_NO_TABDIALOG -//# define QT_NO_TABDIALOG -//#endif -//#ifndef QT_NO_WIZARD -//# define QT_NO_WIZARD -//#endif - -/* File I/O */ -//#ifndef QT_NO_DOM -//# define QT_NO_DOM -//#endif -//#ifndef QT_NO_FSFILEENGINE -//# define QT_NO_FSFILEENGINE -//#endif -//#ifndef QT_NO_FILESYSTEMWATCHER -//# define QT_NO_FILESYSTEMWATCHER -//#endif -//#ifndef QT_NO_FILESYSTEMMODEL -//# define QT_NO_FILESYSTEMMODEL -//#endif -//#ifndef QT_NO_PROCESS -//# define QT_NO_PROCESS -//#endif -//#ifndef QT_NO_TEMPORARYFILE -//# define QT_NO_TEMPORARYFILE -//#endif -//#ifndef QT_NO_TEXTSTREAM -//# define QT_NO_TEXTSTREAM -//#endif -//#ifndef QT_NO_SETTINGS -//# define QT_NO_SETTINGS -//#endif -//#ifndef QT_NO_LIBRARY -//# define QT_NO_LIBRARY -//#endif - -/* Fonts */ -#ifndef QT_FONTS_ARE_RESOURCES -# define QT_FONTS_ARE_RESOURCES -#endif -//#ifndef QT_NO_FREETYPE -//# define QT_NO_FREETYPE -//#endif -//#ifndef QT_NO_QWS_QPF -//# define QT_NO_QWS_QPF -//#endif -#ifndef QT_NO_QWS_QPF2 -# define QT_NO_QWS_QPF2 -#endif - -/* Images */ -//#ifndef QT_NO_ICON -//# define QT_NO_ICON -//#endif -//#ifndef QT_NO_IMAGEFORMATPLUGIN -//# define QT_NO_IMAGEFORMATPLUGIN -//#endif -//#ifndef QT_NO_IMAGEFORMAT_BMP -//# define QT_NO_IMAGEFORMAT_BMP -//#endif -//#ifndef QT_NO_IMAGEFORMAT_JPEG -//# define QT_NO_IMAGEFORMAT_JPEG -//#endif -//#ifndef QT_NO_IMAGEFORMAT_PNG -//# define QT_NO_IMAGEFORMAT_PNG -//#endif -//#ifndef QT_NO_IMAGEFORMAT_PPM -//# define QT_NO_IMAGEFORMAT_PPM -//#endif -//#ifndef QT_NO_IMAGEFORMAT_XBM -//# define QT_NO_IMAGEFORMAT_XBM -//#endif -//#ifndef QT_NO_IMAGEFORMAT_XPM -//# define QT_NO_IMAGEFORMAT_XPM -//#endif -//#ifndef QT_NO_IMAGE_HEURISTIC_MASK -//# define QT_NO_IMAGE_HEURISTIC_MASK -//#endif -//#ifndef QT_NO_IMAGE_TEXT -//# define QT_NO_IMAGE_TEXT -//#endif -//#ifndef QT_NO_MOVIE -//# define QT_NO_MOVIE -//#endif - -/* Internationalization */ -//#ifndef QT_NO_BIG_CODECS -//# define QT_NO_BIG_CODECS -//#endif -//#ifndef QT_NO_QWS_INPUTMETHODS -//# define QT_NO_QWS_INPUTMETHODS -//#endif -//#ifndef QT_NO_TEXTCODEC -//# define QT_NO_TEXTCODEC -//#endif -//#ifndef QT_NO_CODECS -//# define QT_NO_CODECS -//#endif -//#ifndef QT_NO_TEXTCODECPLUGIN -//# define QT_NO_TEXTCODECPLUGIN -//#endif -//#ifndef QT_NO_TRANSLATION -//# define QT_NO_TRANSLATION -//#endif -//#ifndef QT_NO_TRANSLATION_UTF8 -//# define QT_NO_TRANSLATION_UTF8 -//#endif - -/* ItemViews */ -//#ifndef QT_NO_ITEMVIEWS -//# define QT_NO_ITEMVIEWS -//#endif -//#ifndef QT_NO_DATAWIDGETMAPPER -//# define QT_NO_DATAWIDGETMAPPER -//#endif -//#ifndef QT_NO_DIRMODEL -//# define QT_NO_DIRMODEL -//#endif -//#ifndef QT_NO_LISTVIEW -//# define QT_NO_LISTVIEW -//#endif -//#ifndef QT_NO_COLUMNVIEW -//# define QT_NO_COLUMNVIEW -//#endif -//#ifndef QT_NO_PROXYMODEL -//# define QT_NO_PROXYMODEL -//#endif -//#ifndef QT_NO_SORTFILTERPROXYMODEL -//# define QT_NO_SORTFILTERPROXYMODEL -//#endif -//#ifndef QT_NO_STANDARDITEMMODEL -//# define QT_NO_STANDARDITEMMODEL -//#endif -//#ifndef QT_NO_STRINGLISTMODEL -//# define QT_NO_STRINGLISTMODEL -//#endif -//#ifndef QT_NO_TABLEVIEW -//# define QT_NO_TABLEVIEW -//#endif -//#ifndef QT_NO_TREEVIEW -//# define QT_NO_TREEVIEW -//#endif - -/* Kernel */ -//#ifndef QT_NO_ACTION -//# define QT_NO_ACTION -//#endif -//#ifndef QT_NO_CLIPBOARD -//# define QT_NO_CLIPBOARD -//#endif -//#ifndef QT_NO_CSSPARSER -//# define QT_NO_CSSPARSER -//#endif -//#ifndef QT_NO_CURSOR -//# define QT_NO_CURSOR -//#endif -//#ifndef QT_NO_DRAGANDDROP -//# define QT_NO_DRAGANDDROP -//#endif -//#ifndef QT_NO_EFFECTS -//# define QT_NO_EFFECTS -//#endif -//#ifndef QT_NO_PROPERTIES -//# define QT_NO_PROPERTIES -//#endif -//#ifndef QT_NO_SESSIONMANAGER -//# define QT_NO_SESSIONMANAGER -//#endif -#ifndef QT_NO_SHAREDMEMORY -# define QT_NO_SHAREDMEMORY -#endif -//#ifndef QT_NO_SHORTCUT -//# define QT_NO_SHORTCUT -//#endif -#ifndef QT_NO_SOUND -# define QT_NO_SOUND -#endif -#ifndef QT_NO_SYSTEMLOCALE -# define QT_NO_SYSTEMLOCALE -#endif -#ifndef QT_NO_SYSTEMSEMAPHORE -# define QT_NO_SYSTEMSEMAPHORE -#endif -//#ifndef QT_NO_TABLETEVENT -//# define QT_NO_TABLETEVENT -//#endif -//#ifndef QT_NO_TEXTHTMLPARSER -//# define QT_NO_TEXTHTMLPARSER -//#endif -//#ifndef QT_NO_THREAD -//# define QT_NO_THREAD -//#endif -#ifndef QT_NO_CONCURRENT -# define QT_NO_CONCURRENT -#endif -//#ifndef QT_NO_WHEELEVENT -//# define QT_NO_WHEELEVENT -//#endif -//#ifndef QT_NO_XMLSTREAM -//# define QT_NO_XMLSTREAM -//#endif -//#ifndef QT_NO_XMLSTREAMREADER -//# define QT_NO_XMLSTREAMREADER -//#endif -//#ifndef QT_NO_XMLSTREAMWRITER -//# define QT_NO_XMLSTREAMWRITER -//#endif - -/* Networking */ -#ifndef QT_NO_COP -# define QT_NO_COP -#endif -//#ifndef QT_NO_HOSTINFO -//# define QT_NO_HOSTINFO -//#endif -//#ifndef QT_NO_HTTP -//# define QT_NO_HTTP -//#endif -//#ifndef QT_NO_NETWORKPROXY -//# define QT_NO_NETWORKPROXY -//#endif -//#ifndef QT_NO_SOCKS5 -//# define QT_NO_SOCKS5 -//#endif -#ifndef QT_NO_UDPSOCKET -# define QT_NO_UDPSOCKET -#endif -#ifndef QT_NO_URLINFO -# define QT_NO_URLINFO -#endif -#ifndef QT_NO_FTP -# define QT_NO_FTP -#endif -/* found in source files */ -//#ifndef QT_NO_LOCALSOCKET -//# define QT_NO_LOCALSOCKET -//#endif -//#ifndef QT_NO_LOCALSERVER -//# define QT_NO_LOCALSERVER -//#endif -#ifndef QT_NO_NETWORKINTERFACE -# define QT_NO_NETWORKINTERFACE -#endif - - -/* Painting */ -//#ifndef QT_NO_COLORNAMES -//# define QT_NO_COLORNAMES -//#endif -//#ifndef QT_NO_DIRECTPAINTER -//# define QT_NO_DIRECTPAINTER -//#endif -//#ifndef QT_NO_PAINTONSCREEN -//# define QT_NO_PAINTONSCREEN -//#endif -//#ifndef QT_NO_PAINT_DEBUG -//# define QT_NO_PAINT_DEBUG -//#endif -//#ifndef QT_NO_PICTURE -//# define QT_NO_PICTURE -//#endif -#ifndef QT_NO_PRINTER -# define QT_NO_PRINTER -#endif -#ifndef QT_NO_CUPS -# define QT_NO_CUPS -#endif - -/* Qt for Embedded Linux */ -//#ifndef QT_NO_QWSEMBEDWIDGET -//# define QT_NO_QWSEMBEDWIDGET -//#endif -//#ifndef QT_NO_QWS_ALPHA_CURSOR -//# define QT_NO_QWS_ALPHA_CURSOR -//#endif - -/* there's already the Nitpicker cursor */ -#ifndef QT_NO_QWS_CURSOR -# define QT_NO_QWS_CURSOR -#endif - -//#ifndef QT_NO_QWS_DECORATION_DEFAULT -//# define QT_NO_QWS_DECORATION_DEFAULT -//#endif -//#ifndef QT_NO_QWS_DECORATION_STYLED -//# define QT_NO_QWS_DECORATION_STYLED -//#endif -//#ifndef QT_NO_QWS_DECORATION_WINDOWS -//# define QT_NO_QWS_DECORATION_WINDOWS -//#endif -//#ifndef QT_NO_QWS_MANAGER -//# define QT_NO_QWS_MANAGER -//#endif -//#ifndef QT_NO_QWS_KEYBOARD -//# define QT_NO_QWS_KEYBOARD -//#endif -//#ifndef QT_NO_QWS_MOUSE -//# define QT_NO_QWS_MOUSE -//#endif -//#ifndef QT_NO_QWS_MOUSE_AUTO -//# define QT_NO_QWS_MOUSE_AUTO -//#endif -//#ifndef QT_NO_QWS_MOUSE_MANUAL -//# define QT_NO_QWS_MOUSE_MANUAL -//#endif -#ifndef QT_NO_QWS_MULTIPROCESS -# define QT_NO_QWS_MULTIPROCESS -#endif -#ifndef QT_NO_QWS_SOUNDSERVER -# define QT_NO_QWS_SOUNDSERVER -#endif -#ifndef QT_NO_SXE -# define QT_NO_SXE -#endif -//#ifndef QT_NO_QWS_PROPERTIES -//# define QT_NO_QWS_PROPERTIES -//#endif -//#ifndef QT_NO_QWS_PROXYSCREEN -//# define QT_NO_QWS_PROXYSCREEN -//#endif -//#ifndef QT_NO_QWS_DYNAMICSCREENTRANSFORMATION -//# define QT_NO_QWS_DYNAMICSCREENTRANSFORMATION -//#endif - -/* SVG */ -//#ifndef QT_NO_SVG -//# define QT_NO_SVG -//#endif -//#ifndef QT_NO_GRAPHICSSVGITEM -//# define QT_NO_GRAPHICSSVGITEM -//#endif -//#ifndef QT_NO_SVGGENERATOR -//# define QT_NO_SVGGENERATOR -//#endif -//#ifndef QT_NO_SVGRENDERER -//# define QT_NO_SVGRENDERER -//#endif -//#ifndef QT_NO_SVGWIDGET -//# define QT_NO_SVGWIDGET -//#endif - -/* Styles */ -//#ifndef QT_NO_STYLE_MOTIF -//# define QT_NO_STYLE_MOTIF -//#endif -//#ifndef QT_NO_STYLE_CDE -//# define QT_NO_STYLE_CDE -//#endif -//#ifndef QT_NO_STYLE_CLEANLOOKS -//# define QT_NO_STYLE_CLEANLOOKS -//#endif -//#ifndef QT_NO_STYLE_PLASTIQUE -//# define QT_NO_STYLE_PLASTIQUE -//#endif -//#ifndef QT_NO_STYLE_STYLESHEET -//# define QT_NO_STYLE_STYLESHEET -//#endif -//#ifndef QT_NO_STYLE_WINDOWSCE -//# define QT_NO_STYLE_WINDOWSCE -//#endif -//#ifndef QT_NO_STYLE_WINDOWSMOBILE -//# define QT_NO_STYLE_WINDOWSMOBILE -//#endif -//#ifndef QT_NO_STYLE_WINDOWSVISTA -//# define QT_NO_STYLE_WINDOWSVISTA -//#endif -//#ifndef QT_NO_STYLE_WINDOWSXP -//# define QT_NO_STYLE_WINDOWSXP -//#endif - -/* Utilities */ -//#ifndef QT_NO_ACCESSIBILITY -//# define QT_NO_ACCESSIBILITY -//#endif -//#ifndef QT_NO_COMPLETER -//# define QT_NO_COMPLETER -//#endif -//#ifndef QT_NO_DESKTOPSERVICES -//# define QT_NO_DESKTOPSERVICES -//#endif -//#ifndef QT_NO_SCRIPT -//# define QT_NO_SCRIPT -//#endif -//#ifndef QT_NO_SYSTEMTRAYICON -//# define QT_NO_SYSTEMTRAYICON -//#endif -//#ifndef QT_NO_UNDOCOMMAND -//# define QT_NO_UNDOCOMMAND -//#endif -//#ifndef QT_NO_UNDOGROUP -//# define QT_NO_UNDOGROUP -//#endif -//#ifndef QT_NO_UNDOSTACK -//# define QT_NO_UNDOSTACK -//#endif -//#ifndef QT_NO_UNDOVIEW -//# define QT_NO_UNDOVIEW -//#endif - -/* Widgets */ -//#ifndef QT_NO_GROUPBOX -//# define QT_NO_GROUPBOX -//#endif -//#ifndef QT_NO_BUTTONGROUP -//# define QT_NO_BUTTONGROUP -//#endif -//#ifndef QT_NO_LCDNUMBER -//# define QT_NO_LCDNUMBER -//#endif -//#ifndef QT_NO_LINEEDIT -//# define QT_NO_LINEEDIT -//#endif -//#ifndef QT_NO_COMBOBOX -//# define QT_NO_COMBOBOX -//#endif -//#ifndef QT_NO_FONTCOMBOBOX -//# define QT_NO_FONTCOMBOBOX -//#endif -//#ifndef QT_NO_SPINBOX -//# define QT_NO_SPINBOX -//#endif -//#ifndef QT_NO_CALENDARWIDGET -//# define QT_NO_CALENDARWIDGET -//#endif -//#ifndef QT_NO_DATETIMEEDIT -//# define QT_NO_DATETIMEEDIT -//#endif -//#ifndef QT_NO_LISTWIDGET -//# define QT_NO_LISTWIDGET -//#endif -//#ifndef QT_NO_MENU -//# define QT_NO_MENU -//#endif -//#ifndef QT_NO_CONTEXTMENU -//# define QT_NO_CONTEXTMENU -//#endif -//#ifndef QT_NO_MAINWINDOW -//# define QT_NO_MAINWINDOW -//#endif -//#ifndef QT_NO_DOCKWIDGET -//# define QT_NO_DOCKWIDGET -//#endif -//#ifndef QT_NO_TOOLBAR -//# define QT_NO_TOOLBAR -//#endif -//#ifndef QT_NO_MENUBAR -//# define QT_NO_MENUBAR -//#endif -//#ifndef QT_NO_WORKSPACE -//# define QT_NO_WORKSPACE -//#endif -//#ifndef QT_NO_PROGRESSBAR -//# define QT_NO_PROGRESSBAR -//#endif -//#ifndef QT_NO_RESIZEHANDLER -//# define QT_NO_RESIZEHANDLER -//#endif -//#ifndef QT_NO_RUBBERBAND -//# define QT_NO_RUBBERBAND -//#endif -//#ifndef QT_NO_SPLITTER -//# define QT_NO_SPLITTER -//#endif -//#ifndef QT_NO_SIGNALMAPPER -//# define QT_NO_SIGNALMAPPER -//#endif -//#ifndef QT_NO_SIZEGRIP -//# define QT_NO_SIZEGRIP -//#endif -//#ifndef QT_NO_SLIDER -//# define QT_NO_SLIDER -//#endif -//#ifndef QT_NO_DIAL -//# define QT_NO_DIAL -//#endif -//#ifndef QT_NO_SCROLLBAR -//# define QT_NO_SCROLLBAR -//#endif -//#ifndef QT_NO_SCROLLAREA -//# define QT_NO_SCROLLAREA -//#endif -//#ifndef QT_NO_GRAPHICSVIEW -//# define QT_NO_GRAPHICSVIEW -//#endif -//#ifndef QT_NO_PRINTPREVIEWWIDGET -//# define QT_NO_PRINTPREVIEWWIDGET -//#endif -//#ifndef QT_NO_MDIAREA -//# define QT_NO_MDIAREA -//#endif -//#ifndef QT_NO_TEXTEDIT -//# define QT_NO_TEXTEDIT -//#endif -//#ifndef QT_NO_SYNTAXHIGHLIGHTER -//# define QT_NO_SYNTAXHIGHLIGHTER -//#endif -//#ifndef QT_NO_TEXTBROWSER -//# define QT_NO_TEXTBROWSER -//#endif -//#ifndef QT_NO_SPINWIDGET -//# define QT_NO_SPINWIDGET -//#endif -//#ifndef QT_NO_SPLASHSCREEN -//# define QT_NO_SPLASHSCREEN -//#endif -//#ifndef QT_NO_STACKEDWIDGET -//# define QT_NO_STACKEDWIDGET -//#endif -//#ifndef QT_NO_TABWIDGET -//# define QT_NO_TABWIDGET -//#endif -//#ifndef QT_NO_STATUSBAR -//# define QT_NO_STATUSBAR -//#endif -//#ifndef QT_NO_STATUSTIP -//# define QT_NO_STATUSTIP -//#endif -//#ifndef QT_NO_TABLEWIDGET -//# define QT_NO_TABLEWIDGET -//#endif -//#ifndef QT_NO_TOOLBUTTON -//# define QT_NO_TOOLBUTTON -//#endif -//#ifndef QT_NO_TABBAR -//# define QT_NO_TABBAR -//#endif -//#ifndef QT_NO_TOOLBOX -//# define QT_NO_TOOLBOX -//#endif -//#ifndef QT_NO_WHATSTHIS -//# define QT_NO_WHATSTHIS -//#endif -//#ifndef QT_NO_TOOLTIP -//# define QT_NO_TOOLTIP -//#endif -//#ifndef QT_NO_TREEWIDGET -//# define QT_NO_TREEWIDGET -//#endif -//#ifndef QT_NO_VALIDATOR -//# define QT_NO_VALIDATOR -//#endif - -/* Windows */ -//#ifndef QT_NO_WIN_ACTIVEQT -//# define QT_NO_WIN_ACTIVEQT -//#endif diff --git a/repos/qt4/include/qt4/QtCore/qconfig.h b/repos/qt4/include/qt4/QtCore/qconfig.h deleted file mode 100644 index a39402a20..000000000 --- a/repos/qt4/include/qt4/QtCore/qconfig.h +++ /dev/null @@ -1,369 +0,0 @@ -#ifndef QT_BOOTSTRAPPED -#include "qconfig-genode.h" -#endif - -/* Qt Edition */ -#ifndef QT_EDITION -# define QT_EDITION QT_EDITION_OPENSOURCE -#endif - -/* Machine byte-order */ -#define Q_BIG_ENDIAN 4321 -#define Q_LITTLE_ENDIAN 1234 -#define QT_BUILD_KEY "genode g++-4" - -#ifdef QT_BOOTSTRAPPED -#define Q_BYTE_ORDER Q_LITTLE_ENDIAN -#else -#define Q_BYTE_ORDER Q_LITTLE_ENDIAN -#endif -/* Machine Architecture */ -//#ifndef QT_BOOTSTRAPPED -//# define QT_ARCH_X86_64 -//#else -//# define QT_ARCH_X86_64 -//#endif -/* Compile time features */ -#ifdef QT_ARCH_X86_64 -# define QT_POINTER_SIZE 8 -#endif -#ifdef QT_ARCH_I386 -# define QT_POINTER_SIZE 4 -#endif - -#if defined(QT_LINKED_OPENSSL) && defined(QT_NO_LINKED_OPENSSL) -# undef QT_LINKED_OPENSSL -#elif !defined(QT_LINKED_OPENSSL) && !defined(QT_NO_LINKED_OPENSSL) -# define QT_LINKED_OPENSSL -#endif - -#if defined(QT_NO_ACCESSIBILITY) && defined(QT_ACCESSIBILITY) -# undef QT_NO_ACCESSIBILITY -#elif !defined(QT_NO_ACCESSIBILITY) && !defined(QT_ACCESSIBILITY) -# define QT_NO_ACCESSIBILITY -#endif - -#if defined(QT_NO_ALSA) && defined(QT_ALSA) -# undef QT_NO_ALSA -#elif !defined(QT_NO_ALSA) && !defined(QT_ALSA) -# define QT_NO_ALSA -#endif - -#if defined(QT_NO_CLOCK_MONOTONIC) && defined(QT_CLOCK_MONOTONIC) -# undef QT_NO_CLOCK_MONOTONIC -#elif !defined(QT_NO_CLOCK_MONOTONIC) && !defined(QT_CLOCK_MONOTONIC) -# define QT_NO_CLOCK_MONOTONIC -#endif - -#if defined(QT_NO_CUPS) && defined(QT_CUPS) -# undef QT_NO_CUPS -#elif !defined(QT_NO_CUPS) && !defined(QT_CUPS) -# define QT_NO_CUPS -#endif - -#if defined(QT_NO_DBUS) && defined(QT_DBUS) -# undef QT_NO_DBUS -#elif !defined(QT_NO_DBUS) && !defined(QT_DBUS) -# define QT_NO_DBUS -#endif - -#if defined(QT_NO_DECLARATIVE) && defined(QT_DECLARATIVE) -# undef QT_NO_DECLARATIVE -#elif !defined(QT_NO_DECLARATIVE) && !defined(QT_DECLARATIVE) -# define QT_NO_DECLARATIVE -#endif - -#if defined(QT_NO_EGL) && defined(QT_EGL) -# undef QT_NO_EGL -#elif !defined(QT_NO_EGL) && !defined(QT_EGL) -# define QT_NO_EGL -#endif - -#if defined(QT_NO_EXCEPTIONS) && defined(QT_EXCEPTIONS) -# undef QT_NO_EXCEPTIONS -#elif !defined(QT_NO_EXCEPTIONS) && !defined(QT_EXCEPTIONS) -# define QT_NO_EXCEPTIONS -#endif - -#if defined(QT_NO_GLIB) && defined(QT_GLIB) -# undef QT_NO_GLIB -#elif !defined(QT_NO_GLIB) && !defined(QT_GLIB) -# define QT_NO_GLIB -#endif - -#if defined(QT_NO_GSTREAMER) && defined(QT_GSTREAMER) -# undef QT_NO_GSTREAMER -#elif !defined(QT_NO_GSTREAMER) && !defined(QT_GSTREAMER) -# define QT_NO_GSTREAMER -#endif - -#if defined(QT_NO_ICONV) && defined(QT_ICONV) -# undef QT_NO_ICONV -#elif !defined(QT_NO_ICONV) && !defined(QT_ICONV) -# define QT_NO_ICONV -#endif - -#if defined(QT_NO_IMAGEFORMAT_JPEG) && defined(QT_IMAGEFORMAT_JPEG) -# undef QT_NO_IMAGEFORMAT_JPEG -#elif !defined(QT_NO_IMAGEFORMAT_JPEG) && !defined(QT_IMAGEFORMAT_JPEG) -# define QT_NO_IMAGEFORMAT_JPEG -#endif - -#if defined(QT_NO_IMAGEFORMAT_MNG) && defined(QT_IMAGEFORMAT_MNG) -# undef QT_NO_IMAGEFORMAT_MNG -#elif !defined(QT_NO_IMAGEFORMAT_MNG) && !defined(QT_IMAGEFORMAT_MNG) -# define QT_NO_IMAGEFORMAT_MNG -#endif - -#if defined(QT_NO_IMAGEFORMAT_TIFF) && defined(QT_IMAGEFORMAT_TIFF) -# undef QT_NO_IMAGEFORMAT_TIFF -#elif !defined(QT_NO_IMAGEFORMAT_TIFF) && !defined(QT_IMAGEFORMAT_TIFF) -# define QT_NO_IMAGEFORMAT_TIFF -#endif - -#if defined(QT_NO_IPV6) && defined(QT_IPV6) -# undef QT_NO_IPV6 -#elif !defined(QT_NO_IPV6) && !defined(QT_IPV6) -# define QT_NO_IPV6 -#endif - -#if defined(QT_NO_IPV6IFNAME) && defined(QT_IPV6IFNAME) -# undef QT_NO_IPV6IFNAME -#elif !defined(QT_NO_IPV6IFNAME) && !defined(QT_IPV6IFNAME) -# define QT_NO_IPV6IFNAME -#endif - -#if defined(QT_NO_NAS) && defined(QT_NAS) -# undef QT_NO_NAS -#elif !defined(QT_NO_NAS) && !defined(QT_NAS) -# define QT_NO_NAS -#endif - -#if defined(QT_NO_NIS) && defined(QT_NIS) -# undef QT_NO_NIS -#elif !defined(QT_NO_NIS) && !defined(QT_NIS) -# define QT_NO_NIS -#endif - -#if defined(QT_NO_OPENGL) && defined(QT_OPENGL) -# undef QT_NO_OPENGL -#elif !defined(QT_NO_OPENGL) && !defined(QT_OPENGL) -# define QT_NO_OPENGL -#endif - -#if defined(QT_NO_OPENVG) && defined(QT_OPENVG) -# undef QT_NO_OPENVG -#elif !defined(QT_NO_OPENVG) && !defined(QT_OPENVG) -# define QT_NO_OPENVG -#endif - -#if defined(QT_NO_PHONON) && defined(QT_PHONON) -# undef QT_NO_PHONON -#elif !defined(QT_NO_PHONON) && !defined(QT_PHONON) -# define QT_NO_PHONON -#endif - -#if defined(QT_NO_QWS_DIRECTFB) && defined(QT_QWS_DIRECTFB) -# undef QT_NO_QWS_DIRECTFB -#elif !defined(QT_NO_QWS_DIRECTFB) && !defined(QT_QWS_DIRECTFB) -# define QT_NO_QWS_DIRECTFB -#endif - -#if defined(QT_NO_QWS_KBD_LINUXINPUT) && defined(QT_QWS_KBD_LINUXINPUT) -# undef QT_NO_QWS_KBD_LINUXINPUT -#elif !defined(QT_NO_QWS_KBD_LINUXINPUT) && !defined(QT_QWS_KBD_LINUXINPUT) -# define QT_NO_QWS_KBD_LINUXINPUT -#endif - -#if defined(QT_NO_QWS_KBD_QNX) && defined(QT_QWS_KBD_QNX) -# undef QT_NO_QWS_KBD_QNX -#elif !defined(QT_NO_QWS_KBD_QNX) && !defined(QT_QWS_KBD_QNX) -# define QT_NO_QWS_KBD_QNX -#endif - -#if defined(QT_NO_QWS_KBD_QVFB) && defined(QT_QWS_KBD_QVFB) -# undef QT_NO_QWS_KBD_QVFB -#elif !defined(QT_NO_QWS_KBD_QVFB) && !defined(QT_QWS_KBD_QVFB) -# define QT_NO_QWS_KBD_QVFB -#endif - -#if defined(QT_NO_QWS_KBD_TTY) && defined(QT_QWS_KBD_TTY) -# undef QT_NO_QWS_KBD_TTY -#elif !defined(QT_NO_QWS_KBD_TTY) && !defined(QT_QWS_KBD_TTY) -# define QT_NO_QWS_KBD_TTY -#endif - -#if defined(QT_NO_QWS_KBD_UM) && defined(QT_QWS_KBD_UM) -# undef QT_NO_QWS_KBD_UM -#elif !defined(QT_NO_QWS_KBD_UM) && !defined(QT_QWS_KBD_UM) -# define QT_NO_QWS_KBD_UM -#endif - -#if defined(QT_NO_QWS_LINUXFB) && defined(QT_QWS_LINUXFB) -# undef QT_NO_QWS_LINUXFB -#elif !defined(QT_NO_QWS_LINUXFB) && !defined(QT_QWS_LINUXFB) -# define QT_NO_QWS_LINUXFB -#endif - -#if defined(QT_NO_QWS_MOUSE_LINUXINPUT) && defined(QT_QWS_MOUSE_LINUXINPUT) -# undef QT_NO_QWS_MOUSE_LINUXINPUT -#elif !defined(QT_NO_QWS_MOUSE_LINUXINPUT) && !defined(QT_QWS_MOUSE_LINUXINPUT) -# define QT_NO_QWS_MOUSE_LINUXINPUT -#endif - -#if defined(QT_NO_QWS_MOUSE_LINUXTP) && defined(QT_QWS_MOUSE_LINUXTP) -# undef QT_NO_QWS_MOUSE_LINUXTP -#elif !defined(QT_NO_QWS_MOUSE_LINUXTP) && !defined(QT_QWS_MOUSE_LINUXTP) -# define QT_NO_QWS_MOUSE_LINUXTP -#endif - -#if defined(QT_NO_QWS_MOUSE_PC) && defined(QT_QWS_MOUSE_PC) -# undef QT_NO_QWS_MOUSE_PC -#elif !defined(QT_NO_QWS_MOUSE_PC) && !defined(QT_QWS_MOUSE_PC) -# define QT_NO_QWS_MOUSE_PC -#endif - -#if defined(QT_NO_QWS_MOUSE_QNX) && defined(QT_QWS_MOUSE_QNX) -# undef QT_NO_QWS_MOUSE_QNX -#elif !defined(QT_NO_QWS_MOUSE_QNX) && !defined(QT_QWS_MOUSE_QNX) -# define QT_NO_QWS_MOUSE_QNX -#endif - -#if defined(QT_NO_QWS_MOUSE_QVFB) && defined(QT_QWS_MOUSE_QVFB) -# undef QT_NO_QWS_MOUSE_QVFB -#elif !defined(QT_NO_QWS_MOUSE_QVFB) && !defined(QT_QWS_MOUSE_QVFB) -# define QT_NO_QWS_MOUSE_QVFB -#endif - -#if defined(QT_NO_QWS_MOUSE_TSLIB) && defined(QT_QWS_MOUSE_TSLIB) -# undef QT_NO_QWS_MOUSE_TSLIB -#elif !defined(QT_NO_QWS_MOUSE_TSLIB) && !defined(QT_QWS_MOUSE_TSLIB) -# define QT_NO_QWS_MOUSE_TSLIB -#endif - -#if defined(QT_NO_QWS_MULTISCREEN) && defined(QT_QWS_MULTISCREEN) -# undef QT_NO_QWS_MULTISCREEN -#elif !defined(QT_NO_QWS_MULTISCREEN) && !defined(QT_QWS_MULTISCREEN) -# define QT_NO_QWS_MULTISCREEN -#endif - -#if defined(QT_NO_QWS_QNX) && defined(QT_QWS_QNX) -# undef QT_NO_QWS_QNX -#elif !defined(QT_NO_QWS_QNX) && !defined(QT_QWS_QNX) -# define QT_NO_QWS_QNX -#endif - -#if defined(QT_NO_QWS_QVFB) && defined(QT_QWS_QVFB) -# undef QT_NO_QWS_QVFB -#elif !defined(QT_NO_QWS_QVFB) && !defined(QT_QWS_QVFB) -# define QT_NO_QWS_QVFB -#endif - -#if defined(QT_NO_QWS_TRANSFORMED) && defined(QT_QWS_TRANSFORMED) -# undef QT_NO_QWS_TRANSFORMED -#elif !defined(QT_NO_QWS_TRANSFORMED) && !defined(QT_QWS_TRANSFORMED) -# define QT_NO_QWS_TRANSFORMED -#endif - -#if defined(QT_NO_QWS_VNC) && defined(QT_QWS_VNC) -# undef QT_NO_QWS_VNC -#elif !defined(QT_NO_QWS_VNC) && !defined(QT_QWS_VNC) -# define QT_NO_QWS_VNC -#endif - -#if defined(QT_NO_SESSIONMANAGER) && defined(QT_SESSIONMANAGER) -# undef QT_NO_SESSIONMANAGER -#elif !defined(QT_NO_SESSIONMANAGER) && !defined(QT_SESSIONMANAGER) -# define QT_NO_SESSIONMANAGER -#endif - -#if defined(QT_NO_STYLE_GTK) && defined(QT_STYLE_GTK) -# undef QT_NO_STYLE_GTK -#elif !defined(QT_NO_STYLE_GTK) && !defined(QT_STYLE_GTK) -# define QT_NO_STYLE_GTK -#endif - -#if defined(QT_NO_SXE) && defined(QT_SXE) -# undef QT_NO_SXE -#elif !defined(QT_NO_SXE) && !defined(QT_SXE) -# define QT_NO_SXE -#endif - -#if defined(QT_NO_WEBKIT) && defined(QT_WEBKIT) -# undef QT_NO_WEBKIT -#elif !defined(QT_NO_WEBKIT) && !defined(QT_WEBKIT) -# define QT_NO_WEBKIT -#endif - -#if defined(QT_NO_XMLPATTERNS) && defined(QT_XMLPATTERNS) -# undef QT_NO_XMLPATTERNS -#elif !defined(QT_NO_XMLPATTERNS) && !defined(QT_XMLPATTERNS) -# define QT_NO_XMLPATTERNS -#endif - -#if defined(QT_NO_ZLIB) && defined(QT_ZLIB) -# undef QT_NO_ZLIB -#elif !defined(QT_NO_ZLIB) && !defined(QT_ZLIB) -# define QT_NO_ZLIB -#endif - -#if defined(QT_QWS_DEPTH_16) && defined(QT_NO_QWS_DEPTH_16) -# undef QT_QWS_DEPTH_16 -#elif !defined(QT_QWS_DEPTH_16) && !defined(QT_NO_QWS_DEPTH_16) -# define QT_QWS_DEPTH_16 -#endif - -#if defined(QT_QWS_DEPTH_32) && defined(QT_NO_QWS_DEPTH_32) -# undef QT_QWS_DEPTH_32 -#elif !defined(QT_QWS_DEPTH_32) && !defined(QT_NO_QWS_DEPTH_32) -# define QT_QWS_DEPTH_32 -#endif - -#if defined(QT_QWS_DEPTH_8) && defined(QT_NO_QWS_DEPTH_8) -# undef QT_QWS_DEPTH_8 -#elif !defined(QT_QWS_DEPTH_8) && !defined(QT_NO_QWS_DEPTH_8) -# define QT_QWS_DEPTH_8 -#endif - -#if defined(QT_RUNTIME_XCURSOR) && defined(QT_NO_RUNTIME_XCURSOR) -# undef QT_RUNTIME_XCURSOR -#elif !defined(QT_RUNTIME_XCURSOR) && !defined(QT_NO_RUNTIME_XCURSOR) -# define QT_RUNTIME_XCURSOR -#endif - -#if defined(QT_RUNTIME_XFIXES) && defined(QT_NO_RUNTIME_XFIXES) -# undef QT_RUNTIME_XFIXES -#elif !defined(QT_RUNTIME_XFIXES) && !defined(QT_NO_RUNTIME_XFIXES) -# define QT_RUNTIME_XFIXES -#endif - -#if defined(QT_RUNTIME_XINERAMA) && defined(QT_NO_RUNTIME_XINERAMA) -# undef QT_RUNTIME_XINERAMA -#elif !defined(QT_RUNTIME_XINERAMA) && !defined(QT_NO_RUNTIME_XINERAMA) -# define QT_RUNTIME_XINERAMA -#endif - -#if defined(QT_RUNTIME_XINPUT) && defined(QT_NO_RUNTIME_XINPUT) -# undef QT_RUNTIME_XINPUT -#elif !defined(QT_RUNTIME_XINPUT) && !defined(QT_NO_RUNTIME_XINPUT) -# define QT_RUNTIME_XINPUT -#endif - -#if defined(QT_RUNTIME_XRANDR) && defined(QT_NO_RUNTIME_XRANDR) -# undef QT_RUNTIME_XRANDR -#elif !defined(QT_RUNTIME_XRANDR) && !defined(QT_NO_RUNTIME_XRANDR) -# define QT_RUNTIME_XRANDR -#endif - -#if defined(QT_USE_MATH_H_FLOATS) && defined(QT_NO_USE_MATH_H_FLOATS) -# undef QT_USE_MATH_H_FLOATS -#elif !defined(QT_USE_MATH_H_FLOATS) && !defined(QT_NO_USE_MATH_H_FLOATS) -# define QT_USE_MATH_H_FLOATS -#endif - -#ifndef Q_WS_QWS -# define Q_WS_QWS -#endif - -#define QT_VISIBILITY_AVAILABLE - diff --git a/repos/qt4/include/qt4/QtGui/private/qwindowsurface_nitpicker_qws_p.h b/repos/qt4/include/qt4/QtGui/private/qwindowsurface_nitpicker_qws_p.h deleted file mode 100644 index ca8607290..000000000 --- a/repos/qt4/include/qt4/QtGui/private/qwindowsurface_nitpicker_qws_p.h +++ /dev/null @@ -1,80 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 1992-2007 Trolltech ASA. All rights reserved. -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** This file may be used under the terms of the GNU General Public -** License version 2.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of -** this file. Please review the following information to ensure GNU -** General Public Licensing requirements will be met: -** http://trolltech.com/products/qt/licenses/licensing/opensource/ -** -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -** or contact the sales department at sales@trolltech.com. -** -** In addition, as a special exception, Trolltech gives you certain -** additional rights. These rights are described in the Trolltech GPL -** Exception version 1.0, which can be found at -** http://www.trolltech.com/products/qt/gplexception/ and in the file -** GPL_EXCEPTION.txt in this package. -** -** In addition, as a special exception, Trolltech, as the sole copyright -** holder for Qt Designer, grants users of the Qt/Eclipse Integration -** plug-in the right for the Qt/Eclipse Integration to link to -** functionality provided by Qt Designer and its related libraries. -** -** Trolltech reserves all rights not expressly granted herein. -** -** Trolltech ASA (c) 2007 -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -****************************************************************************/ - -#ifndef QWINDOWSURFACE_NITPICKER_QWS_P_H -#define QWINDOWSURFACE_NITPICKER_QWS_P_H - -#include -#include -#include -#include - -#include - -#include - -class QWSWindow; - -class Q_GUI_EXPORT QWSNitpickerWindowSurface : public QObject, public QWSLocalMemSurface -{ - Q_OBJECT - -public: - QWSNitpickerWindowSurface(QWidget *widget, Nitpicker::Session_client *nitpicker); - ~QWSNitpickerWindowSurface(); - - virtual bool move(const QPoint &offset); - - virtual void flush(QWidget *widget, const QRegion ®ion, - const QPoint &offset); - - Nitpicker::View_capability view_cap() { return _view_cap; } - -private slots: - void windowEvent (QWSWindow *window, QWSServer::WindowEvent eventType); - -private: - Nitpicker::Session_client *_nitpicker; - Nitpicker::View_capability _view_cap; - Nitpicker::View_client *_view_client; - Framebuffer::Session_client *_framebuffer_session_client; - - bool moving; -}; - -#endif // QWINDOWSURFACE_NITPICKER_QWS_P_H diff --git a/repos/qt4/include/qt4/QtGui/qinputnitpicker_qws.h b/repos/qt4/include/qt4/QtGui/qinputnitpicker_qws.h deleted file mode 100644 index 402906101..000000000 --- a/repos/qt4/include/qt4/QtGui/qinputnitpicker_qws.h +++ /dev/null @@ -1,52 +0,0 @@ -#ifndef QINPUTNITPICKER_QWS_H -#define QINPUTNITPICKER_QWS_H - -#include "qmousenitpicker_qws.h" -#include "qkbdnitpicker_qws.h" - -QT_BEGIN_HEADER - -QT_MODULE(Gui) - -#if !defined(QT_NO_QWS_MOUSE_NITPICKER) || !defined(QT_NO_QWS_KEYBOARD_NITPICKER) - -#include -#include -#include - -class QNitpickerInputHandler : public QObject { - - Q_OBJECT - -public: - QNitpickerInputHandler(QScreen *screen, - Input::Session_capability input_session_cap, - const QString &driver = QString(), - const QString &device = QString()); - ~QNitpickerInputHandler(); - - void setScreen(const QScreen *screen); - -private: - Input::Session_client *input; - Input::Event *ev_buf; - -#ifndef QT_NO_QWS_MOUSE_NITPICKER - QNitpickerMouseHandler *mouse; -#endif - -#ifndef QT_NO_QWS_KEYBOARD_NITPICKER - QNitpickerKeyboardHandler *keyboard; -#endif - - QTimer *timer; - -private Q_SLOTS: - void readInputData(); -}; - -#endif // !defined(QT_NO_QWS_MOUSE_NITPICKER) || !defined(QT_NO_QWS_KEYBOARD_NITPICKER) - -QT_END_HEADER - -#endif // QINPUTNITPICKER_QWS_H diff --git a/repos/qt4/include/qt4/QtGui/qkbdnitpicker_qws.h b/repos/qt4/include/qt4/QtGui/qkbdnitpicker_qws.h deleted file mode 100644 index 1b7662349..000000000 --- a/repos/qt4/include/qt4/QtGui/qkbdnitpicker_qws.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 1992-2007 Trolltech ASA. All rights reserved. -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** This file may be used under the terms of the GNU General Public -** License version 2.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of -** this file. Please review the following information to ensure GNU -** General Public Licensing requirements will be met: -** http://trolltech.com/products/qt/licenses/licensing/opensource/ -** -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -** or contact the sales department at sales@trolltech.com. -** -** In addition, as a special exception, Trolltech gives you certain -** additional rights. These rights are described in the Trolltech GPL -** Exception version 1.0, which can be found at -** http://www.trolltech.com/products/qt/gplexception/ and in the file -** GPL_EXCEPTION.txt in this package. -** -** In addition, as a special exception, Trolltech, as the sole copyright -** holder for Qt Designer, grants users of the Qt/Eclipse Integration -** plug-in the right for the Qt/Eclipse Integration to link to -** functionality provided by Qt Designer and its related libraries. -** -** Trolltech reserves all rights not expressly granted herein. -** -** Trolltech ASA (c) 2007 -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -****************************************************************************/ - -#ifndef QKBDNITPICKER_QWS_H -#define QKBDNITPICKER_QWS_H - -#include - -QT_BEGIN_HEADER - -QT_MODULE(Gui) - -#ifndef QT_NO_QWS_KEYBOARD - -#ifndef QT_NO_QWS_KBD_NITPICKER - -#include - -class QNitpickerKeyboardHandler : public QWSPC101KeyboardHandler -{ -public: - QNitpickerKeyboardHandler(const QString &device = QString()); - virtual ~QNitpickerKeyboardHandler(); - - void processKeyEvent(Input::Event *ev); -}; - -#endif // QT_NO_QWS_KBD_NITPICKER - -#endif // QT_NO_QWS_KEYBOARD - -QT_END_HEADER - -#endif // QKBDNITPICKER_QWS_H diff --git a/repos/qt4/include/qt4/QtGui/qkbdpc101_qws.h b/repos/qt4/include/qt4/QtGui/qkbdpc101_qws.h deleted file mode 100644 index ca34ed95f..000000000 --- a/repos/qt4/include/qt4/QtGui/qkbdpc101_qws.h +++ /dev/null @@ -1,95 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QKBDPC101_QWS_H -#define QKBDPC101_QWS_H - -#include - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Gui) - -#ifndef QT_NO_QWS_KEYBOARD - -#ifndef QT_NO_QWS_KBD_PC101 - -struct QWSKeyMap { - uint key_code; - ushort unicode; - ushort shift_unicode; - ushort ctrl_unicode; -}; - -class QWSPC101KeyboardHandler : public QWSKeyboardHandler -{ -public: - explicit QWSPC101KeyboardHandler(const QString&); - virtual ~QWSPC101KeyboardHandler(); - - virtual void doKey(uchar scancode); - virtual const QWSKeyMap *keyMap() const; - -protected: - bool shift; - bool alt; - bool ctrl; - bool caps; -#if defined(QT_QWS_IPAQ) - uint ipaq_return_pressed:1; -#endif - uint extended:2; - Qt::KeyboardModifiers modifiers; - int prevuni; - int prevkey; -}; - -#endif // QT_NO_QWS_KBD_PC101 - -#endif // QT_NO_QWS_KEYBOARD - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QKBDPC101_QWS_H diff --git a/repos/qt4/include/qt4/QtGui/qmousenitpicker_qws.h b/repos/qt4/include/qt4/QtGui/qmousenitpicker_qws.h deleted file mode 100644 index 93009fe79..000000000 --- a/repos/qt4/include/qt4/QtGui/qmousenitpicker_qws.h +++ /dev/null @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 1992-2007 Trolltech ASA. All rights reserved. -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** This file may be used under the terms of the GNU General Public -** License version 2.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of -** this file. Please review the following information to ensure GNU -** General Public Licensing requirements will be met: -** http://trolltech.com/products/qt/licenses/licensing/opensource/ -** -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -** or contact the sales department at sales@trolltech.com. -** -** In addition, as a special exception, Trolltech gives you certain -** additional rights. These rights are described in the Trolltech GPL -** Exception version 1.0, which can be found at -** http://www.trolltech.com/products/qt/gplexception/ and in the file -** GPL_EXCEPTION.txt in this package. -** -** In addition, as a special exception, Trolltech, as the sole copyright -** holder for Qt Designer, grants users of the Qt/Eclipse Integration -** plug-in the right for the Qt/Eclipse Integration to link to -** functionality provided by Qt Designer and its related libraries. -** -** Trolltech reserves all rights not expressly granted herein. -** -** Trolltech ASA (c) 2007 -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -****************************************************************************/ - -#ifndef QMOUSENITPICKER_QWS_H -#define QMOUSENITPICKER_QWS_H - -#include - -#include - -QT_BEGIN_HEADER - -QT_MODULE(Gui) - -#ifndef QT_NO_QWS_MOUSE_NITPICKER - -class QNitpickerMouseHandler : public QWSMouseHandler { - -public: - QNitpickerMouseHandler(const QString &driver = QString(), - const QString &device = QString()); - ~QNitpickerMouseHandler(); - - void resume(); - void suspend(); - - void processMouseEvent(Input::Event *ev); - -private: - int state; -}; -#endif // QT_NO_QWS_MOUSE_NITPICKER - -QT_END_HEADER - -#endif // QMOUSENITPICKER_QWS_H diff --git a/repos/qt4/include/qt4/QtGui/qscreennitpicker_qws.h b/repos/qt4/include/qt4/QtGui/qscreennitpicker_qws.h deleted file mode 100644 index 33408ee7d..000000000 --- a/repos/qt4/include/qt4/QtGui/qscreennitpicker_qws.h +++ /dev/null @@ -1,83 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 1992-2007 Trolltech ASA. All rights reserved. -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** This file may be used under the terms of the GNU General Public -** License version 2.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of -** this file. Please review the following information to ensure GNU -** General Public Licensing requirements will be met: -** http://trolltech.com/products/qt/licenses/licensing/opensource/ -** -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -** or contact the sales department at sales@trolltech.com. -** -** In addition, as a special exception, Trolltech gives you certain -** additional rights. These rights are described in the Trolltech GPL -** Exception version 1.0, which can be found at -** http://www.trolltech.com/products/qt/gplexception/ and in the file -** GPL_EXCEPTION.txt in this package. -** -** In addition, as a special exception, Trolltech, as the sole copyright -** holder for Qt Designer, grants users of the Qt/Eclipse Integration -** plug-in the right for the Qt/Eclipse Integration to link to -** functionality provided by Qt Designer and its related libraries. -** -** Trolltech reserves all rights not expressly granted herein. -** -** Trolltech ASA (c) 2007 -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -****************************************************************************/ - -#ifndef QSCREENNITPICKER_QWS_H -#define QSCREENNITPICKER_QWS_H - -#include - -QT_BEGIN_HEADER - -QT_MODULE(Gui) - -#ifndef QT_NO_QWS_NITPICKER - -#include -#include -#include - -class QNitpickerInputHandler; - -class Q_GUI_EXPORT QNitpickerScreen : public QScreen -{ -public: - explicit QNitpickerScreen(int display_id); - virtual ~QNitpickerScreen(); - - virtual bool initDevice(); - virtual bool connect(const QString &displaySpec); - virtual void disconnect(); - virtual void shutdownDevice(); - - virtual QWSWindowSurface *createSurface(QWidget *widget) const; - - virtual void save(); - virtual void restore(); - virtual void setMode(int nw,int nh,int nd); - -private: - Nitpicker::Session_client *nitpicker; - Framebuffer::Session_client *framebuffer; - QNitpickerInputHandler *inputhandler; -}; - -#endif // QT_NO_QWS_NITPICKER - -QT_END_HEADER - -#endif // QSCREENNITPICKER_QWS_H diff --git a/repos/qt4/lib/import/import-qgif.mk b/repos/qt4/lib/import/import-qgif.mk deleted file mode 100644 index ec79bf453..000000000 --- a/repos/qt4/lib/import/import-qgif.mk +++ /dev/null @@ -1,3 +0,0 @@ -IMPORT_QT4_INC=$(call select_from_repositories,lib/import/import-qt4.inc) - -include $(IMPORT_QT4_INC) diff --git a/repos/qt4/lib/import/import-qjpeg.mk b/repos/qt4/lib/import/import-qjpeg.mk deleted file mode 100644 index ec79bf453..000000000 --- a/repos/qt4/lib/import/import-qjpeg.mk +++ /dev/null @@ -1,3 +0,0 @@ -IMPORT_QT4_INC=$(call select_from_repositories,lib/import/import-qt4.inc) - -include $(IMPORT_QT4_INC) diff --git a/repos/qt4/lib/import/import-qt4.inc b/repos/qt4/lib/import/import-qt4.inc deleted file mode 100644 index 772330085..000000000 --- a/repos/qt4/lib/import/import-qt4.inc +++ /dev/null @@ -1,148 +0,0 @@ -# prevent import file to be included twice, for example via import-qt_gui.mk -# and import-qt_core.mk - -ifeq ($(QT4_IMPORTED),) -QT4_IMPORTED = true - -REQUIRES += qt4_deprecated - -# identify the qt4 repository by searching for a file that is unique for qt4 -QT4_REP_DIR := $(call select_from_repositories,lib/import/import-qt4.inc) -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-generic-g++ \ - $(QT4_REP_DIR)/include/qt4 \ - $(QT4_REP_DIR)/contrib/$(QT4)/include \ - $(QT4_REP_DIR)/include/qt4/QtCore \ - $(QT4_REP_DIR)/contrib/$(QT4)/include/QtCore \ - $(QT4_REP_DIR)/include/qt4/QtGui \ - $(QT4_REP_DIR)/contrib/$(QT4)/include/QtGui \ - $(QT4_REP_DIR)/include/qt4/QtNetwork \ - $(QT4_REP_DIR)/contrib/$(QT4)/include/QtNetwork \ - $(QT4_REP_DIR)/include/qt4/QtScript \ - $(QT4_REP_DIR)/contrib/$(QT4)/include/QtScript \ - $(QT4_REP_DIR)/include/qt4/QtScriptTools \ - $(QT4_REP_DIR)/contrib/$(QT4)/include/QtScriptTools \ - $(QT4_REP_DIR)/include/qt4/QtSvg \ - $(QT4_REP_DIR)/contrib/$(QT4)/include/QtSvg \ - $(QT4_REP_DIR)/include/qt4/QtUiTools \ - $(QT4_REP_DIR)/contrib/$(QT4)/include/QtUiTools \ - $(QT4_REP_DIR)/include/qt4/QtWebKit \ - $(QT4_REP_DIR)/contrib/$(QT4)/include/QtWebKit \ - $(QT4_REP_DIR)/include/qt4/QtXml \ - $(QT4_REP_DIR)/contrib/$(QT4)/include/QtXml - -INC_DIR += $(QT4_INC_DIR) - -# extracted from qt.prf -QT_DEFINES += -DQT_STATICPLUGIN - -QT_DEFINES += -D__GENODE__ - -# -# Prevent inclusion of non-existent 'features.h' from 'bits/os_defines.h' -# header that comes with the Codesourcery ARM tool chain. -# -QT_DEFINES += -D_GLIBCXX_OS_DEFINES - -# -# When using the Codesourcery tool chain for ARM, the compiler provides a -# built-in definition for '__linux__', which is obviously wrong when using the -# compiler for Genode. Unfortunately, Webkit tests for this definition in -# 'JavaScriptCore/wtf/Platform.h'. To prevent webkit from drawing wrong -# conclusions, we explicitly undefine '__linux__'. -# -QT_DEFINES += -U__linux__ - -CC_CXX_OPT += $(QT_DEFINES) - -SOURCES_FILTERED = $(filter-out $(SOURCES_FILTER_OUT), $(SOURCES)) -HEADERS_FILTERED = $(filter-out $(HEADERS_FILTER_OUT), $(HEADERS)) - -# add sources defined in qmake project files -SRC_CC += $(SOURCES_FILTERED) - -# handle moc-headers, resources and ui descriptions -$(SRC_CC:.cpp=.o): $(addprefix ui_,$(FORMS:.ui=.h)) - -SRC_CC_QT_GENERATED = $(addprefix moc_,$(HEADERS_FILTERED:.h=.cpp)) \ - $(addprefix qrc_,$(RESOURCES:.qrc=.cpp)) - -.SECONDARY: $(SRC_CC_QT_GENERATED) -SRC_CC += $(SRC_CC_QT_GENERATED) - -# -# Locations of moc, rcc, and uic binaries -# -# These binaries are created by calling 'make' in the 'tool' directory, which -# should have happened before starting to build Qt4 applications. -# -MOC = $(QT4_REP_DIR)/tool/moc/moc -RCC = $(QT4_REP_DIR)/tool/rcc/rcc -UIC = $(QT4_REP_DIR)/tool/uic/uic - -$(MOC) $(RCC) $(UIC): - @echo - @echo "Attempting to build Qt4 application without having built the Qt4 tools." - @echo "Please execute 'make prepare' in the root of the qt4 repository." - @echo - @false - -# moc rules -moc_%.cpp: %.h $(MOC) - $(MSG_CONVERT)$@ - $(VERBOSE) $(MOC) $(QT_DEFINES) $(addprefix -I,$(QT4_INC_DIR)) $< -o $@ - -%.moc: %.cpp $(MOC) - $(MSG_CONVERT)$@ - $(VERBOSE) $(MOC) $(QT_DEFINES) $(addprefix -I,$(QT4_INC_DIR)) $< -o $@ - -# rcc rule -qrc_%.cpp: %.qrc $(RCC) - $(MSG_CONVERT)$@ - $(VERBOSE) $(RCC) -name $(basename $(notdir $<)) $< -o $@ - -# uic rule -ui_%.h: %.ui $(UIC) - $(MSG_CONVERT)$@ - $(VERBOSE) $(UIC) $< -o $@ - -# add include dirs for Qt4-specific genode addons -INC_DIR += $(QT4_REP_DIR)/include/genode - -# add C++ include dirs and libs -# -# We cannot just extend the 'LIBS' variable here because 'import-*.mk' are -# included (in 'base/mk/lib.mk') by iterating through the elements of the -# 'LIBS' variable. Hence, we also need to manually import the stdlib snippet. -# -LIBS += stdcxx -include $(call select_from_repositories,lib/import/import-stdcxx.mk) - -# custom main() thread stack size support via main() wrapper -ifeq ($(findstring -DQT_MAIN_STACK_SIZE, $(CC_CXX_OPT)), -DQT_MAIN_STACK_SIZE) -CC_CXX_OPT += -Dmain=qt_main -SRC_CC += qt_main.cc -vpath qt_main.cc $(QT4_REP_DIR)/src/lib/qt_main -endif - -# set QT_ARCH definition according to the SPECS variable -ifneq ($(filter x86_32,$(SPECS)),) - QT_DEFINES += -DQT_ARCH_I386 -endif -ifneq ($(filter x86_64,$(SPECS)),) - QT_DEFINES += -DQT_ARCH_X86_64 -endif -ifneq ($(filter arm,$(SPECS)),) - QT_DEFINES += -DQT_ARCH_ARMV6 -endif - -# remove generated files in clean rules -clean cleanall: clean_rule -clean_rule: - $(VERBOSE)$(RM) -f $(SRC_CC_QT_GENERATED) - $(VERBOSE)$(RM) -f $(SOURCES_FILTERED:.cpp=.moc) - $(VERBOSE)$(RM) -f $(addprefix ui_,$(FORMS:.ui=.h)) -endif diff --git a/repos/qt4/lib/import/import-qt_core.mk b/repos/qt4/lib/import/import-qt_core.mk deleted file mode 100644 index ec79bf453..000000000 --- a/repos/qt4/lib/import/import-qt_core.mk +++ /dev/null @@ -1,3 +0,0 @@ -IMPORT_QT4_INC=$(call select_from_repositories,lib/import/import-qt4.inc) - -include $(IMPORT_QT4_INC) diff --git a/repos/qt4/lib/import/import-qt_gui.mk b/repos/qt4/lib/import/import-qt_gui.mk deleted file mode 100644 index ec79bf453..000000000 --- a/repos/qt4/lib/import/import-qt_gui.mk +++ /dev/null @@ -1,3 +0,0 @@ -IMPORT_QT4_INC=$(call select_from_repositories,lib/import/import-qt4.inc) - -include $(IMPORT_QT4_INC) diff --git a/repos/qt4/lib/import/import-qt_javascriptcore.mk b/repos/qt4/lib/import/import-qt_javascriptcore.mk deleted file mode 100644 index ec79bf453..000000000 --- a/repos/qt4/lib/import/import-qt_javascriptcore.mk +++ /dev/null @@ -1,3 +0,0 @@ -IMPORT_QT4_INC=$(call select_from_repositories,lib/import/import-qt4.inc) - -include $(IMPORT_QT4_INC) diff --git a/repos/qt4/lib/import/import-qt_jscore.mk b/repos/qt4/lib/import/import-qt_jscore.mk deleted file mode 100644 index ec79bf453..000000000 --- a/repos/qt4/lib/import/import-qt_jscore.mk +++ /dev/null @@ -1,3 +0,0 @@ -IMPORT_QT4_INC=$(call select_from_repositories,lib/import/import-qt4.inc) - -include $(IMPORT_QT4_INC) diff --git a/repos/qt4/lib/import/import-qt_network.mk b/repos/qt4/lib/import/import-qt_network.mk deleted file mode 100644 index ec79bf453..000000000 --- a/repos/qt4/lib/import/import-qt_network.mk +++ /dev/null @@ -1,3 +0,0 @@ -IMPORT_QT4_INC=$(call select_from_repositories,lib/import/import-qt4.inc) - -include $(IMPORT_QT4_INC) diff --git a/repos/qt4/lib/import/import-qt_script.mk b/repos/qt4/lib/import/import-qt_script.mk deleted file mode 100644 index ec79bf453..000000000 --- a/repos/qt4/lib/import/import-qt_script.mk +++ /dev/null @@ -1,3 +0,0 @@ -IMPORT_QT4_INC=$(call select_from_repositories,lib/import/import-qt4.inc) - -include $(IMPORT_QT4_INC) diff --git a/repos/qt4/lib/import/import-qt_scriptclassic.mk b/repos/qt4/lib/import/import-qt_scriptclassic.mk deleted file mode 100644 index ec79bf453..000000000 --- a/repos/qt4/lib/import/import-qt_scriptclassic.mk +++ /dev/null @@ -1,3 +0,0 @@ -IMPORT_QT4_INC=$(call select_from_repositories,lib/import/import-qt4.inc) - -include $(IMPORT_QT4_INC) diff --git a/repos/qt4/lib/import/import-qt_scripttools.mk b/repos/qt4/lib/import/import-qt_scripttools.mk deleted file mode 100644 index ec79bf453..000000000 --- a/repos/qt4/lib/import/import-qt_scripttools.mk +++ /dev/null @@ -1,3 +0,0 @@ -IMPORT_QT4_INC=$(call select_from_repositories,lib/import/import-qt4.inc) - -include $(IMPORT_QT4_INC) diff --git a/repos/qt4/lib/import/import-qt_svg.mk b/repos/qt4/lib/import/import-qt_svg.mk deleted file mode 100644 index ec79bf453..000000000 --- a/repos/qt4/lib/import/import-qt_svg.mk +++ /dev/null @@ -1,3 +0,0 @@ -IMPORT_QT4_INC=$(call select_from_repositories,lib/import/import-qt4.inc) - -include $(IMPORT_QT4_INC) diff --git a/repos/qt4/lib/import/import-qt_ui_tools.mk b/repos/qt4/lib/import/import-qt_ui_tools.mk deleted file mode 100644 index ec79bf453..000000000 --- a/repos/qt4/lib/import/import-qt_ui_tools.mk +++ /dev/null @@ -1,3 +0,0 @@ -IMPORT_QT4_INC=$(call select_from_repositories,lib/import/import-qt4.inc) - -include $(IMPORT_QT4_INC) diff --git a/repos/qt4/lib/import/import-qt_webcore.mk b/repos/qt4/lib/import/import-qt_webcore.mk deleted file mode 100644 index ec79bf453..000000000 --- a/repos/qt4/lib/import/import-qt_webcore.mk +++ /dev/null @@ -1,3 +0,0 @@ -IMPORT_QT4_INC=$(call select_from_repositories,lib/import/import-qt4.inc) - -include $(IMPORT_QT4_INC) diff --git a/repos/qt4/lib/import/import-qt_webkit.mk b/repos/qt4/lib/import/import-qt_webkit.mk deleted file mode 100644 index ec79bf453..000000000 --- a/repos/qt4/lib/import/import-qt_webkit.mk +++ /dev/null @@ -1,3 +0,0 @@ -IMPORT_QT4_INC=$(call select_from_repositories,lib/import/import-qt4.inc) - -include $(IMPORT_QT4_INC) diff --git a/repos/qt4/lib/import/import-qt_xml.mk b/repos/qt4/lib/import/import-qt_xml.mk deleted file mode 100644 index ec79bf453..000000000 --- a/repos/qt4/lib/import/import-qt_xml.mk +++ /dev/null @@ -1,3 +0,0 @@ -IMPORT_QT4_INC=$(call select_from_repositories,lib/import/import-qt4.inc) - -include $(IMPORT_QT4_INC) diff --git a/repos/qt4/lib/mk/dejavusans.mk b/repos/qt4/lib/mk/dejavusans.mk deleted file mode 100644 index edda1e4b5..000000000 --- a/repos/qt4/lib/mk/dejavusans.mk +++ /dev/null @@ -1,7 +0,0 @@ -SHARED_LIB = yes - -SRC_CC = qrc_dejavusans.cpp - -LIBS = qt_core - -vpath % $(REP_DIR)/src/lib/dejavusans diff --git a/repos/qt4/lib/mk/qgif.mk b/repos/qt4/lib/mk/qgif.mk deleted file mode 100644 index f07749cf5..000000000 --- a/repos/qt4/lib/mk/qgif.mk +++ /dev/null @@ -1,10 +0,0 @@ -include $(REP_DIR)/lib/import/import-qgif.mk - -SRC_CC = main.cpp qgifhandler.cpp - -INC_DIR += $(REP_DIR)/contrib/$(QT4)/include/QtGui/private - -LIBS = qt_core libc - -vpath % $(call select_from_repositories,contrib/$(QT4)/src/plugins/imageformats/gif) -vpath % $(call select_from_repositories,contrib/$(QT4)/src/gui/image) diff --git a/repos/qt4/lib/mk/qjpeg.mk b/repos/qt4/lib/mk/qjpeg.mk deleted file mode 100644 index f126c9dc6..000000000 --- a/repos/qt4/lib/mk/qjpeg.mk +++ /dev/null @@ -1,10 +0,0 @@ -include $(REP_DIR)/lib/import/import-qjpeg.mk - -SRC_CC = main.cpp qjpeghandler.cpp - -INC_DIR += $(REP_DIR)/contrib/$(QT4)/include/QtGui/private - -LIBS = qt_core libc jpeg - -vpath % $(call select_from_repositories,contrib/$(QT4)/src/plugins/imageformats/jpeg) -vpath % $(call select_from_repositories,contrib/$(QT4)/src/gui/image) diff --git a/repos/qt4/lib/mk/qnitpickerviewwidget.mk b/repos/qt4/lib/mk/qnitpickerviewwidget.mk deleted file mode 100644 index bab27a971..000000000 --- a/repos/qt4/lib/mk/qnitpickerviewwidget.mk +++ /dev/null @@ -1,10 +0,0 @@ -SHARED_LIB = yes - -SRC_CC = qnitpickerviewwidget.cpp - -HEADERS += qnitpickerviewwidget.h - -vpath %.h $(REP_DIR)/include/qnitpickerviewwidget -vpath %.cpp $(REP_DIR)/src/lib/qnitpickerviewwidget - -LIBS += qt_gui libc diff --git a/repos/qt4/lib/mk/qpluginwidget.mk b/repos/qt4/lib/mk/qpluginwidget.mk deleted file mode 100644 index 4e57ce591..000000000 --- a/repos/qt4/lib/mk/qpluginwidget.mk +++ /dev/null @@ -1,10 +0,0 @@ -SHARED_LIB = yes - -SRC_CC = qpluginwidget.cpp - -HEADERS += qpluginwidget.h - -vpath %.h $(REP_DIR)/include/qpluginwidget -vpath %.cpp $(REP_DIR)/src/lib/qpluginwidget - -LIBS += qt_gui qt_network qnitpickerviewwidget libc zlib diff --git a/repos/qt4/lib/mk/qt.inc b/repos/qt4/lib/mk/qt.inc deleted file mode 100644 index 45b5a6e20..000000000 --- a/repos/qt4/lib/mk/qt.inc +++ /dev/null @@ -1,20 +0,0 @@ -QT_SOURCES_FILTER_OUT += $(COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT) -QT_SOURCES_FILTERED = $(filter-out $(QT_SOURCES_FILTER_OUT), $(QT_SOURCES)) - -SRC_CC += $(filter %.cpp, $(QT_SOURCES_FILTERED)) -SRC_C += $(filter %.c, $(QT_SOURCES_FILTERED)) - -COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTERED = $(filter-out $(COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT), $(COMPILER_MOC_HEADER_MAKE_ALL_FILES)) -$(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-generic-g++ \ - $(REP_DIR)/src/lib/qt4/src/corelib/global - -INC_DIR += $(addprefix $(REP_DIR)/src/lib/qt4/, $(QT_INCPATH)) -INC_DIR += $(addprefix $(REP_DIR)/contrib/$(QT4)/, $(QT_INCPATH)) - -vpath % $(addprefix $(REP_DIR)/src/lib/qt4/, $(QT_VPATH)) -vpath % $(addprefix $(REP_DIR)/contrib/$(QT4)/, $(QT_VPATH)) diff --git a/repos/qt4/lib/mk/qt_core.mk b/repos/qt4/lib/mk/qt_core.mk deleted file mode 100644 index 717383669..000000000 --- a/repos/qt4/lib/mk/qt_core.mk +++ /dev/null @@ -1,40 +0,0 @@ -include $(REP_DIR)/lib/import/import-qt_core.mk - -SHARED_LIB = yes - -# 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_core_generated.inc - -# add Genode-specific sources -QT_SOURCES += qprocess_genode.cpp \ - qeventdispatcher_genode.cpp \ - qmutex_genode.cpp \ - qthread_genode.cpp \ - qwaitcondition_genode.cpp \ - moc_qeventdispatcher_genode_p.cpp - -# remove unsupported UNIX-specific files -QT_SOURCES_FILTER_OUT = \ - moc_qeventdispatcher_unix_p.cpp \ - qeventdispatcher_unix.cpp \ - qmutex_unix.cpp \ - qprocess_unix.cpp \ - qthread_unix.cpp \ - qwaitcondition_unix.cpp - -# remove unneeded files to prevent moc warnings -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 - -LIBS += launchpad zlib libc libm alarm libc_lock_pipe - -vpath % $(REP_DIR)/include/qt4/QtCore -vpath % $(REP_DIR)/include/qt4/QtCore/private diff --git a/repos/qt4/lib/mk/qt_core_generated.inc b/repos/qt4/lib/mk/qt_core_generated.inc deleted file mode 100644 index 0bc29731b..000000000 --- a/repos/qt4/lib/mk/qt_core_generated.inc +++ /dev/null @@ -1,294 +0,0 @@ -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 \ - qpropertyanimation.cpp \ - qanimationgroup.cpp \ - qsequentialanimationgroup.cpp \ - qparallelanimationgroup.cpp \ - qpauseanimation.cpp \ - qfuture.cpp \ - qfutureinterface.cpp \ - qfuturesynchronizer.cpp \ - qfuturewatcher.cpp \ - qrunnable.cpp \ - qtconcurrentfilter.cpp \ - qtconcurrentmap.cpp \ - qtconcurrentresultstore.cpp \ - qtconcurrentthreadengine.cpp \ - qtconcurrentiteratekernel.cpp \ - qtconcurrentexception.cpp \ - qthreadpool.cpp \ - qglobal.cpp \ - qlibraryinfo.cpp \ - qmalloc.cpp \ - qnumeric.cpp \ - qatomic.cpp \ - qmutex.cpp \ - qreadwritelock.cpp \ - qmutexpool.cpp \ - qsemaphore.cpp \ - qthread.cpp \ - qthreadstorage.cpp \ - qmutex_unix.cpp \ - qthread_unix.cpp \ - qwaitcondition_unix.cpp \ - qbitarray.cpp \ - qbytearray.cpp \ - qbytearraymatcher.cpp \ - qcryptographichash.cpp \ - qdatetime.cpp \ - qeasingcurve.cpp \ - qelapsedtimer.cpp \ - qhash.cpp \ - qline.cpp \ - qlinkedlist.cpp \ - qlist.cpp \ - qlocale.cpp \ - qlocale_tools.cpp \ - qpoint.cpp \ - qmap.cpp \ - qmargins.cpp \ - qcontiguouscache.cpp \ - qrect.cpp \ - qregexp.cpp \ - qshareddata.cpp \ - qsharedpointer.cpp \ - qsimd.cpp \ - qsize.cpp \ - qstring.cpp \ - qstringbuilder.cpp \ - qstringlist.cpp \ - qtextboundaryfinder.cpp \ - qtimeline.cpp \ - qvector.cpp \ - qvsnprintf.cpp \ - qelapsedtimer_unix.cpp \ - qlocale_unix.cpp \ - harfbuzz-buffer.c \ - harfbuzz-gdef.c \ - harfbuzz-gsub.c \ - harfbuzz-gpos.c \ - harfbuzz-impl.c \ - harfbuzz-open.c \ - harfbuzz-stream.c \ - harfbuzz-shaper-all.cpp \ - qharfbuzz.cpp \ - qabstractfileengine.cpp \ - qbuffer.cpp \ - qdatastream.cpp \ - qdataurl.cpp \ - qtldurl.cpp \ - qdebug.cpp \ - qdir.cpp \ - qdiriterator.cpp \ - qfile.cpp \ - qfileinfo.cpp \ - qiodevice.cpp \ - qnoncontiguousbytedevice.cpp \ - qprocess.cpp \ - qtextstream.cpp \ - qtemporaryfile.cpp \ - qresource.cpp \ - qresource_iterator.cpp \ - qurl.cpp \ - qsettings.cpp \ - qfsfileengine.cpp \ - qfsfileengine_iterator.cpp \ - qfilesystemwatcher.cpp \ - qfilesystementry.cpp \ - qfilesystemengine.cpp \ - qfsfileengine_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 \ - qbasictimer.cpp \ - qeventloop.cpp \ - qcoreapplication.cpp \ - qcoreevent.cpp \ - qmetaobject.cpp \ - qmetatype.cpp \ - qmimedata.cpp \ - qobject.cpp \ - qobjectcleanuphandler.cpp \ - qsignalmapper.cpp \ - qsocketnotifier.cpp \ - qtimer.cpp \ - qtranslator.cpp \ - qvariant.cpp \ - qcoreglobaldata.cpp \ - qsharedmemory.cpp \ - qsystemsemaphore.cpp \ - qpointer.cpp \ - qmath.cpp \ - qsystemerror.cpp \ - qcore_unix.cpp \ - qcrashhandler.cpp \ - qsharedmemory_unix.cpp \ - qsystemsemaphore_unix.cpp \ - qeventdispatcher_unix.cpp \ - qisciicodec.cpp \ - qlatincodec.cpp \ - qsimplecodec.cpp \ - qtextcodec.cpp \ - qtsciicodec.cpp \ - qutfcodec.cpp \ - qtextcodecplugin.cpp \ - qfontlaocodec.cpp \ - qgb18030codec.cpp \ - qjpunicode.cpp \ - qeucjpcodec.cpp \ - qjiscodec.cpp \ - qsjiscodec.cpp \ - qeuckrcodec.cpp \ - qbig5codec.cpp \ - qfontjpcodec.cpp \ - qstatemachine.cpp \ - qabstractstate.cpp \ - qstate.cpp \ - qfinalstate.cpp \ - qhistorystate.cpp \ - qabstracttransition.cpp \ - qsignaltransition.cpp \ - qeventtransition.cpp \ - qxmlstream.cpp \ - qxmlutils.cpp \ - moc_qabstractanimation_p.cpp \ - moc_qfuturewatcher.cpp \ - moc_qthreadpool.cpp \ - moc_qnamespace.cpp \ - moc_qthread.cpp \ - moc_qeasingcurve.cpp \ - moc_qlocale.cpp \ - moc_qtimeline.cpp \ - moc_qfile.cpp \ - moc_qiodevice.cpp \ - moc_qnoncontiguousbytedevice_p.cpp \ - moc_qtemporaryfile.cpp \ - moc_qsettings.cpp \ - moc_qfilesystemwatcher_p.cpp \ - moc_qpluginloader.cpp \ - moc_qlibrary.cpp \ - moc_qfactoryloader_p.cpp \ - moc_qabstracteventdispatcher.cpp \ - moc_qabstractitemmodel.cpp \ - moc_qeventloop.cpp \ - moc_qcoreapplication.cpp \ - moc_qcoreevent.cpp \ - moc_qmimedata.cpp \ - moc_qsocketnotifier.cpp \ - moc_qtimer.cpp \ - moc_qtranslator.cpp \ - moc_qobjectcleanuphandler.cpp \ - moc_qsharedmemory.cpp \ - moc_qeventdispatcher_unix_p.cpp \ - moc_qtextcodecplugin.cpp \ - moc_qabstractstate.cpp \ - moc_qstate.cpp \ - moc_qfinalstate.cpp \ - moc_qhistorystate.cpp \ - moc_qabstracttransition.cpp \ - 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 - -# 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_qabstractanimation.cpp \ - moc_qabstractanimation_p.cpp \ - moc_qvariantanimation.cpp \ - moc_qpropertyanimation.cpp \ - moc_qanimationgroup.cpp \ - moc_qsequentialanimationgroup.cpp \ - moc_qparallelanimationgroup.cpp \ - moc_qpauseanimation.cpp \ - moc_qfuturewatcher.cpp \ - moc_qthreadpool.cpp \ - moc_qnamespace.cpp \ - moc_qthread.cpp \ - moc_qeasingcurve.cpp \ - moc_qlocale.cpp \ - moc_qtimeline.cpp \ - moc_qbuffer.cpp \ - moc_qfile.cpp \ - moc_qiodevice.cpp \ - moc_qnoncontiguousbytedevice_p.cpp \ - moc_qprocess.cpp \ - moc_qtemporaryfile.cpp \ - moc_qsettings.cpp \ - moc_qfilesystemwatcher.cpp \ - moc_qfilesystemwatcher_p.cpp \ - moc_qpluginloader.cpp \ - moc_qlibrary.cpp \ - moc_qfactoryloader_p.cpp \ - moc_qabstracteventdispatcher.cpp \ - moc_qabstractitemmodel.cpp \ - moc_qeventloop.cpp \ - moc_qcoreapplication.cpp \ - moc_qcoreevent.cpp \ - moc_qmimedata.cpp \ - moc_qobject.cpp \ - moc_qsignalmapper.cpp \ - moc_qsocketnotifier.cpp \ - moc_qtimer.cpp \ - moc_qtranslator.cpp \ - moc_qobjectcleanuphandler.cpp \ - moc_qsharedmemory.cpp \ - moc_qeventdispatcher_unix_p.cpp \ - moc_qtextcodecplugin.cpp \ - moc_qstatemachine.cpp \ - moc_qabstractstate.cpp \ - moc_qstate.cpp \ - moc_qfinalstate.cpp \ - moc_qhistorystate.cpp \ - moc_qabstracttransition.cpp \ - moc_qsignaltransition.cpp \ - moc_qeventtransition.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 = \ - qtextstream.moc \ - qfilesystemwatcher.moc \ - qprocess_unix.moc \ - qtimer.moc - diff --git a/repos/qt4/lib/mk/qt_gui.mk b/repos/qt4/lib/mk/qt_gui.mk deleted file mode 100644 index 705adc2da..000000000 --- a/repos/qt4/lib/mk/qt_gui.mk +++ /dev/null @@ -1,60 +0,0 @@ -include $(REP_DIR)/lib/import/import-qt_gui.mk - -SHARED_LIB = yes - -# 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 \ - moc_qwindowsurface_nitpicker_qws_p.cpp \ - qscreennitpicker_qws.cpp \ - qmousenitpicker_qws.cpp \ - qkbdnitpicker_qws.cpp \ - qinputnitpicker_qws.cpp \ - moc_qinputnitpicker_qws.cpp - -# remove unneeded files to prevent moc warnings -COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT = \ - moc_qsoundqss_qws.cpp \ - moc_qcopchannel_qws.cpp \ - moc_qtransportauth_qws.cpp \ - moc_qtransportauth_qws_p.cpp \ - moc_qwssocket_qws.cpp \ - moc_qsessionmanager.cpp \ - moc_qsound.cpp \ - moc_qsound_p.cpp \ - moc_qmenudata.cpp \ - moc_qprintpreviewwidget.cpp \ - moc_qabstractprintdialog.cpp \ - moc_qabstractpagesetupdialog.cpp \ - moc_qpagesetupdialog.cpp \ - moc_qprintdialog.cpp \ - moc_qprintpreviewdialog.cpp \ - moc_qpagesetupdialog_unix_p.cpp - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES_FILTER_OUT = \ - qsoundqss_qws.moc \ - qcopchannel_qws.moc \ - qsound_qws.moc \ - qprintpreviewwidget.moc \ - qprintdialog_unix.moc \ - qprintpreviewdialog.moc - -# 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 - -LIBS += qt_core libpng zlib libc libm freetype jpeg - -vpath % $(REP_DIR)/include/qt4/QtGui -vpath % $(REP_DIR)/include/qt4/QtGui/private diff --git a/repos/qt4/lib/mk/qt_gui_generated.inc b/repos/qt4/lib/mk/qt_gui_generated.inc deleted file mode 100644 index 5d66b83a2..000000000 --- a/repos/qt4/lib/mk/qt_gui_generated.inc +++ /dev/null @@ -1,762 +0,0 @@ -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 \ - qdecoration_qws.cpp \ - qdecorationfactory_qws.cpp \ - qdecorationplugin_qws.cpp \ - qdirectpainter_qws.cpp \ - qlock.cpp \ - qscreen_qws.cpp \ - qscreenmulti_qws.cpp \ - qscreenproxy_qws.cpp \ - qwindowsystem_qws.cpp \ - qwscommand_qws.cpp \ - qwscursor_qws.cpp \ - qwsevent_qws.cpp \ - qwsmanager_qws.cpp \ - qwsproperty_qws.cpp \ - qtransportauth_qws.cpp \ - qwslock.cpp \ - qwssharedmemory.cpp \ - qwssocket_qws.cpp \ - qwssignalhandler.cpp \ - qwsembedwidget.cpp \ - qdecorationdefault_qws.cpp \ - qdecorationstyled_qws.cpp \ - qdecorationwindows_qws.cpp \ - qscreendriverplugin_qws.cpp \ - qscreendriverfactory_qws.cpp \ - qkbd_qws.cpp \ - qkbddriverplugin_qws.cpp \ - qkbddriverfactory_qws.cpp \ - qmouse_qws.cpp \ - qmousedriverplugin_qws.cpp \ - qmousedriverfactory_qws.cpp \ - qguivariantanimation.cpp \ - qaction.cpp \ - qactiongroup.cpp \ - qapplication.cpp \ - qboxlayout.cpp \ - qclipboard.cpp \ - qcursor.cpp \ - qdrag.cpp \ - qdnd.cpp \ - qevent.cpp \ - qformlayout.cpp \ - qgridlayout.cpp \ - qkeysequence.cpp \ - qlayout.cpp \ - qlayoutengine.cpp \ - qlayoutitem.cpp \ - qmime.cpp \ - qpalette.cpp \ - qshortcut.cpp \ - qshortcutmap.cpp \ - qstackedlayout.cpp \ - qtooltip.cpp \ - qguivariant.cpp \ - qwhatsthis.cpp \ - qwidget.cpp \ - qwidgetaction.cpp \ - qkeymapper.cpp \ - qgesture.cpp \ - qstandardgestures.cpp \ - qgesturerecognizer.cpp \ - qgesturemanager.cpp \ - qsoftkeymanager.cpp \ - qdesktopwidget.cpp \ - qguiplatformplugin.cpp \ - qapplication_qws.cpp \ - qclipboard_qws.cpp \ - qcursor_qws.cpp \ - qdesktopwidget_qws.cpp \ - qdnd_qws.cpp \ - qeventdispatcher_qws.cpp \ - qsound_qws.cpp \ - qwidget_qws.cpp \ - qkeymapper_qws.cpp \ - qsessionmanager_qws.cpp \ - qsound.cpp \ - qbitmap.cpp \ - qicon.cpp \ - qiconloader.cpp \ - qimage.cpp \ - qimageiohandler.cpp \ - qimagereader.cpp \ - qimagewriter.cpp \ - qpaintengine_pic.cpp \ - qpicture.cpp \ - qpictureformatplugin.cpp \ - qpixmap.cpp \ - qpixmapcache.cpp \ - qpixmapdata.cpp \ - qpixmapdatafactory.cpp \ - qpixmapfilter.cpp \ - qiconengine.cpp \ - qiconengineplugin.cpp \ - qmovie.cpp \ - qpixmap_raster.cpp \ - qpixmap_blitter.cpp \ - qnativeimage.cpp \ - qimagepixmapcleanuphooks.cpp \ - qvolatileimage.cpp \ - qpixmap_qws.cpp \ - qvolatileimagedata.cpp \ - qbmphandler.cpp \ - qppmhandler.cpp \ - qxbmhandler.cpp \ - qxpmhandler.cpp \ - qpnghandler.cpp \ - qjpeghandler.cpp \ - qgifhandler.cpp \ - qbezier.cpp \ - qblendfunctions.cpp \ - qbrush.cpp \ - qcolor.cpp \ - qcolor_p.cpp \ - qcosmeticstroker.cpp \ - qcssutil.cpp \ - qdrawutil.cpp \ - qemulationpaintengine.cpp \ - qgraphicssystem.cpp \ - qmatrix.cpp \ - qmemrotate.cpp \ - qoutlinemapper.cpp \ - qpaintdevice.cpp \ - qpaintengine.cpp \ - qpaintengine_alpha.cpp \ - qpaintengine_preview.cpp \ - qpaintengineex.cpp \ - qpainter.cpp \ - qpainterpath.cpp \ - qpathclipper.cpp \ - qpdf.cpp \ - qpen.cpp \ - qpolygon.cpp \ - qprintengine_pdf.cpp \ - qprintengine_ps.cpp \ - qprinter.cpp \ - qprinterinfo.cpp \ - qrasterizer.cpp \ - qregion.cpp \ - qstroker.cpp \ - qstylepainter.cpp \ - qtessellator.cpp \ - qtextureglyphcache.cpp \ - qtransform.cpp \ - qwindowsurface.cpp \ - qpaintbuffer.cpp \ - qpaintengine_raster.cpp \ - qdrawhelper.cpp \ - qimagescale.cpp \ - qgrayraster.c \ - qpaintengine_blitter.cpp \ - qblittable.cpp \ - qgraphicssystem_qws.cpp \ - qprinterinfo_unix.cpp \ - qbackingstore.cpp \ - qcolormap_qws.cpp \ - qpaintdevice_qws.cpp \ - qcups.cpp \ - qwindowsurface_qws.cpp \ - qfont.cpp \ - qfontengine.cpp \ - qfontsubset.cpp \ - qfontmetrics.cpp \ - qfontdatabase.cpp \ - qtextcontrol.cpp \ - qtextengine.cpp \ - qtextlayout.cpp \ - qtextformat.cpp \ - qtextobject.cpp \ - qtextoption.cpp \ - qfragmentmap.cpp \ - qtextdocument.cpp \ - qtextdocument_p.cpp \ - qtexthtmlparser.cpp \ - qabstracttextdocumentlayout.cpp \ - qtextdocumentlayout.cpp \ - qtextcursor.cpp \ - qtextdocumentfragment.cpp \ - qtextimagehandler.cpp \ - qtexttable.cpp \ - qtextlist.cpp \ - qtextdocumentwriter.cpp \ - qsyntaxhighlighter.cpp \ - qcssparser.cpp \ - 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 \ - qstyleplugin.cpp \ - qstylehelper.cpp \ - qcommonstyle.cpp \ - qproxystyle.cpp \ - qstylesheetstyle.cpp \ - qstylesheetstyle_default.cpp \ - qcdestyle.cpp \ - qplastiquestyle.cpp \ - qcleanlooksstyle.cpp \ - qwindowsstyle.cpp \ - qmotifstyle.cpp \ - qabstractbutton.cpp \ - qabstractslider.cpp \ - qabstractspinbox.cpp \ - qcalendarwidget.cpp \ - qcheckbox.cpp \ - qcombobox.cpp \ - qcommandlinkbutton.cpp \ - qdatetimeedit.cpp \ - qdial.cpp \ - qdialogbuttonbox.cpp \ - qdockwidget.cpp \ - qdockarealayout.cpp \ - qeffects.cpp \ - qfontcombobox.cpp \ - qframe.cpp \ - qgroupbox.cpp \ - qlabel.cpp \ - qlcdnumber.cpp \ - qlineedit_p.cpp \ - qlineedit.cpp \ - qlinecontrol.cpp \ - qmainwindow.cpp \ - qmainwindowlayout.cpp \ - qmdiarea.cpp \ - qmdisubwindow.cpp \ - qmenu.cpp \ - qmenubar.cpp \ - qmenudata.cpp \ - qprogressbar.cpp \ - qpushbutton.cpp \ - qradiobutton.cpp \ - qrubberband.cpp \ - qscrollbar.cpp \ - qsizegrip.cpp \ - qslider.cpp \ - qspinbox.cpp \ - qsplashscreen.cpp \ - qsplitter.cpp \ - qstackedwidget.cpp \ - qstatusbar.cpp \ - qtabbar.cpp \ - qtabwidget.cpp \ - qtextedit.cpp \ - qtextbrowser.cpp \ - qtoolbar.cpp \ - qtoolbarlayout.cpp \ - qtoolbarextension.cpp \ - qtoolbarseparator.cpp \ - qtoolbox.cpp \ - qtoolbutton.cpp \ - qvalidator.cpp \ - qabstractscrollarea.cpp \ - qwidgetresizehandler.cpp \ - qfocusframe.cpp \ - qscrollarea.cpp \ - qworkspace.cpp \ - qwidgetanimator.cpp \ - qtoolbararealayout.cpp \ - qplaintextedit.cpp \ - qprintpreviewwidget.cpp \ - qprintdialog_unix.cpp \ - qpagesetupdialog_unix.cpp \ - qabstractprintdialog.cpp \ - qabstractpagesetupdialog.cpp \ - qcolordialog.cpp \ - qdialog.cpp \ - qerrormessage.cpp \ - qfiledialog.cpp \ - qfontdialog.cpp \ - qinputdialog.cpp \ - qmessagebox.cpp \ - qprogressdialog.cpp \ - qsidebar.cpp \ - qfilesystemmodel.cpp \ - qfileinfogatherer.cpp \ - qpagesetupdialog.cpp \ - qwizard.cpp \ - qprintpreviewdialog.cpp \ - qabstractitemview.cpp \ - qheaderview.cpp \ - qidentityproxymodel.cpp \ - qlistview.cpp \ - qbsptree.cpp \ - qtableview.cpp \ - qtreeview.cpp \ - qabstractitemdelegate.cpp \ - qitemdelegate.cpp \ - qitemselectionmodel.cpp \ - qdirmodel.cpp \ - qlistwidget.cpp \ - qtablewidget.cpp \ - qtreewidget.cpp \ - qproxymodel.cpp \ - qabstractproxymodel.cpp \ - qsortfilterproxymodel.cpp \ - qitemeditorfactory.cpp \ - qstandarditemmodel.cpp \ - qstringlistmodel.cpp \ - qtreewidgetitemiterator.cpp \ - qdatawidgetmapper.cpp \ - qfileiconprovider.cpp \ - qcolumnview.cpp \ - qcolumnviewgrip.cpp \ - qstyleditemdelegate.cpp \ - qinputcontextfactory.cpp \ - qinputcontextplugin.cpp \ - qinputcontext.cpp \ - qwsinputcontext_qws.cpp \ - qgraphicsgridlayout.cpp \ - qgraphicsitem.cpp \ - qgraphicsitemanimation.cpp \ - qgraphicslayout.cpp \ - qgraphicslayout_p.cpp \ - qgraphicslayoutitem.cpp \ - qgraphicslinearlayout.cpp \ - qgraphicsproxywidget.cpp \ - qgraphicsscene.cpp \ - qgraphicsscene_bsp.cpp \ - qgraphicsscenebsptreeindex.cpp \ - qgraphicssceneevent.cpp \ - qgraphicssceneindex.cpp \ - qgraphicsscenelinearindex.cpp \ - qgraphicstransform.cpp \ - qgraphicsview.cpp \ - qgraphicswidget.cpp \ - qgraphicswidget_p.cpp \ - qgridlayoutengine.cpp \ - qsimplex_p.cpp \ - qgraphicsanchorlayout_p.cpp \ - qgraphicsanchorlayout.cpp \ - qsystemtrayicon.cpp \ - qcompleter.cpp \ - qdesktopservices.cpp \ - qundogroup.cpp \ - qundostack.cpp \ - qundoview.cpp \ - qsystemtrayicon_qws.cpp \ - qguistatemachine.cpp \ - qkeyeventtransition.cpp \ - qmouseeventtransition.cpp \ - qbasickeyeventtransition.cpp \ - qbasicmouseeventtransition.cpp \ - qgenericmatrix.cpp \ - qmatrix4x4.cpp \ - qquaternion.cpp \ - qvector2d.cpp \ - qvector3d.cpp \ - qvector4d.cpp \ - qgraphicseffect.cpp \ - moc_qsoundqss_qws.cpp \ - moc_qcopchannel_qws.cpp \ - moc_qdecorationplugin_qws.cpp \ - moc_qdirectpainter_qws.cpp \ - moc_qwsmanager_qws.cpp \ - moc_qtransportauth_qws.cpp \ - moc_qwssocket_qws.cpp \ - moc_qwsembedwidget.cpp \ - moc_qscreendriverplugin_qws.cpp \ - moc_qkbddriverplugin_qws.cpp \ - moc_qmousedriverplugin_qws.cpp \ - moc_qboxlayout.cpp \ - moc_qclipboard.cpp \ - moc_qdesktopwidget.cpp \ - moc_qdrag.cpp \ - moc_qdnd_p.cpp \ - moc_qformlayout.cpp \ - moc_qgridlayout.cpp \ - moc_qlayout.cpp \ - moc_qsessionmanager.cpp \ - moc_qshortcut.cpp \ - moc_qsizepolicy.cpp \ - moc_qpalette.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 \ - moc_qpixmapfilter_p.cpp \ - moc_qbrush.cpp \ - moc_qpainter.cpp \ - moc_qpaintbuffer_p.cpp \ - moc_qfont.cpp \ - moc_qfontdatabase.cpp \ - moc_qfont_p.cpp \ - moc_qtextformat.cpp \ - moc_qtextobject.cpp \ - moc_qtextdocument.cpp \ - moc_qtextimagehandler_p.cpp \ - moc_qtexttable.cpp \ - moc_qtextlist.cpp \ - moc_qabstractfontengine_qws.cpp \ - moc_qabstractfontengine_p.cpp \ - moc_qstyle.cpp \ - moc_qstyleplugin.cpp \ - moc_qcommonstyle.cpp \ - moc_qproxystyle.cpp \ - moc_qcdestyle.cpp \ - moc_qplastiquestyle.cpp \ - moc_qcleanlooksstyle.cpp \ - moc_qwindowsstyle.cpp \ - moc_qmotifstyle.cpp \ - moc_qbuttongroup.cpp \ - moc_qabstractbutton.cpp \ - moc_qabstractslider.cpp \ - moc_qcalendartextnavigator_p.cpp \ - moc_qcheckbox.cpp \ - moc_qcombobox_p.cpp \ - moc_qcommandlinkbutton.cpp \ - moc_qdatetimeedit_p.cpp \ - moc_qdial.cpp \ - moc_qdockwidget_p.cpp \ - moc_qframe.cpp \ - moc_qlcdnumber.cpp \ - moc_qlinecontrol_p.cpp \ - moc_qmainwindow.cpp \ - moc_qmainwindowlayout_p.cpp \ - moc_qmenudata.cpp \ - moc_qprogressbar.cpp \ - moc_qradiobutton.cpp \ - moc_qrubberband.cpp \ - moc_qscrollbar.cpp \ - moc_qslider.cpp \ - moc_qspinbox.cpp \ - moc_qsplashscreen.cpp \ - moc_qsplitter.cpp \ - moc_qstackedwidget.cpp \ - moc_qstatusbar.cpp \ - moc_qtabbar_p.cpp \ - moc_qtoolbarlayout_p.cpp \ - moc_qtoolbarextension_p.cpp \ - moc_qtoolbarseparator_p.cpp \ - moc_qvalidator.cpp \ - moc_qwidgetresizehandler_p.cpp \ - moc_qfocusframe.cpp \ - moc_qscrollarea.cpp \ - moc_qwidgetanimator_p.cpp \ - moc_qabstractprintdialog.cpp \ - moc_qabstractpagesetupdialog.cpp \ - moc_qerrormessage.cpp \ - moc_qsidebar_p.cpp \ - moc_qfileinfogatherer_p.cpp \ - moc_qpagesetupdialog_unix_p.cpp \ - moc_qlistview.cpp \ - moc_qabstractitemdelegate.cpp \ - moc_qlistwidget_p.cpp \ - moc_qtablewidget_p.cpp \ - moc_qtreewidget_p.cpp \ - moc_qitemeditorfactory_p.cpp \ - moc_qstringlistmodel.cpp \ - moc_qcolumnviewgrip_p.cpp \ - moc_qinputcontextplugin.cpp \ - moc_qinputcontext.cpp \ - moc_qwsinputcontext_p.cpp \ - moc_qgraphicsitemanimation.cpp \ - moc_qgraphicsscenelinearindex_p.cpp \ - moc_qgraphicsanchorlayout.cpp \ - moc_qsystemtrayicon.cpp \ - moc_qcompleter_p.cpp \ - moc_qsystemtrayicon_p.cpp \ - moc_qundogroup.cpp \ - moc_qundostack.cpp \ - moc_qundostack_p.cpp \ - moc_qundoview.cpp \ - moc_qkeyeventtransition.cpp \ - moc_qmouseeventtransition.cpp \ - moc_qbasickeyeventtransition_p.cpp \ - moc_qbasicmouseeventtransition_p.cpp \ - moc_qgraphicseffect.cpp \ - moc_qgraphicseffect_p.cpp \ - 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 - -# 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_qsoundqss_qws.cpp \ - moc_qcopchannel_qws.cpp \ - moc_qdecorationplugin_qws.cpp \ - moc_qdirectpainter_qws.cpp \ - moc_qwindowsystem_qws.cpp \ - moc_qwsmanager_qws.cpp \ - moc_qtransportauth_qws.cpp \ - moc_qtransportauth_qws_p.cpp \ - moc_qwssocket_qws.cpp \ - moc_qwsembedwidget.cpp \ - moc_qscreendriverplugin_qws.cpp \ - moc_qkbddriverplugin_qws.cpp \ - moc_qmousedriverplugin_qws.cpp \ - moc_qaction.cpp \ - moc_qactiongroup.cpp \ - moc_qapplication.cpp \ - moc_qboxlayout.cpp \ - moc_qclipboard.cpp \ - moc_qdesktopwidget.cpp \ - moc_qdrag.cpp \ - moc_qdnd_p.cpp \ - moc_qformlayout.cpp \ - moc_qgridlayout.cpp \ - moc_qlayout.cpp \ - moc_qsessionmanager.cpp \ - moc_qshortcut.cpp \ - moc_qsizepolicy.cpp \ - moc_qpalette.cpp \ - moc_qstackedlayout.cpp \ - moc_qwidget.cpp \ - moc_qwidgetaction.cpp \ - moc_qkeymapper_p.cpp \ - moc_qgesture.cpp \ - moc_qgesturemanager_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_qmovie.cpp \ - moc_qpictureformatplugin.cpp \ - moc_qpixmapfilter_p.cpp \ - moc_qbrush.cpp \ - moc_qpainter.cpp \ - moc_qpaintbuffer_p.cpp \ - moc_qfont.cpp \ - moc_qfontdatabase.cpp \ - moc_qfont_p.cpp \ - moc_qtextcontrol_p.cpp \ - moc_qtextformat.cpp \ - moc_qtextobject.cpp \ - moc_qtextdocument.cpp \ - moc_qabstracttextdocumentlayout.cpp \ - moc_qtextdocumentlayout_p.cpp \ - moc_qtextimagehandler_p.cpp \ - moc_qtexttable.cpp \ - moc_qtextlist.cpp \ - moc_qsyntaxhighlighter.cpp \ - moc_qabstractfontengine_qws.cpp \ - moc_qabstractfontengine_p.cpp \ - moc_qstyle.cpp \ - moc_qstyleplugin.cpp \ - moc_qcommonstyle.cpp \ - moc_qproxystyle.cpp \ - moc_qstylesheetstyle_p.cpp \ - moc_qcdestyle.cpp \ - moc_qplastiquestyle.cpp \ - moc_qcleanlooksstyle.cpp \ - moc_qwindowsstyle.cpp \ - moc_qmotifstyle.cpp \ - moc_qbuttongroup.cpp \ - moc_qabstractbutton.cpp \ - moc_qabstractslider.cpp \ - moc_qabstractspinbox.cpp \ - moc_qcalendartextnavigator_p.cpp \ - moc_qcalendarwidget.cpp \ - moc_qcheckbox.cpp \ - moc_qcombobox.cpp \ - moc_qcombobox_p.cpp \ - moc_qcommandlinkbutton.cpp \ - moc_qdatetimeedit.cpp \ - moc_qdatetimeedit_p.cpp \ - moc_qdial.cpp \ - moc_qdialogbuttonbox.cpp \ - moc_qdockwidget.cpp \ - moc_qdockwidget_p.cpp \ - moc_qfontcombobox.cpp \ - moc_qframe.cpp \ - moc_qgroupbox.cpp \ - moc_qlabel.cpp \ - moc_qlcdnumber.cpp \ - moc_qlineedit.cpp \ - moc_qlinecontrol_p.cpp \ - moc_qmainwindow.cpp \ - moc_qmainwindowlayout_p.cpp \ - moc_qmdiarea.cpp \ - moc_qmdisubwindow.cpp \ - moc_qmenu.cpp \ - moc_qmenubar.cpp \ - moc_qmenudata.cpp \ - moc_qprogressbar.cpp \ - moc_qpushbutton.cpp \ - moc_qradiobutton.cpp \ - moc_qrubberband.cpp \ - moc_qscrollbar.cpp \ - moc_qsizegrip.cpp \ - moc_qslider.cpp \ - moc_qspinbox.cpp \ - moc_qsplashscreen.cpp \ - moc_qsplitter.cpp \ - moc_qstackedwidget.cpp \ - moc_qstatusbar.cpp \ - moc_qtabbar.cpp \ - moc_qtabbar_p.cpp \ - moc_qtabwidget.cpp \ - moc_qtextedit.cpp \ - moc_qtextbrowser.cpp \ - moc_qtoolbar.cpp \ - moc_qtoolbarlayout_p.cpp \ - moc_qtoolbarextension_p.cpp \ - moc_qtoolbarseparator_p.cpp \ - moc_qtoolbox.cpp \ - moc_qtoolbutton.cpp \ - moc_qvalidator.cpp \ - moc_qabstractscrollarea.cpp \ - moc_qabstractscrollarea_p.cpp \ - moc_qwidgetresizehandler_p.cpp \ - moc_qfocusframe.cpp \ - moc_qscrollarea.cpp \ - moc_qworkspace.cpp \ - moc_qwidgetanimator_p.cpp \ - moc_qplaintextedit.cpp \ - moc_qplaintextedit_p.cpp \ - moc_qprintpreviewwidget.cpp \ - moc_qabstractprintdialog.cpp \ - moc_qabstractpagesetupdialog.cpp \ - moc_qcolordialog.cpp \ - moc_qdialog.cpp \ - moc_qerrormessage.cpp \ - moc_qfiledialog.cpp \ - moc_qfontdialog.cpp \ - moc_qinputdialog.cpp \ - moc_qmessagebox.cpp \ - moc_qpagesetupdialog.cpp \ - moc_qprintdialog.cpp \ - moc_qprogressdialog.cpp \ - moc_qsidebar_p.cpp \ - moc_qfilesystemmodel.cpp \ - moc_qfileinfogatherer_p.cpp \ - moc_qwizard.cpp \ - moc_qprintpreviewdialog.cpp \ - moc_qpagesetupdialog_unix_p.cpp \ - moc_qabstractitemview.cpp \ - moc_qheaderview.cpp \ - moc_qidentityproxymodel.cpp \ - moc_qlistview.cpp \ - moc_qtableview.cpp \ - moc_qtreeview.cpp \ - moc_qabstractitemdelegate.cpp \ - moc_qitemdelegate.cpp \ - moc_qitemselectionmodel.cpp \ - moc_qdirmodel.cpp \ - moc_qlistwidget.cpp \ - moc_qlistwidget_p.cpp \ - moc_qtablewidget.cpp \ - moc_qtablewidget_p.cpp \ - moc_qtreewidget.cpp \ - moc_qtreewidget_p.cpp \ - moc_qproxymodel.cpp \ - moc_qabstractproxymodel.cpp \ - moc_qsortfilterproxymodel.cpp \ - moc_qitemeditorfactory_p.cpp \ - moc_qstandarditemmodel.cpp \ - moc_qstringlistmodel.cpp \ - moc_qdatawidgetmapper.cpp \ - moc_qcolumnviewgrip_p.cpp \ - moc_qcolumnview.cpp \ - moc_qstyleditemdelegate.cpp \ - moc_qinputcontextplugin.cpp \ - moc_qinputcontext.cpp \ - moc_qwsinputcontext_p.cpp \ - moc_qgraphicsitem.cpp \ - moc_qgraphicsitemanimation.cpp \ - moc_qgraphicsproxywidget.cpp \ - moc_qgraphicsscene.cpp \ - moc_qgraphicsscenebsptreeindex_p.cpp \ - moc_qgraphicssceneindex_p.cpp \ - moc_qgraphicsscenelinearindex_p.cpp \ - moc_qgraphicstransform.cpp \ - moc_qgraphicsview.cpp \ - moc_qgraphicswidget.cpp \ - moc_qgraphicsanchorlayout.cpp \ - moc_qsystemtrayicon.cpp \ - moc_qcompleter.cpp \ - moc_qcompleter_p.cpp \ - moc_qsystemtrayicon_p.cpp \ - moc_qundogroup.cpp \ - moc_qundostack.cpp \ - moc_qundostack_p.cpp \ - moc_qundoview.cpp \ - moc_qkeyeventtransition.cpp \ - moc_qmouseeventtransition.cpp \ - moc_qbasickeyeventtransition_p.cpp \ - moc_qbasicmouseeventtransition_p.cpp \ - moc_qgraphicseffect.cpp \ - moc_qgraphicseffect_p.cpp - -# 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 = \ - qsoundqss_qws.moc \ - qcopchannel_qws.moc \ - qkbd_qws.moc \ - qtooltip.moc \ - qwhatsthis.moc \ - qsound_qws.moc \ - qpixmapcache.moc \ - qcalendarwidget.moc \ - qdockwidget.moc \ - qeffects.moc \ - qfontcombobox.moc \ - qmdisubwindow.moc \ - qmenu.moc \ - qtoolbox.moc \ - qworkspace.moc \ - qprintpreviewwidget.moc \ - qprintdialog_unix.moc \ - qcolordialog.moc \ - qfontdialog.moc \ - qinputdialog.moc \ - qprintpreviewdialog.moc \ - qtableview.moc \ - qlistwidget.moc \ - qitemeditorfactory.moc \ - qdesktopservices.moc \ - qundoview.moc - diff --git a/repos/qt4/lib/mk/qt_jscore.mk b/repos/qt4/lib/mk/qt_jscore.mk deleted file mode 100644 index 0bf2f99d3..000000000 --- a/repos/qt4/lib/mk/qt_jscore.mk +++ /dev/null @@ -1,25 +0,0 @@ -include $(REP_DIR)/lib/import/import-qt_jscore.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 = - -# some parts of the library are not C++11 compatible -CC_CXX_OPT_STD = - -# StackBounds includes Genode headers, which rely on C++11. Hence, we need -# to selectively enable C++11 for this compilation unit. -CC_OPT_StackBounds = -std=gnu++11 - -include $(REP_DIR)/lib/mk/qt_jscore_generated.inc - -include $(REP_DIR)/lib/mk/qt.inc - -LIBS += qt_network qt_core libc libm diff --git a/repos/qt4/lib/mk/qt_jscore_generated.inc b/repos/qt4/lib/mk/qt_jscore_generated.inc deleted file mode 100644 index edd7c7d53..000000000 --- a/repos/qt4/lib/mk/qt_jscore_generated.inc +++ /dev/null @@ -1,258 +0,0 @@ -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 = \ - 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 \ - JSCallbackObject.cpp \ - JSClassRef.cpp \ - JSContextRef.cpp \ - JSObjectRef.cpp \ - JSStringRef.cpp \ - JSValueRef.cpp \ - OpaqueJSString.cpp \ - ARMAssembler.cpp \ - ARMv7Assembler.cpp \ - MacroAssemblerARM.cpp \ - MacroAssemblerSH4.cpp \ - CodeBlock.cpp \ - JumpTable.cpp \ - Opcode.cpp \ - SamplingTool.cpp \ - 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 \ - 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 \ - Profiler.cpp \ - ArgList.cpp \ - Arguments.cpp \ - ArrayConstructor.cpp \ - ArrayPrototype.cpp \ - BooleanConstructor.cpp \ - BooleanObject.cpp \ - BooleanPrototype.cpp \ - CallData.cpp \ - CommonIdentifiers.cpp \ - Completion.cpp \ - ConstructData.cpp \ - DateConstructor.cpp \ - DateConversion.cpp \ - DateInstance.cpp \ - DatePrototype.cpp \ - ErrorConstructor.cpp \ - Error.cpp \ - ErrorInstance.cpp \ - ErrorPrototype.cpp \ - ExceptionHelpers.cpp \ - Executable.cpp \ - FunctionConstructor.cpp \ - FunctionPrototype.cpp \ - GCActivityCallback.cpp \ - GetterSetter.cpp \ - Identifier.cpp \ - InitializeThreading.cpp \ - InternalFunction.cpp \ - JSActivation.cpp \ - JSAPIValueWrapper.cpp \ - JSArray.cpp \ - JSByteArray.cpp \ - JSCell.cpp \ - JSFunction.cpp \ - JSGlobalData.cpp \ - JSGlobalObject.cpp \ - JSGlobalObjectFunctions.cpp \ - JSLock.cpp \ - JSNotAnObject.cpp \ - JSObject.cpp \ - JSObjectWithGlobalObject.cpp \ - JSONObject.cpp \ - JSPropertyNameIterator.cpp \ - JSStaticScopeObject.cpp \ - JSString.cpp \ - JSValue.cpp \ - JSVariableObject.cpp \ - JSWrapperObject.cpp \ - LiteralParser.cpp \ - Lookup.cpp \ - MathObject.cpp \ - NativeErrorConstructor.cpp \ - NativeErrorPrototype.cpp \ - NumberConstructor.cpp \ - NumberObject.cpp \ - NumberPrototype.cpp \ - ObjectConstructor.cpp \ - ObjectPrototype.cpp \ - Operations.cpp \ - PropertyDescriptor.cpp \ - PropertyNameArray.cpp \ - PropertySlot.cpp \ - 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 \ - 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 - -# 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 = \ - - -# 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 \ - ThreadingQt.moc - diff --git a/repos/qt4/lib/mk/qt_network.mk b/repos/qt4/lib/mk/qt_network.mk deleted file mode 100644 index 7fb89963d..000000000 --- a/repos/qt4/lib/mk/qt_network.mk +++ /dev/null @@ -1,22 +0,0 @@ -include $(REP_DIR)/lib/import/import-qt_network.mk - -SHARED_LIB = yes - -# use default warning level to avoid noise when compiling contrib code -CC_WARN = - -include $(REP_DIR)/lib/mk/qt_network_generated.inc - -# remove unneeded files to prevent moc warnings -COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT = \ - moc_qftp.cpp \ - moc_qnetworkaccessdebugpipebackend_p.cpp \ - moc_qnetworkaccessftpbackend_p.cpp \ - moc_qudpsocket.cpp - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES_FILTER_OUT = \ - qftp.moc - -include $(REP_DIR)/lib/mk/qt.inc - -LIBS += qt_core zlib libc libssl diff --git a/repos/qt4/lib/mk/qt_network_generated.inc b/repos/qt4/lib/mk/qt_network_generated.inc deleted file mode 100644 index 9b64c7d3c..000000000 --- a/repos/qt4/lib/mk/qt_network_generated.inc +++ /dev/null @@ -1,157 +0,0 @@ -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 \ - qhttpnetworkheader.cpp \ - qhttpnetworkrequest.cpp \ - qhttpnetworkreply.cpp \ - qhttpnetworkconnection.cpp \ - qhttpnetworkconnectionchannel.cpp \ - qnetworkaccessauthenticationmanager.cpp \ - qnetworkaccessmanager.cpp \ - qnetworkaccesscache.cpp \ - qnetworkaccessbackend.cpp \ - qnetworkaccessdebugpipebackend.cpp \ - qnetworkaccessfilebackend.cpp \ - qnetworkaccesscachebackend.cpp \ - qnetworkaccessftpbackend.cpp \ - qnetworkaccesshttpbackend.cpp \ - qnetworkcookie.cpp \ - qnetworkcookiejar.cpp \ - qnetworkrequest.cpp \ - qnetworkreply.cpp \ - qnetworkreplyimpl.cpp \ - qnetworkreplydataimpl.cpp \ - qnetworkreplyfileimpl.cpp \ - qabstractnetworkcache.cpp \ - qnetworkdiskcache.cpp \ - qhttpthreaddelegate.cpp \ - qhttpmultipart.cpp \ - qnetworksession.cpp \ - qnetworkconfigmanager.cpp \ - qnetworkconfiguration.cpp \ - qnetworkconfigmanager_p.cpp \ - qbearerengine.cpp \ - qbearerplugin.cpp \ - qsharednetworksession.cpp \ - qauthenticator.cpp \ - qhostaddress.cpp \ - qhostinfo.cpp \ - qurlinfo.cpp \ - qnetworkproxy.cpp \ - qnetworkinterface.cpp \ - qhostinfo_unix.cpp \ - qnetworkinterface_unix.cpp \ - qnetworkproxy_generic.cpp \ - qabstractsocketengine.cpp \ - qhttpsocketengine.cpp \ - qsocks5socketengine.cpp \ - qabstractsocket.cpp \ - qtcpsocket.cpp \ - qudpsocket.cpp \ - 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 \ - moc_qnetworkaccessdebugpipebackend_p.cpp \ - moc_qnetworkaccesshttpbackend_p.cpp \ - moc_qnetworkaccessfilebackend_p.cpp \ - moc_qnetworkaccessftpbackend_p.cpp \ - moc_qnetworkcookiejar.cpp \ - 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_qhttpsocketengine_p.cpp \ - moc_qsocks5socketengine_p.cpp \ - moc_qtcpsocket.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 - -# 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_qftp.cpp \ - moc_qhttp.cpp \ - moc_qhttpnetworkreply_p.cpp \ - moc_qhttpnetworkconnection_p.cpp \ - moc_qhttpnetworkconnectionchannel_p.cpp \ - moc_qnetworkaccessmanager.cpp \ - moc_qnetworkaccesscache_p.cpp \ - moc_qnetworkaccessbackend_p.cpp \ - moc_qnetworkaccessdebugpipebackend_p.cpp \ - moc_qnetworkaccesshttpbackend_p.cpp \ - moc_qnetworkaccessfilebackend_p.cpp \ - moc_qnetworkaccessftpbackend_p.cpp \ - 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 \ - moc_qnetworksession_p.cpp \ - moc_qbearerengine_p.cpp \ - moc_qbearerplugin_p.cpp \ - moc_qhostinfo_p.cpp \ - moc_qabstractsocketengine_p.cpp \ - moc_qhttpsocketengine_p.cpp \ - moc_qsocks5socketengine_p.cpp \ - moc_qabstractsocket.cpp \ - moc_qtcpsocket.cpp \ - moc_qudpsocket.cpp \ - moc_qtcpserver.cpp \ - moc_qlocalserver.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 - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - qftp.moc - diff --git a/repos/qt4/lib/mk/qt_script.mk b/repos/qt4/lib/mk/qt_script.mk deleted file mode 100644 index 83c0fa6cd..000000000 --- a/repos/qt4/lib/mk/qt_script.mk +++ /dev/null @@ -1 +0,0 @@ -include $(REP_DIR)/lib/mk/qt_scriptclassic.mk diff --git a/repos/qt4/lib/mk/qt_scriptclassic.mk b/repos/qt4/lib/mk/qt_scriptclassic.mk deleted file mode 100644 index 1294e3188..000000000 --- a/repos/qt4/lib/mk/qt_scriptclassic.mk +++ /dev/null @@ -1,31 +0,0 @@ -include $(REP_DIR)/lib/import/import-qt_scriptclassic.mk - -SHARED_LIB = yes - -# use default warning level to avoid noise when compiling contrib code -CC_WARN = - -include $(REP_DIR)/lib/mk/qt_scriptclassic_generated.inc - -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 \ - $(REP_DIR)/contrib/include/QtCore \ - $(REP_DIR)/include/qt4/QtCore/private \ - $(REP_DIR)/contrib/include/QtCore/private \ - $(REP_DIR)/include/qt4/QtScript \ - $(REP_DIR)/contrib/qtscriptclassic-1.0_1-opensource/include/QtScript \ - $(REP_DIR)/contrib/qtscriptclassic-1.0_1-opensource/src \ - $(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/script - -vpath % $(REP_DIR)/contrib/qtscriptclassic-1.0_1-opensource/src diff --git a/repos/qt4/lib/mk/qt_scriptclassic_generated.inc b/repos/qt4/lib/mk/qt_scriptclassic_generated.inc deleted file mode 100644 index 7a51aec13..000000000 --- a/repos/qt4/lib/mk/qt_scriptclassic_generated.inc +++ /dev/null @@ -1,60 +0,0 @@ -QT_SOURCES = \ - qscriptasm.cpp \ - qscriptast.cpp \ - qscriptastvisitor.cpp \ - qscriptcompiler.cpp \ - qscriptecmaarray.cpp \ - qscriptecmaboolean.cpp \ - qscriptecmacore.cpp \ - qscriptecmadate.cpp \ - qscriptecmafunction.cpp \ - qscriptecmaglobal.cpp \ - qscriptecmamath.cpp \ - qscriptecmanumber.cpp \ - qscriptecmaobject.cpp \ - qscriptecmaregexp.cpp \ - qscriptecmastring.cpp \ - qscriptecmaerror.cpp \ - qscriptcontext_p.cpp \ - qscriptengine.cpp \ - qscriptengine_p.cpp \ - qscriptengineagent.cpp \ - qscriptextenumeration.cpp \ - qscriptextvariant.cpp \ - qscriptcontext.cpp \ - qscriptcontextinfo.cpp \ - qscriptfunction.cpp \ - qscriptgrammar.cpp \ - qscriptlexer.cpp \ - qscriptclassdata.cpp \ - qscriptparser.cpp \ - qscriptprettypretty.cpp \ - qscriptxmlgenerator.cpp \ - qscriptsyntaxchecker.cpp \ - qscriptstring.cpp \ - qscriptclass.cpp \ - qscriptclasspropertyiterator.cpp \ - qscriptvalueiteratorimpl.cpp \ - qscriptvalueiterator.cpp \ - qscriptvalueimpl.cpp \ - qscriptvalue.cpp \ - qscriptextqobject.cpp \ - qscriptable.cpp \ - qscriptextensionplugin.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 - -# 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 = \ - qscriptextqobject.moc diff --git a/repos/qt4/lib/mk/qt_scripttools.mk b/repos/qt4/lib/mk/qt_scripttools.mk deleted file mode 100644 index 55c60b960..000000000 --- a/repos/qt4/lib/mk/qt_scripttools.mk +++ /dev/null @@ -1,15 +0,0 @@ -include $(REP_DIR)/lib/import/import-qt_scripttools.mk - -SHARED_LIB = yes - -include $(REP_DIR)/lib/mk/qt_scripttools_generated.inc - -include $(REP_DIR)/lib/mk/qt.inc - -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 diff --git a/repos/qt4/lib/mk/qt_scripttools_generated.inc b/repos/qt4/lib/mk/qt_scripttools_generated.inc deleted file mode 100644 index 7ed255321..000000000 --- a/repos/qt4/lib/mk/qt_scripttools_generated.inc +++ /dev/null @@ -1,134 +0,0 @@ -QT_DEFINES += -DQT_BUILD_SCRIPTTOOLS_LIB -DQT_NO_USING_NAMESPACE -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_NO_DEBUG -DQT_SCRIPT_LIB -DQT_GUI_LIB -DQT_CORE_LIB - -QT_INCPATH = \ - mkspecs/qws/genode-generic-g++ \ - src/scripttools \ - -QT_SOURCES = \ - qscriptdebuggervalue.cpp \ - qscriptdebuggervalueproperty.cpp \ - qscriptdebuggercommand.cpp \ - qscriptdebuggerresponse.cpp \ - qscriptdebuggerevent.cpp \ - qscriptdebuggercommandexecutor.cpp \ - qscriptdebuggercommandschedulerfrontend.cpp \ - qscriptdebuggerbackend.cpp \ - qscriptdebuggeragent.cpp \ - qscriptdebuggerfrontend.cpp \ - qscriptstdmessagehandler.cpp \ - qscriptenginedebuggerfrontend.cpp \ - qscriptdebuggerjob.cpp \ - qscriptdebuggercommandschedulerjob.cpp \ - qscriptvalueproperty.cpp \ - qscriptobjectsnapshot.cpp \ - qscriptscriptdata.cpp \ - qscriptxmlparser.cpp \ - qscriptbreakpointdata.cpp \ - qscriptdebugger.cpp \ - qscriptdebuggerconsole.cpp \ - qscriptdebuggerconsolecommand.cpp \ - qscriptdebuggerconsolecommandjob.cpp \ - qscriptdebuggerconsolecommandgroupdata.cpp \ - qscriptdebuggerconsolecommandmanager.cpp \ - qscriptcompletiontaskinterface.cpp \ - qscriptcompletiontask.cpp \ - qscriptdebuggerconsoleglobalobject.cpp \ - qscriptdebuggerscriptedconsolecommand.cpp \ - qscriptedit.cpp \ - qscriptsyntaxhighlighter.cpp \ - qscriptdebuggerconsolewidgetinterface.cpp \ - qscriptdebuggerconsolewidget.cpp \ - qscriptdebuggerstackwidgetinterface.cpp \ - qscriptdebuggerstackwidget.cpp \ - qscriptdebuggerstackmodel.cpp \ - qscriptdebuggerscriptswidgetinterface.cpp \ - qscriptdebuggerscriptswidget.cpp \ - qscriptdebuggerscriptsmodel.cpp \ - qscriptdebuggerlocalswidgetinterface.cpp \ - qscriptdebuggerlocalswidget.cpp \ - qscriptdebuggerlocalsmodel.cpp \ - qscriptdebuggercodewidgetinterface.cpp \ - qscriptdebuggercodewidget.cpp \ - qscriptdebuggercodeviewinterface.cpp \ - qscriptdebuggercodeview.cpp \ - qscriptdebuggercodefinderwidgetinterface.cpp \ - qscriptdebuggercodefinderwidget.cpp \ - qscriptdebugoutputwidgetinterface.cpp \ - qscriptdebugoutputwidget.cpp \ - qscriptbreakpointswidgetinterface.cpp \ - qscriptbreakpointswidget.cpp \ - qscriptbreakpointsmodel.cpp \ - qscripterrorlogwidgetinterface.cpp \ - qscripterrorlogwidget.cpp \ - qscriptdebuggerstandardwidgetfactory.cpp \ - qscriptenginedebugger.cpp \ - moc_qscriptcompletiontaskinterface_p.cpp \ - moc_qscriptcompletiontask_p.cpp \ - moc_qscriptdebuggerconsoleglobalobject_p.cpp \ - moc_qscriptedit_p.cpp \ - moc_qscriptdebuggerconsolewidgetinterface_p.cpp \ - moc_qscriptdebuggerstackwidgetinterface_p.cpp \ - moc_qscriptdebuggerscriptswidgetinterface_p.cpp \ - moc_qscriptdebuggerscriptsmodel_p.cpp \ - moc_qscriptdebuggerlocalswidgetinterface_p.cpp \ - moc_qscriptdebuggerlocalsmodel_p.cpp \ - moc_qscriptdebuggercodewidgetinterface_p.cpp \ - moc_qscriptdebuggercodeviewinterface_p.cpp \ - moc_qscriptdebuggercodefinderwidgetinterface_p.cpp \ - moc_qscriptdebugoutputwidgetinterface_p.cpp \ - moc_qscriptdebugoutputwidget_p.cpp \ - moc_qscriptbreakpointswidgetinterface_p.cpp \ - moc_qscriptbreakpointsmodel_p.cpp \ - moc_qscripterrorlogwidgetinterface_p.cpp \ - moc_qscripterrorlogwidget_p.cpp \ - qrc_scripttools_debugging.cpp - -QT_VPATH = \ - src/scripttools/debugging \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in spec-qt4.mk) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - moc_qscriptdebugger_p.cpp \ - moc_qscriptcompletiontaskinterface_p.cpp \ - moc_qscriptcompletiontask_p.cpp \ - moc_qscriptdebuggerconsoleglobalobject_p.cpp \ - moc_qscriptedit_p.cpp \ - moc_qscriptdebuggerconsolewidgetinterface_p.cpp \ - moc_qscriptdebuggerconsolewidget_p.cpp \ - moc_qscriptdebuggerstackwidgetinterface_p.cpp \ - moc_qscriptdebuggerstackwidget_p.cpp \ - moc_qscriptdebuggerscriptswidgetinterface_p.cpp \ - moc_qscriptdebuggerscriptswidget_p.cpp \ - moc_qscriptdebuggerscriptsmodel_p.cpp \ - moc_qscriptdebuggerlocalswidgetinterface_p.cpp \ - moc_qscriptdebuggerlocalswidget_p.cpp \ - moc_qscriptdebuggerlocalsmodel_p.cpp \ - moc_qscriptdebuggercodewidgetinterface_p.cpp \ - moc_qscriptdebuggercodewidget_p.cpp \ - moc_qscriptdebuggercodeviewinterface_p.cpp \ - moc_qscriptdebuggercodeview_p.cpp \ - moc_qscriptdebuggercodefinderwidgetinterface_p.cpp \ - moc_qscriptdebuggercodefinderwidget_p.cpp \ - moc_qscriptdebugoutputwidgetinterface_p.cpp \ - moc_qscriptdebugoutputwidget_p.cpp \ - moc_qscriptbreakpointswidgetinterface_p.cpp \ - moc_qscriptbreakpointswidget_p.cpp \ - moc_qscriptbreakpointsmodel_p.cpp \ - moc_qscripterrorlogwidgetinterface_p.cpp \ - moc_qscripterrorlogwidget_p.cpp \ - moc_qscriptenginedebugger.cpp - -# source files generated from existing source files ('%.moc: %.cpp' rule in spec-qt4.mk) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - qscriptdebuggerconsolewidget.moc \ - qscriptdebuggerlocalswidget.moc \ - qscriptbreakpointswidget.moc \ - qscriptenginedebugger.moc - diff --git a/repos/qt4/lib/mk/qt_svg.mk b/repos/qt4/lib/mk/qt_svg.mk deleted file mode 100644 index 58b4966bb..000000000 --- a/repos/qt4/lib/mk/qt_svg.mk +++ /dev/null @@ -1,15 +0,0 @@ -include $(REP_DIR)/lib/import/import-qt_svg.mk - -SHARED_LIB = yes - -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 - -LIBS += qt_core qt_gui zlib libc - -vpath % $(REP_DIR)/include/qt4/QtSvg -vpath % $(REP_DIR)/include/qt4/QtSvg/private diff --git a/repos/qt4/lib/mk/qt_svg_generated.inc b/repos/qt4/lib/mk/qt_svg_generated.inc deleted file mode 100644 index 7e58fb76d..000000000 --- a/repos/qt4/lib/mk/qt_svg_generated.inc +++ /dev/null @@ -1,41 +0,0 @@ -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 \ - qsvgnode.cpp \ - qsvgstructure.cpp \ - qsvgstyle.cpp \ - qsvgfont.cpp \ - qsvgtinydocument.cpp \ - qsvgrenderer.cpp \ - qsvgwidget.cpp \ - qgraphicssvgitem.cpp \ - 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 - -# 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_qsvgrenderer.cpp \ - moc_qsvgwidget.cpp \ - moc_qgraphicssvgitem.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 = \ - - diff --git a/repos/qt4/lib/mk/qt_ui_tools.mk b/repos/qt4/lib/mk/qt_ui_tools.mk deleted file mode 100644 index 62b30140d..000000000 --- a/repos/qt4/lib/mk/qt_ui_tools.mk +++ /dev/null @@ -1,20 +0,0 @@ -include $(REP_DIR)/lib/import/import-qt_ui_tools.mk - -SHARED_LIB = yes - -CC_OPT += -Wno-unused-but-set-variable - -include $(REP_DIR)/lib/mk/qt_ui_tools_generated.inc - -include $(REP_DIR)/lib/mk/qt.inc - -LIBS += qt_core qt_gui qt_xml libc - -vpath % $(REP_DIR)/include/qt4/QtUiTools -vpath % $(REP_DIR)/include/qt4/QtUiTools/private - -vpath % $(REP_DIR)/src/lib/qt4/tools/designer/src/lib/uilib -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 diff --git a/repos/qt4/lib/mk/qt_ui_tools_generated.inc b/repos/qt4/lib/mk/qt_ui_tools_generated.inc deleted file mode 100644 index 05dfa08f4..000000000 --- a/repos/qt4/lib/mk/qt_ui_tools_generated.inc +++ /dev/null @@ -1,39 +0,0 @@ -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 \ - ui4.cpp \ - properties.cpp \ - formbuilderextra.cpp \ - resourcebuilder.cpp \ - textbuilder.cpp \ - quiloader.cpp \ - 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 - -# 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_properties_p.cpp \ - moc_quiloader.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 = \ - quiloader.moc - diff --git a/repos/qt4/lib/mk/qt_version.inc b/repos/qt4/lib/mk/qt_version.inc deleted file mode 100644 index 865900522..000000000 --- a/repos/qt4/lib/mk/qt_version.inc +++ /dev/null @@ -1 +0,0 @@ -QT4 := qt-everywhere-opensource-src-4.8.4 diff --git a/repos/qt4/lib/mk/qt_webcore.mk b/repos/qt4/lib/mk/qt_webcore.mk deleted file mode 100644 index 5701466bd..000000000 --- a/repos/qt4/lib/mk/qt_webcore.mk +++ /dev/null @@ -1,23 +0,0 @@ -include $(REP_DIR)/lib/import/import-qt_webcore.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 - -# some parts of the library are not C++11 compatible -CC_CXX_OPT_STD = - -include $(REP_DIR)/lib/mk/qt_webcore_generated.inc - -include $(REP_DIR)/lib/mk/qt.inc - -LIBS += qt_jscore qt_network qt_core libc libm diff --git a/repos/qt4/lib/mk/qt_webcore_generated.inc b/repos/qt4/lib/mk/qt_webcore_generated.inc deleted file mode 100644 index cabe81ab0..000000000 --- a/repos/qt4/lib/mk/qt_webcore_generated.inc +++ /dev/null @@ -1,1553 +0,0 @@ -QT_DEFINES += -DNDEBUG -DBUILDING_QT__=1 -DNDEBUG -DQT_ASCII_CAST_WARNINGS -DENABLE_XSLT=0 -DENABLE_WEB_TIMING=0 -DENABLE_JAVASCRIPT_DEBUGGER=1 -DENABLE_DATABASE=1 -DENABLE_EVENTSOURCE=1 -DENABLE_OFFLINE_WEB_APPLICATIONS=1 -DENABLE_DOM_STORAGE=1 -DENABLE_ICONDATABASE=1 -DENABLE_CHANNEL_MESSAGING=1 -DENABLE_DIRECTORY_UPLOAD=0 -DENABLE_FILE_SYSTEM=0 -DENABLE_QUOTA=0 -DENABLE_SQLITE=1 -DENABLE_DASHBOARD_SUPPORT=0 -DENABLE_FILTERS=1 -DENABLE_XPATH=1 -DENABLE_WCSS=0 -DENABLE_SHARED_WORKERS=1 -DENABLE_WORKERS=1 -DENABLE_XHTMLMP=0 -DENABLE_DETAILS=1 -DENABLE_METER_TAG=1 -DENABLE_PROGRESS_TAG=1 -DENABLE_BLOB=1 -DENABLE_NOTIFICATIONS=1 -DENABLE_INPUT_SPEECH=0 -DENABLE_INSPECTOR=1 -DENABLE_3D_RENDERING=1 -DENABLE_WEB_AUDIO=0 -DENABLE_WEBGL=0 -DENABLE_MEDIA_STATISTICS=0 -DENABLE_VIDEO_TRACK=0 -DENABLE_TOUCH_ICON_LOADING=0 -DENABLE_ANIMATION_API=0 -DENABLE_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_SVG_FOREIGN_OBJECT=1 -DENABLE_SVG_ANIMATION=1 -DENABLE_SVG_AS_IMAGE=1 -DENABLE_SVG_USE=1 -DENABLE_DATALIST=1 -DENABLE_TILED_BACKING_STORE=1 -DENABLE_NETSCAPE_PLUGIN_API=0 -DWTF_USE_QT_BEARER=1 -DENABLE_TOUCH_EVENTS=1 -DENABLE_VIDEO=0 -DSQLITE_CORE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_OMIT_COMPLETE -DBUILDING_JavaScriptCore -DBUILDING_WTF -DBUILDING_WEBKIT -DQT_MAKEDLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB - -QT_INCPATH = \ - mkspecs/qws/genode-generic-g++ \ - src/3rdparty/sqlite \ - src/3rdparty/webkit/include \ - src/3rdparty/webkit/Source \ - src/3rdparty/webkit/Source/JavaScriptCore \ - src/3rdparty/webkit/Source/JavaScriptCore/API \ - src/3rdparty/webkit/Source/JavaScriptCore/assembler \ - src/3rdparty/webkit/Source/JavaScriptCore/bytecode \ - src/3rdparty/webkit/Source/JavaScriptCore/bytecompiler \ - src/3rdparty/webkit/Source/JavaScriptCore/debugger \ - src/3rdparty/webkit/Source/JavaScriptCore/dfg \ - src/3rdparty/webkit/Source/JavaScriptCore/ForwardingHeaders \ - src/3rdparty/webkit/Source/JavaScriptCore/generated \ - src/3rdparty/webkit/Source/JavaScriptCore/heap \ - src/3rdparty/webkit/Source/JavaScriptCore/interpreter \ - src/3rdparty/webkit/Source/JavaScriptCore/jit \ - src/3rdparty/webkit/Source/JavaScriptCore/parser \ - src/3rdparty/webkit/Source/JavaScriptCore/profiler \ - src/3rdparty/webkit/Source/JavaScriptCore/runtime \ - src/3rdparty/webkit/Source/JavaScriptCore/wtf \ - src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject \ - src/3rdparty/webkit/Source/JavaScriptCore/wtf/symbian \ - src/3rdparty/webkit/Source/JavaScriptCore/wtf/unicode \ - src/3rdparty/webkit/Source/JavaScriptCore/yarr \ - src/3rdparty/webkit/Source/ThirdParty \ - src/3rdparty/webkit/Source/WebCore \ - src/3rdparty/webkit/Source/WebCore/accessibility \ - src/3rdparty/webkit/Source/WebCore/bindings \ - src/3rdparty/webkit/Source/WebCore/bindings/generic \ - src/3rdparty/webkit/Source/WebCore/bindings/js \ - src/3rdparty/webkit/Source/WebCore/bindings/js/specialization \ - src/3rdparty/webkit/Source/WebCore/bridge \ - src/3rdparty/webkit/Source/WebCore/bridge/c \ - src/3rdparty/webkit/Source/WebCore/bridge/jsc \ - src/3rdparty/webkit/Source/WebCore/bridge/qt \ - src/3rdparty/webkit/Source/WebCore/css \ - src/3rdparty/webkit/Source/WebCore/dom \ - src/3rdparty/webkit/Source/WebCore/dom/default \ - src/3rdparty/webkit/Source/WebCore/editing \ - src/3rdparty/webkit/Source/WebCore/fileapi \ - src/3rdparty/webkit/Source/WebCore/generated \ - src/3rdparty/webkit/Source/WebCore/history \ - src/3rdparty/webkit/Source/WebCore/html \ - src/3rdparty/webkit/Source/WebCore/html/canvas \ - src/3rdparty/webkit/Source/WebCore/html/parser \ - src/3rdparty/webkit/Source/WebCore/html/shadow \ - src/3rdparty/webkit/Source/WebCore/inspector \ - src/3rdparty/webkit/Source/WebCore/loader \ - src/3rdparty/webkit/Source/WebCore/loader/appcache \ - src/3rdparty/webkit/Source/WebCore/loader/archive \ - src/3rdparty/webkit/Source/WebCore/loader/cache \ - src/3rdparty/webkit/Source/WebCore/loader/icon \ - src/3rdparty/webkit/Source/WebCore/mathml \ - src/3rdparty/webkit/Source/WebCore/notifications \ - src/3rdparty/webkit/Source/WebCore/page \ - src/3rdparty/webkit/Source/WebCore/page/animation \ - src/3rdparty/webkit/Source/WebCore/page/qt \ - src/3rdparty/webkit/Source/WebCore/platform \ - src/3rdparty/webkit/Source/WebCore/platform/animation \ - src/3rdparty/webkit/Source/WebCore/platform/audio \ - src/3rdparty/webkit/Source/WebCore/platform/graphics \ - src/3rdparty/webkit/Source/WebCore/platform/graphics/filters \ - src/3rdparty/webkit/Source/WebCore/platform/graphics/filters/arm \ - src/3rdparty/webkit/Source/WebCore/platform/graphics/qt \ - src/3rdparty/webkit/Source/WebCore/platform/graphics/texmap \ - src/3rdparty/webkit/Source/WebCore/platform/graphics/transforms \ - src/3rdparty/webkit/Source/WebCore/platform/image-decoders \ - src/3rdparty/webkit/Source/WebCore/platform/leveldb \ - src/3rdparty/webkit/Source/WebCore/platform/mock \ - src/3rdparty/webkit/Source/WebCore/platform/network \ - src/3rdparty/webkit/Source/WebCore/platform/network/qt \ - src/3rdparty/webkit/Source/WebCore/platform/qt \ - src/3rdparty/webkit/Source/WebCore/platform/sql \ - src/3rdparty/webkit/Source/WebCore/platform/text \ - src/3rdparty/webkit/Source/WebCore/platform/text/transcoder \ - src/3rdparty/webkit/Source/WebCore/plugins \ - src/3rdparty/webkit/Source/WebCore/rendering \ - src/3rdparty/webkit/Source/WebCore/rendering/mathml \ - src/3rdparty/webkit/Source/WebCore/rendering/style \ - src/3rdparty/webkit/Source/WebCore/rendering/svg \ - src/3rdparty/webkit/Source/WebCore/storage \ - src/3rdparty/webkit/Source/WebCore/svg \ - src/3rdparty/webkit/Source/WebCore/svg/animation \ - src/3rdparty/webkit/Source/WebCore/svg/graphics \ - src/3rdparty/webkit/Source/WebCore/svg/graphics/filters \ - src/3rdparty/webkit/Source/WebCore/svg/properties \ - src/3rdparty/webkit/Source/WebCore/testing \ - src/3rdparty/webkit/Source/WebCore/testing/js \ - src/3rdparty/webkit/Source/WebCore/webaudio \ - src/3rdparty/webkit/Source/WebCore/websockets \ - src/3rdparty/webkit/Source/WebCore/wml \ - src/3rdparty/webkit/Source/WebCore/workers \ - src/3rdparty/webkit/Source/WebCore/xml \ - src/3rdparty/webkit/Source/WebKit/qt/Api \ - src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport \ - -QT_SOURCES = \ - AccessibilityImageMapLink.cpp \ - AccessibilityMediaControls.cpp \ - AccessibilityMenuList.cpp \ - AccessibilityMenuListOption.cpp \ - AccessibilityMenuListPopup.cpp \ - AccessibilityObject.cpp \ - AccessibilityList.cpp \ - AccessibilityListBox.cpp \ - AccessibilityListBoxOption.cpp \ - AccessibilityProgressIndicator.cpp \ - AccessibilityRenderObject.cpp \ - AccessibilityScrollbar.cpp \ - AccessibilityScrollView.cpp \ - AccessibilitySlider.cpp \ - AccessibilityARIAGrid.cpp \ - AccessibilityARIAGridCell.cpp \ - AccessibilityARIAGridRow.cpp \ - AccessibilityTable.cpp \ - AccessibilityTableCell.cpp \ - AccessibilityTableColumn.cpp \ - AccessibilityTableHeaderContainer.cpp \ - AccessibilityTableRow.cpp \ - AXObjectCache.cpp \ - ActiveDOMCallback.cpp \ - RuntimeEnabledFeatures.cpp \ - ScriptControllerBase.cpp \ - CallbackFunction.cpp \ - DOMObjectHashTableMap.cpp \ - DOMWrapperWorld.cpp \ - GCController.cpp \ - JSArrayBufferCustom.cpp \ - JSAttrCustom.cpp \ - JSCDATASectionCustom.cpp \ - JSCSSFontFaceRuleCustom.cpp \ - JSCSSImportRuleCustom.cpp \ - JSCSSMediaRuleCustom.cpp \ - JSCSSPageRuleCustom.cpp \ - JSCSSRuleCustom.cpp \ - JSCSSRuleListCustom.cpp \ - JSCSSStyleDeclarationCustom.cpp \ - JSCSSStyleRuleCustom.cpp \ - JSCSSValueCustom.cpp \ - JSCallbackData.cpp \ - JSCanvasRenderingContext2DCustom.cpp \ - JSCanvasRenderingContextCustom.cpp \ - JSClipboardCustom.cpp \ - JSConsoleCustom.cpp \ - JSCoordinatesCustom.cpp \ - JSCustomPositionCallback.cpp \ - JSCustomPositionErrorCallback.cpp \ - JSCustomVoidCallback.cpp \ - JSCustomXPathNSResolver.cpp \ - JSDOMBinding.cpp \ - JSDOMFormDataCustom.cpp \ - JSDOMGlobalObject.cpp \ - JSDOMImplementationCustom.cpp \ - JSDOMMimeTypeArrayCustom.cpp \ - JSDOMPluginArrayCustom.cpp \ - JSDOMPluginCustom.cpp \ - JSDOMStringMapCustom.cpp \ - JSDOMTokenListCustom.cpp \ - JSDOMWindowBase.cpp \ - JSDOMWindowCustom.cpp \ - JSDOMWindowShell.cpp \ - JSDOMWrapper.cpp \ - JSDataViewCustom.cpp \ - JSDesktopNotificationsCustom.cpp \ - JSDeviceMotionEventCustom.cpp \ - JSDeviceOrientationEventCustom.cpp \ - JSDocumentCustom.cpp \ - JSElementCustom.cpp \ - JSErrorHandler.cpp \ - JSEventCustom.cpp \ - JSEventListener.cpp \ - JSEventSourceCustom.cpp \ - JSEventTarget.cpp \ - JSExceptionBase.cpp \ - JSFileReaderCustom.cpp \ - JSFloat32ArrayCustom.cpp \ - JSGeolocationCustom.cpp \ - JSHTMLAllCollectionCustom.cpp \ - JSHTMLAppletElementCustom.cpp \ - JSHTMLCanvasElementCustom.cpp \ - JSHTMLCollectionCustom.cpp \ - JSHTMLDocumentCustom.cpp \ - JSHTMLElementCustom.cpp \ - JSHTMLEmbedElementCustom.cpp \ - JSHTMLFormElementCustom.cpp \ - JSHTMLFrameElementCustom.cpp \ - JSHTMLFrameSetElementCustom.cpp \ - JSHTMLInputElementCustom.cpp \ - JSHTMLLinkElementCustom.cpp \ - JSHTMLObjectElementCustom.cpp \ - JSHTMLOptionsCollectionCustom.cpp \ - JSHTMLOutputElementCustom.cpp \ - JSHTMLSelectElementCustom.cpp \ - JSHTMLStyleElementCustom.cpp \ - JSHistoryCustom.cpp \ - JSImageConstructor.cpp \ - JSImageDataCustom.cpp \ - JSInjectedScriptHostCustom.cpp \ - JSInjectedScriptManager.cpp \ - JSInspectorFrontendHostCustom.cpp \ - JSInt16ArrayCustom.cpp \ - JSInt32ArrayCustom.cpp \ - JSInt8ArrayCustom.cpp \ - JSLazyEventListener.cpp \ - JSLocationCustom.cpp \ - JSMainThreadExecState.cpp \ - JSMediaListCustom.cpp \ - JSMemoryInfoCustom.cpp \ - JSMessageChannelCustom.cpp \ - JSMessageEventCustom.cpp \ - JSMessagePortCustom.cpp \ - JSNamedNodeMapCustom.cpp \ - JSNavigatorCustom.cpp \ - JSNodeCustom.cpp \ - JSNodeFilterCondition.cpp \ - JSNodeFilterCustom.cpp \ - JSNodeIteratorCustom.cpp \ - JSNodeListCustom.cpp \ - JSOptionConstructor.cpp \ - JSPluginElementFunctions.cpp \ - JSProcessingInstructionCustom.cpp \ - JSScriptProfileNodeCustom.cpp \ - JSStyleSheetCustom.cpp \ - JSStyleSheetListCustom.cpp \ - JSTextCustom.cpp \ - JSTouchCustom.cpp \ - JSTouchListCustom.cpp \ - JSTreeWalkerCustom.cpp \ - JSUint16ArrayCustom.cpp \ - JSUint32ArrayCustom.cpp \ - JSUint8ArrayCustom.cpp \ - JSWebKitAnimationCustom.cpp \ - JSWebKitAnimationListCustom.cpp \ - JSWebKitCSSKeyframeRuleCustom.cpp \ - JSWebKitCSSKeyframesRuleCustom.cpp \ - JSWebKitCSSMatrixCustom.cpp \ - JSWebKitPointCustom.cpp \ - JSXMLHttpRequestCustom.cpp \ - JSXMLHttpRequestUploadCustom.cpp \ - PageScriptDebugServer.cpp \ - ScheduledAction.cpp \ - ScriptCachedFrameData.cpp \ - ScriptCallStackFactory.cpp \ - ScriptController.cpp \ - ScriptControllerQt.cpp \ - ScriptDebugServer.cpp \ - ScriptEventListener.cpp \ - ScriptFunctionCall.cpp \ - ScriptGCEvent.cpp \ - ScriptObject.cpp \ - ScriptProfile.cpp \ - ScriptState.cpp \ - ScriptValue.cpp \ - SerializedScriptValue.cpp \ - IdentifierRep.cpp \ - NP_jsobject.cpp \ - CRuntimeObject.cpp \ - c_class.cpp \ - c_instance.cpp \ - c_runtime.cpp \ - c_utility.cpp \ - BridgeJSC.cpp \ - npruntime.cpp \ - qt_class.cpp \ - qt_instance.cpp \ - qt_pixmapruntime.cpp \ - qt_runtime.cpp \ - runtime_array.cpp \ - runtime_method.cpp \ - runtime_object.cpp \ - runtime_root.cpp \ - WebCoreTestSupport.cpp \ - CSSBorderImageValue.cpp \ - CSSCanvasValue.cpp \ - CSSCharsetRule.cpp \ - CSSComputedStyleDeclaration.cpp \ - CSSCursorImageValue.cpp \ - CSSFontFace.cpp \ - CSSFontFaceRule.cpp \ - CSSFontFaceSrcValue.cpp \ - CSSFontSelector.cpp \ - CSSFontFaceSource.cpp \ - CSSFunctionValue.cpp \ - CSSGradientValue.cpp \ - CSSImageValue.cpp \ - CSSImageGeneratorValue.cpp \ - CSSImportRule.cpp \ - CSSInheritedValue.cpp \ - CSSInitialValue.cpp \ - CSSLineBoxContainValue.cpp \ - CSSMediaRule.cpp \ - CSSMutableStyleDeclaration.cpp \ - CSSOMUtils.cpp \ - CSSPageRule.cpp \ - CSSParser.cpp \ - CSSParserValues.cpp \ - CSSPrimitiveValue.cpp \ - CSSPrimitiveValueCache.cpp \ - CSSProperty.cpp \ - CSSPropertyLonghand.cpp \ - CSSPropertySourceData.cpp \ - CSSReflectValue.cpp \ - CSSRule.cpp \ - CSSRuleList.cpp \ - CSSSelector.cpp \ - CSSSelectorList.cpp \ - CSSSegmentedFontFace.cpp \ - CSSStyleApplyProperty.cpp \ - CSSStyleDeclaration.cpp \ - CSSStyleRule.cpp \ - CSSStyleSelector.cpp \ - CSSStyleSheet.cpp \ - CSSTimingFunctionValue.cpp \ - CSSUnicodeRangeValue.cpp \ - CSSValueList.cpp \ - FontFamilyValue.cpp \ - FontValue.cpp \ - MediaFeatureNames.cpp \ - MediaList.cpp \ - MediaQuery.cpp \ - MediaQueryEvaluator.cpp \ - MediaQueryExp.cpp \ - MediaQueryList.cpp \ - MediaQueryListListener.cpp \ - MediaQueryMatcher.cpp \ - RGBColor.cpp \ - ShadowValue.cpp \ - StyleBase.cpp \ - StyleList.cpp \ - StyleMedia.cpp \ - StyleSheet.cpp \ - StyleSheetList.cpp \ - WebKitCSSKeyframeRule.cpp \ - WebKitCSSKeyframesRule.cpp \ - WebKitCSSMatrix.cpp \ - WebKitCSSTransformValue.cpp \ - ActiveDOMObject.cpp \ - Attr.cpp \ - Attribute.cpp \ - BeforeProcessEvent.cpp \ - BeforeTextInsertedEvent.cpp \ - BeforeUnloadEvent.cpp \ - CDATASection.cpp \ - CharacterData.cpp \ - CheckedRadioButtons.cpp \ - ChildNodeList.cpp \ - ClassNodeList.cpp \ - ClientRect.cpp \ - ClientRectList.cpp \ - Clipboard.cpp \ - ClipboardEvent.cpp \ - Comment.cpp \ - CompositionEvent.cpp \ - ContainerNode.cpp \ - CSSMappedAttributeDeclaration.cpp \ - CustomEvent.cpp \ - DecodedDataDocumentParser.cpp \ - DeviceMotionController.cpp \ - DeviceMotionData.cpp \ - DeviceMotionEvent.cpp \ - DeviceOrientation.cpp \ - DeviceOrientationController.cpp \ - DeviceOrientationEvent.cpp \ - Document.cpp \ - DocumentFragment.cpp \ - DocumentMarkerController.cpp \ - DocumentOrderedMap.cpp \ - DocumentParser.cpp \ - DocumentType.cpp \ - DOMImplementation.cpp \ - DOMStringList.cpp \ - DOMStringMap.cpp \ - DatasetDOMStringMap.cpp \ - DynamicNodeList.cpp \ - EditingText.cpp \ - Element.cpp \ - EntityReference.cpp \ - ErrorEvent.cpp \ - Event.cpp \ - EventContext.cpp \ - EventDispatcher.cpp \ - EventNames.cpp \ - EventTarget.cpp \ - EventQueue.cpp \ - ExceptionBase.cpp \ - ExceptionCode.cpp \ - IconURL.cpp \ - InputElement.cpp \ - KeyboardEvent.cpp \ - MessageChannel.cpp \ - MessageEvent.cpp \ - MessagePort.cpp \ - MessagePortChannel.cpp \ - MouseEvent.cpp \ - MouseRelatedEvent.cpp \ - MutationEvent.cpp \ - NamedNodeMap.cpp \ - NameNodeList.cpp \ - Node.cpp \ - NodeFilterCondition.cpp \ - NodeFilter.cpp \ - NodeIterator.cpp \ - Notation.cpp \ - OptionGroupElement.cpp \ - OptionElement.cpp \ - StaticHashSetNodeList.cpp \ - OverflowEvent.cpp \ - PageTransitionEvent.cpp \ - PendingScript.cpp \ - PopStateEvent.cpp \ - Position.cpp \ - PositionIterator.cpp \ - ProcessingInstruction.cpp \ - ProgressEvent.cpp \ - QualifiedName.cpp \ - Range.cpp \ - RegisteredEventListener.cpp \ - ScopedEventQueue.cpp \ - ScriptableDocumentParser.cpp \ - ScriptElement.cpp \ - ScriptExecutionContext.cpp \ - ScriptRunner.cpp \ - SelectElement.cpp \ - SelectorNodeList.cpp \ - ShadowRoot.cpp \ - SpaceSplitString.cpp \ - StaticNodeList.cpp \ - StyledElement.cpp \ - StyleElement.cpp \ - TagNodeList.cpp \ - Text.cpp \ - TextEvent.cpp \ - Touch.cpp \ - TouchEvent.cpp \ - TouchList.cpp \ - Traversal.cpp \ - TreeScope.cpp \ - TreeWalker.cpp \ - UIEvent.cpp \ - UIEventWithKeyState.cpp \ - UserGestureIndicator.cpp \ - UserTypingGestureIndicator.cpp \ - ViewportArguments.cpp \ - WebKitAnimationEvent.cpp \ - WebKitTransitionEvent.cpp \ - WheelEvent.cpp \ - WindowEventContext.cpp \ - XMLDocumentParser.cpp \ - XMLDocumentParserQt.cpp \ - PlatformMessagePortChannel.cpp \ - AppendNodeCommand.cpp \ - ApplyBlockElementCommand.cpp \ - ApplyStyleCommand.cpp \ - BreakBlockquoteCommand.cpp \ - CompositeEditCommand.cpp \ - CreateLinkCommand.cpp \ - DeleteButtonController.cpp \ - DeleteButton.cpp \ - DeleteFromTextNodeCommand.cpp \ - DeleteSelectionCommand.cpp \ - EditCommand.cpp \ - EditingStyle.cpp \ - Editor.cpp \ - EditorCommand.cpp \ - FormatBlockCommand.cpp \ - htmlediting.cpp \ - HTMLInterchange.cpp \ - IndentOutdentCommand.cpp \ - InsertIntoTextNodeCommand.cpp \ - InsertLineBreakCommand.cpp \ - InsertListCommand.cpp \ - InsertNodeBeforeCommand.cpp \ - InsertParagraphSeparatorCommand.cpp \ - InsertTextCommand.cpp \ - JoinTextNodesCommand.cpp \ - markup.cpp \ - MarkupAccumulator.cpp \ - MergeIdenticalElementsCommand.cpp \ - ModifySelectionListLevel.cpp \ - MoveSelectionCommand.cpp \ - RemoveCSSPropertyCommand.cpp \ - RemoveFormatCommand.cpp \ - RemoveNodeCommand.cpp \ - RemoveNodePreservingChildrenCommand.cpp \ - ReplaceNodeWithSpanCommand.cpp \ - ReplaceSelectionCommand.cpp \ - SelectionController.cpp \ - SetNodeAttributeCommand.cpp \ - SmartReplaceICU.cpp \ - SpellChecker.cpp \ - SpellingCorrectionController.cpp \ - SplitElementCommand.cpp \ - SplitTextNodeCommand.cpp \ - SplitTextNodeContainingElementCommand.cpp \ - TextCheckingHelper.cpp \ - TextIterator.cpp \ - TypingCommand.cpp \ - UnlinkCommand.cpp \ - VisiblePosition.cpp \ - VisibleSelection.cpp \ - visible_units.cpp \ - WrapContentsInDummySpanCommand.cpp \ - Blob.cpp \ - BlobURL.cpp \ - File.cpp \ - FileList.cpp \ - FileReader.cpp \ - FileReaderLoader.cpp \ - FileReaderSync.cpp \ - FileStreamProxy.cpp \ - FileThread.cpp \ - ThreadableBlobRegistry.cpp \ - WebKitBlobBuilder.cpp \ - BackForwardController.cpp \ - BackForwardListImpl.cpp \ - CachedFrame.cpp \ - CachedPage.cpp \ - HistoryItem.cpp \ - HistoryItemQt.cpp \ - PageCache.cpp \ - BaseButtonInputType.cpp \ - BaseCheckableInputType.cpp \ - BaseDateAndTimeInputType.cpp \ - BaseTextInputType.cpp \ - ButtonInputType.cpp \ - CheckboxInputType.cpp \ - ClassList.cpp \ - CollectionCache.cpp \ - ColorInputType.cpp \ - DOMFormData.cpp \ - DOMSettableTokenList.cpp \ - DOMTokenList.cpp \ - DOMURL.cpp \ - DateInputType.cpp \ - DateTimeInputType.cpp \ - DateTimeLocalInputType.cpp \ - EmailInputType.cpp \ - FTPDirectoryDocument.cpp \ - FileInputType.cpp \ - FormAssociatedElement.cpp \ - FormDataList.cpp \ - HTMLAllCollection.cpp \ - HTMLAnchorElement.cpp \ - HTMLAppletElement.cpp \ - HTMLAreaElement.cpp \ - HTMLBRElement.cpp \ - HTMLBaseElement.cpp \ - HTMLBaseFontElement.cpp \ - HTMLBlockquoteElement.cpp \ - HTMLBodyElement.cpp \ - HTMLButtonElement.cpp \ - HTMLCanvasElement.cpp \ - HTMLCollection.cpp \ - HTMLDListElement.cpp \ - HTMLDataListElement.cpp \ - HTMLDirectoryElement.cpp \ - HTMLDetailsElement.cpp \ - HTMLDivElement.cpp \ - HTMLDocument.cpp \ - HTMLElement.cpp \ - HTMLEmbedElement.cpp \ - HTMLFieldSetElement.cpp \ - HTMLFontElement.cpp \ - HTMLFormCollection.cpp \ - HTMLFormControlElement.cpp \ - HTMLFormElement.cpp \ - HTMLFrameElement.cpp \ - HTMLFrameElementBase.cpp \ - HTMLFrameOwnerElement.cpp \ - HTMLFrameSetElement.cpp \ - HTMLHRElement.cpp \ - HTMLHeadElement.cpp \ - HTMLHeadingElement.cpp \ - HTMLHtmlElement.cpp \ - HTMLIFrameElement.cpp \ - HTMLImageElement.cpp \ - HTMLImageLoader.cpp \ - HTMLInputElement.cpp \ - HTMLIsIndexElement.cpp \ - HTMLKeygenElement.cpp \ - HTMLLIElement.cpp \ - HTMLLabelElement.cpp \ - HTMLLegendElement.cpp \ - HTMLLinkElement.cpp \ - HTMLMapElement.cpp \ - HTMLMarqueeElement.cpp \ - HTMLMenuElement.cpp \ - HTMLMetaElement.cpp \ - HTMLMeterElement.cpp \ - HTMLModElement.cpp \ - HTMLNameCollection.cpp \ - HTMLOListElement.cpp \ - HTMLObjectElement.cpp \ - HTMLOptGroupElement.cpp \ - HTMLOptionElement.cpp \ - HTMLOptionsCollection.cpp \ - HTMLOutputElement.cpp \ - HTMLParagraphElement.cpp \ - HTMLParamElement.cpp \ - HTMLParserErrorCodes.cpp \ - HTMLPlugInElement.cpp \ - HTMLPlugInImageElement.cpp \ - HTMLPreElement.cpp \ - HTMLProgressElement.cpp \ - HTMLQuoteElement.cpp \ - HTMLScriptElement.cpp \ - HTMLSelectElement.cpp \ - HTMLStyleElement.cpp \ - HTMLSummaryElement.cpp \ - HTMLTableCaptionElement.cpp \ - HTMLTableCellElement.cpp \ - HTMLTableColElement.cpp \ - HTMLTableElement.cpp \ - HTMLTablePartElement.cpp \ - HTMLTableRowElement.cpp \ - HTMLTableRowsCollection.cpp \ - HTMLTableSectionElement.cpp \ - HTMLTextAreaElement.cpp \ - HTMLTitleElement.cpp \ - HTMLUListElement.cpp \ - HTMLViewSourceDocument.cpp \ - HiddenInputType.cpp \ - ImageData.cpp \ - ImageDocument.cpp \ - ImageInputType.cpp \ - InputType.cpp \ - IsIndexInputType.cpp \ - LabelsNodeList.cpp \ - MediaDocument.cpp \ - MonthInputType.cpp \ - NumberInputType.cpp \ - PasswordInputType.cpp \ - PluginDocument.cpp \ - RadioInputType.cpp \ - RangeInputType.cpp \ - ResetInputType.cpp \ - SearchInputType.cpp \ - StepRange.cpp \ - SubmitInputType.cpp \ - TelephoneInputType.cpp \ - TextDocument.cpp \ - TextFieldInputType.cpp \ - TextInputType.cpp \ - TimeInputType.cpp \ - URLInputType.cpp \ - ValidationMessage.cpp \ - ValidityState.cpp \ - WeekInputType.cpp \ - ArrayBuffer.cpp \ - ArrayBufferView.cpp \ - CanvasGradient.cpp \ - CanvasPattern.cpp \ - CanvasPixelArray.cpp \ - CanvasRenderingContext.cpp \ - CanvasRenderingContext2D.cpp \ - CanvasStyle.cpp \ - DataView.cpp \ - Float32Array.cpp \ - Int16Array.cpp \ - Int32Array.cpp \ - Int8Array.cpp \ - Uint16Array.cpp \ - Uint32Array.cpp \ - Uint8Array.cpp \ - CSSPreloadScanner.cpp \ - HTMLConstructionSite.cpp \ - HTMLDocumentParser.cpp \ - HTMLElementStack.cpp \ - HTMLEntityParser.cpp \ - HTMLEntitySearch.cpp \ - HTMLFormattingElementList.cpp \ - HTMLMetaCharsetParser.cpp \ - HTMLParserIdioms.cpp \ - HTMLParserScheduler.cpp \ - HTMLPreloadScanner.cpp \ - HTMLScriptRunner.cpp \ - HTMLSourceTracker.cpp \ - HTMLTokenizer.cpp \ - HTMLTreeBuilder.cpp \ - HTMLViewSourceParser.cpp \ - TextDocumentParser.cpp \ - TextViewSourceParser.cpp \ - XSSFilter.cpp \ - DetailsMarkerControl.cpp \ - MediaControls.cpp \ - MediaControlRootElement.cpp \ - MeterShadowElement.cpp \ - ProgressShadowElement.cpp \ - SliderThumbElement.cpp \ - TextControlInnerElements.cpp \ - ConsoleMessage.cpp \ - DOMNodeHighlighter.cpp \ - EventsCollector.cpp \ - InjectedScript.cpp \ - InjectedScriptHost.cpp \ - InjectedScriptManager.cpp \ - InspectorAgent.cpp \ - InspectorApplicationCacheAgent.cpp \ - InspectorCSSAgent.cpp \ - InspectorClient.cpp \ - InspectorConsoleAgent.cpp \ - InspectorController.cpp \ - InspectorDatabaseAgent.cpp \ - InspectorDatabaseResource.cpp \ - InspectorDebuggerAgent.cpp \ - InspectorDOMAgent.cpp \ - InspectorDOMDebuggerAgent.cpp \ - InspectorDOMStorageAgent.cpp \ - InspectorDOMStorageResource.cpp \ - InspectorFrontendClientLocal.cpp \ - InspectorFrontendHost.cpp \ - InspectorFrontendProxy.cpp \ - InspectorInstrumentation.cpp \ - InspectorPageAgent.cpp \ - InspectorProfilerAgent.cpp \ - InspectorResourceAgent.cpp \ - InspectorRuntimeAgent.cpp \ - InspectorState.cpp \ - InspectorStyleSheet.cpp \ - InspectorTimelineAgent.cpp \ - InspectorValues.cpp \ - InspectorWorkerAgent.cpp \ - PageDebuggerAgent.cpp \ - ScriptArguments.cpp \ - ScriptCallFrame.cpp \ - ScriptCallStack.cpp \ - TimelineRecordFactory.cpp \ - WorkerDebuggerAgent.cpp \ - WorkerInspectorController.cpp \ - ArchiveResource.cpp \ - ArchiveResourceCollection.cpp \ - MemoryCache.cpp \ - CachedCSSStyleSheet.cpp \ - CachedFont.cpp \ - CachedImage.cpp \ - CachedResourceClientWalker.cpp \ - CachedResourceHandle.cpp \ - CachedResourceRequest.cpp \ - CachedResource.cpp \ - CachedScript.cpp \ - CachedXSLStyleSheet.cpp \ - CrossOriginAccessControl.cpp \ - CrossOriginPreflightResultCache.cpp \ - CachedResourceLoader.cpp \ - DocumentLoader.cpp \ - DocumentThreadableLoader.cpp \ - DocumentWriter.cpp \ - FormState.cpp \ - FormSubmission.cpp \ - FrameLoader.cpp \ - FrameLoaderStateMachine.cpp \ - HistoryController.cpp \ - FTPDirectoryParser.cpp \ - IconDatabaseBase.cpp \ - IconLoader.cpp \ - ImageLoader.cpp \ - MainResourceLoader.cpp \ - NavigationAction.cpp \ - NetscapePlugInStreamLoader.cpp \ - PingLoader.cpp \ - PlaceholderDocument.cpp \ - PolicyCallback.cpp \ - PolicyChecker.cpp \ - ProgressTracker.cpp \ - NavigationScheduler.cpp \ - ResourceLoader.cpp \ - ResourceLoadNotifier.cpp \ - ResourceLoadScheduler.cpp \ - SinkDocument.cpp \ - SubframeLoader.cpp \ - SubresourceLoader.cpp \ - TextResourceDecoder.cpp \ - ThreadableLoader.cpp \ - Notification.cpp \ - NotificationCenter.cpp \ - AnimationBase.cpp \ - AnimationController.cpp \ - CompositeAnimation.cpp \ - ImplicitAnimation.cpp \ - KeyframeAnimation.cpp \ - WebKitAnimation.cpp \ - WebKitAnimationList.cpp \ - BarInfo.cpp \ - Chrome.cpp \ - Console.cpp \ - ContentSecurityPolicy.cpp \ - ContextMenuController.cpp \ - Crypto.cpp \ - DOMSelection.cpp \ - DOMTimer.cpp \ - DOMWindow.cpp \ - DragController.cpp \ - EventHandler.cpp \ - EventSource.cpp \ - FocusController.cpp \ - Frame.cpp \ - FrameActionScheduler.cpp \ - FrameTree.cpp \ - FrameView.cpp \ - Geolocation.cpp \ - GeolocationController.cpp \ - GeolocationPositionCache.cpp \ - GroupSettings.cpp \ - History.cpp \ - Location.cpp \ - MemoryInfo.cpp \ - MouseEventWithHitTestResults.cpp \ - Navigator.cpp \ - NavigatorBase.cpp \ - OriginAccessEntry.cpp \ - Page.cpp \ - PageGroup.cpp \ - PageGroupLoadDeferrer.cpp \ - PageSerializer.cpp \ - Performance.cpp \ - PerformanceNavigation.cpp \ - PerformanceTiming.cpp \ - PluginHalter.cpp \ - PrintContext.cpp \ - Screen.cpp \ - SecurityOrigin.cpp \ - Settings.cpp \ - SpatialNavigation.cpp \ - SuspendableTimer.cpp \ - UserContentURLPattern.cpp \ - WindowFeatures.cpp \ - PluginData.cpp \ - DOMPluginArray.cpp \ - DOMPlugin.cpp \ - PluginMainThreadScheduler.cpp \ - DOMMimeType.cpp \ - DOMMimeTypeArray.cpp \ - Animation.cpp \ - AnimationList.cpp \ - Arena.cpp \ - Base64.cpp \ - BidiContext.cpp \ - Hyphenation.cpp \ - LocalizedDateNone.cpp \ - LocalizedNumberNone.cpp \ - ContentType.cpp \ - CrossThreadCopier.cpp \ - DateComponents.cpp \ - DefaultLocalizationStrategy.cpp \ - DragData.cpp \ - DragImage.cpp \ - FileChooser.cpp \ - FileStream.cpp \ - FileSystem.cpp \ - GeolocationService.cpp \ - ImageFrameQt.cpp \ - FontDescription.cpp \ - FontFallbackList.cpp \ - FontFamily.cpp \ - BitmapImage.cpp \ - Color.cpp \ - ContextShadow.cpp \ - FloatPoint3D.cpp \ - FloatPoint.cpp \ - FloatQuad.cpp \ - FloatRect.cpp \ - FloatSize.cpp \ - FontData.cpp \ - Font.cpp \ - FontCache.cpp \ - GeneratedImage.cpp \ - Gradient.cpp \ - GraphicsContext.cpp \ - GraphicsLayer.cpp \ - GraphicsTypes.cpp \ - Image.cpp \ - ImageBuffer.cpp \ - ImageSource.cpp \ - IntRect.cpp \ - Path.cpp \ - PathTraversalState.cpp \ - Pattern.cpp \ - RoundedIntRect.cpp \ - SegmentedFontData.cpp \ - ShadowBlur.cpp \ - SVGGlyph.cpp \ - SimpleFontData.cpp \ - TiledBackingStore.cpp \ - AffineTransform.cpp \ - TransformationMatrix.cpp \ - MatrixTransformOperation.cpp \ - Matrix3DTransformOperation.cpp \ - PerspectiveTransformOperation.cpp \ - RotateTransformOperation.cpp \ - ScaleTransformOperation.cpp \ - SkewTransformOperation.cpp \ - TransformOperations.cpp \ - TranslateTransformOperation.cpp \ - KillRingNone.cpp \ - KURL.cpp \ - Language.cpp \ - Length.cpp \ - LineEnding.cpp \ - LevelDBDatabase.cpp \ - LevelDBIterator.cpp \ - LinkHash.cpp \ - Logging.cpp \ - MIMETypeRegistry.cpp \ - DeviceOrientationClientMock.cpp \ - GeolocationClientMock.cpp \ - GeolocationServiceMock.cpp \ - SpeechInputClientMock.cpp \ - AuthenticationChallengeBase.cpp \ - BlobData.cpp \ - BlobRegistryImpl.cpp \ - BlobResourceHandle.cpp \ - Credential.cpp \ - FormData.cpp \ - FormDataBuilder.cpp \ - HTTPHeaderMap.cpp \ - HTTPParsers.cpp \ - NetworkStateNotifier.cpp \ - ProtectionSpace.cpp \ - ProxyServer.cpp \ - ResourceErrorBase.cpp \ - ResourceHandle.cpp \ - ResourceRequestBase.cpp \ - ResourceResponseBase.cpp \ - RegularExpression.cpp \ - RuntimeApplicationChecks.cpp \ - SchemeRegistry.cpp \ - ScrollableArea.cpp \ - ScrollAnimator.cpp \ - Scrollbar.cpp \ - ScrollbarThemeComposite.cpp \ - ScrollView.cpp \ - SegmentedString.cpp \ - SharedBuffer.cpp \ - SharedBufferCRLFLineReader.cpp \ - String.cpp \ - TextBoundaries.cpp \ - TextCodec.cpp \ - TextCodecLatin1.cpp \ - TextCodecUserDefined.cpp \ - TextCodecUTF16.cpp \ - TextCodecUTF8.cpp \ - TextEncoding.cpp \ - TextEncodingDetectorNone.cpp \ - TextEncodingRegistry.cpp \ - TextStream.cpp \ - ThreadGlobalData.cpp \ - ThreadTimers.cpp \ - Timer.cpp \ - UnicodeRange.cpp \ - FontTranscoder.cpp \ - UUID.cpp \ - Widget.cpp \ - PlatformStrategies.cpp \ - LocalizedStrings.cpp \ - IFrameShimSupport.cpp \ - PluginDatabase.cpp \ - PluginDebug.cpp \ - PluginPackage.cpp \ - PluginStream.cpp \ - PluginView.cpp \ - AutoTableLayout.cpp \ - break_lines.cpp \ - BidiRun.cpp \ - CounterNode.cpp \ - EllipsisBox.cpp \ - FixedTableLayout.cpp \ - HitTestResult.cpp \ - InlineBox.cpp \ - InlineFlowBox.cpp \ - InlineTextBox.cpp \ - LayoutState.cpp \ - RenderApplet.cpp \ - RenderArena.cpp \ - RenderBlock.cpp \ - RenderBlockLineLayout.cpp \ - RenderBox.cpp \ - RenderBoxModelObject.cpp \ - RenderBR.cpp \ - RenderButton.cpp \ - RenderCombineText.cpp \ - RenderCounter.cpp \ - RenderDetails.cpp \ - RenderDetailsMarker.cpp \ - RenderEmbeddedObject.cpp \ - RenderFieldset.cpp \ - RenderFileUploadControl.cpp \ - RenderFlexibleBox.cpp \ - RenderFrame.cpp \ - RenderFrameBase.cpp \ - RenderFrameSet.cpp \ - RenderHTMLCanvas.cpp \ - RenderIFrame.cpp \ - RenderImage.cpp \ - RenderImageResource.cpp \ - RenderImageResourceStyleImage.cpp \ - RenderInline.cpp \ - RenderLayer.cpp \ - RenderLayerBacking.cpp \ - RenderLayerCompositor.cpp \ - RenderLineBoxList.cpp \ - RenderListBox.cpp \ - RenderListItem.cpp \ - RenderListMarker.cpp \ - RenderMarquee.cpp \ - RenderMenuList.cpp \ - RenderMeter.cpp \ - RenderObject.cpp \ - RenderObjectChildList.cpp \ - RenderPart.cpp \ - RenderProgress.cpp \ - RenderQuote.cpp \ - RenderReplaced.cpp \ - RenderReplica.cpp \ - RenderRuby.cpp \ - RenderRubyBase.cpp \ - RenderRubyRun.cpp \ - RenderRubyText.cpp \ - RenderScrollbar.cpp \ - RenderScrollbarPart.cpp \ - RenderScrollbarTheme.cpp \ - RenderSlider.cpp \ - RenderSummary.cpp \ - RenderTable.cpp \ - RenderTableCell.cpp \ - RenderTableCol.cpp \ - RenderTableRow.cpp \ - RenderTableSection.cpp \ - RenderText.cpp \ - RenderTextControl.cpp \ - RenderTextControlMultiLine.cpp \ - RenderTextControlSingleLine.cpp \ - RenderTextFragment.cpp \ - RenderTheme.cpp \ - RenderTreeAsText.cpp \ - RenderView.cpp \ - RenderWidget.cpp \ - RenderWordBreak.cpp \ - RootInlineBox.cpp \ - ScrollBehavior.cpp \ - ShadowElement.cpp \ - TransformState.cpp \ - ContentData.cpp \ - CounterDirectives.cpp \ - FillLayer.cpp \ - KeyframeList.cpp \ - NinePieceImage.cpp \ - QuotesData.cpp \ - RenderStyle.cpp \ - ShadowData.cpp \ - StyleBackgroundData.cpp \ - StyleBoxData.cpp \ - StyleCachedImage.cpp \ - StyleFlexibleBoxData.cpp \ - StyleGeneratedImage.cpp \ - StyleInheritedData.cpp \ - StyleMarqueeData.cpp \ - StyleMultiColData.cpp \ - StyleRareInheritedData.cpp \ - StyleRareNonInheritedData.cpp \ - StyleSurroundData.cpp \ - StyleTransformData.cpp \ - StyleVisualData.cpp \ - Internals.cpp \ - DOMParser.cpp \ - XMLHttpRequest.cpp \ - XMLHttpRequestProgressEventThrottle.cpp \ - XMLHttpRequestUpload.cpp \ - XMLSerializer.cpp \ - AccessibilityObjectQt.cpp \ - DragControllerQt.cpp \ - EventHandlerQt.cpp \ - FrameQt.cpp \ - TransformationMatrixQt.cpp \ - ColorQt.cpp \ - ContextShadowQt.cpp \ - FontQt.cpp \ - FontPlatformDataQt.cpp \ - FloatPointQt.cpp \ - FloatRectQt.cpp \ - GradientQt.cpp \ - GraphicsContextQt.cpp \ - IconQt.cpp \ - ImageBufferQt.cpp \ - ImageDecoderQt.cpp \ - ImageQt.cpp \ - IntPointQt.cpp \ - IntRectQt.cpp \ - IntSizeQt.cpp \ - PathQt.cpp \ - PatternQt.cpp \ - StillImageQt.cpp \ - MIMESniffing.cpp \ - CredentialStorageQt.cpp \ - ResourceHandleQt.cpp \ - ResourceRequestQt.cpp \ - DnsPrefetchHelper.cpp \ - ProxyServerQt.cpp \ - QtMIMETypeSniffer.cpp \ - QNetworkReplyHandler.cpp \ - EditorQt.cpp \ - SmartReplaceQt.cpp \ - Cursor.cpp \ - ClipboardQt.cpp \ - ContextMenuItemQt.cpp \ - ContextMenuQt.cpp \ - CookieJarQt.cpp \ - CursorQt.cpp \ - DragDataQt.cpp \ - DragImageQt.cpp \ - EventLoopQt.cpp \ - FileChooserQt.cpp \ - FileSystemQt.cpp \ - SharedBufferQt.cpp \ - FontCacheQt.cpp \ - FontCustomPlatformDataQt.cpp \ - GlyphPageTreeNodeQt.cpp \ - SimpleFontDataQt.cpp \ - TileQt.cpp \ - KURLQt.cpp \ - MIMETypeRegistryQt.cpp \ - PasteboardQt.cpp \ - PlatformKeyboardEventQt.cpp \ - PlatformMouseEventQt.cpp \ - PlatformScreenQt.cpp \ - PlatformTouchEventQt.cpp \ - PlatformTouchPointQt.cpp \ - RenderThemeQt.cpp \ - ScrollbarQt.cpp \ - ScrollbarThemeQt.cpp \ - ScrollViewQt.cpp \ - SharedTimerQt.cpp \ - SoundQt.cpp \ - LoggingQt.cpp \ - LanguageQt.cpp \ - TemporaryLinkStubsQt.cpp \ - TextBoundariesQt.cpp \ - TextBreakIteratorQt.cpp \ - TextCodecQt.cpp \ - WheelEventQt.cpp \ - WidgetQt.cpp \ - PluginPackageNone.cpp \ - PluginViewNone.cpp \ - sqlite3.c \ - SQLiteAuthorizer.cpp \ - SQLiteDatabase.cpp \ - SQLiteFileSystem.cpp \ - SQLiteStatement.cpp \ - SQLiteTransaction.cpp \ - SQLValue.cpp \ - AbstractDatabase.cpp \ - Database.cpp \ - DatabaseAuthorizer.cpp \ - DatabaseSync.cpp \ - ChangeVersionWrapper.cpp \ - DatabaseTask.cpp \ - DatabaseThread.cpp \ - DatabaseTracker.cpp \ - OriginQuotaManager.cpp \ - OriginUsageRecord.cpp \ - SQLResultSet.cpp \ - SQLResultSetRowList.cpp \ - SQLStatement.cpp \ - SQLStatementSync.cpp \ - SQLTransaction.cpp \ - SQLTransactionClient.cpp \ - SQLTransactionCoordinator.cpp \ - SQLTransactionSync.cpp \ - JSCustomSQLStatementErrorCallback.cpp \ - JSSQLResultSetRowListCustom.cpp \ - JSSQLTransactionCustom.cpp \ - JSSQLTransactionSyncCustom.cpp \ - JSStorageCustom.cpp \ - LocalStorageTask.cpp \ - LocalStorageThread.cpp \ - Storage.cpp \ - StorageAreaImpl.cpp \ - StorageAreaSync.cpp \ - StorageEvent.cpp \ - StorageEventDispatcher.cpp \ - StorageMap.cpp \ - StorageNamespace.cpp \ - StorageNamespaceImpl.cpp \ - StorageSyncManager.cpp \ - StorageTracker.cpp \ - IconDatabase.cpp \ - IconRecord.cpp \ - PageURLRecord.cpp \ - JSDedicatedWorkerContextCustom.cpp \ - JSWorkerContextBase.cpp \ - JSWorkerContextCustom.cpp \ - JSWorkerCustom.cpp \ - WorkerScriptController.cpp \ - WorkerScriptDebugServer.cpp \ - WorkerThreadableLoader.cpp \ - WorkerNavigator.cpp \ - AbstractWorker.cpp \ - DedicatedWorkerContext.cpp \ - DedicatedWorkerThread.cpp \ - Worker.cpp \ - WorkerContext.cpp \ - WorkerLocation.cpp \ - WorkerMessagingProxy.cpp \ - WorkerRunLoop.cpp \ - WorkerThread.cpp \ - WorkerScriptLoader.cpp \ - JSSharedWorkerCustom.cpp \ - DefaultSharedWorkerRepository.cpp \ - SharedWorker.cpp \ - SharedWorkerContext.cpp \ - SharedWorkerThread.cpp \ - NativeXPathNSResolver.cpp \ - XPathEvaluator.cpp \ - XPathExpression.cpp \ - XPathExpressionNode.cpp \ - XPathFunctions.cpp \ - XPathNodeSet.cpp \ - XPathNSResolver.cpp \ - XPathParser.cpp \ - XPathPath.cpp \ - XPathPredicate.cpp \ - XPathResult.cpp \ - XPathStep.cpp \ - XPathUtil.cpp \ - XPathValue.cpp \ - XPathVariableReference.cpp \ - DistantLightSource.cpp \ - FEBlend.cpp \ - FEColorMatrix.cpp \ - FEComponentTransfer.cpp \ - FEComposite.cpp \ - FEConvolveMatrix.cpp \ - FEDiffuseLighting.cpp \ - FEDisplacementMap.cpp \ - FEDropShadow.cpp \ - FEFlood.cpp \ - FEGaussianBlur.cpp \ - FELighting.cpp \ - FEMerge.cpp \ - FEMorphology.cpp \ - FEOffset.cpp \ - FESpecularLighting.cpp \ - FETile.cpp \ - FETurbulence.cpp \ - FilterEffect.cpp \ - LightSource.cpp \ - PointLightSource.cpp \ - SpotLightSource.cpp \ - SourceAlpha.cpp \ - SourceGraphic.cpp \ - FELightingNEON.cpp \ - FEGaussianBlurNEON.cpp \ - NetworkStateNotifierQt.cpp \ - JSSVGElementInstanceCustom.cpp \ - JSSVGLengthCustom.cpp \ - JSSVGPathSegCustom.cpp \ - SVGCSSComputedStyleDeclaration.cpp \ - SVGCSSParser.cpp \ - SVGCSSStyleSelector.cpp \ - SVGRenderStyle.cpp \ - SVGRenderStyleDefs.cpp \ - PointerEventsHitRules.cpp \ - RenderSVGPath.cpp \ - SMILTime.cpp \ - SMILTimeContainer.cpp \ - SVGSMILElement.cpp \ - SVGFEImage.cpp \ - SVGFilter.cpp \ - SVGFilterBuilder.cpp \ - SVGImage.cpp \ - SVGPathSegListPropertyTearOff.cpp \ - RenderSVGBlock.cpp \ - RenderSVGContainer.cpp \ - RenderSVGForeignObject.cpp \ - RenderSVGGradientStop.cpp \ - RenderSVGHiddenContainer.cpp \ - RenderSVGImage.cpp \ - RenderSVGInline.cpp \ - RenderSVGInlineText.cpp \ - RenderSVGModelObject.cpp \ - RenderSVGResource.cpp \ - RenderSVGResourceClipper.cpp \ - RenderSVGResourceContainer.cpp \ - RenderSVGResourceFilter.cpp \ - RenderSVGResourceFilterPrimitive.cpp \ - RenderSVGResourceGradient.cpp \ - RenderSVGResourceLinearGradient.cpp \ - RenderSVGResourceMarker.cpp \ - RenderSVGResourceMasker.cpp \ - RenderSVGResourcePattern.cpp \ - RenderSVGResourceRadialGradient.cpp \ - RenderSVGResourceSolidColor.cpp \ - RenderSVGRoot.cpp \ - RenderSVGShadowTreeRootContainer.cpp \ - RenderSVGTSpan.cpp \ - RenderSVGText.cpp \ - RenderSVGTextPath.cpp \ - RenderSVGTransformableContainer.cpp \ - RenderSVGViewportContainer.cpp \ - SVGImageBufferTools.cpp \ - SVGInlineFlowBox.cpp \ - SVGInlineTextBox.cpp \ - SVGMarkerLayoutInfo.cpp \ - SVGRenderSupport.cpp \ - SVGRenderTreeAsText.cpp \ - SVGResources.cpp \ - SVGResourcesCache.cpp \ - SVGResourcesCycleSolver.cpp \ - SVGRootInlineBox.cpp \ - SVGShadowTreeElements.cpp \ - SVGTextChunk.cpp \ - SVGTextChunkBuilder.cpp \ - SVGTextLayoutAttributes.cpp \ - SVGTextLayoutAttributesBuilder.cpp \ - SVGTextLayoutEngine.cpp \ - SVGTextLayoutEngineBaseline.cpp \ - SVGTextLayoutEngineSpacing.cpp \ - SVGTextMetrics.cpp \ - SVGTextQuery.cpp \ - SVGDocumentExtensions.cpp \ - SVGImageLoader.cpp \ - ColorDistance.cpp \ - SVGAElement.cpp \ - SVGAltGlyphElement.cpp \ - SVGAngle.cpp \ - SVGAnimateColorElement.cpp \ - SVGAnimateElement.cpp \ - SVGAnimateMotionElement.cpp \ - SVGAnimateTransformElement.cpp \ - SVGAnimationElement.cpp \ - SVGCircleElement.cpp \ - SVGClipPathElement.cpp \ - SVGColor.cpp \ - SVGComponentTransferFunctionElement.cpp \ - SVGCursorElement.cpp \ - SVGDefsElement.cpp \ - SVGDescElement.cpp \ - SVGDocument.cpp \ - SVGElement.cpp \ - SVGElementInstance.cpp \ - SVGElementInstanceList.cpp \ - SVGEllipseElement.cpp \ - SVGExternalResourcesRequired.cpp \ - SVGFEBlendElement.cpp \ - SVGFEColorMatrixElement.cpp \ - SVGFEComponentTransferElement.cpp \ - SVGFECompositeElement.cpp \ - SVGFEConvolveMatrixElement.cpp \ - SVGFEDiffuseLightingElement.cpp \ - SVGFEDisplacementMapElement.cpp \ - SVGFEDistantLightElement.cpp \ - SVGFEDropShadowElement.cpp \ - SVGFEFloodElement.cpp \ - SVGFEFuncAElement.cpp \ - SVGFEFuncBElement.cpp \ - SVGFEFuncGElement.cpp \ - SVGFEFuncRElement.cpp \ - SVGFEGaussianBlurElement.cpp \ - SVGFEImageElement.cpp \ - SVGFELightElement.cpp \ - SVGFEMergeElement.cpp \ - SVGFEMergeNodeElement.cpp \ - SVGFEMorphologyElement.cpp \ - SVGFEOffsetElement.cpp \ - SVGFEPointLightElement.cpp \ - SVGFESpecularLightingElement.cpp \ - SVGFESpotLightElement.cpp \ - SVGFETileElement.cpp \ - SVGFETurbulenceElement.cpp \ - SVGFilterElement.cpp \ - SVGFilterPrimitiveStandardAttributes.cpp \ - SVGFitToViewBox.cpp \ - SVGFont.cpp \ - SVGFontData.cpp \ - SVGFontElement.cpp \ - SVGFontFaceElement.cpp \ - SVGFontFaceFormatElement.cpp \ - SVGFontFaceNameElement.cpp \ - SVGFontFaceSrcElement.cpp \ - SVGFontFaceUriElement.cpp \ - SVGForeignObjectElement.cpp \ - SVGGElement.cpp \ - SVGGlyphElement.cpp \ - SVGGradientElement.cpp \ - SVGHKernElement.cpp \ - SVGImageElement.cpp \ - SVGLangSpace.cpp \ - SVGLength.cpp \ - SVGLengthList.cpp \ - SVGLinearGradientElement.cpp \ - SVGLineElement.cpp \ - SVGLocatable.cpp \ - SVGMarkerElement.cpp \ - SVGMaskElement.cpp \ - SVGMetadataElement.cpp \ - SVGMissingGlyphElement.cpp \ - SVGMPathElement.cpp \ - SVGNumberList.cpp \ - SVGPaint.cpp \ - SVGParserUtilities.cpp \ - SVGPathBlender.cpp \ - SVGPathBuilder.cpp \ - SVGPathByteStreamBuilder.cpp \ - SVGPathByteStreamSource.cpp \ - SVGPathElement.cpp \ - SVGPathParser.cpp \ - SVGPathParserFactory.cpp \ - SVGPathSegList.cpp \ - SVGPathSegListBuilder.cpp \ - SVGPathSegListSource.cpp \ - SVGPathStringBuilder.cpp \ - SVGPathStringSource.cpp \ - SVGPathTraversalStateBuilder.cpp \ - SVGPatternElement.cpp \ - SVGPointList.cpp \ - SVGPolyElement.cpp \ - SVGPolygonElement.cpp \ - SVGPolylineElement.cpp \ - SVGPreserveAspectRatio.cpp \ - SVGRadialGradientElement.cpp \ - SVGRectElement.cpp \ - SVGScriptElement.cpp \ - SVGSetElement.cpp \ - SVGStopElement.cpp \ - SVGStringList.cpp \ - SVGStylable.cpp \ - SVGStyledElement.cpp \ - SVGStyledLocatableElement.cpp \ - SVGStyledTransformableElement.cpp \ - SVGStyleElement.cpp \ - SVGSVGElement.cpp \ - SVGSwitchElement.cpp \ - SVGSymbolElement.cpp \ - SVGTests.cpp \ - SVGTextContentElement.cpp \ - SVGTextElement.cpp \ - SVGTextPathElement.cpp \ - SVGTextPositioningElement.cpp \ - SVGTitleElement.cpp \ - SVGTransformable.cpp \ - SVGTransform.cpp \ - SVGTransformDistance.cpp \ - SVGTransformList.cpp \ - SVGTRefElement.cpp \ - SVGTSpanElement.cpp \ - SVGURIReference.cpp \ - SVGUseElement.cpp \ - SVGViewElement.cpp \ - SVGViewSpec.cpp \ - SVGVKernElement.cpp \ - SVGZoomAndPan.cpp \ - SVGZoomEvent.cpp \ - JSJavaScriptCallFrameCustom.cpp \ - ScriptProfiler.cpp \ - JavaScriptCallFrame.cpp \ - ApplicationCache.cpp \ - ApplicationCacheGroup.cpp \ - ApplicationCacheHost.cpp \ - ApplicationCacheStorage.cpp \ - ApplicationCacheResource.cpp \ - DOMApplicationCache.cpp \ - ManifestParser.cpp \ - JSDOMApplicationCacheCustom.cpp \ - GraphicsLayerQt.cpp \ - moc_QtMIMETypeSniffer.cpp \ - moc_DnsPrefetchHelper.cpp - -QT_VPATH = \ - src/3rdparty/sqlite \ - src/3rdparty/webkit/Source/WebCore/accessibility \ - src/3rdparty/webkit/Source/WebCore/accessibility/qt \ - src/3rdparty/webkit/Source/WebCore/bindings \ - src/3rdparty/webkit/Source/WebCore/bindings/generic \ - src/3rdparty/webkit/Source/WebCore/bindings/js \ - src/3rdparty/webkit/Source/WebCore/bridge \ - src/3rdparty/webkit/Source/WebCore/bridge/c \ - src/3rdparty/webkit/Source/WebCore/bridge/jsc \ - src/3rdparty/webkit/Source/WebCore/bridge/qt \ - src/3rdparty/webkit/Source/WebCore/css \ - src/3rdparty/webkit/Source/WebCore/dom \ - src/3rdparty/webkit/Source/WebCore/dom/default \ - src/3rdparty/webkit/Source/WebCore/editing \ - src/3rdparty/webkit/Source/WebCore/editing/qt \ - src/3rdparty/webkit/Source/WebCore/fileapi \ - src/3rdparty/webkit/Source/WebCore/history \ - src/3rdparty/webkit/Source/WebCore/history/qt \ - src/3rdparty/webkit/Source/WebCore/html \ - src/3rdparty/webkit/Source/WebCore/html/canvas \ - src/3rdparty/webkit/Source/WebCore/html/parser \ - src/3rdparty/webkit/Source/WebCore/html/shadow \ - src/3rdparty/webkit/Source/WebCore/inspector \ - src/3rdparty/webkit/Source/WebCore/loader \ - src/3rdparty/webkit/Source/WebCore/loader/appcache \ - src/3rdparty/webkit/Source/WebCore/loader/archive \ - src/3rdparty/webkit/Source/WebCore/loader/cache \ - src/3rdparty/webkit/Source/WebCore/loader/icon \ - src/3rdparty/webkit/Source/WebCore/notifications \ - src/3rdparty/webkit/Source/WebCore/page \ - src/3rdparty/webkit/Source/WebCore/page/animation \ - src/3rdparty/webkit/Source/WebCore/page/qt \ - src/3rdparty/webkit/Source/WebCore/platform \ - src/3rdparty/webkit/Source/WebCore/platform/animation \ - src/3rdparty/webkit/Source/WebCore/platform/graphics \ - src/3rdparty/webkit/Source/WebCore/platform/graphics/filters \ - src/3rdparty/webkit/Source/WebCore/platform/graphics/filters/arm \ - src/3rdparty/webkit/Source/WebCore/platform/graphics/qt \ - src/3rdparty/webkit/Source/WebCore/platform/graphics/transforms \ - src/3rdparty/webkit/Source/WebCore/platform/image-decoders/qt \ - src/3rdparty/webkit/Source/WebCore/platform/leveldb \ - src/3rdparty/webkit/Source/WebCore/platform/mock \ - src/3rdparty/webkit/Source/WebCore/platform/network \ - src/3rdparty/webkit/Source/WebCore/platform/network/qt \ - src/3rdparty/webkit/Source/WebCore/platform/qt \ - src/3rdparty/webkit/Source/WebCore/platform/sql \ - src/3rdparty/webkit/Source/WebCore/platform/text \ - src/3rdparty/webkit/Source/WebCore/platform/text/qt \ - src/3rdparty/webkit/Source/WebCore/platform/text/transcoder \ - src/3rdparty/webkit/Source/WebCore/plugins \ - src/3rdparty/webkit/Source/WebCore/rendering \ - src/3rdparty/webkit/Source/WebCore/rendering/style \ - src/3rdparty/webkit/Source/WebCore/rendering/svg \ - src/3rdparty/webkit/Source/WebCore/storage \ - src/3rdparty/webkit/Source/WebCore/svg \ - src/3rdparty/webkit/Source/WebCore/svg/animation \ - src/3rdparty/webkit/Source/WebCore/svg/graphics \ - src/3rdparty/webkit/Source/WebCore/svg/graphics/filters \ - src/3rdparty/webkit/Source/WebCore/svg/properties \ - src/3rdparty/webkit/Source/WebCore/testing \ - src/3rdparty/webkit/Source/WebCore/testing/js \ - src/3rdparty/webkit/Source/WebCore/workers \ - src/3rdparty/webkit/Source/WebCore/xml \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# 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_QtMIMETypeSniffer.cpp \ - moc_QNetworkReplyHandler.cpp \ - moc_DnsPrefetchHelper.cpp \ - moc_NetworkStateNotifierPrivate.cpp - -# source files generated from existing source files ('%.moc: %.cpp' rule in spec-qt4.mk) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - SharedTimerQt.moc \ - GraphicsLayerQt.moc - diff --git a/repos/qt4/lib/mk/qt_webkit.mk b/repos/qt4/lib/mk/qt_webkit.mk deleted file mode 100644 index 680f65eae..000000000 --- a/repos/qt4/lib/mk/qt_webkit.mk +++ /dev/null @@ -1,26 +0,0 @@ -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 - -# some parts of the library are not C++11 compatible -CC_CXX_OPT_STD = - -include $(REP_DIR)/lib/mk/qt_webkit_generated.inc - -include $(REP_DIR)/lib/mk/qt.inc - -LIBS += qt_webcore qt_jscore qt_network qt_core libc libm - -vpath %.qrc $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/Source/WebCore -vpath %.qrc $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/Source/WebCore/inspector/front-end diff --git a/repos/qt4/lib/mk/qt_webkit_generated.inc b/repos/qt4/lib/mk/qt_webkit_generated.inc deleted file mode 100644 index 31d07f3e2..000000000 --- a/repos/qt4/lib/mk/qt_webkit_generated.inc +++ /dev/null @@ -1,674 +0,0 @@ -QT_DEFINES += -DBUILDING_WEBKIT -DNDEBUG -DBUILDING_QT__=1 -DNDEBUG -DQT_ASCII_CAST_WARNINGS -DBUILDING_JavaScriptCore -DBUILDING_WTF -DENABLE_XSLT=0 -DENABLE_WEB_TIMING=0 -DENABLE_JAVASCRIPT_DEBUGGER=1 -DENABLE_DATABASE=1 -DENABLE_EVENTSOURCE=1 -DENABLE_OFFLINE_WEB_APPLICATIONS=1 -DENABLE_DOM_STORAGE=1 -DENABLE_ICONDATABASE=1 -DENABLE_CHANNEL_MESSAGING=1 -DENABLE_DIRECTORY_UPLOAD=0 -DENABLE_FILE_SYSTEM=0 -DENABLE_QUOTA=0 -DENABLE_SQLITE=1 -DENABLE_DASHBOARD_SUPPORT=0 -DENABLE_FILTERS=1 -DENABLE_XPATH=1 -DENABLE_WCSS=0 -DENABLE_SHARED_WORKERS=1 -DENABLE_WORKERS=1 -DENABLE_XHTMLMP=0 -DENABLE_DETAILS=1 -DENABLE_METER_TAG=1 -DENABLE_PROGRESS_TAG=1 -DENABLE_BLOB=1 -DENABLE_NOTIFICATIONS=1 -DENABLE_INPUT_SPEECH=0 -DENABLE_INSPECTOR=1 -DENABLE_3D_RENDERING=1 -DENABLE_WEB_AUDIO=0 -DENABLE_WEBGL=0 -DENABLE_MEDIA_STATISTICS=0 -DENABLE_VIDEO_TRACK=0 -DENABLE_TOUCH_ICON_LOADING=0 -DENABLE_ANIMATION_API=0 -DENABLE_SVG=1 -DENABLE_SVG_FONTS=1 -DENABLE_SVG_FOREIGN_OBJECT=1 -DENABLE_SVG_ANIMATION=1 -DENABLE_SVG_AS_IMAGE=1 -DENABLE_SVG_USE=1 -DENABLE_DATALIST=1 -DENABLE_TILED_BACKING_STORE=1 -DENABLE_NETSCAPE_PLUGIN_API=0 -DWTF_USE_QT_BEARER=1 -DENABLE_TOUCH_EVENTS=1 -DENABLE_VIDEO=0 -DSQLITE_CORE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_OMIT_COMPLETE -DENABLE_XSLT=0 -DENABLE_WEB_TIMING=0 -DQT_NO_CAST_TO_ASCII -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB - -QT_INCPATH = \ - mkspecs/qws/genode-generic-g++ \ - src/3rdparty/sqlite \ - src/3rdparty/webkit/include \ - src/3rdparty/webkit/Source \ - src/3rdparty/webkit/Source/JavaScriptCore \ - src/3rdparty/webkit/Source/JavaScriptCore/API \ - src/3rdparty/webkit/Source/JavaScriptCore/assembler \ - src/3rdparty/webkit/Source/JavaScriptCore/bytecode \ - src/3rdparty/webkit/Source/JavaScriptCore/bytecompiler \ - src/3rdparty/webkit/Source/JavaScriptCore/debugger \ - src/3rdparty/webkit/Source/JavaScriptCore/dfg \ - src/3rdparty/webkit/Source/JavaScriptCore/ForwardingHeaders \ - src/3rdparty/webkit/Source/JavaScriptCore/generated \ - src/3rdparty/webkit/Source/JavaScriptCore/heap \ - src/3rdparty/webkit/Source/JavaScriptCore/interpreter \ - src/3rdparty/webkit/Source/JavaScriptCore/jit \ - src/3rdparty/webkit/Source/JavaScriptCore/parser \ - src/3rdparty/webkit/Source/JavaScriptCore/profiler \ - src/3rdparty/webkit/Source/JavaScriptCore/runtime \ - src/3rdparty/webkit/Source/JavaScriptCore/wtf \ - src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject \ - src/3rdparty/webkit/Source/JavaScriptCore/wtf/symbian \ - src/3rdparty/webkit/Source/JavaScriptCore/wtf/unicode \ - src/3rdparty/webkit/Source/JavaScriptCore/yarr \ - src/3rdparty/webkit/Source/ThirdParty \ - src/3rdparty/webkit/Source/WebCore \ - src/3rdparty/webkit/Source/WebCore/accessibility \ - src/3rdparty/webkit/Source/WebCore/bindings \ - src/3rdparty/webkit/Source/WebCore/bindings/generic \ - src/3rdparty/webkit/Source/WebCore/bindings/js \ - src/3rdparty/webkit/Source/WebCore/bindings/js/specialization \ - src/3rdparty/webkit/Source/WebCore/bridge \ - src/3rdparty/webkit/Source/WebCore/bridge/c \ - src/3rdparty/webkit/Source/WebCore/bridge/jsc \ - src/3rdparty/webkit/Source/WebCore/bridge/qt \ - src/3rdparty/webkit/Source/WebCore/css \ - src/3rdparty/webkit/Source/WebCore/dom \ - src/3rdparty/webkit/Source/WebCore/dom/default \ - src/3rdparty/webkit/Source/WebCore/editing \ - src/3rdparty/webkit/Source/WebCore/fileapi \ - src/3rdparty/webkit/Source/WebCore/generated \ - src/3rdparty/webkit/Source/WebCore/history \ - src/3rdparty/webkit/Source/WebCore/html \ - src/3rdparty/webkit/Source/WebCore/html/canvas \ - src/3rdparty/webkit/Source/WebCore/html/parser \ - src/3rdparty/webkit/Source/WebCore/html/shadow \ - src/3rdparty/webkit/Source/WebCore/inspector \ - src/3rdparty/webkit/Source/WebCore/loader \ - src/3rdparty/webkit/Source/WebCore/loader/appcache \ - src/3rdparty/webkit/Source/WebCore/loader/archive \ - src/3rdparty/webkit/Source/WebCore/loader/cache \ - src/3rdparty/webkit/Source/WebCore/loader/icon \ - src/3rdparty/webkit/Source/WebCore/mathml \ - src/3rdparty/webkit/Source/WebCore/notifications \ - src/3rdparty/webkit/Source/WebCore/page \ - src/3rdparty/webkit/Source/WebCore/page/animation \ - src/3rdparty/webkit/Source/WebCore/page/qt \ - src/3rdparty/webkit/Source/WebCore/platform \ - src/3rdparty/webkit/Source/WebCore/platform/animation \ - src/3rdparty/webkit/Source/WebCore/platform/audio \ - src/3rdparty/webkit/Source/WebCore/platform/graphics \ - src/3rdparty/webkit/Source/WebCore/platform/graphics/filters \ - src/3rdparty/webkit/Source/WebCore/platform/graphics/filters/arm \ - src/3rdparty/webkit/Source/WebCore/platform/graphics/qt \ - src/3rdparty/webkit/Source/WebCore/platform/graphics/texmap \ - src/3rdparty/webkit/Source/WebCore/platform/graphics/transforms \ - src/3rdparty/webkit/Source/WebCore/platform/image-decoders \ - src/3rdparty/webkit/Source/WebCore/platform/leveldb \ - src/3rdparty/webkit/Source/WebCore/platform/mock \ - src/3rdparty/webkit/Source/WebCore/platform/network \ - src/3rdparty/webkit/Source/WebCore/platform/network/qt \ - src/3rdparty/webkit/Source/WebCore/platform/qt \ - src/3rdparty/webkit/Source/WebCore/platform/sql \ - src/3rdparty/webkit/Source/WebCore/platform/text \ - src/3rdparty/webkit/Source/WebCore/platform/text/transcoder \ - src/3rdparty/webkit/Source/WebCore/plugins \ - src/3rdparty/webkit/Source/WebCore/rendering \ - src/3rdparty/webkit/Source/WebCore/rendering/mathml \ - src/3rdparty/webkit/Source/WebCore/rendering/style \ - src/3rdparty/webkit/Source/WebCore/rendering/svg \ - src/3rdparty/webkit/Source/WebCore/storage \ - src/3rdparty/webkit/Source/WebCore/svg \ - src/3rdparty/webkit/Source/WebCore/svg/animation \ - src/3rdparty/webkit/Source/WebCore/svg/graphics \ - src/3rdparty/webkit/Source/WebCore/svg/graphics/filters \ - src/3rdparty/webkit/Source/WebCore/svg/properties \ - src/3rdparty/webkit/Source/WebCore/testing \ - src/3rdparty/webkit/Source/WebCore/testing/js \ - src/3rdparty/webkit/Source/WebCore/webaudio \ - src/3rdparty/webkit/Source/WebCore/websockets \ - src/3rdparty/webkit/Source/WebCore/wml \ - src/3rdparty/webkit/Source/WebCore/workers \ - src/3rdparty/webkit/Source/WebCore/xml \ - src/3rdparty/webkit/Source/WebKit/qt \ - src/3rdparty/webkit/Source/WebKit/qt/Api \ - src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport \ - -QT_SOURCES = \ - MathMLNames.cpp \ - MathMLElementFactory.cpp \ - SVGNames.cpp \ - SVGElementFactory.cpp \ - JSSVGElementWrapperFactory.cpp \ - XLinkNames.cpp \ - CSSPropertyNames.cpp \ - CSSValueKeywords.cpp \ - JSCounter.cpp \ - JSCSSCharsetRule.cpp \ - JSCSSFontFaceRule.cpp \ - JSCSSImportRule.cpp \ - JSCSSMediaRule.cpp \ - JSCSSPageRule.cpp \ - JSCSSPrimitiveValue.cpp \ - JSCSSRule.cpp \ - JSCSSRuleList.cpp \ - JSCSSStyleDeclaration.cpp \ - JSCSSStyleRule.cpp \ - JSCSSStyleSheet.cpp \ - JSCSSValue.cpp \ - JSCSSValueList.cpp \ - JSMediaList.cpp \ - JSMediaQueryList.cpp \ - JSRect.cpp \ - JSRGBColor.cpp \ - JSStyleMedia.cpp \ - JSStyleSheet.cpp \ - JSStyleSheetList.cpp \ - JSWebKitCSSKeyframeRule.cpp \ - JSWebKitCSSKeyframesRule.cpp \ - JSWebKitCSSMatrix.cpp \ - JSWebKitCSSTransformValue.cpp \ - JSAttr.cpp \ - JSBeforeLoadEvent.cpp \ - JSBeforeProcessEvent.cpp \ - JSCharacterData.cpp \ - JSClientRect.cpp \ - JSClientRectList.cpp \ - JSClipboard.cpp \ - JSCDATASection.cpp \ - JSComment.cpp \ - JSCompositionEvent.cpp \ - JSCustomEvent.cpp \ - JSDataTransferItem.cpp \ - JSDataTransferItems.cpp \ - JSDeviceMotionEvent.cpp \ - JSDeviceOrientationEvent.cpp \ - JSDocumentFragment.cpp \ - JSDocument.cpp \ - JSDocumentType.cpp \ - JSDOMCoreException.cpp \ - JSDOMImplementation.cpp \ - JSDOMStringList.cpp \ - JSDOMStringMap.cpp \ - JSElement.cpp \ - JSEntity.cpp \ - JSEntityReference.cpp \ - JSErrorEvent.cpp \ - JSEvent.cpp \ - JSEventException.cpp \ - JSHashChangeEvent.cpp \ - JSKeyboardEvent.cpp \ - JSMouseEvent.cpp \ - JSMessageChannel.cpp \ - JSMessageEvent.cpp \ - JSMessagePort.cpp \ - JSMutationEvent.cpp \ - JSNamedNodeMap.cpp \ - JSNode.cpp \ - JSNodeFilter.cpp \ - JSNodeIterator.cpp \ - JSNodeList.cpp \ - JSNotation.cpp \ - JSOverflowEvent.cpp \ - JSPageTransitionEvent.cpp \ - JSPopStateEvent.cpp \ - JSProcessingInstruction.cpp \ - JSProgressEvent.cpp \ - JSRangeException.cpp \ - JSRange.cpp \ - JSStringCallback.cpp \ - JSText.cpp \ - JSTextEvent.cpp \ - JSTouch.cpp \ - JSTouchEvent.cpp \ - JSTouchList.cpp \ - JSTreeWalker.cpp \ - JSUIEvent.cpp \ - JSWebKitAnimationEvent.cpp \ - JSWebKitTransitionEvent.cpp \ - JSWheelEvent.cpp \ - JSBlob.cpp \ - JSDirectoryEntry.cpp \ - JSDirectoryEntrySync.cpp \ - JSDirectoryReader.cpp \ - JSDirectoryReaderSync.cpp \ - JSDOMFileSystem.cpp \ - JSDOMFileSystemSync.cpp \ - JSEntriesCallback.cpp \ - JSEntry.cpp \ - JSEntryArray.cpp \ - JSEntryArraySync.cpp \ - JSEntryCallback.cpp \ - JSEntrySync.cpp \ - JSErrorCallback.cpp \ - JSFile.cpp \ - JSFileCallback.cpp \ - JSFileEntry.cpp \ - JSFileEntrySync.cpp \ - JSFileError.cpp \ - JSFileException.cpp \ - JSFileList.cpp \ - JSFileReader.cpp \ - JSFileReaderSync.cpp \ - JSFileSystemCallback.cpp \ - JSFileWriter.cpp \ - JSFileWriterCallback.cpp \ - JSWebKitFlags.cpp \ - JSMetadata.cpp \ - JSMetadataCallback.cpp \ - JSWebKitBlobBuilder.cpp \ - JSArrayBufferView.cpp \ - JSArrayBuffer.cpp \ - JSDataView.cpp \ - JSInt8Array.cpp \ - JSFloat32Array.cpp \ - JSCanvasGradient.cpp \ - JSInt32Array.cpp \ - JSCanvasPattern.cpp \ - JSCanvasRenderingContext.cpp \ - JSCanvasRenderingContext2D.cpp \ - JSOESStandardDerivatives.cpp \ - JSOESTextureFloat.cpp \ - JSOESVertexArrayObject.cpp \ - JSWebGLActiveInfo.cpp \ - JSWebGLBuffer.cpp \ - JSWebGLContextAttributes.cpp \ - JSWebGLFramebuffer.cpp \ - JSWebGLProgram.cpp \ - JSWebGLRenderbuffer.cpp \ - JSWebGLRenderingContext.cpp \ - JSWebGLShader.cpp \ - JSInt16Array.cpp \ - JSWebGLTexture.cpp \ - JSWebGLUniformLocation.cpp \ - JSWebGLVertexArrayObjectOES.cpp \ - JSWebKitLoseContext.cpp \ - JSUint8Array.cpp \ - JSUint32Array.cpp \ - JSUint16Array.cpp \ - JSDOMFormData.cpp \ - JSDOMSettableTokenList.cpp \ - JSDOMTokenList.cpp \ - JSDOMURL.cpp \ - JSHTMLAllCollection.cpp \ - JSHTMLAudioElement.cpp \ - JSHTMLAnchorElement.cpp \ - JSHTMLAppletElement.cpp \ - JSHTMLAreaElement.cpp \ - JSHTMLBaseElement.cpp \ - JSHTMLBaseFontElement.cpp \ - JSHTMLBlockquoteElement.cpp \ - JSHTMLBodyElement.cpp \ - JSHTMLBRElement.cpp \ - JSHTMLButtonElement.cpp \ - JSHTMLCanvasElement.cpp \ - JSHTMLCollection.cpp \ - JSHTMLDataListElement.cpp \ - JSHTMLDetailsElement.cpp \ - JSHTMLDirectoryElement.cpp \ - JSHTMLDivElement.cpp \ - JSHTMLDListElement.cpp \ - JSHTMLDocument.cpp \ - JSHTMLElement.cpp \ - JSHTMLEmbedElement.cpp \ - JSHTMLFieldSetElement.cpp \ - JSHTMLFontElement.cpp \ - JSHTMLFormElement.cpp \ - JSHTMLFrameElement.cpp \ - JSHTMLFrameSetElement.cpp \ - JSHTMLHeadElement.cpp \ - JSHTMLHeadingElement.cpp \ - JSHTMLHRElement.cpp \ - JSHTMLHtmlElement.cpp \ - JSHTMLIFrameElement.cpp \ - JSHTMLImageElement.cpp \ - JSHTMLInputElement.cpp \ - JSHTMLIsIndexElement.cpp \ - JSHTMLKeygenElement.cpp \ - JSHTMLLabelElement.cpp \ - JSHTMLLegendElement.cpp \ - JSHTMLLIElement.cpp \ - JSHTMLLinkElement.cpp \ - JSHTMLMapElement.cpp \ - JSHTMLMarqueeElement.cpp \ - JSHTMLMediaElement.cpp \ - JSHTMLMenuElement.cpp \ - JSHTMLMetaElement.cpp \ - JSHTMLMeterElement.cpp \ - JSHTMLModElement.cpp \ - JSHTMLObjectElement.cpp \ - JSHTMLOListElement.cpp \ - JSHTMLOptGroupElement.cpp \ - JSHTMLOptionElement.cpp \ - JSHTMLOptionsCollection.cpp \ - JSHTMLOutputElement.cpp \ - JSHTMLParagraphElement.cpp \ - JSHTMLParamElement.cpp \ - JSHTMLPreElement.cpp \ - JSHTMLProgressElement.cpp \ - JSHTMLQuoteElement.cpp \ - JSHTMLScriptElement.cpp \ - JSHTMLSelectElement.cpp \ - JSHTMLSourceElement.cpp \ - JSHTMLStyleElement.cpp \ - JSHTMLTableCaptionElement.cpp \ - JSHTMLTableCellElement.cpp \ - JSHTMLTableColElement.cpp \ - JSHTMLTableElement.cpp \ - JSHTMLTableRowElement.cpp \ - JSHTMLTableSectionElement.cpp \ - JSHTMLTextAreaElement.cpp \ - JSHTMLTitleElement.cpp \ - JSHTMLTrackElement.cpp \ - JSHTMLUListElement.cpp \ - JSHTMLVideoElement.cpp \ - JSImageData.cpp \ - JSMediaError.cpp \ - JSTextMetrics.cpp \ - JSTimeRanges.cpp \ - JSValidityState.cpp \ - JSVoidCallback.cpp \ - JSInjectedScriptHost.cpp \ - JSInspectorFrontendHost.cpp \ - JSJavaScriptCallFrame.cpp \ - JSScriptProfile.cpp \ - JSScriptProfileNode.cpp \ - JSDOMApplicationCache.cpp \ - JSNotification.cpp \ - JSNotificationCenter.cpp \ - JSBarInfo.cpp \ - JSConsole.cpp \ - JSCoordinates.cpp \ - JSCrypto.cpp \ - JSDOMSelection.cpp \ - JSDOMWindow.cpp \ - JSEventSource.cpp \ - JSGeolocation.cpp \ - JSGeoposition.cpp \ - JSHistory.cpp \ - JSLocation.cpp \ - JSMemoryInfo.cpp \ - JSNavigator.cpp \ - JSNavigatorUserMediaError.cpp \ - JSNavigatorUserMediaErrorCallback.cpp \ - JSNavigatorUserMediaSuccessCallback.cpp \ - JSPerformance.cpp \ - JSPerformanceNavigation.cpp \ - JSPerformanceTiming.cpp \ - JSPositionError.cpp \ - JSScreen.cpp \ - JSSpeechInputEvent.cpp \ - JSSpeechInputResult.cpp \ - JSSpeechInputResultList.cpp \ - JSWebKitAnimation.cpp \ - JSWebKitAnimationList.cpp \ - JSWebKitPoint.cpp \ - JSWorkerNavigator.cpp \ - JSDOMPlugin.cpp \ - JSDOMMimeType.cpp \ - JSDOMPluginArray.cpp \ - JSDOMMimeTypeArray.cpp \ - JSDatabase.cpp \ - JSDatabaseCallback.cpp \ - JSDatabaseSync.cpp \ - JSIDBAny.cpp \ - JSIDBCursor.cpp \ - JSIDBDatabaseError.cpp \ - JSIDBDatabaseException.cpp \ - JSIDBDatabase.cpp \ - JSIDBFactory.cpp \ - JSIDBIndex.cpp \ - JSIDBKey.cpp \ - JSIDBKeyRange.cpp \ - JSIDBObjectStore.cpp \ - JSIDBRequest.cpp \ - JSIDBTransaction.cpp \ - JSStorage.cpp \ - JSStorageEvent.cpp \ - JSStorageInfo.cpp \ - JSStorageInfoErrorCallback.cpp \ - JSStorageInfoUsageCallback.cpp \ - JSSQLError.cpp \ - JSSQLException.cpp \ - JSSQLResultSet.cpp \ - JSSQLResultSetRowList.cpp \ - JSSQLStatementCallback.cpp \ - JSSQLStatementErrorCallback.cpp \ - JSSQLTransaction.cpp \ - JSSQLTransactionCallback.cpp \ - JSSQLTransactionErrorCallback.cpp \ - JSSQLTransactionSync.cpp \ - JSSQLTransactionSyncCallback.cpp \ - JSSVGZoomEvent.cpp \ - JSSVGAElement.cpp \ - JSSVGAltGlyphElement.cpp \ - JSSVGAngle.cpp \ - JSSVGAnimateColorElement.cpp \ - JSSVGAnimatedAngle.cpp \ - JSSVGAnimatedBoolean.cpp \ - JSSVGAnimatedEnumeration.cpp \ - JSSVGAnimatedInteger.cpp \ - JSSVGAnimatedLength.cpp \ - JSSVGAnimatedLengthList.cpp \ - JSSVGAnimatedNumber.cpp \ - JSSVGAnimatedNumberList.cpp \ - JSSVGAnimatedPreserveAspectRatio.cpp \ - JSSVGAnimatedRect.cpp \ - JSSVGAnimatedString.cpp \ - JSSVGAnimatedTransformList.cpp \ - JSSVGAnimateElement.cpp \ - JSSVGAnimateTransformElement.cpp \ - JSSVGAnimationElement.cpp \ - JSSVGCircleElement.cpp \ - JSSVGClipPathElement.cpp \ - JSSVGColor.cpp \ - JSSVGComponentTransferFunctionElement.cpp \ - JSSVGCursorElement.cpp \ - JSSVGDefsElement.cpp \ - JSSVGDescElement.cpp \ - JSSVGDocument.cpp \ - JSSVGElement.cpp \ - JSSVGElementInstance.cpp \ - JSSVGElementInstanceList.cpp \ - JSSVGEllipseElement.cpp \ - JSSVGException.cpp \ - JSSVGFEBlendElement.cpp \ - JSSVGFEColorMatrixElement.cpp \ - JSSVGFEComponentTransferElement.cpp \ - JSSVGFECompositeElement.cpp \ - JSSVGFEConvolveMatrixElement.cpp \ - JSSVGFEDiffuseLightingElement.cpp \ - JSSVGFEDisplacementMapElement.cpp \ - JSSVGFEDistantLightElement.cpp \ - JSSVGFEDropShadowElement.cpp \ - JSSVGFEFloodElement.cpp \ - JSSVGFEFuncAElement.cpp \ - JSSVGFEFuncBElement.cpp \ - JSSVGFEFuncGElement.cpp \ - JSSVGFEFuncRElement.cpp \ - JSSVGFEGaussianBlurElement.cpp \ - JSSVGFEImageElement.cpp \ - JSSVGFEMergeElement.cpp \ - JSSVGFEMergeNodeElement.cpp \ - JSSVGFEMorphologyElement.cpp \ - JSSVGFEOffsetElement.cpp \ - JSSVGFEPointLightElement.cpp \ - JSSVGFESpecularLightingElement.cpp \ - JSSVGFESpotLightElement.cpp \ - JSSVGFETileElement.cpp \ - JSSVGFETurbulenceElement.cpp \ - JSSVGFilterElement.cpp \ - JSSVGFontElement.cpp \ - JSSVGFontFaceElement.cpp \ - JSSVGFontFaceFormatElement.cpp \ - JSSVGFontFaceNameElement.cpp \ - JSSVGFontFaceSrcElement.cpp \ - JSSVGFontFaceUriElement.cpp \ - JSSVGForeignObjectElement.cpp \ - JSSVGGElement.cpp \ - JSSVGGlyphElement.cpp \ - JSSVGGradientElement.cpp \ - JSSVGHKernElement.cpp \ - JSSVGImageElement.cpp \ - JSSVGLength.cpp \ - JSSVGLengthList.cpp \ - JSSVGLinearGradientElement.cpp \ - JSSVGLineElement.cpp \ - JSSVGMarkerElement.cpp \ - JSSVGMaskElement.cpp \ - JSSVGMatrix.cpp \ - JSSVGMetadataElement.cpp \ - JSSVGMissingGlyphElement.cpp \ - JSSVGNumber.cpp \ - JSSVGNumberList.cpp \ - JSSVGPaint.cpp \ - JSSVGPathElement.cpp \ - JSSVGPathSegArcAbs.cpp \ - JSSVGPathSegArcRel.cpp \ - JSSVGPathSegClosePath.cpp \ - JSSVGPathSegCurvetoCubicAbs.cpp \ - JSSVGPathSegCurvetoCubicRel.cpp \ - JSSVGPathSegCurvetoCubicSmoothAbs.cpp \ - JSSVGPathSegCurvetoCubicSmoothRel.cpp \ - JSSVGPathSegCurvetoQuadraticAbs.cpp \ - JSSVGPathSegCurvetoQuadraticRel.cpp \ - JSSVGPathSegCurvetoQuadraticSmoothAbs.cpp \ - JSSVGPathSegCurvetoQuadraticSmoothRel.cpp \ - JSSVGPathSeg.cpp \ - JSSVGPathSegLinetoAbs.cpp \ - JSSVGPathSegLinetoHorizontalAbs.cpp \ - JSSVGPathSegLinetoHorizontalRel.cpp \ - JSSVGPathSegLinetoRel.cpp \ - JSSVGPathSegLinetoVerticalAbs.cpp \ - JSSVGPathSegLinetoVerticalRel.cpp \ - JSSVGPathSegList.cpp \ - JSSVGPathSegMovetoAbs.cpp \ - JSSVGPathSegMovetoRel.cpp \ - JSSVGPatternElement.cpp \ - JSSVGPoint.cpp \ - JSSVGPointList.cpp \ - JSSVGPolygonElement.cpp \ - JSSVGPolylineElement.cpp \ - JSSVGPreserveAspectRatio.cpp \ - JSSVGRadialGradientElement.cpp \ - JSSVGRectElement.cpp \ - JSSVGRect.cpp \ - JSSVGRenderingIntent.cpp \ - JSSVGScriptElement.cpp \ - JSSVGSetElement.cpp \ - JSSVGStopElement.cpp \ - JSSVGStringList.cpp \ - JSSVGStyleElement.cpp \ - JSSVGSVGElement.cpp \ - JSSVGSwitchElement.cpp \ - JSSVGSymbolElement.cpp \ - JSSVGTextContentElement.cpp \ - JSSVGTextElement.cpp \ - JSSVGTextPathElement.cpp \ - JSSVGTextPositioningElement.cpp \ - JSSVGTitleElement.cpp \ - JSSVGTransform.cpp \ - JSSVGTransformList.cpp \ - JSSVGTRefElement.cpp \ - JSSVGTSpanElement.cpp \ - JSSVGUnitTypes.cpp \ - JSSVGUseElement.cpp \ - JSSVGViewElement.cpp \ - JSSVGVKernElement.cpp \ - JSInternals.cpp \ - JSAudioBuffer.cpp \ - JSAudioBufferSourceNode.cpp \ - JSAudioChannelMerger.cpp \ - JSAudioChannelSplitter.cpp \ - JSAudioContext.cpp \ - JSAudioDestinationNode.cpp \ - JSAudioGain.cpp \ - JSAudioGainNode.cpp \ - JSAudioListener.cpp \ - JSAudioNode.cpp \ - JSAudioPannerNode.cpp \ - JSAudioParam.cpp \ - JSAudioProcessingEvent.cpp \ - JSAudioSourceNode.cpp \ - JSConvolverNode.cpp \ - JSDelayNode.cpp \ - JSHighPass2FilterNode.cpp \ - JSJavaScriptAudioNode.cpp \ - JSLowPass2FilterNode.cpp \ - JSRealtimeAnalyserNode.cpp \ - JSWebSocket.cpp \ - JSAbstractWorker.cpp \ - JSDedicatedWorkerContext.cpp \ - JSSharedWorker.cpp \ - JSSharedWorkerContext.cpp \ - JSWorker.cpp \ - JSWorkerContext.cpp \ - JSWorkerLocation.cpp \ - JSDOMParser.cpp \ - JSXMLHttpRequest.cpp \ - JSXMLHttpRequestException.cpp \ - JSXMLHttpRequestProgressEvent.cpp \ - JSXMLHttpRequestUpload.cpp \ - JSXMLSerializer.cpp \ - JSXPathNSResolver.cpp \ - JSXPathException.cpp \ - JSXPathExpression.cpp \ - JSXPathResult.cpp \ - JSXPathEvaluator.cpp \ - JSXSLTProcessor.cpp \ - InspectorFrontend.cpp \ - InspectorBackendDispatcher.cpp \ - CSSGrammar.cpp \ - HTMLNames.cpp \ - HTMLElementFactory.cpp \ - JSHTMLElementWrapperFactory.cpp \ - XMLNSNames.cpp \ - XMLNames.cpp \ - HTMLEntityTable.cpp \ - DocTypeStrings.cpp \ - ColorData.cpp \ - UserAgentStyleSheetsData.cpp \ - XPathGrammar.cpp \ - qwebframe.cpp \ - qgraphicswebview.cpp \ - qwebpage.cpp \ - qwebview.cpp \ - qwebelement.cpp \ - qwebhistory.cpp \ - qwebsettings.cpp \ - qwebhistoryinterface.cpp \ - qwebplugindatabase.cpp \ - qwebpluginfactory.cpp \ - qwebsecurityorigin.cpp \ - qwebscriptworld.cpp \ - qwebdatabase.cpp \ - qwebinspector.cpp \ - qwebkitversion.cpp \ - QtFallbackWebPopup.cpp \ - ChromeClientQt.cpp \ - ContextMenuClientQt.cpp \ - DragClientQt.cpp \ - DumpRenderTreeSupportQt.cpp \ - EditorClientQt.cpp \ - EditCommandQt.cpp \ - FrameLoaderClientQt.cpp \ - FrameNetworkingContextQt.cpp \ - GeolocationPermissionClientQt.cpp \ - InspectorClientQt.cpp \ - InspectorServerQt.cpp \ - NotificationPresenterClientQt.cpp \ - PageClientQt.cpp \ - PopupMenuQt.cpp \ - QtPlatformPlugin.cpp \ - SearchPopupMenuQt.cpp \ - WebPlatformStrategies.cpp \ - IconDatabaseClientQt.cpp \ - moc_qwebkitplatformplugin.cpp \ - moc_qwebhistoryinterface.cpp \ - moc_qwebpluginfactory.cpp \ - moc_qwebinspector.cpp \ - moc_qwebplugindatabase_p.cpp \ - moc_InspectorServerQt.cpp \ - moc_QtFallbackWebPopup.cpp \ - qrc_WebCore.cpp \ - qrc_WebKit.cpp \ - qrc_InspectorBackendStub.cpp - -QT_VPATH = \ - src/3rdparty/webkit/Source/WebCore/generated \ - src/3rdparty/webkit/Source/WebKit/qt/Api \ - src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport \ - -# some source files need to be generated by moc from other source/header files before -# they get #included again by the original source file in the compiling stage - -# source files generated from existing header files ('moc_%.cpp: %.h' rule in spec-qt4.mk) -# extracted from 'compiler_moc_header_make_all' target - -COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ - moc_qwebframe.cpp \ - moc_qgraphicswebview.cpp \ - moc_qwebkitplatformplugin.cpp \ - moc_qwebpage.cpp \ - moc_qwebview.cpp \ - moc_qwebhistoryinterface.cpp \ - moc_qwebpluginfactory.cpp \ - moc_qwebinspector.cpp \ - moc_qwebplugindatabase_p.cpp \ - moc_InspectorServerQt.cpp \ - moc_QtFallbackWebPopup.cpp \ - moc_FrameLoaderClientQt.cpp \ - moc_NotificationPresenterClientQt.cpp \ - moc_PopupMenuQt.cpp \ - moc_IconDatabaseClientQt.cpp - -# source files generated from existing source files ('%.moc: %.cpp' rule in spec-qt4.mk) -# extracted from 'compiler_moc_source_make_all' rule - -COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ - InspectorClientQt.moc - diff --git a/repos/qt4/lib/mk/qt_xml.mk b/repos/qt4/lib/mk/qt_xml.mk deleted file mode 100644 index 914d7066f..000000000 --- a/repos/qt4/lib/mk/qt_xml.mk +++ /dev/null @@ -1,15 +0,0 @@ -include $(REP_DIR)/lib/import/import-qt_xml.mk - -SHARED_LIB = yes - -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 \ - -LIBS += qt_core libc - -vpath % $(REP_DIR)/include/qt4/QtXml -vpath % $(REP_DIR)/include/qt4/QtXml/private diff --git a/repos/qt4/lib/mk/qt_xml_generated.inc b/repos/qt4/lib/mk/qt_xml_generated.inc deleted file mode 100644 index c732cf022..000000000 --- a/repos/qt4/lib/mk/qt_xml_generated.inc +++ /dev/null @@ -1,29 +0,0 @@ -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 - -# 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 = \ - - -# 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 = \ - - diff --git a/repos/qt4/run/calculatorform.run b/repos/qt4/run/calculatorform.run deleted file mode 100644 index dd6b9d372..000000000 --- a/repos/qt4/run/calculatorform.run +++ /dev/null @@ -1,120 +0,0 @@ -# -# Build -# - -build { - core - init - drivers/input/ps2 - drivers/pci - drivers/framebuffer - drivers/timer - server/nitpicker - app/examples/calculatorform -} - -create_boot_directory - -# -# Generate config -# - -set config { - - - - - - - - - - - - - - - - - } - -append_if [have_spec sdl] config { - - - - - - - } - -append_if [have_spec pci] config { - - - - } - -append_if [have_spec framebuffer] config { - - - - } - -append_if [have_spec ps2] config { - - - - } - -append config { - - - - - - - - - - - - -} - -install_config $config - -# -# Boot modules -# - -# generic modules -set boot_modules { - core - init - timer - nitpicker - calculatorform - dejavusans.lib.so - freetype.lib.so - ld.lib.so - libc.lib.so - libc_lock_pipe.lib.so - libm.lib.so - libpng.lib.so - jpeg.lib.so - qt_core.lib.so - qt_gui.lib.so - zlib.lib.so - stdcxx.lib.so -} - -# platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec framebuffer] boot_modules fb_drv -lappend_if [have_spec ps2] boot_modules ps2_drv - -build_boot_image $boot_modules - -append qemu_args " -m 128" - -run_genode_until forever diff --git a/repos/qt4/run/previewer.run b/repos/qt4/run/previewer.run deleted file mode 100644 index c267b2938..000000000 --- a/repos/qt4/run/previewer.run +++ /dev/null @@ -1,124 +0,0 @@ -# -# Build -# - -build { - core - init - drivers/input/ps2 - drivers/pci - drivers/framebuffer - drivers/timer - server/nitpicker - app/examples/previewer -} - -create_boot_directory - -# -# Generate config -# - -set config { - - - - - - - - - - - - - - - - - } - -append_if [have_spec sdl] config { - - - - - - - } - -append_if [have_spec pci] config { - - - - } - -append_if [have_spec framebuffer] config { - - - - } - -append_if [have_spec ps2] config { - - - - } - -append config { - - - - - - - - - - - - -} - -install_config $config - -# -# Boot modules -# - -# generic modules -set boot_modules { - core - init - timer - nitpicker - previewer - dejavusans.lib.so - freetype.lib.so - ld.lib.so - libc.lib.so - libc_lock_pipe.lib.so - libm.lib.so - libpng.lib.so - jpeg.lib.so - qt_core.lib.so - qt_gui.lib.so - qt_jscore.lib.so - qt_network.lib.so - qt_webcore.lib.so - qt_webkit.lib.so - zlib.lib.so - stdcxx.lib.so -} - -# platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec framebuffer] boot_modules fb_drv -lappend_if [have_spec ps2] boot_modules ps2_drv - -build_boot_image $boot_modules - -append qemu_args " -m 128" - -run_genode_until forever diff --git a/repos/qt4/run/qpluginwidget.run b/repos/qt4/run/qpluginwidget.run deleted file mode 100644 index 7c15be27a..000000000 --- a/repos/qt4/run/qpluginwidget.run +++ /dev/null @@ -1,138 +0,0 @@ -# -# Build -# - -build { - core - init - drivers/input/ps2 - drivers/pci - drivers/framebuffer - drivers/timer - server/nitpicker - server/loader - server/tar_rom - test/nitpicker - test/qpluginwidget -} - -create_boot_directory - -# -# Generate config -# - -set config { - - - - - - - - - - - - - - - - - } - -append_if [have_spec sdl] config { - - - - - - - } - -append_if [have_spec pci] config { - - - - } - -append_if [have_spec framebuffer] config { - - - - } - -append_if [have_spec ps2] config { - - - - } - -append config { - - - - - - - - - - - - - - - - -} - -install_config $config - -# -# Boot modules -# - -exec sh -c "ln -sf ../test/qpluginwidget/test-plugin.tar bin/" - -# generic modules -set boot_modules { - core - init - timer - nitpicker - loader - tar_rom - testnit - test-qpluginwidget - dejavusans.lib.so - freetype.lib.so - ld.lib.so - libc.lib.so - libc_lock_pipe.lib.so - libm.lib.so - libpng.lib.so - libssl.lib.so - libcrypto.lib.so - jpeg.lib.so - qt_core.lib.so - qt_gui.lib.so - qt_network.lib.so - zlib.lib.so - qnitpickerviewwidget.lib.so - qpluginwidget.lib.so - test-plugin.tar - stdcxx.lib.so -} - -# platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec framebuffer] boot_modules fb_drv -lappend_if [have_spec ps2] boot_modules ps2_drv - -build_boot_image $boot_modules - -append qemu_args " -m 128" - -run_genode_until forever diff --git a/repos/qt4/run/qt4.run b/repos/qt4/run/qt4.run deleted file mode 100644 index eb8aefcae..000000000 --- a/repos/qt4/run/qt4.run +++ /dev/null @@ -1,128 +0,0 @@ -# -# Build -# - -build { - core - init - drivers/input/ps2 - drivers/pci - drivers/framebuffer - drivers/timer - server/nitpicker - app/examples/calculatorform - app/examples/tetrix - app/qt_launchpad -} - -create_boot_directory - -# -# Generate config -# - -set config { - - - - - - - - - - - - - - - - - } - -append_if [have_spec sdl] config { - - - - - - - } - -append_if [have_spec pci] config { - - - - } - -append_if [have_spec framebuffer] config { - - - - } - -append_if [have_spec ps2] config { - - - - } - -append config { - - - - - - - - - - - - -} - -install_config $config - -# -# Boot modules -# - -# generic modules -set boot_modules { - core - init - timer - nitpicker - qt_launchpad - calculatorform - tetrix - dejavusans.lib.so - freetype.lib.so - ld.lib.so - libc.lib.so - libc_lock_pipe.lib.so - libm.lib.so - libpng.lib.so - jpeg.lib.so - qt_core.lib.so - qt_gui.lib.so - qt_script.lib.so - qt_ui_tools.lib.so - qt_xml.lib.so - zlib.lib.so - stdcxx.lib.so -} - -# platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec framebuffer] boot_modules fb_drv -lappend_if [have_spec ps2] boot_modules ps2_drv - -build_boot_image $boot_modules - -append qemu_args " -m 512" - -run_genode_until forever - diff --git a/repos/qt4/run/qt_avplay.run b/repos/qt4/run/qt_avplay.run deleted file mode 100644 index 78097dddd..000000000 --- a/repos/qt4/run/qt_avplay.run +++ /dev/null @@ -1,152 +0,0 @@ -# -# Build -# - -build { - core - init - drivers/input/ps2 - drivers/pci - drivers/framebuffer - drivers/timer - drivers/audio_out - server/nitpicker - app/avplay - app/qt_avplay -} - -# -# Download media file -# - -set media_url "ftp://ftp.untergrund.net/users/ae/dhstv/escape-chotro.mp4" -if {![file exists bin/mediafile]} { - puts "downloading media file from $media_url" - catch { exec wget -O bin/mediafile $media_url } -} - -create_boot_directory - -# -# Generate config -# - -set config { - - - - - - - - - - - - - - - - - } - -append_if [have_spec sdl] config { - - - - - - - } - -append_if [have_spec pci] config { - - - - } - -append_if [have_spec framebuffer] config { - - - - } - -append_if [have_spec ps2] config { - - - - } - -append config { - - - - - - - - - - - - - - - - - - - -} - -install_config $config - -# -# Boot modules -# - -# generic modules -set boot_modules { - core - init - timer - audio_out_drv - nitpicker - qt_avplay - dejavusans.lib.so - freetype.lib.so - ld.lib.so - libc.lib.so - libc_lock_pipe.lib.so - libm.lib.so - libpng.lib.so - jpeg.lib.so - qnitpickerviewwidget.lib.so - qt_core.lib.so - qt_gui.lib.so - qt_xml.lib.so - zlib.lib.so - avcodec.lib.so - avformat.lib.so - avutil.lib.so - avfilter.lib.so - swscale.lib.so - sdl.lib.so - pthread.lib.so - avplay - mediafile - stdcxx.lib.so -} - -# platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec framebuffer] boot_modules fb_drv -lappend_if [have_spec ps2] boot_modules ps2_drv - -build_boot_image $boot_modules - -append qemu_args " -m 512 -soundhw all" - -run_genode_until forever - diff --git a/repos/qt4/run/tetrix.run b/repos/qt4/run/tetrix.run deleted file mode 100644 index 37800173e..000000000 --- a/repos/qt4/run/tetrix.run +++ /dev/null @@ -1,123 +0,0 @@ -# -# Build -# - -build { - core - init - drivers/input/ps2 - drivers/pci - drivers/framebuffer - drivers/timer - server/nitpicker - app/examples/tetrix -} - -create_boot_directory - -# -# Generate config -# - -set config { - - - - - - - - - - - - - - - - - } - -append_if [have_spec sdl] config { - - - - - - - } - -append_if [have_spec pci] config { - - - - } - -append_if [have_spec framebuffer] config { - - - - } - -append_if [have_spec ps2] config { - - - - } - -append config { - - - - - - - - - - - - -} - -install_config $config - -# -# Boot modules -# - -# generic modules -set boot_modules { - core - init - timer - nitpicker - tetrix - dejavusans.lib.so - freetype.lib.so - ld.lib.so - libc.lib.so - libc_lock_pipe.lib.so - libm.lib.so - libpng.lib.so - jpeg.lib.so - qt_core.lib.so - qt_gui.lib.so - qt_script.lib.so - qt_ui_tools.lib.so - qt_xml.lib.so - zlib.lib.so - stdcxx.lib.so -} - -# platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec framebuffer] boot_modules fb_drv -lappend_if [have_spec ps2] boot_modules ps2_drv - -build_boot_image $boot_modules - -append qemu_args " -m 128" - -run_genode_until forever diff --git a/repos/qt4/run/textedit.run b/repos/qt4/run/textedit.run deleted file mode 100644 index fa7fd700c..000000000 --- a/repos/qt4/run/textedit.run +++ /dev/null @@ -1,214 +0,0 @@ -# -# Build -# - -if {[have_spec hw_odroid_xu]} { - puts "Run script does not support this platform." - exit 0 -} - -set build_components { - core - init - drivers/framebuffer - drivers/timer - server/nitpicker - app/examples/textedit -} - -set use_sd_card_driver [expr [have_spec omap4] || [have_spec platform_arndale]] -set use_usb_driver [expr [have_spec omap4] || [have_spec platform_arndale] || [have_spec platform_rpi]] - -lappend_if $use_sd_card_driver build_components drivers/sd_card -lappend_if $use_usb_driver build_components drivers/usb -lappend_if [have_spec pci] build_components drivers/pci -lappend_if [have_spec pci] build_components drivers/atapi -lappend_if [have_spec acpi] build_components drivers/acpi -lappend_if [have_spec ps2] build_components drivers/input/ps2 -lappend_if [have_spec linux] build_components server/ram_fs -lappend_if [expr ![have_spec linux]] build_components server/ffat_fs -lappend_if [have_spec gpio] build_components drivers/gpio - -build $build_components -create_boot_directory - -# -# Generate config -# - -set config { - - - - - - - - - - - - - - - - - } - -append_if [have_spec sdl] config { - - - - - - - } - -append_if [have_spec pci] config { - - - - - - - - - } - -append_if [have_spec gpio] config { - - - - - } - -append_if $use_sd_card_driver config { - - - - } - -append_if [have_spec framebuffer] config { - - - - } - -append_if [expr ![have_spec ps2] && [have_spec usb]] config { - - - - - } - -append_if [have_spec ps2] config { - - - - } - -append_if [have_spec linux] config { - - - - - - - - - } - -append_if [expr ![have_spec linux]] config { - - - - - - - - } - -append config { - - - - - - - - - - - - - - - - - - - - - - - - - - -} - -install_config $config - -# -# Boot modules -# - -# generic modules -set boot_modules { - core - init - timer - nitpicker - textedit - dejavusans.lib.so - freetype.lib.so - ld.lib.so - libc.lib.so - libc_lock_pipe.lib.so - libm.lib.so - libpng.lib.so - jpeg.lib.so - qt_core.lib.so - qt_gui.lib.so - zlib.lib.so - stdcxx.lib.so -} - -# platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec linux] boot_modules ram_fs -lappend_if [expr ![have_spec linux]] boot_modules ffat_fs -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec pci] boot_modules atapi_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec framebuffer] boot_modules fb_drv -lappend_if $use_sd_card_driver boot_modules sd_card_drv -lappend_if $use_usb_driver boot_modules usb_drv -lappend_if [have_spec gpio] boot_modules gpio_drv - -build_boot_image $boot_modules - -set disk_image "bin/test.hda" -set cmd "dd if=/dev/zero of=$disk_image bs=1024 count=65536" -puts "creating disk image: $cmd" -catch { exec sh -c $cmd } - -set cmd "mkfs.vfat -F32 $disk_image" -puts "formating disk image with vfat file system: $cmd" -catch { exec sh -c $cmd } - -append_if [have_spec pci] qemu_args " -hda $disk_image -boot order=d " - -append qemu_args " -m 128" - -run_genode_until forever diff --git a/repos/qt4/src/app/examples/calculatorform/target.mk b/repos/qt4/src/app/examples/calculatorform/target.mk deleted file mode 100644 index 2f31a6e48..000000000 --- a/repos/qt4/src/app/examples/calculatorform/target.mk +++ /dev/null @@ -1,14 +0,0 @@ -# identify the qt4 repository by searching for a file that is unique for qt4 -QT4_REP_DIR := $(call select_from_repositories,lib/import/import-qt4.inc) -QT4_REP_DIR := $(realpath $(dir $(QT4_REP_DIR))../..) - -include $(QT4_REP_DIR)/lib/mk/qt_version.inc - -QMAKE_PROJECT_PATH = $(realpath $(QT4_REP_DIR)/contrib/$(QT4)/examples/designer/calculatorform) -QMAKE_PROJECT_FILE = $(QMAKE_PROJECT_PATH)/calculatorform.pro - -vpath % $(QMAKE_PROJECT_PATH) - -include $(QT4_REP_DIR)/src/app/tmpl/target_defaults.inc - -include $(QT4_REP_DIR)/src/app/tmpl/target_final.inc diff --git a/repos/qt4/src/app/examples/previewer/target.mk b/repos/qt4/src/app/examples/previewer/target.mk deleted file mode 100644 index 2ed36210d..000000000 --- a/repos/qt4/src/app/examples/previewer/target.mk +++ /dev/null @@ -1,14 +0,0 @@ -# identify the qt4 repository by searching for a file that is unique for qt4 -QT4_REP_DIR := $(call select_from_repositories,lib/import/import-qt4.inc) -QT4_REP_DIR := $(realpath $(dir $(QT4_REP_DIR))../..) - -include $(QT4_REP_DIR)/lib/mk/qt_version.inc - -QMAKE_PROJECT_PATH = $(realpath $(QT4_REP_DIR)/contrib/$(QT4)/examples/webkit/previewer) -QMAKE_PROJECT_FILE = $(QMAKE_PROJECT_PATH)/previewer.pro - -vpath % $(QMAKE_PROJECT_PATH) - -include $(QT4_REP_DIR)/src/app/tmpl/target_defaults.inc - -include $(QT4_REP_DIR)/src/app/tmpl/target_final.inc diff --git a/repos/qt4/src/app/examples/tetrix/target.mk b/repos/qt4/src/app/examples/tetrix/target.mk deleted file mode 100644 index f01c258a7..000000000 --- a/repos/qt4/src/app/examples/tetrix/target.mk +++ /dev/null @@ -1,16 +0,0 @@ -# identify the qt4 repository by searching for a file that is unique for qt4 -QT4_REP_DIR := $(call select_from_repositories,lib/import/import-qt4.inc) -QT4_REP_DIR := $(realpath $(dir $(QT4_REP_DIR))../..) - -include $(QT4_REP_DIR)/lib/mk/qt_version.inc - -QMAKE_PROJECT_PATH = $(realpath $(QT4_REP_DIR)/contrib/$(QT4)/examples/script/qstetrix) -QMAKE_PROJECT_FILE = $(QMAKE_PROJECT_PATH)/qstetrix.pro - -vpath % $(QMAKE_PROJECT_PATH) - -include $(QT4_REP_DIR)/src/app/tmpl/target_defaults.inc - -CC_CXX_OPT += -DQT_NO_SCRIPTTOOLS - -include $(QT4_REP_DIR)/src/app/tmpl/target_final.inc diff --git a/repos/qt4/src/app/examples/textedit/target.mk b/repos/qt4/src/app/examples/textedit/target.mk deleted file mode 100644 index d2be91ee4..000000000 --- a/repos/qt4/src/app/examples/textedit/target.mk +++ /dev/null @@ -1,14 +0,0 @@ -# identify the qt4 repository by searching for a file that is unique for qt4 -QT4_REP_DIR := $(call select_from_repositories,lib/import/import-qt4.inc) -QT4_REP_DIR := $(realpath $(dir $(QT4_REP_DIR))../..) - -include $(QT4_REP_DIR)/lib/mk/qt_version.inc - -QMAKE_PROJECT_PATH = $(realpath $(QT4_REP_DIR)/contrib/$(QT4)/demos/textedit) -QMAKE_PROJECT_FILE = $(QMAKE_PROJECT_PATH)/textedit.pro - -vpath % $(QMAKE_PROJECT_PATH) - -include $(QT4_REP_DIR)/src/app/tmpl/target_defaults.inc - -include $(QT4_REP_DIR)/src/app/tmpl/target_final.inc diff --git a/repos/qt4/src/app/qt_avplay/README b/repos/qt4/src/app/qt_avplay/README deleted file mode 100644 index 5e9a2ef51..000000000 --- a/repos/qt4/src/app/qt_avplay/README +++ /dev/null @@ -1,18 +0,0 @@ -This directory contains a simple Qt-based media player which is actually a -graphical user interface for the SDL-based 'avplay' media player from 'libav'. -It starts 'avplay' as a child and shows its graphical output in a -'QNitpickerViewWidget'. The widgets for controlling the player state send the -according keyboard and mouse input events to 'avplay'. - -The 'qt_avplay' player supports the following configuration options: - -:':' - name of the media file to play - -:'': - - This node contains the name of a framebuffer filter service to filter the - video output. It may appear multiple times. If specified more than once, it - is possible to build a post-processing pipeline for the video display where - each processing stage is executed by a separate program. - diff --git a/repos/qt4/src/app/qt_avplay/avplay_policy.h b/repos/qt4/src/app/qt_avplay/avplay_policy.h deleted file mode 100644 index 958938275..000000000 --- a/repos/qt4/src/app/qt_avplay/avplay_policy.h +++ /dev/null @@ -1,134 +0,0 @@ -/* - * \brief Avplay policy - * \author Christian Prochaska - * \date 2012-04-05 - */ - -/* - * Copyright (C) 2012-2013 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU General Public License version 2. - */ - -#ifndef _AVPLAY_POLICY_H_ -#define _AVPLAY_POLICY_H_ - -/* Qt4 includes */ -#include -#include -#include -#include -#include - -/* Genode includes */ -#include - - -class Avplay_policy : public QObject, public Genode::Slave_policy -{ - Q_OBJECT - - private: - - Genode::Service_registry &_input_in; - Genode::Service_registry &_framebuffer_in; - - const char *_mediafile; - int _sdl_audio_volume; - QByteArray _config_byte_array; - - - const char *_config() - { - QDomDocument config_doc; - - QDomElement config_node = config_doc.createElement("config"); - config_doc.appendChild(config_node); - - QDomElement arg0_node = config_doc.createElement("arg"); - arg0_node.setAttribute("value", "avplay"); - config_node.appendChild(arg0_node); - - QDomElement arg1_node = config_doc.createElement("arg"); - arg1_node.setAttribute("value", _mediafile); - config_node.appendChild(arg1_node); - - /* - * Configure libc of avplay to direct output to LOG and to obtain - * the mediafile from ROM. - */ - QDomElement libc_node = config_doc.createElement("libc"); - libc_node.setAttribute("stdout", "/dev/log"); - libc_node.setAttribute("stderr", "/dev/log"); - QDomElement libc_vfs_node = config_doc.createElement("vfs"); - QDomElement libc_vfs_dev_node = config_doc.createElement("dir"); - libc_vfs_dev_node.setAttribute("name", "dev"); - QDomElement libc_vfs_dev_log_node = config_doc.createElement("log"); - libc_vfs_dev_node.appendChild(libc_vfs_dev_log_node); - libc_vfs_node.appendChild(libc_vfs_dev_node); - QDomElement libc_vfs_mediafile_node = config_doc.createElement("rom"); - libc_vfs_mediafile_node.setAttribute("name", "mediafile"); - libc_vfs_node.appendChild(libc_vfs_mediafile_node); - libc_node.appendChild(libc_vfs_node); - config_node.appendChild(libc_node); - - QDomElement sdl_audio_volume_node = config_doc.createElement("sdl_audio_volume"); - sdl_audio_volume_node.setAttribute("value", QString::number(_sdl_audio_volume)); - config_node.appendChild(sdl_audio_volume_node); - - _config_byte_array = config_doc.toByteArray(4); - - return _config_byte_array.constData(); - } - - protected: - - const char **_permitted_services() const - { - static const char *permitted_services[] = { - "CAP", "LOG", "RM", "ROM", "SIGNAL", - "Timer", "Audio_out", 0 }; - - return permitted_services; - }; - - public: - - Avplay_policy(Genode::Rpc_entrypoint &entrypoint, - Genode::Service_registry &input_in, - Genode::Service_registry &framebuffer_in, - const char *mediafile) - : Genode::Slave_policy("avplay", entrypoint, Genode::env()->ram_session()), - _input_in(input_in), - _framebuffer_in(framebuffer_in), - _mediafile(mediafile), - _sdl_audio_volume(100) - { - configure(_config()); - } - - Genode::Service *resolve_session_request(const char *service_name, - const char *args) - { - if (strcmp(service_name, "Input") == 0) - return _input_in.find(service_name); - - if (strcmp(service_name, "Framebuffer") == 0) { - Genode::Client client; - return _framebuffer_in.wait_for_service(service_name, &client, name()); - } - - return Slave_policy::resolve_session_request(service_name, args); - } - - public Q_SLOTS: - - void volume_changed(int value) - { - _sdl_audio_volume = value; - configure(_config()); - } -}; - -#endif /* _AVPLAY_POLICY_H_ */ diff --git a/repos/qt4/src/app/qt_avplay/control_bar.cpp b/repos/qt4/src/app/qt_avplay/control_bar.cpp deleted file mode 100644 index d40eff97c..000000000 --- a/repos/qt4/src/app/qt_avplay/control_bar.cpp +++ /dev/null @@ -1,74 +0,0 @@ -/* - * \brief Control bar - * \author Christian Prochaska - * \date 2012-03-30 - */ - -/* - * Copyright (C) 2012-2013 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU General Public License version 2. - */ - -/* Genode includes */ -#include - -/* Qoost includes */ -#include - -/* local includes */ -#include "main_window.h" - - -void Control_bar::_rewind() -{ - /* mouse click at horizontal position 0 */ - _event_queue.add(Input::Event(Input::Event::PRESS, Input::BTN_LEFT, 0, 0, 0, 0)); - _event_queue.add(Input::Event(Input::Event::RELEASE, Input::BTN_LEFT, 0, 0, 0, 0)); -} - - -void Control_bar::_pause_resume() -{ - _event_queue.add(Input::Event(Input::Event::PRESS, Input::KEY_SPACE, 0, 0, 0, 0)); - _event_queue.add(Input::Event(Input::Event::RELEASE, Input::KEY_SPACE, 0, 0, 0, 0)); - - _playing = !_playing; - if (_playing) - update_style_id(_play_pause_button, "play"); - else - update_style_id(_play_pause_button, "pause"); -} - - -void Control_bar::_stop() -{ - if (_playing) - _pause_resume(); - - _rewind(); -} - - -Control_bar::Control_bar(Input::Event_queue &event_queue) -: - _event_queue(event_queue), _playing(true) -{ - update_style_id(_play_pause_button, "play"); - - _volume_slider->setOrientation(Qt::Horizontal); - _volume_slider->setRange(0, 100); - _volume_slider->setTickInterval(10); - _volume_slider->setValue(100); - - _layout->addWidget(_play_pause_button); - _layout->addWidget(_stop_button); - _layout->addStretch(); - _layout->addWidget(_volume_label); - _layout->addWidget(_volume_slider); - - connect(_play_pause_button, SIGNAL(clicked()), this, SLOT(_pause_resume())); - connect(_stop_button, SIGNAL(clicked()), this, SLOT(_stop())); - connect(_volume_slider, SIGNAL(valueChanged(int)), this, SIGNAL(volume_changed(int))); -} diff --git a/repos/qt4/src/app/qt_avplay/control_bar.h b/repos/qt4/src/app/qt_avplay/control_bar.h deleted file mode 100644 index 6bb9af57b..000000000 --- a/repos/qt4/src/app/qt_avplay/control_bar.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - * \brief Control bar - * \author Christian Prochaska - * \date 2012-03-30 - */ - -/* - * Copyright (C) 2012-2013 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU General Public License version 2. - */ - -#ifndef _CONTROL_BAR_H_ -#define _CONTROL_BAR_H_ - -/* Qt includes */ -#include - -/* Qoost includes */ -#include -#include - -/* Genode includes */ -#include - -struct Play_pause_button : QPushButton { Q_OBJECT }; -struct Stop_button : QPushButton { Q_OBJECT }; -struct Volume_label : QLabel { Q_OBJECT }; -struct Volume_slider : QSlider { Q_OBJECT }; - -class Control_bar : public Compound_widget -{ - Q_OBJECT - - private: - - Input::Event_queue &_event_queue; - - QMember _play_pause_button; - QMember _stop_button; - QMember _volume_label; - QMember _volume_slider; - - bool _playing; - - void _rewind(); - - private Q_SLOTS: - - void _pause_resume(); - void _stop(); - - public: - - Control_bar(Input::Event_queue &event_queue); - - Q_SIGNALS: - - void volume_changed(int value); -}; - -#endif /* _CONTROL_BAR_H_ */ diff --git a/repos/qt4/src/app/qt_avplay/filter_framebuffer_policy.h b/repos/qt4/src/app/qt_avplay/filter_framebuffer_policy.h deleted file mode 100644 index 0a6b40572..000000000 --- a/repos/qt4/src/app/qt_avplay/filter_framebuffer_policy.h +++ /dev/null @@ -1,77 +0,0 @@ -/* - * \brief Filter framebuffer policy - * \author Christian Prochaska - * \date 2012-04-11 - */ - -/* - * Copyright (C) 2012-2013 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU General Public License version 2. - */ - -#ifndef _FILTER_FRAMEBUFFER_POLICY_H_ -#define _FILTER_FRAMEBUFFER_POLICY_H_ - -/* Genode includes */ -#include -#include - - -class Filter_framebuffer_policy : public Genode::Slave_policy -{ - private: - - Genode::Service_registry &_framebuffer_in; - Genode::Service_registry &_framebuffer_out; - - protected: - - const char **_permitted_services() const - { - static const char *permitted_services[] = { - "CAP", "LOG", "RM", "ROM", "SIGNAL", - "Timer", 0 }; - - return permitted_services; - }; - - public: - - Filter_framebuffer_policy(const char *name, - Genode::Rpc_entrypoint &entrypoint, - Genode::Service_registry &framebuffer_in, - Genode::Service_registry &framebuffer_out) - : Genode::Slave_policy(name, entrypoint, Genode::env()->ram_session()), - _framebuffer_in(framebuffer_in), - _framebuffer_out(framebuffer_out) { } - - Genode::Service *resolve_session_request(const char *service_name, - const char *args) - { - if (strcmp(service_name, "Framebuffer") == 0) { - Genode::Client client; - return _framebuffer_in.wait_for_service(service_name, &client, name()); - } - - return Slave_policy::resolve_session_request(service_name, args); - } - - bool announce_service(const char *name, - Genode::Root_capability root, - Genode::Allocator *alloc, - Genode::Server *server) - { - if (strcmp(name, "Framebuffer") == 0) { - _framebuffer_out.insert(new (alloc) Genode::Child_service(name, root, server)); - return true; - } - - return Slave_policy::announce_service(name, root, alloc, server); - } - - -}; - -#endif /* _FILTER_FRAMEBUFFER_POLICY_H_ */ diff --git a/repos/qt4/src/app/qt_avplay/framebuffer_root.h b/repos/qt4/src/app/qt_avplay/framebuffer_root.h deleted file mode 100644 index ad46f893a..000000000 --- a/repos/qt4/src/app/qt_avplay/framebuffer_root.h +++ /dev/null @@ -1,64 +0,0 @@ -/* - * \brief Framebuffer root - * \author Christian Prochaska - * \date 2012-04-02 - */ - -/* - * Copyright (C) 2012-2013 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU General Public License version 2. - */ - - -#ifndef _FRAMEBUFFER_ROOT_H_ -#define _FRAMEBUFFER_ROOT_H_ - -/* Genode includes */ -#include - -#include "framebuffer_session_component.h" - -namespace Framebuffer { - - /** - * Shortcut for single-client root component - */ - typedef Genode::Root_component Root_component; - - - class Root : public Root_component - { - private: - - QNitpickerViewWidget &_nitpicker_view_widget; - int _max_width; - int _max_height; - - protected: - - Session_component *_create_session(const char *args) - { - return new (md_alloc()) - Session_component(args, _nitpicker_view_widget, - _max_width, _max_height); - } - - public: - - Root(Genode::Rpc_entrypoint *session_ep, - Genode::Allocator *md_alloc, - QNitpickerViewWidget &nitpicker_view_widget, - int max_width = 0, - int max_height = 0) - : Root_component(session_ep, md_alloc), - _nitpicker_view_widget(nitpicker_view_widget), - _max_width(max_width), - _max_height(max_height) { } - - }; - -} - -#endif /* _FRAMEBUFFER_ROOT_H_ */ diff --git a/repos/qt4/src/app/qt_avplay/framebuffer_session_component.cc b/repos/qt4/src/app/qt_avplay/framebuffer_session_component.cc deleted file mode 100644 index 88ebc5d89..000000000 --- a/repos/qt4/src/app/qt_avplay/framebuffer_session_component.cc +++ /dev/null @@ -1,89 +0,0 @@ -/* - * \brief Framebuffer session component - * \author Christian Prochaska - * \date 2012-04-02 - */ - -/* - * Copyright (C) 2012-2013 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU General Public License version 2. - */ - -/* Genode includes */ -#include -#include -#include -#include - -#include "framebuffer_session_component.h" - -namespace Framebuffer { - - - int Session_component::_limited_size(int requested_size, int max_size) - { - if (requested_size == 0) - return max_size; - else - return (max_size > 0) ? Genode::min(requested_size, max_size) : requested_size; - } - - - static inline long session_arg(const char *arg, const char *key) - { - return Genode::Arg_string::find_arg(arg, key).long_value(0); - } - - - Session_component::Session_component(const char *args, - QNitpickerViewWidget &nitpicker_view_widget, - int max_width, - int max_height) - : - _framebuffer(_nitpicker.framebuffer_session()) - { - Framebuffer::Mode const - mode(_limited_size(session_arg(args, "fb_width"), max_width), - _limited_size(session_arg(args, "fb_height"), max_height), - _nitpicker.mode().format()); - _nitpicker.buffer(mode, false); - Nitpicker::View_capability nitpicker_view_cap = _nitpicker.create_view(); - Mode _mode = _framebuffer.mode(); - nitpicker_view_widget.setNitpickerView(nitpicker_view_cap, - 0, 0, - _mode.width(), - _mode.height()); - } - - - Genode::Dataspace_capability Session_component::dataspace() - { - return _framebuffer.dataspace(); - } - - - Mode Session_component::mode() const - { - return _framebuffer.mode(); - } - - - void Session_component::mode_sigh(Genode::Signal_context_capability sigh_cap) - { - _framebuffer.mode_sigh(sigh_cap); - } - - - void Session_component::sync_sigh(Genode::Signal_context_capability sigh_cap) - { - _framebuffer.sync_sigh(sigh_cap); - } - - - void Session_component::refresh(int x, int y, int w, int h) - { - _framebuffer.refresh(x, y, w, h); - } -} diff --git a/repos/qt4/src/app/qt_avplay/framebuffer_session_component.h b/repos/qt4/src/app/qt_avplay/framebuffer_session_component.h deleted file mode 100644 index cd51abb04..000000000 --- a/repos/qt4/src/app/qt_avplay/framebuffer_session_component.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * \brief Framebuffer session component - * \author Christian Prochaska - * \date 2012-04-02 - */ - -/* - * Copyright (C) 2012-2013 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU General Public License version 2. - */ - - -#ifndef _FRAMEBUFFER_SESSION_COMPONENT_H_ -#define _FRAMEBUFFER_SESSION_COMPONENT_H_ - -/* Genode includes */ -#include -#include -#include - -/* Qt4 includes */ -#include - - -namespace Framebuffer { - - class Session_component : public Genode::Rpc_object - { - private: - - Nitpicker::Connection _nitpicker; - Session_client _framebuffer; - - int _limited_size(int requested_size, int max_size); - - public: - - /** - * Constructor - */ - Session_component(const char *args, - QNitpickerViewWidget &nitpicker_view_widget, - int max_width = 0, - int max_height = 0); - - Genode::Dataspace_capability dataspace() override; - Mode mode() const override; - void mode_sigh(Genode::Signal_context_capability) override; - void sync_sigh(Genode::Signal_context_capability) override; - void refresh(int, int, int, int) override; - }; - -} - -#endif /* _FRAMEBUFFER_SESSION_COMPONENT_H_ */ diff --git a/repos/qt4/src/app/qt_avplay/main.cpp b/repos/qt4/src/app/qt_avplay/main.cpp deleted file mode 100644 index de37c2a27..000000000 --- a/repos/qt4/src/app/qt_avplay/main.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/* - * \brief Simple Qt interface for 'avplay' media player - * \author Christian Prochaska - * \date 2012-03-21 - */ - -/* - * Copyright (C) 2012-2013 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU General Public License version 2. - */ - -/* Qt includes */ -#include - -/* qt_avplay includes */ -#include "main_window.h" - -/* Genode includes */ -#include -#include -#include - - -static inline void load_stylesheet() -{ - QFile file(":style.qss"); - if (!file.open(QFile::ReadOnly)) { - qWarning() << "Warning:" << file.errorString() - << "opening file" << file.fileName(); - return; - } - - qApp->setStyleSheet(QLatin1String(file.readAll())); -} - - -int main(int argc, char *argv[]) -{ - QApplication app(argc, argv); - - load_stylesheet(); - - /* look for dynamic linker */ - try { - static Genode::Rom_connection ldso_rom("ld.lib.so"); - Genode::Process::dynamic_linker(ldso_rom.dataspace()); - } catch (...) { - PERR("ld.lib.so not found"); - } - - QMember main_window; - - main_window->show(); - - return app.exec(); -} diff --git a/repos/qt4/src/app/qt_avplay/main_window.cpp b/repos/qt4/src/app/qt_avplay/main_window.cpp deleted file mode 100644 index 1659206aa..000000000 --- a/repos/qt4/src/app/qt_avplay/main_window.cpp +++ /dev/null @@ -1,94 +0,0 @@ -/* - * \brief Main window of the media player - * \author Christian Prochaska - * \date 2012-03-29 - */ - -/* - * Copyright (C) 2012-2013 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU General Public License version 2. - */ - -/* qt_avplay includes */ -#include "avplay_policy.h" -#include "filter_framebuffer_policy.h" -#include "framebuffer_root.h" -#include "main_window.h" - - -using namespace Genode; - - -struct Framebuffer_filter -{ - enum { MAX_FILTER_NAME_SIZE = 32 }; - char name[MAX_FILTER_NAME_SIZE]; - Genode::Number_of_bytes ram_quota; - - Service_registry *framebuffer_out_registry; - Rpc_entrypoint *ep; - Filter_framebuffer_policy *policy; - Slave *slave; -}; - - -Main_window::Main_window() -: - _control_bar(_input_session.event_queue()) -{ - _input_registry.insert(&_input_service); - _ep.manage(&_input_root); - - /* find out which filtering framebuffer services to start and sort them in reverse order */ - - static QList framebuffer_filters; - try { - Xml_node node = config()->xml_node().sub_node("framebuffer_filter"); - for (; ; node = node.next("framebuffer_filter")) { - Framebuffer_filter *framebuffer_filter = new Framebuffer_filter; - node.attribute("name").value(framebuffer_filter->name, sizeof(framebuffer_filter->name)); - node.attribute("ram_quota").value(&framebuffer_filter->ram_quota); - qDebug() << "filter:" << framebuffer_filter->name << "," << framebuffer_filter->ram_quota; - framebuffer_filters.prepend(framebuffer_filter); - } - } catch (Xml_node::Nonexistent_sub_node) { } - - /* start the filtering framebuffer services */ - - Service_registry *framebuffer_in_registry = &_nitpicker_framebuffer_registry; - - Q_FOREACH(Framebuffer_filter *framebuffer_filter, framebuffer_filters) { - framebuffer_filter->framebuffer_out_registry = new Service_registry; - framebuffer_filter->ep = new Rpc_entrypoint(&_cap, STACK_SIZE, "filter_fb_ep"); - framebuffer_filter->policy = new Filter_framebuffer_policy(framebuffer_filter->name, - *framebuffer_filter->ep, - *framebuffer_in_registry, - *framebuffer_filter->framebuffer_out_registry); - framebuffer_filter->slave = new Slave(*framebuffer_filter->ep, - *framebuffer_filter->policy, - framebuffer_filter->ram_quota); - framebuffer_in_registry = framebuffer_filter->framebuffer_out_registry; - } - - Rpc_entrypoint *local_framebuffer_ep = framebuffer_filters.isEmpty() ? - &_ep : - framebuffer_filters.at(0)->ep; - - static Framebuffer::Root framebuffer_root(local_framebuffer_ep, env()->heap(), *_avplay_widget, 640, 480); - static Local_service framebuffer_service(Framebuffer::Session::service_name(), &framebuffer_root); - _nitpicker_framebuffer_registry.insert(&framebuffer_service); - - /* start avplay */ - - static Avplay_policy avplay_policy(_ep, _input_registry, *framebuffer_in_registry, _mediafile_name.buf); - static Genode::Slave avplay_slave(_ep, avplay_policy, 32*1024*1024); - - /* add widgets to layout */ - - _layout->addWidget(_avplay_widget); - _layout->addWidget(_control_bar); - - connect(_control_bar, SIGNAL(volume_changed(int)), &avplay_policy, SLOT(volume_changed(int))); -} diff --git a/repos/qt4/src/app/qt_avplay/main_window.h b/repos/qt4/src/app/qt_avplay/main_window.h deleted file mode 100644 index 0b10b58cd..000000000 --- a/repos/qt4/src/app/qt_avplay/main_window.h +++ /dev/null @@ -1,80 +0,0 @@ -/* - * \brief Main window of the media player - * \author Christian Prochaska - * \date 2012-03-29 - */ - -/* - * Copyright (C) 2012-2013 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU General Public License version 2. - */ - -#ifndef _MAIN_WINDOW_H_ -#define _MAIN_WINDOW_H_ - -/* Qt includes */ -#include -#include -#include - -/* Qoost includes */ -#include -#include - -/* Genode includes */ -#include -#include -#include -#include -#include - -/* local includes */ -#include "control_bar.h" - - -class Main_window : public Compound_widget -{ - Q_OBJECT - - private: - - struct Mediafile_name - { - /* get the name of the media file from the config file */ - enum { MAX_LEN_MEDIAFILE_NAME = 256 }; - char buf[MAX_LEN_MEDIAFILE_NAME]; - - Mediafile_name() - { - Genode::strncpy(buf, "mediafile", sizeof(buf)); - try { - Genode::config()->xml_node().sub_node("mediafile") - .attribute("name").value(buf, sizeof(buf)); - } catch(...) { - PWRN("no config node found, using \"mediafile\""); - } - } - } _mediafile_name; - - enum { STACK_SIZE = 2*sizeof(Genode::addr_t)*1024 }; - Genode::Cap_connection _cap; - Genode::Rpc_entrypoint _ep { &_cap, STACK_SIZE, "avplay_ep" }; - Genode::Service_registry _input_registry; - Genode::Service_registry _nitpicker_framebuffer_registry; - - Input::Session_component _input_session; - Input::Root_component _input_root { _ep, _input_session }; - - Genode::Local_service _input_service { Input::Session::service_name(), &_input_root }; - - QMember _avplay_widget; - QMember _control_bar; - - public: - - Main_window(); -}; - -#endif /* _MAIN_WINDOW_H_ */ diff --git a/repos/qt4/src/app/qt_avplay/qt_avplay.pro b/repos/qt4/src/app/qt_avplay/qt_avplay.pro deleted file mode 100644 index 5c2c7d9d1..000000000 --- a/repos/qt4/src/app/qt_avplay/qt_avplay.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app -TARGET = qt_avplay -QT = core gui xml -HEADERS = avplay_policy.h \ - control_bar.h \ - main_window.h -SOURCES = control_bar.cpp \ - framebuffer_session_component.cc \ - main.cpp \ - main_window.cpp -RESOURCES = style.qrc diff --git a/repos/qt4/src/app/qt_avplay/style.qrc b/repos/qt4/src/app/qt_avplay/style.qrc deleted file mode 100644 index 77f0e343b..000000000 --- a/repos/qt4/src/app/qt_avplay/style.qrc +++ /dev/null @@ -1,10 +0,0 @@ - - - -style.qss -../../../contrib/qt-everywhere-opensource-src-4.8.4/examples/network/torrent/icons/player_play.png -../../../contrib/qt-everywhere-opensource-src-4.8.4/examples/network/torrent/icons/player_pause.png -../../../contrib/qt-everywhere-opensource-src-4.8.4/examples/network/torrent/icons/player_stop.png -../../../contrib/qt-everywhere-opensource-src-4.8.4/demos/mobile/guitartuner/src/mycomponents/images/volume.png - - diff --git a/repos/qt4/src/app/qt_avplay/style.qss b/repos/qt4/src/app/qt_avplay/style.qss deleted file mode 100644 index 08e0a4d73..000000000 --- a/repos/qt4/src/app/qt_avplay/style.qss +++ /dev/null @@ -1,32 +0,0 @@ -Main_window { - max-width: 640px; - max-height: 512px; -} - -Play_pause_button, Stop_button { - width: 32px; - height: 32px; -} - -Play_pause_button#play { - border-image: url(:player_pause.png); -} - - -Play_pause_button#pause { - border-image: url(:player_play.png); -} - - -Stop_button { - border-image: url(:player_stop.png); -} - -Volume_label { - background-image: url(:volume.png); - min-width: 16px; - max-width: 32px; - min-height: 16px; - max-height: 32px; - margin-right: 5px; -} diff --git a/repos/qt4/src/app/qt_avplay/target.mk b/repos/qt4/src/app/qt_avplay/target.mk deleted file mode 100644 index 6515e9be5..000000000 --- a/repos/qt4/src/app/qt_avplay/target.mk +++ /dev/null @@ -1,9 +0,0 @@ -# identify the qt4 repository by searching for a file that is unique for qt4 -QT4_REP_DIR := $(call select_from_repositories,lib/import/import-qt4.inc) -QT4_REP_DIR := $(realpath $(dir $(QT4_REP_DIR))../..) - -include $(QT4_REP_DIR)/src/app/tmpl/target_defaults.inc - -include $(QT4_REP_DIR)/src/app/tmpl/target_final.inc - -LIBS += qnitpickerviewwidget qoost diff --git a/repos/qt4/src/app/qt_launchpad/child_entry.cpp b/repos/qt4/src/app/qt_launchpad/child_entry.cpp deleted file mode 100644 index 4dd13c7de..000000000 --- a/repos/qt4/src/app/qt_launchpad/child_entry.cpp +++ /dev/null @@ -1,29 +0,0 @@ -/* - * \brief Child entry widget implementation - * \author Christian Prochaska - * \date 2008-04-06 - */ - -#include "child_entry.h" - -Child_entry::Child_entry(const char *name, int quota_kb, int max_quota_kb, - Launchpad *launchpad, Launchpad_child *launchpad_child, - QWidget *parent) - : QWidget(parent), _launchpad(launchpad), _launchpad_child(launchpad_child) -{ - ui.setupUi(this); - - ui.nameLabel->setText(name); - ui.quotaBar->setMaximum(max_quota_kb); - ui.quotaBar->setValue(quota_kb); -} - -Child_entry::~Child_entry() -{ - -} - -void Child_entry::on_exitButton_clicked() -{ - _launchpad->exit_child(_launchpad_child); -} diff --git a/repos/qt4/src/app/qt_launchpad/child_entry.h b/repos/qt4/src/app/qt_launchpad/child_entry.h deleted file mode 100644 index a48a5061d..000000000 --- a/repos/qt4/src/app/qt_launchpad/child_entry.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * \brief Child entry widget interface - * \author Christian Prochaska - * \date 2008-04-06 - */ - -/* - * Copyright (C) 2008-2013 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU General Public License version 2. - */ - -#ifndef CHILD_ENTRY_H -#define CHILD_ENTRY_H - -#include - -#include - -#include "ui_child_entry.h" - -class Child_entry : public QWidget -{ - Q_OBJECT - -public: - Child_entry(const char *name, int quota_kb, int max_quota_kb, - Launchpad *launchpad, Launchpad_child *launchpad_child, - QWidget *parent = 0); - ~Child_entry(); - -private: - Ui::Child_entryClass ui; - - Launchpad *_launchpad; - Launchpad_child *_launchpad_child; - -private slots: - void on_exitButton_clicked(); -}; - -#endif // CHILD_ENTRY_H diff --git a/repos/qt4/src/app/qt_launchpad/child_entry.ui b/repos/qt4/src/app/qt_launchpad/child_entry.ui deleted file mode 100644 index 7004ca509..000000000 --- a/repos/qt4/src/app/qt_launchpad/child_entry.ui +++ /dev/null @@ -1,148 +0,0 @@ - - Child_entryClass - - - - 0 - 0 - 396 - 30 - - - - - 4 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 100 - 22 - - - - Qt::AlignCenter - - - - - - - Qt::Horizontal - - - - 0 - 20 - - - - - - - - - 240 - 22 - - - - - 240 - 16777215 - - - - 0 - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 6 - 30 - - - - - - - - - 20 - 20 - - - - - 20 - 20 - - - - - 75 - true - - - - X - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 6 - 30 - - - - - - - - - - Kbyte_loadbar - QProgressBar -

kbyte_loadbar.h
- - - - - diff --git a/repos/qt4/src/app/qt_launchpad/kbyte_loadbar.cpp b/repos/qt4/src/app/qt_launchpad/kbyte_loadbar.cpp deleted file mode 100644 index 216091fe9..000000000 --- a/repos/qt4/src/app/qt_launchpad/kbyte_loadbar.cpp +++ /dev/null @@ -1,24 +0,0 @@ -/* - * \brief KByte loadbar implementation - * \author Christian Prochaska - * \date 2008-04-05 - */ - -#include "kbyte_loadbar.h" - -Kbyte_loadbar::Kbyte_loadbar(QWidget *parent) - : QProgressBar(parent) -{ -} - -Kbyte_loadbar::~Kbyte_loadbar() -{ - -} - -QString Kbyte_loadbar::text() const -{ - return QString::number(value()) + " KByte / " + - QString::number(maximum()) + " KByte"; - -} diff --git a/repos/qt4/src/app/qt_launchpad/kbyte_loadbar.h b/repos/qt4/src/app/qt_launchpad/kbyte_loadbar.h deleted file mode 100644 index 13f10abde..000000000 --- a/repos/qt4/src/app/qt_launchpad/kbyte_loadbar.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * \brief KByte loadbar interface - * \author Christian Prochaska - * \date 2008-04-05 - */ - -/* - * Copyright (C) 2008-2013 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU General Public License version 2. - */ - -#ifndef KBYTE_LOADBAR_H -#define KBYTE_LOADBAR_H - -#include - -class Kbyte_loadbar : public QProgressBar -{ - Q_OBJECT - -public: - Kbyte_loadbar(QWidget *parent = 0); - ~Kbyte_loadbar(); - - virtual QString text() const; - -protected: - -}; - -#endif // KBYTE_LOADBAR_H diff --git a/repos/qt4/src/app/qt_launchpad/launch_entry.cpp b/repos/qt4/src/app/qt_launchpad/launch_entry.cpp deleted file mode 100644 index d82c204bb..000000000 --- a/repos/qt4/src/app/qt_launchpad/launch_entry.cpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * \brief Launcher entry widget implementation - * \author Christian Prochaska - * \date 2008-04-06 - */ - -#include "launch_entry.h" - -Launch_entry::Launch_entry(const char *filename, unsigned long default_quota, - unsigned long max_quota, Launchpad *launchpad, - QWidget *parent) - : QWidget(parent), _filename(filename), _launchpad(launchpad) -{ - ui.setupUi(this); - - ui.launchButton->setText(filename); - - ui.quotaDial->setMaximum(max_quota); - ui.quotaDial->setSingleStep(max_quota / 100); - ui.quotaDial->setValue(default_quota); -} - -Launch_entry::~Launch_entry() -{ - -} - -void Launch_entry::on_launchButton_clicked() -{ - _launchpad->start_child(_filename, 1024 * ui.quotaDial->value(), Genode::Dataspace_capability()); -} diff --git a/repos/qt4/src/app/qt_launchpad/launch_entry.h b/repos/qt4/src/app/qt_launchpad/launch_entry.h deleted file mode 100644 index 970a3f05f..000000000 --- a/repos/qt4/src/app/qt_launchpad/launch_entry.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * \brief Launcher entry widget interface - * \author Christian Prochaska - * \date 2008-04-06 - */ - -/* - * Copyright (C) 2008-2013 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU General Public License version 2. - */ - -#ifndef LAUNCH_ENTRY_H -#define LAUNCH_ENTRY_H - -#include - -#include - -#include "ui_launch_entry.h" - -class Launch_entry : public QWidget -{ - Q_OBJECT - -public: - Launch_entry(const char *filename, unsigned long default_quota, - unsigned long max_quota, Launchpad *launchpad, - QWidget *parent = 0); - ~Launch_entry(); - -private: - Ui::Launch_entryClass ui; - - const char *_filename; - Launchpad *_launchpad; - -private slots: - void on_launchButton_clicked(); -}; - -#endif // LAUNCH_ENTRY_H diff --git a/repos/qt4/src/app/qt_launchpad/launch_entry.ui b/repos/qt4/src/app/qt_launchpad/launch_entry.ui deleted file mode 100644 index dae32b824..000000000 --- a/repos/qt4/src/app/qt_launchpad/launch_entry.ui +++ /dev/null @@ -1,133 +0,0 @@ - - Launch_entryClass - - - - 0 - 0 - 396 - 40 - - - - - 4 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 100 - 40 - - - - - - - - Qt::Horizontal - - - - 0 - 20 - - - - - - - - - 240 - 40 - - - - - 240 - 16777215 - - - - 0 - - - - - - - - 40 - 40 - - - - 100 - - - false - - - true - - - - - - - - Kbyte_loadbar - QProgressBar -
kbyte_loadbar.h
-
-
- - - - quotaDial - valueChanged(int) - quotaBar - setValue(int) - - - 395 - 43 - - - 355 - 43 - - - - - quotaDial - rangeChanged(int,int) - quotaBar - setRange(int,int) - - - 395 - 30 - - - 355 - 30 - - - - -
diff --git a/repos/qt4/src/app/qt_launchpad/main.cpp b/repos/qt4/src/app/qt_launchpad/main.cpp deleted file mode 100644 index f08510043..000000000 --- a/repos/qt4/src/app/qt_launchpad/main.cpp +++ /dev/null @@ -1,46 +0,0 @@ -/* - * \brief Qt Launchpad main program - * \author Christian Prochaska - * \date 2008-04-05 - */ - -/* local includes */ -#include "qt_launchpad.h" - -/* Qt includes */ -#include -#include - -/* Genode includes */ -#include -#include - -int main(int argc, char *argv[]) -{ - /* look for dynamic linker */ - try { - static Genode::Rom_connection rom("ld.lib.so"); - Genode::Process::dynamic_linker(rom.dataspace()); - } catch (...) { } - - int result; - - QApplication *a = new QApplication(argc, argv); - - Qt_launchpad *launchpad = new Qt_launchpad(Genode::env()->ram_session()->quota()); - - launchpad->add_launcher("calculatorform", 18*1024*1024); - launchpad->add_launcher("tetrix", 18*1024*1024); - - launchpad->move(300,100); - launchpad->show(); - - a->connect(a, SIGNAL(lastWindowClosed()), a, SLOT(quit())); - - result = a->exec(); - - delete launchpad; - delete a; - - return result; -} diff --git a/repos/qt4/src/app/qt_launchpad/qt_launchpad.cpp b/repos/qt4/src/app/qt_launchpad/qt_launchpad.cpp deleted file mode 100644 index b387bce31..000000000 --- a/repos/qt4/src/app/qt_launchpad/qt_launchpad.cpp +++ /dev/null @@ -1,113 +0,0 @@ -/* - * \brief Qt Launchpad window implementation - * \author Christian Prochaska - * \date 2008-04-05 - */ - -#include "qt_launchpad.h" - -#include "launch_entry.h" -#include "child_entry.h" - -Qt_launchpad::Qt_launchpad(unsigned long initial_quota, QWidget *parent) - : QMainWindow(parent), Launchpad(initial_quota) -{ - setupUi(this); - - // disable minimize and maximize buttons - Qt::WindowFlags flags = windowFlags(); - flags &= ~Qt::WindowMinMaxButtonsHint; - setWindowFlags(flags); - - // put a QScrollArea into launcherDockWidget for scrolling of launcher entries - QScrollArea *launcherScrollArea = new QScrollArea; - launcherScrollArea->setFrameStyle(QFrame::NoFrame); - launcherScrollArea->setWidget(launcherDockWidgetContents); - - launcherDockWidget->setWidget(launcherScrollArea); - - QVBoxLayout *launcherDockWidgetLayout = new QVBoxLayout; - launcherDockWidgetLayout->setContentsMargins(2, 2, 2, 2); - launcherDockWidgetLayout->setSpacing(2); - launcherDockWidgetContents->setLayout(launcherDockWidgetLayout); - - // put a QScrollArea into childrenDockWidget for scrolling of child entries - QScrollArea *childrenScrollArea = new QScrollArea; - childrenScrollArea->setFrameStyle(QFrame::NoFrame); - childrenScrollArea->setWidget(childrenDockWidgetContents); - - childrenDockWidget->setWidget(childrenScrollArea); - - QVBoxLayout *childrenDockWidgetLayout = new QVBoxLayout; - childrenDockWidgetLayout->setContentsMargins(2, 2, 2, 2); - childrenDockWidgetLayout->setSpacing(2); - childrenDockWidgetContents->setLayout(childrenDockWidgetLayout); - - // update the available quota bar every 200ms - QTimer *avail_quota_timer = new QTimer(this); - connect(avail_quota_timer, SIGNAL(timeout()), this, SLOT(avail_quota_update())); - avail_quota_timer->start(200); -} - -Qt_launchpad::~Qt_launchpad() -{ - -} - -void Qt_launchpad::avail_quota_update() -{ - static Genode::size_t _avail = 0; - - Genode::size_t new_avail = Genode::env()->ram_session()->avail(); - - if (new_avail != _avail) - quota(new_avail); - - _avail = new_avail; -} - -void Qt_launchpad::quota(unsigned long quota) -{ - totalQuotaProgressBar->setMaximum(initial_quota() / 1024); - totalQuotaProgressBar->setValue(quota / 1024); -} - -void Qt_launchpad::add_launcher(const char *filename, - unsigned long default_quota) -{ - Launch_entry *launch_entry = new Launch_entry(filename, default_quota / 1024, - initial_quota() / 1024, this); - launcherDockWidgetContents->layout()->addWidget(launch_entry); - launch_entry->show(); - launcherDockWidgetContents->adjustSize(); -} - -void Qt_launchpad::add_child(const char *unique_name, - unsigned long quota, - Launchpad_child *launchpad_child, - Genode::Allocator *alloc) -{ - Child_entry *child_entry = new Child_entry(unique_name, quota / 1024, - initial_quota() / 1024, - this, launchpad_child); - child_entry->setObjectName(QString(unique_name) + "_child_entry"); - childrenDockWidgetContents->layout()->addWidget(child_entry); - child_entry->show(); - childrenDockWidgetContents->adjustSize(); -} - -void Qt_launchpad::remove_child(const char *name, Genode::Allocator *alloc) -{ - Child_entry *child_entry = - childrenDockWidgetContents->findChild(QString(name) + "_child_entry"); - - if (!child_entry) { - PWRN("child entry lookup failed"); - return; - } - - // still in "button clicked" event handler - child_entry->deleteLater(); - - childrenDockWidgetContents->adjustSize(); -} diff --git a/repos/qt4/src/app/qt_launchpad/qt_launchpad.h b/repos/qt4/src/app/qt_launchpad/qt_launchpad.h deleted file mode 100644 index c817f2556..000000000 --- a/repos/qt4/src/app/qt_launchpad/qt_launchpad.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * \brief Qt Launchpad window interface - * \author Christian Prochaska - * \date 2008-04-05 - */ - -/* - * Copyright (C) 2008-2013 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU General Public License version 2. - */ - -#ifndef QT_LAUNCHPAD_H -#define QT_LAUNCHPAD_H - -#include - -#include -#include "ui_qt_launchpad.h" - -class Qt_launchpad : public QMainWindow, public Launchpad, private Ui::Qt_launchpadClass -{ - Q_OBJECT - -public: - Qt_launchpad(unsigned long initial_quota, QWidget *parent = 0); - ~Qt_launchpad(); - - virtual void quota(unsigned long quota); - - virtual void add_launcher(const char *filename, - unsigned long default_quota); - - virtual void add_child(const char *unique_name, - unsigned long quota, - Launchpad_child *launchpad_child, - Genode::Allocator *alloc); - - virtual void remove_child(const char *name, Genode::Allocator *alloc); - -private slots: - void avail_quota_update(); -}; - -#endif // QT_LAUNCHPAD_H diff --git a/repos/qt4/src/app/qt_launchpad/qt_launchpad.pro b/repos/qt4/src/app/qt_launchpad/qt_launchpad.pro deleted file mode 100644 index 0546c53e0..000000000 --- a/repos/qt4/src/app/qt_launchpad/qt_launchpad.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = app -TARGET = qt_launchpad -QT = core gui -HEADERS += child_entry.h \ - kbyte_loadbar.h \ - launch_entry.h \ - qt_launchpad.h -SOURCES += child_entry.cpp \ - kbyte_loadbar.cpp \ - launch_entry.cpp \ - main.cpp \ - qt_launchpad.cpp -FORMS += child_entry.ui \ - launch_entry.ui \ - qt_launchpad.ui diff --git a/repos/qt4/src/app/qt_launchpad/qt_launchpad.ui b/repos/qt4/src/app/qt_launchpad/qt_launchpad.ui deleted file mode 100644 index 31e7820af..000000000 --- a/repos/qt4/src/app/qt_launchpad/qt_launchpad.ui +++ /dev/null @@ -1,152 +0,0 @@ - - Qt_launchpadClass - - - - 0 - 0 - 410 - 500 - - - - - 410 - 500 - - - - - 410 - 500 - - - - Qt Launchpad - - - - - - 410 - 0 - - - - QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable|QDockWidget::NoDockWidgetFeatures - - - Qt::LeftDockWidgetArea - - - Status - - - 1 - - - - - 16777215 - 50 - - - - - - - - 100 - 0 - - - - Quota - - - Qt::AlignCenter - - - - - - - - 240 - 0 - - - - 0 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - 410 - 0 - - - - QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable|QDockWidget::NoDockWidgetFeatures - - - Qt::LeftDockWidgetArea - - - Launcher - - - 1 - - - - - - - 410 - 0 - - - - QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable|QDockWidget::NoDockWidgetFeatures - - - Qt::LeftDockWidgetArea - - - Children - - - 1 - - - - - - - Kbyte_loadbar - QProgressBar -
kbyte_loadbar.h
-
-
- - -
diff --git a/repos/qt4/src/app/qt_launchpad/target.mk b/repos/qt4/src/app/qt_launchpad/target.mk deleted file mode 100644 index dd31da322..000000000 --- a/repos/qt4/src/app/qt_launchpad/target.mk +++ /dev/null @@ -1,7 +0,0 @@ -# identify the qt4 repository by searching for a file that is unique for qt4 -QT4_REP_DIR := $(call select_from_repositories,lib/import/import-qt4.inc) -QT4_REP_DIR := $(realpath $(dir $(QT4_REP_DIR))../..) - -include $(QT4_REP_DIR)/src/app/tmpl/target_defaults.inc - -include $(QT4_REP_DIR)/src/app/tmpl/target_final.inc diff --git a/repos/qt4/src/app/tmpl/target.mk.example b/repos/qt4/src/app/tmpl/target.mk.example deleted file mode 100644 index dd31da322..000000000 --- a/repos/qt4/src/app/tmpl/target.mk.example +++ /dev/null @@ -1,7 +0,0 @@ -# identify the qt4 repository by searching for a file that is unique for qt4 -QT4_REP_DIR := $(call select_from_repositories,lib/import/import-qt4.inc) -QT4_REP_DIR := $(realpath $(dir $(QT4_REP_DIR))../..) - -include $(QT4_REP_DIR)/src/app/tmpl/target_defaults.inc - -include $(QT4_REP_DIR)/src/app/tmpl/target_final.inc diff --git a/repos/qt4/src/app/tmpl/target_defaults.inc b/repos/qt4/src/app/tmpl/target_defaults.inc deleted file mode 100644 index a3a42736d..000000000 --- a/repos/qt4/src/app/tmpl/target_defaults.inc +++ /dev/null @@ -1,31 +0,0 @@ -# build with QtCore and QtGui support by default -# - can be overridden in the qmake project file - -QT = core gui - -# find out the name of the project directory - -PROJECT_DIR_NAME = $(notdir $(abspath $(PRG_DIR))) - -# include the qmake project file -# - if the qmake project file has a different name than the project directory, -# set QMAKE_PROJECT_FILE in target.mk before the inclusion of this file - -QMAKE_PROJECT_FILE ?= $(realpath $(PRG_DIR)/$(PROJECT_DIR_NAME).pro) - -ifneq ($(strip $(QMAKE_PROJECT_FILE)),) -include $(QMAKE_PROJECT_FILE) -endif - -# how to name the generated executable -# (if not already defined in the qmake project file) -# - can be overridden in target.mk after inclusion of this file - -ifndef TARGET -TARGET = $(PROJECT_DIR_NAME) -endif - -# default stack size of the main thread -# - can be overridden anywhere in target.mk - -QT_MAIN_STACK_SIZE ?= 512*1024 diff --git a/repos/qt4/src/app/tmpl/target_final.inc b/repos/qt4/src/app/tmpl/target_final.inc deleted file mode 100644 index 1e14213df..000000000 --- a/repos/qt4/src/app/tmpl/target_final.inc +++ /dev/null @@ -1,61 +0,0 @@ -INC_DIR += $(PRG_DIR) - -LIBS += libc - -# set the stack size of the main thread -CC_CXX_OPT += -DQT_MAIN_STACK_SIZE=$(QT_MAIN_STACK_SIZE) - -# static Qt plugins -ifeq ($(findstring qgif, $(QT_PLUGIN)), qgif) -LIBS += qgif -endif -ifeq ($(findstring qjpeg, $(QT_PLUGIN)), qjpeg) -LIBS += qjpeg -endif - -# QtCore -ifeq ($(findstring core, $(QT)), core) -QT_DEFINES += -DQT_CORE_LIB -LIBS += qt_core -endif - -# QtGui -ifeq ($(findstring gui, $(QT)), gui) -QT_DEFINES += -DQT_GUI_LIB -LIBS += qt_gui dejavusans -endif - -# QtNetwork -ifeq ($(findstring network, $(QT)), network) -LIBS += qt_network -endif - -# QtScript -ifeq ($(findstring script, $(QT)), script) -LIBS += qt_script -endif - -# QtScriptTools -ifeq ($(findstring scripttools, $(QT)), scripttools) -LIBS += qt_scripttools -endif - -# QtSvg -ifeq ($(findstring svg, $(QT)), svg) -LIBS += qt_svg -endif - -# QtXml -ifeq ($(findstring xml, $(QT)), xml) -LIBS += qt_xml -endif - -# QtUiTools -ifeq ($(findstring uitools, $(CONFIG)), uitools) -LIBS += qt_ui_tools -endif - -# QtWebKit -ifeq ($(findstring webkit, $(QT)), webkit) -LIBS += qt_webcore qt_webkit -endif diff --git a/repos/qt4/src/lib/dejavusans/dejavusans.qrc b/repos/qt4/src/lib/dejavusans/dejavusans.qrc deleted file mode 100644 index ebe85b3ac..000000000 --- a/repos/qt4/src/lib/dejavusans/dejavusans.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - - -../../../contrib/qt-everywhere-opensource-src-4.8.4/lib/fonts/DejaVuSans.ttf - - diff --git a/repos/qt4/src/lib/qnitpickerviewwidget/qnitpickerviewwidget.cpp b/repos/qt4/src/lib/qnitpickerviewwidget/qnitpickerviewwidget.cpp deleted file mode 100644 index 5ac234ebf..000000000 --- a/repos/qt4/src/lib/qnitpickerviewwidget/qnitpickerviewwidget.cpp +++ /dev/null @@ -1,277 +0,0 @@ -/* - * \brief A Qt Widget that shows a nitpicker view - * \author Christian Prochaska - * \date 2010-08-26 - */ - -#include - -#include - -#include -#include -#include - -#include - - -QNitpickerViewWidget::QNitpickerViewWidget(QWidget *parent) - : QWidget(parent), vc(0), orig_w(0), orig_h(0), orig_buf_x(0), orig_buf_y(0) -{ -} - - -void QNitpickerViewWidget::setNitpickerView(Nitpicker::View_capability view, int buf_x, int buf_y, int w, int h) -{ - orig_buf_x = buf_x; - orig_buf_y = buf_y; - orig_w = w; - orig_h = h; -// PDBG("orig_w = %d, orig_h = %d", orig_w, orig_h); - vc = new Nitpicker::View_client(view); - setFixedSize(orig_w, orig_h); -} - - -QNitpickerViewWidget::~QNitpickerViewWidget() -{ - delete vc; -} - - -void QNitpickerViewWidget::showEvent(QShowEvent *event) -{ -// qDebug() << "showEvent()"; - connect(qwsServer, SIGNAL(windowEvent(QWSWindow*, QWSServer::WindowEvent)), - this, SLOT(windowEvent(QWSWindow*, QWSServer::WindowEvent))); - - QWidget::showEvent(event); -} - -void QNitpickerViewWidget::hideEvent(QHideEvent *event) -{ -// qDebug() << "hideEvent()"; - disconnect(this, SLOT(windowEvent(QWSWindow*, QWSServer::WindowEvent))); - - QWidget::hideEvent(event); - - if (vc) - vc->viewport(mapToGlobal(pos()).x(), mapToGlobal(pos()).y(), 0, 0, orig_buf_x, orig_buf_y, 1); -} - -void QNitpickerViewWidget::paintEvent(QPaintEvent *event) -{ - QWidget::paintEvent(event); - - if (!vc) - return; - - /* mark all sliders as unchecked */ - QHashIterator i(_scrollbars); - while(i.hasNext()) { - i.next(); - _scrollbars.insert(i.key(), false); - } - -#if 0 -// qDebug() << "paintEvent()"; - qDebug() << "geometry: " << geometry(); /* widget relative to parent widget */ - qDebug() << "rect: " << rect(); /* (0, 0, width(), height()) without frames */ - qDebug() << "event->rect(): " << event->rect(); - qDebug() << "event->region(): " << event->region(); - qDebug() << "global(0, 0): " << mapToGlobal(QPoint(0, 0)); - qDebug() << "x(): " << x() << "y(): " << y(); - qDebug() << "global(x, y): " << mapToGlobal(QPoint(x(), y())); - qDebug() << "window =" << window(); -// qDebug() << "window->geometry() =" << window()->geometry(); -// qDebug() << "mapToGlobal(window->geometry().topLeft()) =" << mapToGlobal(window()->geometry().topLeft()); - qDebug() << "window->rect().topLeft() =" << window()->rect().topLeft(); - qDebug() << "mapToGlobal(window->rect().topLeft()) =" << mapToGlobal(window()->rect().topLeft()); - qDebug() << "mapToGlobal(window->childrenRect().topLeft()) =" << mapToGlobal(window()->childrenRect().topLeft()); - qDebug() << "mapToGlobal(window->contentsRect().topLeft()) =" << mapToGlobal(window()->contentsRect().topLeft()); - qDebug() << "mapToGlobal(mask().boundingRect().bottomRight()) =" << mapToGlobal(mask().boundingRect().bottomRight()); -#endif - -// QPainter painter(this); -// painter.fillRect(rect(), Qt::black); - - QWidget *parent = parentWidget(); - - int w = 0; - int h = 0; - - int diff_x = 0; - int diff_y = 0; - - int x0 = mapToGlobal(QPoint(0, 0)).x(); -// qDebug() << "x0 = " << x0; - int x1 = mapToGlobal(QPoint(orig_w - 1, 0)).x(); -// qDebug() << "x1 = " << x1; - int y0 = mapToGlobal(QPoint(0, 0)).y(); -// qDebug() << "y0 = " << y0; - int y1 = mapToGlobal(QPoint(0, orig_h - 1)).y(); -// qDebug() << "y1 = " << y1; - - while(parent) { -#if 0 - qDebug() << "parent =" << parent; - qDebug() << "parent's rect: " << parent->rect(); - qDebug() << "parent's children rect:" << parent->childrenRect(); - qDebug() << "parent's contents rect:" << parent->contentsRect(); - - /* start of view = most right window start position */ -// qDebug() << "parent->geometry() =" << parent->geometry(); -// qDebug() << "parent->frameGeometry() =" << parent->frameGeometry(); -// qDebug() << "mapToGlobal(parent->frameGeometry().topLeft()) =" << parent->mapToGlobal(parent->frameGeometry().topLeft()); - qDebug() << "mapToGlobal(parent->geometry().bottomRight()) =" << parent->mapToGlobal(parent->geometry().bottomRight()); - qDebug() << "mapToGlobal(parent->rect().topLeft()) =" << parent->mapToGlobal(parent->rect().topLeft()); - qDebug() << "mapToGlobal(parent->rect().bottomRight()) =" << parent->mapToGlobal(parent->rect().bottomRight()); - qDebug() << "mapToGlobal(parent->childrenRect().topLeft()) =" << parent->mapToGlobal(parent->childrenRect().topLeft()); - qDebug() << "mapToGlobal(parent->childrenRect().bottomRight()) =" << parent->mapToGlobal(parent->childrenRect().bottomRight()); - qDebug() << "mapToGlobal(parent->contentsRect().topLeft()) =" << parent->mapToGlobal(parent->contentsRect().topLeft()); - qDebug() << "mapToGlobal(parent->contentsRect().bottomRight()) =" << parent->mapToGlobal(parent->contentsRect().bottomRight()); - qDebug() << "parentWidget()->childAt(" << geometry().topRight() << ") = " << parentWidget()->childAt(geometry().topRight()); - qDebug() << "visibleRegion() = " << visibleRegion(); - qDebug() << "geometry().contains(" << geometry().topRight() << ") = " << geometry().contains(geometry().topRight()); - qDebug() << "mask() = " << mask(); -#endif - - if (parent->inherits("QAbstractScrollArea")) { - QAbstractScrollArea *scrollarea = qobject_cast(parent); - QScrollBar *scrollbar; - - scrollbar = scrollarea->horizontalScrollBar(); - if (!_scrollbars.contains(scrollbar)) { - connect(scrollbar, SIGNAL(valueChanged(int)), this, SLOT(valueChanged())); - connect(scrollbar, SIGNAL(destroyed(QObject*)), this, SLOT(destroyed(QObject*))); - } - /* update/insert value */ - _scrollbars.insert(scrollbar, true); - - scrollbar = scrollarea->verticalScrollBar(); - if (!_scrollbars.contains(scrollbar)) { - connect(scrollbar, SIGNAL(valueChanged(int)), this, SLOT(valueChanged())); - connect(scrollbar, SIGNAL(destroyed(QObject*)), this, SLOT(destroyed(QObject*))); - } - /* update/insert value */ - _scrollbars.insert(scrollbar, true); - -// w = qMin(w, parent->contentsRect().width() + parent->childrenRect().x()); -// qDebug() << "mapToGlobal(viewport->rect().topLeft()) =" << scrollarea->viewport()->mapToGlobal(scrollarea->viewport()->rect().topLeft()); -// qDebug() << "mapToGlobal(viewport->rect().bottomRight()) =" << scrollarea->viewport()->mapToGlobal(scrollarea->viewport()->rect().bottomRight()); - } - - x0 = qMax(x0, parent->mapToGlobal(parent->contentsRect().topLeft()).x()); -// qDebug() << "x0 = " << x0; - x1 = qMin(x1, parent->mapToGlobal(parent->contentsRect().bottomRight()).x()); -// qDebug() << "x1 = " << x1; - y0 = qMax(y0, parent->mapToGlobal(parent->contentsRect().topLeft()).y()); -// qDebug() << "y0 = " << y0; - y1 = qMin(y1, parent->mapToGlobal(parent->contentsRect().bottomRight()).y()); -// qDebug() << "y1 = " << y1; - - //w = qMin(w, parent->contentsRect().width() /*+ parent->childrenRect().x()*/); - w = x1 - x0 + 1; -// qDebug() << "w = " << w; - h = y1 - y0 + 1; -// qDebug() << "h = " << h; - - if (parent->childrenRect().x() < 0) { - diff_x += parent->childrenRect().x(); - } - - if (parent->childrenRect().y() < 0) { - diff_y += parent->childrenRect().y(); - } - - parent = parent->parentWidget(); - } - - /* disconnect and remove any scrollbar that is not in the hierarchy anymore */ - i.toBack(); - while(i.hasNext()) { - i.next(); - if (_scrollbars.value(i.key()) == false) { - disconnect(i.key(), SIGNAL(valueChanged(int)), this, SLOT(valueChanged())); - disconnect(i.key(), SIGNAL(destroyed(QObject*)), this, SLOT(destroyed(QObject*))); - _scrollbars.remove(i.key()); - } - } - - /* argument to mapToGlobal() is relative to the Widget's origin - * the plugin view starts at (0, 0) - */ - if (mask().isEmpty()) { -// PDBG("x0 = %d, y0 = %d, w = %d, h = %d, buf_x = %d, buf_y = %d", x0, y0, w, h, orig_buf_x + diff_x, orig_buf_y + diff_y); - vc->viewport(x0, - y0, - /*qMin(width(), w)*/w, - /*qMin(height(), h)*/h, - orig_buf_x + diff_x, - orig_buf_y + diff_y, - true); - } else { -// PDBG("x = %d, y = %d, w = %d, h = %d, buf_x = %d, buf_y = %d", mapToGlobal(mask().boundingRect().topLeft()).x(), mapToGlobal(mask().boundingRect().topLeft()).y(), mask().boundingRect().width(), mask().boundingRect().height(), orig_buf_x + diff_x, orig_buf_y + diff_y); - vc->viewport(mapToGlobal(mask().boundingRect().topLeft()).x(), - mapToGlobal(mask().boundingRect().topLeft()).y(), - mask().boundingRect().width(), - mask().boundingRect().height(), - orig_buf_x + diff_x, - orig_buf_y + diff_y, - true); - } - - /* bring the plugin view to the front of the Qt window */ - QWSNitpickerWindowSurface *ws = static_cast(windowSurface()); - vc->stack(ws->view_cap(), false, true); -} - -void QNitpickerViewWidget::windowEvent(QWSWindow *window, - QWSServer::WindowEvent eventType) -{ - if (this->window()->windowSurface() && (window->winId() == static_cast(this->window()->windowSurface())->winId())) { - - switch (eventType) { - - /* the window has changed its geometry */ - case QWSServer::Geometry: - { - if (isVisible()) { - QPaintEvent e(rect()); - paintEvent(&e); - } - break; - } - - case QWSServer::Raise: - { - if (vc) { - try { - vc->stack(Nitpicker::View_capability(), true, true); - } catch (Genode::Ipc_error) { - delete vc; - vc = 0; - } - } - break; - } - - default: - break; - } - } -} - -void QNitpickerViewWidget::valueChanged() -{ -// qDebug() << "valueChanged()"; - if (isVisible()) { - QPaintEvent e(rect()); - paintEvent(&e); - } -} - -void QNitpickerViewWidget::destroyed(QObject *obj) -{ - _scrollbars.remove(qobject_cast(obj)); -} diff --git a/repos/qt4/src/lib/qpluginwidget/qpluginwidget.cpp b/repos/qt4/src/lib/qpluginwidget/qpluginwidget.cpp deleted file mode 100644 index 72f0f4539..000000000 --- a/repos/qt4/src/lib/qpluginwidget/qpluginwidget.cpp +++ /dev/null @@ -1,393 +0,0 @@ -/* - * \brief A Qt Widget that can load a plugin application and show its Nitpicker view - * \author Christian Prochaska - * \date 2010-08-26 - */ - -#include -#include -#include -#include -#include - -#include -#include - -#include -#include - -#include - -QPluginWidget *QPluginWidget::_last = 0; - -using namespace Genode; - - -const char *config = " \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ -"; - - -class Signal_wait_thread : public QThread -{ - private: - - Signal_receiver &_signal_receiver; - Timed_semaphore &_timeout_semaphore; - - protected: - - void run() - { - _signal_receiver.wait_for_signal(); - _timeout_semaphore.up(); - } - - public: - - Signal_wait_thread(Signal_receiver &signal_receiver, Timed_semaphore &timeout_semaphore) - : _signal_receiver(signal_receiver), - _timeout_semaphore(timeout_semaphore) { } -}; - - -PluginStarter::PluginStarter(QUrl plugin_url, QString &args, - int max_width, int max_height) -: _plugin_url(plugin_url), - _args(args.toAscii()), - _max_width(max_width), - _max_height(max_height), - _pc(0), - _plugin_loading_state(LOADING), - _qnam(0), - _reply(0) -{ -} - - -void PluginStarter::_start_plugin(QString &file_name, QByteArray const &file_buf) -{ - if (file_name.endsWith(".gz")) { - file_name.remove(".gz"); - - uint32_t file_size = *(uint32_t*)(file_buf.constData() + file_buf.size() - sizeof(uint32_t)); - - PDBG("file_size_uncompressed = %u", file_size); - - size_t ram_quota = Arg_string::find_arg(_args.constData(), "ram_quota").long_value(0) + file_size; - - if ((long)env()->ram_session()->avail() - (long)ram_quota < QPluginWidget::RAM_QUOTA) { - PERR("quota exceeded"); - _plugin_loading_state = QUOTA_EXCEEDED_ERROR; - return; - } - - _pc = new Loader::Connection(ram_quota); - - Dataspace_capability ds = _pc->alloc_rom_module(file_name.toUtf8().constData(), file_size); - if (ds.valid()) { - void *ds_addr = env()->rm_session()->attach(ds); - - z_stream zs; - zs.next_in = (Bytef*)(file_buf.data()); - zs.avail_in = file_buf.size(); - zs.total_in = 0; - zs.next_out = (Bytef*)ds_addr; - zs.avail_out = file_size; - zs.total_out = 0; - zs.zalloc = Z_NULL; - zs.zfree = Z_NULL; - - /* enable gzip format detection */ - if (inflateInit2(&zs, 16 + MAX_WBITS) != Z_OK) { - PERR("inflateInit2() failed"); - _plugin_loading_state = INFLATE_ERROR; - - inflateEnd(&zs); - env()->rm_session()->detach(ds_addr); - return; - } - - /* uncompress */ - if (inflate(&zs, Z_SYNC_FLUSH) != Z_STREAM_END) { - PERR("inflate() failed"); - _plugin_loading_state = INFLATE_ERROR; - - inflateEnd(&zs); - env()->rm_session()->detach(ds_addr); - return; - } - - inflateEnd(&zs); - - env()->rm_session()->detach(ds_addr); - _pc->commit_rom_module(file_name.toUtf8().constData()); - } - } else { - size_t ram_quota = Arg_string::find_arg(_args.constData(), "ram_quota").long_value(0); - - if ((long)env()->ram_session()->avail() - (long)ram_quota < QPluginWidget::RAM_QUOTA) { - _plugin_loading_state = QUOTA_EXCEEDED_ERROR; - return; - } - - _pc = new Loader::Connection(ram_quota); - - Dataspace_capability plugin_ds = _pc->alloc_rom_module("plugin.tar", file_buf.size()); - if (plugin_ds.valid()) { - void *plugin_ds_addr = env()->rm_session()->attach(plugin_ds); - ::memcpy(plugin_ds_addr, file_buf.constData(), file_buf.size()); - env()->rm_session()->detach(plugin_ds_addr); - _pc->commit_rom_module("plugin.tar"); - } - } - - Dataspace_capability config_ds = _pc->alloc_rom_module("config", ::strlen(config) + 1); - if (config_ds.valid()) { - void *config_ds_addr = env()->rm_session()->attach(config_ds); - ::memcpy(config_ds_addr, config, ::strlen(config) + 1); - env()->rm_session()->detach(config_ds_addr); - _pc->commit_rom_module("config"); - } - - Signal_context sig_ctx; - Signal_receiver sig_rec; - - _pc->view_ready_sigh(sig_rec.manage(&sig_ctx)); - _pc->constrain_geometry(_max_width, _max_height); - _pc->start("init", "init"); - - Timed_semaphore view_ready_semaphore; - Signal_wait_thread signal_wait_thread(sig_rec, view_ready_semaphore); - signal_wait_thread.start(); - try { - view_ready_semaphore.down(10000); - _plugin_loading_state = LOADED; - } catch (Timeout_exception) { - _plugin_loading_state = TIMEOUT_EXCEPTION; - signal_wait_thread.terminate(); - } - signal_wait_thread.wait(); -} - - -void PluginStarter::run() -{ - if (_plugin_url.scheme() == "rom") { - - QString file_name = _plugin_url.path().remove("/"); - - try { - Rom_connection rc(file_name.toLatin1().constData()); - - Dataspace_capability rom_ds = rc.dataspace(); - - char const *rom_ds_addr = (char const *)env()->rm_session()->attach(rom_ds); - - QByteArray file_buf = QByteArray::fromRawData(rom_ds_addr, Dataspace_client(rom_ds).size()); - - _start_plugin(file_name, file_buf); - - env()->rm_session()->detach(rom_ds_addr); - - } catch (Rom_connection::Rom_connection_failed) { - _plugin_loading_state = ROM_CONNECTION_FAILED_EXCEPTION; - } - - emit finished(); - - } else if (_plugin_url.scheme() == "http") { - - _qnam = new QNetworkAccessManager(); - _reply = _qnam->get(QNetworkRequest(_plugin_url)); - - connect(_reply, SIGNAL(finished()), this, SLOT(networkReplyFinished())); - } - - exec(); - - delete _pc; - - moveToThread(QApplication::instance()->thread()); -} - - -void PluginStarter::networkReplyFinished() -{ - if (_reply->error() != QNetworkReply::NoError) { - _plugin_loading_state = NETWORK_ERROR; - _plugin_loading_error_string = _reply->errorString(); - _reply->deleteLater(); - emit finished(); - return; - } - - qDebug() << "download finished, size = " << _reply->size(); - - QString file_name = _plugin_url.path().remove("/");; - QByteArray file_buf = _reply->readAll(); - - _start_plugin(file_name, file_buf); - - _reply->deleteLater(); - _qnam->deleteLater(); - - emit finished(); -} - - -Nitpicker::View_capability PluginStarter::plugin_view(int *w, int *h, int *buf_x, int *buf_y) -{ - Loader::Session::View_geometry geometry = _pc->view_geometry(); - if (w) *w = geometry.width; - if (h) *h = geometry.height; - if (buf_x) *buf_x = geometry.buf_x; - if (buf_y) *buf_y = geometry.buf_y; - return _pc->view(); -} - - -QPluginWidget::QPluginWidget(QWidget *parent, QUrl plugin_url, QString &args, - int max_width, int max_height) -: - QNitpickerViewWidget(parent), - _plugin_loading_state(LOADING), - _plugin_starter(0), - _max_width(max_width), - _max_height(max_height) -{ - qDebug() << "plugin_url = " << plugin_url; - qDebug() << "plugin_url.scheme() = " << plugin_url.scheme(); - qDebug() << "plugin_url.path() = " << plugin_url.path(); - qDebug() << "plugin_url.toLocalFile() = " << plugin_url.toLocalFile(); - qDebug() << "args =" << args; - - if (_last) { - _last->cleanup(); - _last = this; - } - - _plugin_starter = new PluginStarter(plugin_url, args, max_width, max_height); - _plugin_starter->moveToThread(_plugin_starter); - connect(_plugin_starter, SIGNAL(finished()), this, SLOT(pluginStartFinished())); - _plugin_starter->start(); -} - - -QPluginWidget::~QPluginWidget() -{ - cleanup(); - - if (_last == this) - _last = 0; -} - - -void QPluginWidget::cleanup() -{ - if (_plugin_starter) { - /* make the thread leave the event loop */ - _plugin_starter->exit(); - /* wait until the thread has left the run() function */ - _plugin_starter->wait(); - /* delete the QThread object */ - delete _plugin_starter; - _plugin_starter = 0; - delete vc; - vc = 0; - } -} - - -void QPluginWidget::paintEvent(QPaintEvent *event) -{ - if (_plugin_loading_state == LOADED) - QNitpickerViewWidget::paintEvent(event); - else { - QWidget::paintEvent(event); - QPainter painter(this); - painter.drawRect(0, 0, width() - 1, height() - 1); - switch (_plugin_loading_state) { - case LOADING: - painter.drawText(rect(), Qt::AlignCenter, tr("Loading plugin...")); - break; - case NETWORK_ERROR: - painter.drawText(rect(), Qt::AlignCenter, tr("Could not load plugin: ") + - _plugin_loading_error_string); - break; - case INFLATE_ERROR: - painter.drawText(rect(), Qt::AlignCenter, - tr("Could not load plugin: error decompressing gzipped file.")); - break; - case QUOTA_EXCEEDED_ERROR: - painter.drawText(rect(), Qt::AlignCenter, - tr("Could not load plugin: not enough memory.")); - break; - case TIMEOUT_EXCEPTION: - painter.drawText(rect(), Qt::AlignCenter, tr("Could not load plugin: timeout.")); - break; - case ROM_CONNECTION_FAILED_EXCEPTION: - painter.drawText(rect(), Qt::AlignCenter, tr("Could not load plugin: file not found.")); - break; - default: - break; - } - } -} - - -void QPluginWidget::pluginStartFinished() -{ - _plugin_loading_state = _plugin_starter->plugin_loading_state(); - - if (_plugin_loading_state == LOADED) { - Nitpicker::View_capability view = _plugin_starter->plugin_view(&orig_w, &orig_h, &orig_buf_x, &orig_buf_y); - - vc = new Nitpicker::View_client(view); - - setFixedSize((_max_width > -1) ? qMin(orig_w, _max_width) : orig_w, - (_max_height > -1) ? qMin(orig_h, _max_height) : orig_h); - } else { - _plugin_loading_error_string = _plugin_starter->plugin_loading_error_string(); - setFixedSize((_max_width > -1) ? _max_width : 100, - (_max_height > -1) ? _max_height : 100); - cleanup(); - } - - update(); -} - diff --git a/repos/qt4/src/lib/qt4/mkspecs/genode-g++/qmake.conf b/repos/qt4/src/lib/qt4/mkspecs/genode-g++/qmake.conf deleted file mode 100644 index f69dc492f..000000000 --- a/repos/qt4/src/lib/qt4/mkspecs/genode-g++/qmake.conf +++ /dev/null @@ -1,15 +0,0 @@ -# -# qmake configuration for linux-g++ -# - -MAKEFILE_GENERATOR = UNIX -TARGET_PLATFORM = unix -TEMPLATE = app -CONFIG += qt warn_on release incremental link_prl -QT += core gui -QMAKE_INCREMENTAL_STYLE = sublib - -include(../common/linux.conf) -include(../common/gcc-base-unix.conf) -include(../common/g++-unix.conf) -load(qt_config) diff --git a/repos/qt4/src/lib/qt4/mkspecs/genode-g++/qplatformdefs.h b/repos/qt4/src/lib/qt4/mkspecs/genode-g++/qplatformdefs.h deleted file mode 100644 index 84dee1eca..000000000 --- a/repos/qt4/src/lib/qt4/mkspecs/genode-g++/qplatformdefs.h +++ /dev/null @@ -1,104 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the qmake spec of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QPLATFORMDEFS_H -#define QPLATFORMDEFS_H - -// Get Qt defines/settings - -#include "qglobal.h" - -// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs - -// 1) need to reset default environment if _BSD_SOURCE is defined -// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0 -// 3) it seems older glibc need this to include the X/Open stuff -#ifndef _GNU_SOURCE -# define _GNU_SOURCE -#endif - -#include - - -// We are hot - unistd.h should have turned on the specific APIs we requested - -//#include -//#include -#include -#include -#include -#include -#include -#include - -#include -#include -//#include -#include -//#include -#include -#include -//#include -#include -#ifndef QT_NO_IPV6IFNAME -#include -#endif - -#define QT_USE_XOPEN_LFS_EXTENSIONS -#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 -#define QT_SOCKLEN_T int -#endif - -#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf -#endif - -#endif // QPLATFORMDEFS_H diff --git a/repos/qt4/src/lib/qt4/mkspecs/qws/genode-generic-g++/qmake.conf b/repos/qt4/src/lib/qt4/mkspecs/qws/genode-generic-g++/qmake.conf deleted file mode 100644 index 55011ec52..000000000 --- a/repos/qt4/src/lib/qt4/mkspecs/qws/genode-generic-g++/qmake.conf +++ /dev/null @@ -1,10 +0,0 @@ -# -# qmake configuration for building with linux-g++ -# - -include(../../common/linux.conf) -include(../../common/gcc-base-unix.conf) -include(../../common/g++-unix.conf) -include(../../common/qws.conf) - -load(qt_config) diff --git a/repos/qt4/src/lib/qt4/mkspecs/qws/genode-generic-g++/qplatformdefs.h b/repos/qt4/src/lib/qt4/mkspecs/qws/genode-generic-g++/qplatformdefs.h deleted file mode 100644 index c21e9563b..000000000 --- a/repos/qt4/src/lib/qt4/mkspecs/qws/genode-generic-g++/qplatformdefs.h +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the qmake spec of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "../../genode-g++/qplatformdefs.h" diff --git a/repos/qt4/src/lib/qt4/patches/previewer_example.patch b/repos/qt4/src/lib/qt4/patches/previewer_example.patch deleted file mode 100644 index 579bedee2..000000000 --- a/repos/qt4/src/lib/qt4/patches/previewer_example.patch +++ /dev/null @@ -1,37 +0,0 @@ -previewer_example.patch - -From: Christian Prochaska - - ---- - examples/webkit/previewer/main.cpp | 1 + - examples/webkit/previewer/previewer.pro | 7 ------- - 2 files changed, 1 insertion(+), 7 deletions(-) - -diff --git a/examples/webkit/previewer/main.cpp b/examples/webkit/previewer/main.cpp -index 99220b3..0587e9a 100644 ---- a/examples/webkit/previewer/main.cpp -+++ b/examples/webkit/previewer/main.cpp -@@ -49,6 +49,7 @@ int main(int argc, char * argv[]) - #if defined Q_OS_SYMBIAN || defined Q_WS_HILDON || defined Q_WS_MAEMO_5 || defined Q_WS_SIMULATOR - mainWindow.showMaximized(); - #else -+ mainWindow.move(200, 200); - mainWindow.show(); - #endif - return app.exec(); -diff --git a/examples/webkit/previewer/previewer.pro b/examples/webkit/previewer/previewer.pro -index 371695e..2808b70 100644 ---- a/examples/webkit/previewer/previewer.pro -+++ b/examples/webkit/previewer/previewer.pro -@@ -12,10 +12,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/webkit/previewer - sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro images - sources.path = $$[QT_INSTALL_EXAMPLES]/webkit/previewer - INSTALLS += target sources -- --symbian { -- TARGET.UID3 = 0xA000CF6F -- include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) -- TARGET.CAPABILITY = NetworkServices --} --maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri) diff --git a/repos/qt4/src/lib/qt4/patches/qt4_connection_close.patch b/repos/qt4/src/lib/qt4/patches/qt4_connection_close.patch deleted file mode 100644 index 40ff2c48b..000000000 --- a/repos/qt4/src/lib/qt4/patches/qt4_connection_close.patch +++ /dev/null @@ -1,26 +0,0 @@ -network: set the 'Connection' HTTP header field to 'Close' - -From: Christian Prochaska - -With the 'Keep-Alive' setting, loading the genode.org website with Arora -took a long time. There appeared to be no indication that all needed data -had been received. - -From: Christian Prochaska ---- - src/network/access/qhttpnetworkconnection.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp -index 350c307..419e456 100644 ---- a/src/network/access/qhttpnetworkconnection.cpp -+++ b/src/network/access/qhttpnetworkconnection.cpp -@@ -217,7 +217,7 @@ void QHttpNetworkConnectionPrivate::prepareRequest(HttpMessagePair &messagePair) - #endif - value = request.headerField("connection"); - if (value.isEmpty()) -- request.setHeaderField("Connection", "Keep-Alive"); -+ request.setHeaderField("Connection", "Close"); - #ifndef QT_NO_NETWORKPROXY - } - #endif diff --git a/repos/qt4/src/lib/qt4/patches/qt4_genode.patch b/repos/qt4/src/lib/qt4/patches/qt4_genode.patch deleted file mode 100644 index fca16deb3..000000000 --- a/repos/qt4/src/lib/qt4/patches/qt4_genode.patch +++ /dev/null @@ -1,1870 +0,0 @@ -qt4_genode.patch - -From: Christian Prochaska - - ---- - include/QtCore/qconfig.h | 2 - - .../JavaScriptCore/runtime/Collector.cpp | 21 +++++++ - .../JavaScriptCore/wtf/FastMalloc.cpp | 2 - - .../javascriptcore/JavaScriptCore/wtf/Platform.h | 19 +++++- - .../JavaScriptCore/wtf/TCSystemAlloc.cpp | 21 +++++++ - src/3rdparty/webkit/Source/JavaScriptCore/config.h | 2 - - .../Source/JavaScriptCore/wtf/FastMalloc.cpp | 4 + - .../webkit/Source/JavaScriptCore/wtf/Platform.h | 25 +++++++- - .../Source/JavaScriptCore/wtf/StackBounds.cpp | 12 ++++ - .../Source/JavaScriptCore/wtf/TCSystemAlloc.cpp | 21 +++++++ - .../Source/WebCore/generated/JSDOMWindow.cpp | 4 + - .../Source/WebCore/generated/JSWorkerContext.cpp | 4 + - .../webkit/Source/WebCore/loader/icon/IconRecord.h | 2 - - src/3rdparty/webkit/Source/WebCore/page/Page.h | 2 - - .../platform/network/ResourceResponseBase.h | 2 - - src/corelib/codecs/qtextcodec.cpp | 2 - - src/corelib/global/qglobal.cpp | 6 ++ - src/corelib/global/qglobal.h | 5 +- - src/corelib/io/qprocess.cpp | 63 ++++++++++++++++++++ - src/corelib/io/qprocess_p.h | 45 ++++++++++++++ - src/corelib/io/qresource.cpp | 2 - - src/corelib/kernel/qcoreapplication.cpp | 10 +++ - src/corelib/kernel/qtranslator.cpp | 2 - - src/corelib/plugin/qpluginloader.cpp | 43 ++++++++++++- - src/corelib/plugin/qpluginloader.h | 13 +++- - src/corelib/thread/qmutex_p.h | 10 +++ - src/corelib/thread/qthread.cpp | 5 ++ - src/corelib/thread/qthread_p.h | 56 +++++++++++++++++- - src/corelib/tools/qdatetime.cpp | 12 ++++ - src/gui/dialogs/qfiledialog.cpp | 2 - - src/gui/embedded/qscreendriverfactory_qws.cpp | 14 ++++ - src/gui/embedded/qwindowsystem_qws.cpp | 9 +++ - src/gui/image/qpnghandler.cpp | 33 +++++++--- - src/gui/image/qxpmhandler.cpp | 8 +++ - src/gui/kernel/qapplication.cpp | 64 ++++++++++++++++++-- - src/gui/kernel/qapplication_qws.cpp | 14 ++++ - src/gui/kernel/qeventdispatcher_qws.cpp | 20 ++++++ - src/gui/kernel/qeventdispatcher_qws_p.h | 12 ++++ - src/gui/text/qfontdatabase_qws.cpp | 37 ++++++++++++ - src/gui/text/qfontengine_qws.cpp | 25 ++++++++ - src/network/access/qnetworkaccessfilebackend.cpp | 5 ++ - src/network/kernel/qhostinfo_unix.cpp | 7 ++ - tools/designer/src/lib/uilib/formbuilder.cpp | 5 +- - tools/designer/src/uitools/quiloader.cpp | 3 + - 44 files changed, 618 insertions(+), 57 deletions(-) - -diff --git a/include/QtCore/qconfig.h b/include/QtCore/qconfig.h -index aa8a3d6..1c65764 100644 ---- a/include/QtCore/qconfig.h -+++ b/include/QtCore/qconfig.h -@@ -1 +1 @@ --#include "../../src/corelib/global/qconfig.h" -+#include "../../../src/corelib/global/qconfig.h" -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp -index 6af1784..2f3b102 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp -@@ -62,6 +62,13 @@ - - #include - -+#elif OS(GENODE) -+ -+#include -+#include -+#include -+#include -+ - #elif OS(UNIX) - - #include -@@ -204,6 +211,15 @@ NEVER_INLINE CollectorBlock* Heap::allocateBlock() - void* address = _aligned_malloc(BLOCK_SIZE, BLOCK_SIZE); - #endif - memset(address, 0, BLOCK_SIZE); -+#elif OS(GENODE) -+ void* real_address = malloc(sizeof(Genode::addr_t) + BLOCK_SIZE + BLOCK_SIZE); -+ Genode::addr_t address = reinterpret_cast(real_address); -+ address += sizeof(Genode::addr_t); -+ address = Genode::align_addr(address, Genode::log2(BLOCK_SIZE)); -+ address -= sizeof(Genode::addr_t); -+ *(Genode::addr_t*)address = (Genode::addr_t)real_address; -+ address += sizeof(Genode::addr_t); -+ memset(reinterpret_cast(address), 0, BLOCK_SIZE); - #elif HAVE(POSIX_MEMALIGN) - void* address; - posix_memalign(&address, BLOCK_SIZE, BLOCK_SIZE); -@@ -294,6 +310,9 @@ NEVER_INLINE void Heap::freeBlockPtr(CollectorBlock* block) - #else - _aligned_free(block); - #endif -+#elif OS(GENODE) -+ void *real_address = (void*)*(Genode::addr_t*)((Genode::addr_t)block - sizeof(Genode::addr_t)); -+ free(real_address); - #elif HAVE(POSIX_MEMALIGN) - free(block); - #else -@@ -644,6 +663,8 @@ static inline void* currentThreadStackBase() - thread_info threadInfo; - get_thread_info(find_thread(NULL), &threadInfo); - return threadInfo.stack_end; -+#elif OS(GENODE) -+ return Genode::Thread_qt::myself()->stack_top(); - #elif OS(UNIX) - AtomicallyInitializedStatic(Mutex&, mutex = *new Mutex); - MutexLocker locker(mutex); -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp -index d95f078..6aa56b6 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp -@@ -97,7 +97,7 @@ - - // Use a background thread to periodically scavenge memory to release back to the system - // https://bugs.webkit.org/show_bug.cgi?id=27900: don't turn this on for Tiger until we have figured out why it caused a crash. --#if defined(BUILDING_ON_TIGER) -+#if defined(BUILDING_ON_TIGER) || OS(GENODE) - #define USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY 0 - #else - #define USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY 1 -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -index e95ac7f..19ad5e2 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -@@ -454,6 +454,13 @@ - #define WTF_OS_UNIX 1 - #endif - -+/* OS(GENODE) */ -+/* Operating system level dependencies for Genode that should */ -+/* be used regardless of operating environment */ -+#ifdef __GENODE__ -+#define WTF_OS_GENODE 1 -+#endif -+ - /* Operating environments */ - - /* FIXME: these are all mixes of OS, operating environment and policy choices. */ -@@ -698,13 +705,13 @@ - #endif - #endif /* !defined(HAVE_ACCESSIBILITY) */ - --#if OS(UNIX) && !OS(SYMBIAN) -+#if OS(UNIX) && !OS(SYMBIAN) && !OS(GENODE) - #define HAVE_SIGNAL_H 1 - #endif - - #if !OS(WINDOWS) && !OS(SOLARIS) && !OS(QNX) \ - && !OS(SYMBIAN) && !OS(HAIKU) && !OS(RVCT) \ -- && !OS(ANDROID) && !OS(AIX) && !OS(HPUX) -+ && !OS(ANDROID) && !OS(AIX) && !OS(HPUX) && !OS(GENODE) - #define HAVE_TM_GMTOFF 1 - #define HAVE_TM_ZONE 1 - #define HAVE_TIMEGM 1 -@@ -779,6 +786,12 @@ - #define HAVE_SYS_PARAM_H 1 - #define HAVE_SYS_TIME_H 1 - -+#elif OS(GENODE) -+ -+#define HAVE_MMAP 0 -+#define HAVE_SBRK 0 -+#define HAVE_SYS_TIME_H 1 -+ - #else - - /* FIXME: is this actually used or do other platforms generate their own config.h? */ -@@ -929,7 +942,7 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */ - #elif CPU(X86) && OS(WINDOWS) && COMPILER(MSVC) - #define ENABLE_JIT 1 - #define WTF_USE_JIT_STUB_ARGUMENT_REGISTER 1 --#elif CPU(X86) && OS(LINUX) && GCC_VERSION >= 40100 -+#elif CPU(X86) && OS(LINUX) && GCC_VERSION >= 40100 && !OS(GENODE) - #define ENABLE_JIT 1 - #define WTF_USE_JIT_STUB_ARGUMENT_VA_LIST 1 - #elif CPU(X86_64) && OS(LINUX) && GCC_VERSION >= 40100 -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/TCSystemAlloc.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/TCSystemAlloc.cpp -index ff2ac2b..370c600 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/TCSystemAlloc.cpp -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/TCSystemAlloc.cpp -@@ -56,6 +56,12 @@ - #include - #endif - -+#if OS(GENODE) -+#include -+#include -+#include -+#endif -+ - #ifndef MAP_ANONYMOUS - #define MAP_ANONYMOUS MAP_ANON - #endif -@@ -379,6 +385,21 @@ void* TCMalloc_SystemAlloc(size_t size, size_t *actual_size, size_t alignment) { - } - #endif - -+#if OS(GENODE) -+ if (actual_size) -+ *actual_size = size; -+ -+ void* real_address = malloc(sizeof(Genode::addr_t) + size + alignment); -+ Genode::addr_t address = reinterpret_cast(real_address); -+ address += sizeof(Genode::addr_t); -+ address = Genode::align_addr(address, Genode::log2(alignment)); -+ address -= sizeof(Genode::addr_t); -+ *(Genode::addr_t*)address = (Genode::addr_t)real_address; -+ address += sizeof(Genode::addr_t); -+ -+ return (void*)address;; -+#endif -+ - // nothing worked - reset failure flags and try again - devmem_failure = false; - sbrk_failure = false; -diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/config.h b/src/3rdparty/webkit/Source/JavaScriptCore/config.h -index 394bba5..805b01d 100644 ---- a/src/3rdparty/webkit/Source/JavaScriptCore/config.h -+++ b/src/3rdparty/webkit/Source/JavaScriptCore/config.h -@@ -80,7 +80,7 @@ - - #endif - --#if OS(UNIX) || OS(WINDOWS) -+#if (OS(UNIX) || OS(WINDOWS)) && !OS(GENODE) - #define WTF_USE_OS_RANDOMNESS 1 - #endif - -diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/FastMalloc.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/FastMalloc.cpp -index 86b123d..fdeb5c9 100644 ---- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/FastMalloc.cpp -+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/FastMalloc.cpp -@@ -97,7 +97,11 @@ - #endif - - // Use a background thread to periodically scavenge memory to release back to the system -+#if OS(GENODE) -+#define USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY 0 -+#else - #define USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY 1 -+#endif /* OS(GENODE) */ - - #ifndef NDEBUG - namespace WTF { -diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h -index a8298c4..7727df2 100644 ---- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h -+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h -@@ -480,6 +480,13 @@ - #define WTF_OS_UNIX 1 - #endif - -+/* OS(GENODE) */ -+/* Operating system level dependencies for Genode that should */ -+/* be used regardless of operating environment */ -+#ifdef __GENODE__ -+#define WTF_OS_GENODE 1 -+#endif -+ - /* Operating environments */ - - /* FIXME: these are all mixes of OS, operating environment and policy choices. */ -@@ -581,7 +588,7 @@ - #define WTF_USE_PTHREAD_BASED_QT 1 - #endif - --#if (PLATFORM(GTK) || PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(WIN) || (PLATFORM(QT) && (OS(DARWIN) || USE(PTHREAD_BASED_QT)) && !ENABLE(SINGLE_THREADED))) && !OS(QNX) && !defined(ENABLE_JSC_MULTIPLE_THREADS) -+#if (PLATFORM(GTK) || PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(WIN) || (PLATFORM(QT) && (OS(DARWIN) || USE(PTHREAD_BASED_QT)) && !ENABLE(SINGLE_THREADED))) && !OS(QNX) && !defined(ENABLE_JSC_MULTIPLE_THREADS) && !OS(GENODE) - #define ENABLE_JSC_MULTIPLE_THREADS 1 - #endif - -@@ -756,7 +763,7 @@ - #endif - #endif /* !defined(HAVE_ACCESSIBILITY) */ - --#if OS(UNIX) && !OS(SYMBIAN) -+#if OS(UNIX) && !OS(SYMBIAN) && !OS(GENODE) - #define HAVE_SIGNAL_H 1 - #endif - -@@ -768,7 +775,7 @@ - - #if !OS(WINDOWS) && !OS(SOLARIS) && !OS(QNX) \ - && !OS(SYMBIAN) && !OS(HAIKU) && !OS(RVCT) \ -- && !OS(ANDROID) && !PLATFORM(BREWMP) -+ && !OS(ANDROID) && !PLATFORM(BREWMP) && !OS(GENODE) - #define HAVE_TM_GMTOFF 1 - #define HAVE_TM_ZONE 1 - #define HAVE_TIMEGM 1 -@@ -851,6 +858,13 @@ - #define HAVE_SYS_PARAM_H 1 - #define HAVE_SYS_TIME_H 1 - -+#elif OS(GENODE) -+ -+#define HAVE_MMAP 0 -+#define HAVE_SBRK 0 -+#define HAVE_SYS_TIME_H 1 -+#define USE_SYSTEM_MALLOC 1 -+ - #else - - /* FIXME: is this actually used or do other platforms generate their own config.h? */ -@@ -1024,6 +1038,11 @@ - #define ENABLE_JIT 0 - #endif - -+/* Disable JIT for Genode */ -+#if OS(GENODE) -+#define ENABLE_JIT 0 -+#endif -+ - /* The JIT is enabled by default on all x86, x64-64, ARM & MIPS platforms. */ - #if !defined(ENABLE_JIT) \ - && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(MIPS)) \ -diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/StackBounds.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/StackBounds.cpp -index 6b61270..f117e48 100644 ---- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/StackBounds.cpp -+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/StackBounds.cpp -@@ -48,6 +48,10 @@ - #include - #include - -+#elif OS(GENODE) -+ -+#include -+ - #elif OS(UNIX) - - #include -@@ -154,6 +158,14 @@ void StackBounds::initialize() - m_bound = estimateStackBound(m_origin); - } - -+#elif OS(GENODE) -+ -+void StackBounds::initialize() -+{ -+ m_bound = Genode::Thread_base::myself()->stack_base(); -+ m_origin = Genode::Thread_base::myself()->stack_top(); -+} -+ - #elif OS(UNIX) - - void StackBounds::initialize() -diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/TCSystemAlloc.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/TCSystemAlloc.cpp -index 3cb59e8..0731d43 100644 ---- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/TCSystemAlloc.cpp -+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/TCSystemAlloc.cpp -@@ -56,6 +56,12 @@ - #include - #endif - -+#if OS(GENODE) -+#include -+#include -+#include -+#endif -+ - #ifndef MAP_ANONYMOUS - #define MAP_ANONYMOUS MAP_ANON - #endif -@@ -379,6 +385,21 @@ void* TCMalloc_SystemAlloc(size_t size, size_t *actual_size, size_t alignment) { - } - #endif - -+#if OS(GENODE) -+ if (actual_size) -+ *actual_size = size; -+ -+ void* real_address = malloc(sizeof(Genode::addr_t) + size + alignment); -+ Genode::addr_t address = reinterpret_cast(real_address); -+ address += sizeof(Genode::addr_t); -+ address = Genode::align_addr(address, Genode::log2(alignment)); -+ address -= sizeof(Genode::addr_t); -+ *(Genode::addr_t*)address = (Genode::addr_t)real_address; -+ address += sizeof(Genode::addr_t); -+ -+ return (void*)address;; -+#endif -+ - // nothing worked - reset failure flags and try again - devmem_failure = false; - sbrk_failure = false; -diff --git a/src/3rdparty/webkit/Source/WebCore/generated/JSDOMWindow.cpp b/src/3rdparty/webkit/Source/WebCore/generated/JSDOMWindow.cpp -index 6fa2ad3..d30fcc1 100644 ---- a/src/3rdparty/webkit/Source/WebCore/generated/JSDOMWindow.cpp -+++ b/src/3rdparty/webkit/Source/WebCore/generated/JSDOMWindow.cpp -@@ -746,7 +746,9 @@ static const HashTableValue JSDOMWindowTableValues[456] = - { "MessageChannel", DontDelete, (intptr_t)static_cast(jsDOMWindowMessageChannelConstructor), (intptr_t)setJSDOMWindowMessageChannelConstructor THUNK_GENERATOR(0) }, - { "Worker", DontDelete, (intptr_t)static_cast(jsDOMWindowWorkerConstructor), (intptr_t)setJSDOMWindowWorkerConstructor THUNK_GENERATOR(0) }, - { "SharedWorker", DontDelete, (intptr_t)static_cast(jsDOMWindowSharedWorkerConstructor), (intptr_t)setJSDOMWindowSharedWorkerConstructor THUNK_GENERATOR(0) }, -+#if ENABLE(WEB_SOCKETS) - { "WebSocket", DontDelete, (intptr_t)static_cast(jsDOMWindowWebSocketConstructor), (intptr_t)setJSDOMWindowWebSocketConstructor THUNK_GENERATOR(0) }, -+#endif - { "Plugin", DontDelete, (intptr_t)static_cast(jsDOMWindowPluginConstructor), (intptr_t)setJSDOMWindowPluginConstructor THUNK_GENERATOR(0) }, - { "PluginArray", DontDelete, (intptr_t)static_cast(jsDOMWindowPluginArrayConstructor), (intptr_t)setJSDOMWindowPluginArrayConstructor THUNK_GENERATOR(0) }, - { "MimeType", DontDelete, (intptr_t)static_cast(jsDOMWindowMimeTypeConstructor), (intptr_t)setJSDOMWindowMimeTypeConstructor THUNK_GENERATOR(0) }, -@@ -4442,6 +4444,7 @@ JSValue jsDOMWindowSharedWorkerConstructor(ExecState* exec, JSValue slotBase, co - } - - -+#if ENABLE(WEB_SOCKETS) - JSValue jsDOMWindowWebSocketConstructor(ExecState* exec, JSValue slotBase, const Identifier&) - { - JSDOMWindow* castedThis = static_cast(asObject(slotBase)); -@@ -4449,6 +4452,7 @@ JSValue jsDOMWindowWebSocketConstructor(ExecState* exec, JSValue slotBase, const - return jsUndefined(); - return castedThis->webSocket(exec); - } -+#endif - - - JSValue jsDOMWindowPluginConstructor(ExecState* exec, JSValue slotBase, const Identifier&) -diff --git a/src/3rdparty/webkit/Source/WebCore/generated/JSWorkerContext.cpp b/src/3rdparty/webkit/Source/WebCore/generated/JSWorkerContext.cpp -index 3a96654..997d192 100644 ---- a/src/3rdparty/webkit/Source/WebCore/generated/JSWorkerContext.cpp -+++ b/src/3rdparty/webkit/Source/WebCore/generated/JSWorkerContext.cpp -@@ -91,7 +91,9 @@ static const HashTableValue JSWorkerContextTableValues[25] = - { "MessageChannel", DontDelete, (intptr_t)static_cast(jsWorkerContextMessageChannelConstructor), (intptr_t)setJSWorkerContextMessageChannelConstructor THUNK_GENERATOR(0) }, - { "EventSource", DontDelete, (intptr_t)static_cast(jsWorkerContextEventSourceConstructor), (intptr_t)setJSWorkerContextEventSourceConstructor THUNK_GENERATOR(0) }, - { "XMLHttpRequest", DontDelete, (intptr_t)static_cast(jsWorkerContextXMLHttpRequestConstructor), (intptr_t)setJSWorkerContextXMLHttpRequestConstructor THUNK_GENERATOR(0) }, -+#if ENABLE(WEB_SOCKETS) - { "WebSocket", DontDelete, (intptr_t)static_cast(jsWorkerContextWebSocketConstructor), (intptr_t)setJSWorkerContextWebSocketConstructor THUNK_GENERATOR(0) }, -+#endif - { "WebKitBlobBuilder", DontDelete, (intptr_t)static_cast(jsWorkerContextWebKitBlobBuilderConstructor), (intptr_t)setJSWorkerContextWebKitBlobBuilderConstructor THUNK_GENERATOR(0) }, - { "FileReader", DontDelete, (intptr_t)static_cast(jsWorkerContextFileReaderConstructor), (intptr_t)setJSWorkerContextFileReaderConstructor THUNK_GENERATOR(0) }, - { "FileReaderSync", DontDelete, (intptr_t)static_cast(jsWorkerContextFileReaderSyncConstructor), (intptr_t)setJSWorkerContextFileReaderSyncConstructor THUNK_GENERATOR(0) }, -@@ -276,11 +278,13 @@ JSValue jsWorkerContextXMLHttpRequestConstructor(ExecState* exec, JSValue slotBa - } - - -+#if ENABLE(WEB_SOCKETS) - JSValue jsWorkerContextWebSocketConstructor(ExecState* exec, JSValue slotBase, const Identifier&) - { - JSWorkerContext* castedThis = static_cast(asObject(slotBase)); - return castedThis->webSocket(exec); - } -+#endif - - - JSValue jsWorkerContextWebKitBlobBuilderConstructor(ExecState* exec, JSValue slotBase, const Identifier&) -diff --git a/src/3rdparty/webkit/Source/WebCore/loader/icon/IconRecord.h b/src/3rdparty/webkit/Source/WebCore/loader/icon/IconRecord.h -index 50ef7f7..9511153 100644 ---- a/src/3rdparty/webkit/Source/WebCore/loader/icon/IconRecord.h -+++ b/src/3rdparty/webkit/Source/WebCore/loader/icon/IconRecord.h -@@ -38,7 +38,7 @@ - #include - #include - --#if OS(SOLARIS) -+#if OS(SOLARIS) || OS(GENODE) - #include // For time_t structure. - #endif - -diff --git a/src/3rdparty/webkit/Source/WebCore/page/Page.h b/src/3rdparty/webkit/Source/WebCore/page/Page.h -index bdea870..6f400be 100644 ---- a/src/3rdparty/webkit/Source/WebCore/page/Page.h -+++ b/src/3rdparty/webkit/Source/WebCore/page/Page.h -@@ -29,7 +29,7 @@ - #include - #include - --#if OS(SOLARIS) -+#if OS(SOLARIS) || OS(GENODE) - #include // For time_t structure. - #endif - -diff --git a/src/3rdparty/webkit/Source/WebCore/platform/network/ResourceResponseBase.h b/src/3rdparty/webkit/Source/WebCore/platform/network/ResourceResponseBase.h -index 250411c..c2a0fd4 100644 ---- a/src/3rdparty/webkit/Source/WebCore/platform/network/ResourceResponseBase.h -+++ b/src/3rdparty/webkit/Source/WebCore/platform/network/ResourceResponseBase.h -@@ -35,7 +35,7 @@ - #include - #include - --#if OS(SOLARIS) -+#if OS(SOLARIS) || OS(GENODE) - #include // For time_t structure. - #endif - -diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp -index ca5c879..85c2da1 100644 ---- a/src/corelib/codecs/qtextcodec.cpp -+++ b/src/corelib/codecs/qtextcodec.cpp -@@ -92,7 +92,7 @@ - #include - #endif - --#if defined(Q_OS_WINCE) -+#if defined(Q_OS_WINCE) || defined(Q_OS_GENODE) - # define QT_NO_SETLOCALE - #endif - -diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp -index b929776..1ecdda7 100644 ---- a/src/corelib/global/qglobal.cpp -+++ b/src/corelib/global/qglobal.cpp -@@ -94,6 +94,10 @@ _LIT(qt_S60Filter, "Series60v?.*.sis"); - _LIT(qt_symbianSystemInstallDir, "z:\\system\\install\\"); - #endif - -+#if defined(Q_OS_GENODE) -+#include -+#endif -+ - QT_BEGIN_NAMESPACE - - -@@ -2285,6 +2289,8 @@ void qt_message_output(QtMsgType msgType, const char *buf) - TPtrC8 part(ptr.Mid(i, qMin(maxBlockSize, ptr.Length()-i))); - RDebug::Printf(format, &part); - } -+#elif defined(Q_OS_GENODE) -+ PDBG("%s", buf); - #else - fprintf(stderr, "%s\n", buf); - fflush(stderr); -diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h -index 1117c79..e5a85de 100644 ---- a/src/corelib/global/qglobal.h -+++ b/src/corelib/global/qglobal.h -@@ -147,6 +147,7 @@ namespace QT_NAMESPACE {} - /* - The operating system, must be one of: (Q_OS_x) - -+ GENODE - Genode - DARWIN - Darwin OS (synonym for Q_OS_MAC) - SYMBIAN - Symbian - MSDOS - MS-DOS and Windows -@@ -178,7 +179,9 @@ namespace QT_NAMESPACE {} - UNIX - Any UNIX BSD/SYSV system - */ - --#if defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__)) -+#if defined(__GENODE__) -+# define Q_OS_GENODE -+#elif defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__)) - # define Q_OS_DARWIN - # define Q_OS_BSD4 - # ifdef __LP64__ -diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp -index 2e63854..6eb8144 100644 ---- a/src/corelib/io/qprocess.cpp -+++ b/src/corelib/io/qprocess.cpp -@@ -100,6 +100,10 @@ QT_END_NAMESPACE - #ifdef Q_OS_SYMBIAN - #include - #endif -+#ifdef Q_OS_GENODE -+#include -+#include -+#endif - - #ifndef QT_NO_PROCESS - -@@ -780,6 +784,65 @@ QProcessPrivate::QProcessPrivate() - symbianProcess = NULL; - processLaunched = false; - #endif -+#ifdef Q_OS_GENODE -+ launchpad_child = 0; -+ -+ /* request config file from ROM service */ -+ Genode::Rom_connection rom("config"); -+ rom.on_destruction(Genode::Rom_connection::KEEP_OPEN); -+ void *addr; -+ try { -+ addr = Genode::env()->rm_session()->attach(rom.dataspace()); -+ } catch(Genode::Parent::Service_denied) { -+ qWarning("Error: Couldn't open config file."); -+ return; -+ } -+ -+ /* -+ * The XML data of a valid config file starts with -+ * a tag. -+ */ -+ Genode::Xml_node config_node((const char *)addr); -+ -+ if (!config_node.has_type("config")) { -+ qWarning("Error: Root node of config file is not a tag."); -+ return; -+ } -+ -+ /* -+ * Iterate through all entries of the config file and start -+ * children as specified. -+ */ -+ for (int i = 0; i < config_node.num_sub_nodes(); i++) { -+ Genode::Xml_node program_node = config_node.sub_node(i); -+ if (program_node.has_type("program")) { -+ -+ /* add filename and ram_quota to ram_quota_hash */ -+ char filename[32]; -+ try { -+ program_node.sub_node("filename").value(filename, sizeof(filename)); -+ } catch (Genode::Xml_node::Nonexistent_sub_node) { -+ qWarning("Warning: Missing valid in config-file entry."); -+ return; -+ } -+ -+ size_t ram_quota = 0; -+ try { -+ program_node.sub_node("ram_quota").value(&ram_quota); -+ } catch (Genode::Xml_node::Nonexistent_sub_node) { -+ qWarning("Warning: Missing valid in config-file entry."); -+ return; -+ } -+ -+ ram_quota_hash()->insert(QString(filename), ram_quota); -+ } else { -+ char buf[32]; -+ program_node.type_name(buf, sizeof(buf)); -+ qWarning("Warning: Ignoring unsupported tag <%s>.", buf); -+ } -+ } -+ -+#endif - } - - /*! \internal -diff --git a/src/corelib/io/qprocess_p.h b/src/corelib/io/qprocess_p.h -index e1d4cbb..2ffb3aa 100644 ---- a/src/corelib/io/qprocess_p.h -+++ b/src/corelib/io/qprocess_p.h -@@ -71,6 +71,11 @@ typedef int Q_PIPE; - - #ifndef QT_NO_PROCESS - -+#ifdef Q_OS_GENODE -+#include -+#include -+#endif -+ - QT_BEGIN_NAMESPACE - - class QSocketNotifier; -@@ -194,6 +199,28 @@ template<> Q_INLINE_TEMPLATE void QSharedDataPointer - d = x; - } - -+#ifdef Q_OS_GENODE -+ -+class QProcess_launchpad : public Launchpad -+{ -+public: -+ QProcess_launchpad(unsigned long initial_quota) : Launchpad(initial_quota) {} -+ -+ virtual void quota(unsigned long quota) {} -+ -+ virtual void add_launcher(const char *filename, -+ unsigned long default_quota) {} -+ -+ virtual void add_child(const char *unique_name, -+ unsigned long quota, -+ Launchpad_child *launchpad_child, -+ Genode::Allocator *alloc) {} -+ -+ virtual void remove_child(const char *name, Genode::Allocator *alloc) {} -+}; -+ -+#endif -+ - class QProcessPrivate : public QIODevicePrivate - { - public: -@@ -301,7 +328,7 @@ public: - QWinEventNotifier *processFinishedNotifier; - - void startProcess(); --#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) && !defined(Q_OS_QNX) -+#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) && !defined(Q_OS_QNX) && !defined(Q_OS_GENODE) - void execChild(const char *workingDirectory, char **path, char **argv, char **envp); - #elif defined(Q_OS_QNX) - pid_t spawnChild(const char *workingDirectory, char **argv, char **envp); -@@ -328,6 +355,22 @@ public: - int serial; - #endif - -+#ifdef Q_OS_GENODE -+ static QProcess_launchpad *launchpad() -+ { -+ static QProcess_launchpad _launchpad(Genode::env()->ram_session()->quota()); -+ return &_launchpad; -+ } -+ -+ static QHash *ram_quota_hash() -+ { -+ static QHash _ram_quota_hash; -+ return &_ram_quota_hash; -+ } -+ -+ Launchpad_child *launchpad_child; -+#endif -+ - bool waitForStarted(int msecs = 30000); - bool waitForReadyRead(int msecs = 30000); - bool waitForBytesWritten(int msecs = 30000); -diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp -index d7b9d16..6352584 100644 ---- a/src/corelib/io/qresource.cpp -+++ b/src/corelib/io/qresource.cpp -@@ -928,7 +928,7 @@ public: - } - }; - --#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) && !defined (Q_OS_NACL) && !defined(Q_OS_INTEGRITY) -+#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) && !defined (Q_OS_NACL) && !defined(Q_OS_INTEGRITY) && !defined(Q_OS_GENODE) - #define QT_USE_MMAP - #endif - -diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp -index bb07d74..fcd8465 100644 ---- a/src/corelib/kernel/qcoreapplication.cpp -+++ b/src/corelib/kernel/qcoreapplication.cpp -@@ -82,8 +82,12 @@ - # if !defined(QT_NO_GLIB) - # include "qeventdispatcher_glib_p.h" - # endif -+# ifdef Q_OS_GENODE -+# include "qeventdispatcher_genode_p.h" -+# else - # include "qeventdispatcher_unix_p.h" - # endif -+# endif - #endif - - #ifdef Q_OS_WIN -@@ -500,8 +504,12 @@ void QCoreApplicationPrivate::createEventDispatcher() - eventDispatcher = new QEventDispatcherGlib(q); - else - # endif -+# ifdef Q_OS_GENODE -+ eventDispatcher = new QEventDispatcherGenode(q); -+# else - eventDispatcher = new QEventDispatcherUNIX(q); - # endif -+# endif - #elif defined(Q_OS_WIN) - eventDispatcher = new QEventDispatcherWin32(q); - #else -@@ -738,7 +746,7 @@ void QCoreApplication::init() - { - Q_D(QCoreApplication); - --#ifdef Q_OS_UNIX -+#if defined(Q_OS_UNIX) && !defined(Q_OS_GENODE) - setlocale(LC_ALL, ""); // use correct char set mapping - qt_locale_initialized = true; - #endif -diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp -index 0dbb388..73f03b6 100644 ---- a/src/corelib/kernel/qtranslator.cpp -+++ b/src/corelib/kernel/qtranslator.cpp -@@ -60,7 +60,7 @@ - #include "qlocale.h" - #include "qresource.h" - --#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) && !defined(Q_OS_INTEGRITY) -+#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) && !defined(Q_OS_INTEGRITY) && !defined(Q_OS_GENODE) - #define QT_USE_MMAP - #include "private/qcore_unix_p.h" - #endif -diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp -index 1ec331d..59f870f 100644 ---- a/src/corelib/plugin/qpluginloader.cpp -+++ b/src/corelib/plugin/qpluginloader.cpp -@@ -53,7 +53,7 @@ - # include "private/qcore_symbian_p.h" - #endif - --#ifndef QT_NO_LIBRARY -+#if !defined(QT_NO_LIBRARY) || defined(Q_OS_GENODE) - - QT_BEGIN_NAMESPACE - -@@ -139,7 +139,11 @@ QT_BEGIN_NAMESPACE - Constructs a plugin loader with the given \a parent. - */ - QPluginLoader::QPluginLoader(QObject *parent) -- : QObject(parent), d(0), did_load(false) -+ : QObject(parent), -+#ifndef Q_OS_GENODE -+ d(0), -+#endif -+ did_load(false) - { - } - -@@ -157,7 +161,11 @@ QPluginLoader::QPluginLoader(QObject *parent) - \sa setFileName() - */ - QPluginLoader::QPluginLoader(const QString &fileName, QObject *parent) -- : QObject(parent), d(0), did_load(false) -+ : QObject(parent), -+#ifndef Q_OS_GENODE -+ d(0), -+#endif -+ did_load(false) - { - setFileName(fileName); - } -@@ -172,8 +180,10 @@ QPluginLoader::QPluginLoader(const QString &fileName, QObject *parent) - */ - QPluginLoader::~QPluginLoader() - { -+#ifndef Q_OS_GENODE - if (d) - d->release(); -+#endif - } - - /*! -@@ -200,9 +210,13 @@ QObject *QPluginLoader::instance() - { - if (!load()) - return 0; -+#ifdef Q_OS_GENODE -+ return 0; -+#else - if (!d->inst && d->instance) - d->inst = d->instance(); - return d->inst.data(); -+#endif - } - - /*! -@@ -217,6 +231,7 @@ QObject *QPluginLoader::instance() - */ - bool QPluginLoader::load() - { -+#ifndef Q_OS_GENODE - if (!d || d->fileName.isEmpty()) - return false; - if (did_load) -@@ -225,6 +240,9 @@ bool QPluginLoader::load() - return false; - did_load = true; - return d->loadPlugin(); -+#else -+ return false; -+#endif - } - - -@@ -246,12 +264,14 @@ bool QPluginLoader::load() - */ - bool QPluginLoader::unload() - { -+#ifndef Q_OS_GENODE - if (did_load) { - did_load = false; - return d->unload(); - } - if (d) // Ouch - d->errorString = tr("The plugin was not loaded."); -+#endif - return false; - } - -@@ -262,7 +282,11 @@ bool QPluginLoader::unload() - */ - bool QPluginLoader::isLoaded() const - { -+#ifndef Q_OS_GENODE - return d && d->pHnd && d->instance; -+#else -+ return false; -+#endif - } - - /*! -@@ -285,6 +309,7 @@ bool QPluginLoader::isLoaded() const - */ - void QPluginLoader::setFileName(const QString &fileName) - { -+#ifndef Q_OS_GENODE - #if defined(QT_SHARED) - QLibrary::LoadHints lh; - if (d) { -@@ -348,13 +373,17 @@ void QPluginLoader::setFileName(const QString &fileName) - } - Q_UNUSED(fileName); - #endif -+#endif - } - - QString QPluginLoader::fileName() const - { -+#ifndef Q_OS_GENODE - if (d) - return d->fileName; -+#else - return QString(); -+#endif - } - - /*! -@@ -364,7 +393,11 @@ QString QPluginLoader::fileName() const - */ - QString QPluginLoader::errorString() const - { -+#ifndef Q_OS_GENODE - return (!d || d->errorString.isEmpty()) ? tr("Unknown error") : d->errorString; -+#else -+ return QString(); -+#endif - } - - typedef QList StaticInstanceFunctionList; -@@ -383,7 +416,7 @@ Q_GLOBAL_STATIC(StaticInstanceFunctionList, staticInstanceFunctionList) - - \sa QLibrary::loadHints - */ -- -+#ifndef Q_OS_GENODE - void QPluginLoader::setLoadHints(QLibrary::LoadHints loadHints) - { - if (!d) { -@@ -402,7 +435,7 @@ QLibrary::LoadHints QPluginLoader::loadHints() const - } - return d->loadHints; - } -- -+#endif - /*! - \relates QPluginLoader - \since 4.4 -diff --git a/src/corelib/plugin/qpluginloader.h b/src/corelib/plugin/qpluginloader.h -index ad8f230..7033cc3 100644 ---- a/src/corelib/plugin/qpluginloader.h -+++ b/src/corelib/plugin/qpluginloader.h -@@ -49,21 +49,23 @@ - #pragma message("QT_NO_LIBRARY is not supported on Windows") - #endif - --#ifndef QT_NO_LIBRARY -+#if !defined(QT_NO_LIBRARY) || defined(Q_OS_GENODE) - - QT_BEGIN_HEADER - - QT_BEGIN_NAMESPACE - - QT_MODULE(Core) -- -+#ifndef Q_OS_GENODE - class QLibraryPrivate; -- -+#endif - class Q_CORE_EXPORT QPluginLoader : public QObject - { - Q_OBJECT - Q_PROPERTY(QString fileName READ fileName WRITE setFileName) -+#ifndef Q_OS_GENODE - Q_PROPERTY(QLibrary::LoadHints loadHints READ loadHints WRITE setLoadHints) -+#endif - public: - explicit QPluginLoader(QObject *parent = 0); - explicit QPluginLoader(const QString &fileName, QObject *parent = 0); -@@ -81,12 +83,15 @@ public: - QString fileName() const; - - QString errorString() const; -- -+#ifndef Q_OS_GENODE - void setLoadHints(QLibrary::LoadHints loadHints); - QLibrary::LoadHints loadHints() const; -+#endif - - private: -+#ifndef Q_OS_GENODE - QLibraryPrivate *d; -+#endif - bool did_load; - Q_DISABLE_COPY(QPluginLoader) - }; -diff --git a/src/corelib/thread/qmutex_p.h b/src/corelib/thread/qmutex_p.h -index 036a17d..f012256 100644 ---- a/src/corelib/thread/qmutex_p.h -+++ b/src/corelib/thread/qmutex_p.h -@@ -64,6 +64,12 @@ - - QT_BEGIN_NAMESPACE - -+#include -+ -+#ifdef Q_OS_GENODE -+#include -+#endif -+ - class QMutexPrivate : public QMutexData { - public: - QMutexPrivate(QMutex::RecursionMode mode); -@@ -79,10 +85,12 @@ public: - Qt::HANDLE owner; - uint count; - --#if defined(Q_OS_UNIX) && !defined(Q_OS_LINUX) && !defined(Q_OS_SYMBIAN) -+#if defined(Q_OS_UNIX) && !defined(Q_OS_LINUX) && !defined(Q_OS_SYMBIAN) && !defined(Q_OS_GENODE) - volatile bool wakeup; - pthread_mutex_t mutex; - pthread_cond_t cond; -+#elif defined(Q_OS_GENODE) -+ Genode::Timed_semaphore sem; - #elif defined(Q_OS_WIN32) || defined(Q_OS_WINCE) - HANDLE event; - #elif defined(Q_OS_SYMBIAN) -diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp -index 2b818ff..4651268 100644 ---- a/src/corelib/thread/qthread.cpp -+++ b/src/corelib/thread/qthread.cpp -@@ -175,7 +175,12 @@ QThreadPrivate::QThreadPrivate(QThreadData *d) - stackSize(0), priority(QThread::InheritPriority), data(d) - { - #if defined (Q_OS_UNIX) -+#ifdef Q_OS_GENODE -+ thread_id = 0; -+ genode_thread = 0; -+#else - thread_id = 0; -+#endif - #elif defined (Q_WS_WIN) - handle = 0; - id = 0; -diff --git a/src/corelib/thread/qthread_p.h b/src/corelib/thread/qthread_p.h -index 1ba89cc..c543f45 100644 ---- a/src/corelib/thread/qthread_p.h -+++ b/src/corelib/thread/qthread_p.h -@@ -54,6 +54,10 @@ - // - // - -+#ifdef Q_OS_GENODE -+#include -+#endif -+ - #include "qplatformdefs.h" - #include "QtCore/qthread.h" - #include "QtCore/qmutex.h" -@@ -158,6 +162,56 @@ public: - static QThread *threadForId(int id); - - #ifdef Q_OS_UNIX -+#ifdef Q_OS_GENODE -+ -+ class Genode_thread : public Genode::Thread_qt -+ { -+ private: -+ -+ /* -+ * The '_finished_lock' is necessary because 'QThreadPrivate::mutex' -+ * uses a 'Genode::Timed_semaphore' internally and it isn't safe -+ * to delete a Genode thread that just called 'Semaphore::up()', -+ * because the 'Semaphore::_meta_lock' could still be locked. -+ */ -+ Genode::Lock _finished_lock; -+ QThread *_qthread; -+ -+ public: -+ -+ Genode_thread(QThread *qthread) -+ : _finished_lock(Genode::Lock::LOCKED), -+ _qthread(qthread) { } -+ -+ virtual void entry() -+ { -+ QThreadPrivate::start(_qthread); -+ QThreadPrivate::finish(_qthread); -+ _finished_lock.unlock(); -+ } -+ -+ void join() -+ { -+ _finished_lock.lock(); -+ } -+ }; -+ -+ Genode_thread *genode_thread; -+ -+ struct tls_struct { -+ QThreadData *data; -+ bool termination_enabled; -+ }; -+ -+ static QHash tls; -+ -+ Qt::HANDLE thread_id; -+ QWaitCondition thread_done; -+ -+ static void start(QThread *thr); -+ static void finish(QThread *thr); -+ -+#else // Q_OS_UNIX && !Q_OS_GENODE - pthread_t thread_id; - QWaitCondition thread_done; - -@@ -167,7 +221,7 @@ public: - #else - static void finish(void *); - #endif -- -+#endif // Q_OS_GENODE - #endif // Q_OS_UNIX - - #if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) -diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp -index 167a6c5..1f55fd3 100644 ---- a/src/corelib/tools/qdatetime.cpp -+++ b/src/corelib/tools/qdatetime.cpp -@@ -3108,6 +3108,9 @@ QTime QTime::currentTime() - // posix compliant system - struct timeval tv; - gettimeofday(&tv, 0); -+#ifdef Q_OS_GENODE -+ ct.mds = (tv.tv_sec * 1000) + (tv.tv_usec / 1000); -+#else - time_t ltime = tv.tv_sec; - struct tm *t = 0; - -@@ -3122,6 +3125,7 @@ QTime QTime::currentTime() - Q_CHECK_PTR(t); - - ct.mds = msecsFromDecomposed(t->tm_hour, t->tm_min, t->tm_sec, tv.tv_usec / 1000); -+#endif /* Q_OS_GENODE */ - return ct; - } - -@@ -4008,6 +4012,10 @@ static QDate adjustDate(QDate date) - - static QDateTimePrivate::Spec utcToLocal(QDate &date, QTime &time) - { -+#ifdef Q_OS_GENODE -+ /* no timezones in Genode */ -+ return QDateTimePrivate::LocalUnknown; -+#endif - QDate fakeDate = adjustDate(date); - - // won't overflow because of fakeDate -@@ -4096,6 +4104,10 @@ static QDateTimePrivate::Spec utcToLocal(QDate &date, QTime &time) - - static void localToUtc(QDate &date, QTime &time, int isdst) - { -+#ifdef Q_OS_GENODE -+ /* no timezones in Genode */ -+ return; -+#endif - if (!date.isValid()) - return; - -diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp -index 2dd342a..e6a5c17 100644 ---- a/src/gui/dialogs/qfiledialog.cpp -+++ b/src/gui/dialogs/qfiledialog.cpp -@@ -880,7 +880,7 @@ Q_AUTOTEST_EXPORT QString qt_tildeExpansion(const QString &path, bool *expanded - if (!path.startsWith(QLatin1Char('~'))) - return path; - QString ret = path; --#if !defined(Q_OS_INTEGRITY) -+#if !defined(Q_OS_INTEGRITY) && !defined(Q_OS_GENODE) - QStringList tokens = ret.split(QDir::separator()); - if (tokens.first() == QLatin1String("~")) { - ret.replace(0, 1, QDir::homePath()); -diff --git a/src/gui/embedded/qscreendriverfactory_qws.cpp b/src/gui/embedded/qscreendriverfactory_qws.cpp -index 6726064..5726a90 100644 ---- a/src/gui/embedded/qscreendriverfactory_qws.cpp -+++ b/src/gui/embedded/qscreendriverfactory_qws.cpp -@@ -49,6 +49,9 @@ - #include "qscreenmulti_qws_p.h" - #include "qscreenqnx_qws.h" - #include "qscreenintegrityfb_qws.h" -+#ifdef Q_OS_GENODE -+#include "qscreennitpicker_qws.h" -+#endif - #include - #include "private/qfactoryloader_p.h" - #include "qscreendriverplugin_qws.h" -@@ -141,6 +144,12 @@ QScreen *QScreenDriverFactory::create(const QString& key, int displayId) - if (driver == QLatin1String("multi")) - return new QMultiScreen(displayId); - #endif -+#ifdef Q_OS_GENODE -+#ifndef QT_NO_QWS_NITPICKER -+ if (driver == QLatin1String("nitpicker") || driver.isEmpty()) -+ return new QNitpickerScreen(displayId); -+#endif -+#endif - #if !defined(Q_OS_WIN32) || defined(QT_MAKEDLL) - #ifndef QT_NO_LIBRARY - -@@ -182,6 +191,11 @@ QStringList QScreenDriverFactory::keys() - #ifndef QT_NO_QWS_MULTISCREEN - list << QLatin1String("Multi"); - #endif -+#ifdef Q_OS_GENODE -+#ifndef QT_NO_QWS_NITPICKER -+ list << QLatin1String("Nitpicker"); -+#endif -+#endif - - #if !defined(Q_OS_WIN32) || defined(QT_MAKEDLL) - #ifndef QT_NO_LIBRARY -diff --git a/src/gui/embedded/qwindowsystem_qws.cpp b/src/gui/embedded/qwindowsystem_qws.cpp -index 9027232..2ea5695 100644 ---- a/src/gui/embedded/qwindowsystem_qws.cpp -+++ b/src/gui/embedded/qwindowsystem_qws.cpp -@@ -3360,8 +3360,15 @@ QWSWindow* QWSServerPrivate::findWindow(int windowid, QWSClient* client) - void QWSServerPrivate::raiseWindow(QWSWindow *changingw, int /*alt*/) - { - Q_Q(QWSServer); -- if (changingw == windows.first()) -+ -+ if (changingw == windows.first()) { -+#ifndef QT_NO_QWS_NITPICKER -+ // make sure that the Nitpicker view is on top, too -+ emit q->windowEvent(changingw, QWSServer::Raise); -+#endif - return; -+ } -+ - QWSWindow::State oldstate = changingw->d->state; - changingw->d->state = QWSWindow::Raising; - // Expose regions previously overlapped by transparent windows -diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp -index e90c61c..35828fa 100644 ---- a/src/gui/image/qpnghandler.cpp -+++ b/src/gui/image/qpnghandler.cpp -@@ -199,7 +199,7 @@ void CALLBACK_CALL_TYPE iod_read_fn(png_structp png_ptr, png_bytep data, png_siz - } - } - -- -+#ifdef PNG_WRITE_SUPPORTED - static - void CALLBACK_CALL_TYPE qpiw_write_fn(png_structp png_ptr, png_bytep data, png_size_t length) - { -@@ -218,6 +218,7 @@ static - void CALLBACK_CALL_TYPE qpiw_flush_fn(png_structp /* png_ptr */) - { - } -+#endif - - #if defined(Q_C_CALLBACKS) - } -@@ -226,12 +227,13 @@ void CALLBACK_CALL_TYPE qpiw_flush_fn(png_structp /* png_ptr */) - static - void setup_qt(QImage& image, png_structp png_ptr, png_infop info_ptr, float screen_gamma=0.0) - { -+#if defined(PNG_gAMA_SUPPORTED) && defined(PNG_FLOATING_POINT_SUPPORTED) - if (screen_gamma != 0.0 && png_get_valid(png_ptr, info_ptr, PNG_INFO_gAMA)) { - double file_gamma; - png_get_gAMA(png_ptr, info_ptr, &file_gamma); - png_set_gamma(png_ptr, screen_gamma, file_gamma); - } -- -+#endif - png_uint_32 width; - png_uint_32 height; - int bit_depth; -@@ -442,13 +444,13 @@ bool Q_INTERNAL_WIN_NO_THROW QPngHandlerPrivate::readPngHeader() - png_ptr = 0; - return false; - } -- -+#ifdef PNG_SETJMP_SUPPORTED - if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); - png_ptr = 0; - return false; - } -- -+#endif - png_set_read_fn(png_ptr, this, iod_read_fn); - png_read_info(png_ptr, info_ptr); - -@@ -472,6 +474,7 @@ bool Q_INTERNAL_WIN_NO_THROW QPngHandlerPrivate::readPngImage(QImage *outImage) - } - - row_pointers = 0; -+#ifdef PNG_SETJMP_SUPPORTED - if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); - delete [] row_pointers; -@@ -479,7 +482,7 @@ bool Q_INTERNAL_WIN_NO_THROW QPngHandlerPrivate::readPngImage(QImage *outImage) - state = Error; - return false; - } -- -+#endif - setup_qt(*outImage, png_ptr, info_ptr, gamma); - - if (outImage->isNull()) { -@@ -510,9 +513,9 @@ bool Q_INTERNAL_WIN_NO_THROW QPngHandlerPrivate::readPngImage(QImage *outImage) - png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) - if (outImage->depth()==32 && png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) { - QRgb trans = 0xFF000000 | qRgb( -- (info_ptr->trans_values.red << 8 >> bit_depth)&0xff, -- (info_ptr->trans_values.green << 8 >> bit_depth)&0xff, -- (info_ptr->trans_values.blue << 8 >> bit_depth)&0xff); -+ (info_ptr->trans_color.red << 8 >> bit_depth)&0xff, -+ (info_ptr->trans_color.green << 8 >> bit_depth)&0xff, -+ (info_ptr->trans_color.blue << 8 >> bit_depth)&0xff); - for (uint y=0; ywidth; x++) { - if (((uint**)jt)[y][x] == trans) { -@@ -637,7 +640,7 @@ void QPNGImageWriter::setGamma(float g) - gamma = g; - } - -- -+#ifdef PNG_WRITE_SUPPORTED - #ifndef QT_NO_IMAGE_TEXT - static void set_text(const QImage &image, png_structp png_ptr, png_infop info_ptr, - const QString &description) -@@ -713,6 +716,7 @@ static void set_text(const QImage &image, png_structp png_ptr, png_infop info_pt - delete [] text_ptr; - } - #endif -+#endif - - bool QPNGImageWriter::writeImage(const QImage& image, int off_x, int off_y) - { -@@ -722,6 +726,8 @@ bool QPNGImageWriter::writeImage(const QImage& image, int off_x, int off_y) - bool Q_INTERNAL_WIN_NO_THROW QPNGImageWriter::writeImage(const QImage& image, int quality_in, const QString &description, - int off_x_in, int off_y_in) - { -+#ifdef PNG_WRITE_SUPPORTED -+ - #ifdef QT_NO_IMAGE_TEXT - Q_UNUSED(description); - #endif -@@ -745,12 +751,12 @@ bool Q_INTERNAL_WIN_NO_THROW QPNGImageWriter::writeImage(const QImage& image, in - png_destroy_write_struct(&png_ptr, 0); - return false; - } -- -+#ifdef PNG_SETJMP_SUPPORTED - if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_write_struct(&png_ptr, &info_ptr); - return false; - } -- -+#endif - int quality = quality_in; - if (quality >= 0) { - if (quality > 9) { -@@ -775,9 +781,11 @@ bool Q_INTERNAL_WIN_NO_THROW QPNGImageWriter::writeImage(const QImage& image, in - image.depth() == 1 ? 1 : 8, // per channel - color_type, 0, 0, 0); // sets #channels - -+#if defined(PNG_gAMA_SUPPORTED) && defined(PNG_FLOATING_POINT_SUPPORTED) - if (gamma != 0.0) { - png_set_gAMA(png_ptr, info_ptr, 1.0/gamma); - } -+#endif - - png_color_8 sig_bit; - sig_bit.red = 8; -@@ -903,6 +911,9 @@ bool Q_INTERNAL_WIN_NO_THROW QPNGImageWriter::writeImage(const QImage& image, in - png_destroy_write_struct(&png_ptr, &info_ptr); - - return true; -+#else -+ return false; -+#endif - } - - static bool write_png_image(const QImage &image, QIODevice *device, -diff --git a/src/gui/image/qxpmhandler.cpp b/src/gui/image/qxpmhandler.cpp -index ec545c2..1fe727d 100644 ---- a/src/gui/image/qxpmhandler.cpp -+++ b/src/gui/image/qxpmhandler.cpp -@@ -848,8 +848,16 @@ static bool read_xpm_header( - #if defined(_MSC_VER) && _MSC_VER >= 1400 && !defined(Q_OS_WINCE) - if (sscanf_s(buf, "%d %d %d %d", w, h, ncols, cpp) < 4) - #else -+#ifdef Q_OS_GENODE -+ *w = QString(buf).section(" ", 0, 0, QString::SectionSkipEmpty).toInt(); -+ *h = QString(buf).section(" ", 1, 1, QString::SectionSkipEmpty).toInt(); -+ *ncols = QString(buf).section(" ", 2, 2, QString::SectionSkipEmpty).toInt(); -+ *cpp = QString(buf).section(" ", 3, 3, QString::SectionSkipEmpty).toInt(); -+ if (*w <= 0 || *h <= 0 || *ncols <= 0 || *cpp <= 0) -+#else - if (sscanf(buf, "%d %d %d %d", w, h, ncols, cpp) < 4) - #endif -+#endif - return false; // < 4 numbers parsed - - return true; -diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp -index d0db0d9..edc6800 100644 ---- a/src/gui/kernel/qapplication.cpp -+++ b/src/gui/kernel/qapplication.cpp -@@ -733,11 +733,23 @@ void QApplicationPrivate::process_cmdline() - */ - - QApplication::QApplication(int &argc, char **argv) -- : QCoreApplication(*new QApplicationPrivate(argc, argv, GuiClient, 0x040000)) -+ : QCoreApplication(*new QApplicationPrivate(argc, argv, -+#ifndef Q_OS_GENODE -+ GuiClient -+#else -+ GuiServer -+#endif -+ , 0x040000)) - { Q_D(QApplication); d->construct(); } - - QApplication::QApplication(int &argc, char **argv, int _internal) -- : QCoreApplication(*new QApplicationPrivate(argc, argv, GuiClient, _internal)) -+ : QCoreApplication(*new QApplicationPrivate(argc, argv, -+#ifndef Q_OS_GENODE -+ GuiClient -+#else -+ GuiServer -+#endif -+ , _internal)) - { Q_D(QApplication); d->construct(); } - - -@@ -767,11 +779,23 @@ QApplication::QApplication(int &argc, char **argv, int _internal) - */ - - QApplication::QApplication(int &argc, char **argv, bool GUIenabled ) -- : QCoreApplication(*new QApplicationPrivate(argc, argv, GUIenabled ? GuiClient : Tty, 0x040000)) -+ : QCoreApplication(*new QApplicationPrivate(argc, argv, GUIenabled ? -+#ifndef Q_OS_GENODE -+ GuiClient -+#else -+ GuiServer -+#endif -+ : Tty, 0x040000)) - { Q_D(QApplication); d->construct(); } - - QApplication::QApplication(int &argc, char **argv, bool GUIenabled , int _internal) -- : QCoreApplication(*new QApplicationPrivate(argc, argv, GUIenabled ? GuiClient : Tty, _internal)) -+ : QCoreApplication(*new QApplicationPrivate(argc, argv, GUIenabled ? -+#ifndef Q_OS_GENODE -+ GuiClient -+#else -+ GuiServer -+#endif -+ : Tty, _internal)) - { Q_D(QApplication); d->construct();} - - -@@ -905,7 +929,13 @@ static char *aargv[] = { (char*)"unknown", 0 }; - This function is only available on X11. - */ - QApplication::QApplication(Display* dpy, Qt::HANDLE visual, Qt::HANDLE colormap) -- : QCoreApplication(*new QApplicationPrivate(aargc, aargv, GuiClient, 0x040000)) -+ : QCoreApplication(*new QApplicationPrivate(aargc, aargv, -+#ifndef Q_OS_GENODE -+ GuiClient -+#else -+ GuiServer -+#endif -+ , 0x040000)) - { - if (! dpy) - qWarning("QApplication: Invalid Display* argument"); -@@ -914,7 +944,13 @@ QApplication::QApplication(Display* dpy, Qt::HANDLE visual, Qt::HANDLE colormap) - } - - QApplication::QApplication(Display* dpy, Qt::HANDLE visual, Qt::HANDLE colormap, int _internal) -- : QCoreApplication(*new QApplicationPrivate(aargc, aargv, GuiClient, _internal)) -+ : QCoreApplication(*new QApplicationPrivate(aargc, aargv, -+#ifndef Q_OS_GENODE -+ GuiClient -+#else -+ GuiServer -+#endif -+ , _internal)) - { - if (! dpy) - qWarning("QApplication: Invalid Display* argument"); -@@ -939,7 +975,13 @@ QApplication::QApplication(Display* dpy, Qt::HANDLE visual, Qt::HANDLE colormap, - */ - QApplication::QApplication(Display *dpy, int &argc, char **argv, - Qt::HANDLE visual, Qt::HANDLE colormap) -- : QCoreApplication(*new QApplicationPrivate(argc, argv, GuiClient, 0x040000)) -+ : QCoreApplication(*new QApplicationPrivate(argc, argv, -+#ifndef Q_OS_GENODE -+ GuiClient -+#else -+ GuiServer -+#endif -+ , 0x040000)) - { - if (! dpy) - qWarning("QApplication: Invalid Display* argument"); -@@ -949,7 +991,13 @@ QApplication::QApplication(Display *dpy, int &argc, char **argv, - - QApplication::QApplication(Display *dpy, int &argc, char **argv, - Qt::HANDLE visual, Qt::HANDLE colormap, int _internal) -- : QCoreApplication(*new QApplicationPrivate(argc, argv, GuiClient, _internal)) -+ : QCoreApplication(*new QApplicationPrivate(argc, argv, -+#ifndef Q_OS_GENODE -+ GuiClient -+#else -+ GuiServer -+#endif -+ , _internal)) - { - if (! dpy) - qWarning("QApplication: Invalid Display* argument"); -diff --git a/src/gui/kernel/qapplication_qws.cpp b/src/gui/kernel/qapplication_qws.cpp -index 3ac3544..25851d5 100644 ---- a/src/gui/kernel/qapplication_qws.cpp -+++ b/src/gui/kernel/qapplication_qws.cpp -@@ -196,6 +196,7 @@ QString qws_dataDir() - WaitForFileSystemInitialization(); - #endif - -+#ifndef Q_OS_GENODE - if (QT_MKDIR(dataDir, 0700)) { - if (errno != EEXIST) { - qFatal("Cannot create Qt for Embedded Linux data directory: %s", dataDir.constData()); -@@ -216,6 +217,7 @@ QString qws_dataDir() - if ((buf.st_mode & 0677) != 0600) - qFatal("Qt for Embedded Linux data directory has incorrect permissions: %s", dataDir.constData()); - #endif -+#endif /* Q_OS_GENODE */ - - result.append(QLatin1Char('/')); - return result; -@@ -463,7 +465,11 @@ void QApplicationPrivate::createEventDispatcher() - #endif - eventDispatcher = (q->type() != QApplication::Tty - ? new QEventDispatcherQWS(q) -+#ifdef Q_OS_GENODE -+ : new QEventDispatcherGenode(q)); -+#else - : new QEventDispatcherUNIX(q)); -+#endif - } - - // Single-process stuff. This should maybe move into qwindowsystem_qws.cpp -@@ -2896,9 +2902,15 @@ int QApplication::qwsProcessEvent(QWSEvent* event) - // The server has grabbed the mouse for us. - // Remember which of my widgets has it. - qt_pressGrab = w; -- if (!widget->isActiveWindow() && -+ if ( -+#ifdef QT_NO_QWS_NITPICKER // make sure that the Nitpicker view is on top, too -+ !widget->isActiveWindow() && -+#endif - (!app_do_modal || QApplication::activeModalWidget() == widget) && - !((widget->windowFlags() & Qt::FramelessWindowHint) || (widget->windowType() == Qt::Tool))) { -+#ifndef QT_NO_QWS_NITPICKER -+ if (!widget->isActiveWindow()) -+#endif - widget->activateWindow(); - if (widget->raiseOnClick()) - widget->raise(); -diff --git a/src/gui/kernel/qeventdispatcher_qws.cpp b/src/gui/kernel/qeventdispatcher_qws.cpp -index e26aabc..e64776e 100644 ---- a/src/gui/kernel/qeventdispatcher_qws.cpp -+++ b/src/gui/kernel/qeventdispatcher_qws.cpp -@@ -46,7 +46,11 @@ - #include "qwsevent_qws.h" - #include "qwindowsystem_qws.h" - #include "qeventdispatcher_qws_p.h" -+#ifdef Q_OS_GENODE -+#include "private/qeventdispatcher_genode_p.h" -+#else - #include "private/qeventdispatcher_unix_p.h" -+#endif - #ifndef QT_NO_THREAD - # include "qmutex.h" - #endif -@@ -57,7 +61,11 @@ QT_BEGIN_NAMESPACE - - QT_USE_NAMESPACE - -+#ifdef Q_OS_GENODE -+class QEventDispatcherQWSPrivate : public QEventDispatcherGenodePrivate -+#else - class QEventDispatcherQWSPrivate : public QEventDispatcherUNIXPrivate -+#endif - { - Q_DECLARE_PUBLIC(QEventDispatcherQWS) - public: -@@ -68,7 +76,11 @@ public: - - - QEventDispatcherQWS::QEventDispatcherQWS(QObject *parent) -+#ifdef Q_OS_GENODE -+ : QEventDispatcherGenode(*new QEventDispatcherQWSPrivate, parent) -+#else - : QEventDispatcherUNIX(*new QEventDispatcherQWSPrivate, parent) -+#endif - { } - - QEventDispatcherQWS::~QEventDispatcherQWS() -@@ -129,7 +141,11 @@ bool QEventDispatcherQWS::processEvents(QEventLoop::ProcessEventsFlags flags) - QWSServer::processEventQueue(); - } - -+#ifdef Q_OS_GENODE -+ if (QEventDispatcherGenode::processEvents(flags)) -+#else - if (QEventDispatcherUNIX::processEvents(flags)) -+#endif - return true; - } - return (nevents > 0); -@@ -158,11 +174,11 @@ void QEventDispatcherQWS::flush() - (void)qt_fbdpy->eventPending(); // flush - } - -- -+#ifndef Q_OS_GENODE - int QEventDispatcherQWS::select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, - timeval *timeout) - { - return QEventDispatcherUNIX::select(nfds, readfds, writefds, exceptfds, timeout); - } -- -+#endif - QT_END_NAMESPACE -diff --git a/src/gui/kernel/qeventdispatcher_qws_p.h b/src/gui/kernel/qeventdispatcher_qws_p.h -index 703057d..64b0469 100644 ---- a/src/gui/kernel/qeventdispatcher_qws_p.h -+++ b/src/gui/kernel/qeventdispatcher_qws_p.h -@@ -53,13 +53,23 @@ - // We mean it. - // - -+#include "qplatformdefs.h" -+ -+#ifdef Q_OS_GENODE -+#include "private/qeventdispatcher_genode_p.h" -+#else - #include "private/qeventdispatcher_unix_p.h" -+#endif - - QT_BEGIN_NAMESPACE - - class QEventDispatcherQWSPrivate; - -+#ifdef Q_OS_GENODE -+class QEventDispatcherQWS : public QEventDispatcherGenode -+#else - class QEventDispatcherQWS : public QEventDispatcherUNIX -+#endif - { - Q_OBJECT - Q_DECLARE_PRIVATE(QEventDispatcherQWS) -@@ -77,8 +87,10 @@ public: - void closingDown(); - - protected: -+#ifndef Q_OS_GENODE - int select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, - timeval *timeout); -+#endif - }; - - QT_END_NAMESPACE -diff --git a/src/gui/text/qfontdatabase_qws.cpp b/src/gui/text/qfontdatabase_qws.cpp -index ec925e9..7afcd0a 100644 ---- a/src/gui/text/qfontdatabase_qws.cpp -+++ b/src/gui/text/qfontdatabase_qws.cpp -@@ -393,6 +393,43 @@ static void initializeDb() - - } - #endif -+ -+ QDir dir(fontpath, QLatin1String("*.qpf")); -+ for (int i=0; iaddFont(familyname, /*foundry*/ "qt", weight, italic, pixelSize, QFile::encodeName(dir.absoluteFilePath(dir[i])), -+ /*fileIndex*/ 0, /*antialiased*/ true); -+ } -+ -+#ifndef QT_NO_FREETYPE -+ dir.setNameFilters(QStringList() << QLatin1String("*.ttf") -+ << QLatin1String("*.ttc") << QLatin1String("*.pfa") -+ << QLatin1String("*.pfb")); -+ dir.refresh(); -+ for (int i = 0; i < int(dir.count()); ++i) { -+ const QByteArray file = QFile::encodeName(dir.absoluteFilePath(dir[i])); -+// qDebug() << "looking at" << file; -+ QByteArray data; -+ QFile f(file); -+ if (!(f.fileEngine()->fileFlags(QAbstractFileEngine::FlagsMask) & QAbstractFileEngine::LocalDiskFlag)) { -+ if (!f.open(QIODevice::ReadOnly)) -+ continue; -+ data = f.readAll(); -+ } -+ db->addTTFile(file, data); -+ } -+#endif -+ - #ifndef QT_NO_QWS_QPF2 - QDir dir(fontpath, QLatin1String("*.qpf2")); - for (int i = 0; i < int(dir.count()); ++i) { -diff --git a/src/gui/text/qfontengine_qws.cpp b/src/gui/text/qfontengine_qws.cpp -index 9b89fae..ec242b7 100644 ---- a/src/gui/text/qfontengine_qws.cpp -+++ b/src/gui/text/qfontengine_qws.cpp -@@ -304,6 +304,23 @@ QFontEngineQPF1::QFontEngineQPF1(const QFontDef&, const QString &fn) - { - cache_cost = 1; - -+#ifdef Q_OS_GENODE -+ -+ QFile ff(fn); -+ if (!ff.open(QIODevice::ReadOnly)) { -+ qFatal("Failed to open %s", QFile::encodeName(fn).data()); -+ } -+ -+ uchar* data = new uchar[ff.size()]; -+ -+ for (int i = 0; i < ff.size(); i++) { -+ ff.getChar(reinterpret_cast(&data[i])); -+ } -+ -+ ff.close(); -+ -+#else -+ - int fd = QT_OPEN(QFile::encodeName(fn).constData(), O_RDONLY, 0); - if (fd == -1) - qFatal("Failed to open '%s'", QFile::encodeName(fn).constData()); -@@ -312,7 +329,11 @@ QFontEngineQPF1::QFontEngineQPF1(const QFontDef&, const QString &fn) - if (QT_FSTAT(fd, &st) != 0) - qFatal("Failed to stat '%s'", QFile::encodeName(fn).constData()); - -+#endif /* Q_OS_GENODE */ -+ - d = new QFontEngineQPF1Data; -+ -+#ifndef Q_OS_GENODE - d->mmapStart = 0; - d->mmapLength = st.st_size; - -@@ -338,7 +359,7 @@ QFontEngineQPF1::QFontEngineQPF1(const QFontDef&, const QString &fn) - - if (d->mmapStart) { - uchar* data = d->mmapStart; -- -+#endif /* Q_OS_GENODE */ - memcpy(reinterpret_cast(&d->fm), data, sizeof(d->fm)); - data += sizeof(d->fm); - -@@ -356,7 +377,9 @@ QFontEngineQPF1::QFontEngineQPF1(const QFontDef&, const QString &fn) - << "underlinepos" << d->fm.underlinepos - << "underlinewidth" << d->fm.underlinewidth; - #endif -+#ifndef Q_OS_GENODE - } -+#endif /* Q_OS_GENODE */ - } - - QFontEngineQPF1::~QFontEngineQPF1() -diff --git a/src/network/access/qnetworkaccessfilebackend.cpp b/src/network/access/qnetworkaccessfilebackend.cpp -index 8ec6a15..65ad5be 100644 ---- a/src/network/access/qnetworkaccessfilebackend.cpp -+++ b/src/network/access/qnetworkaccessfilebackend.cpp -@@ -114,6 +114,7 @@ void QNetworkAccessFileBackend::open() - url.setPath(QLatin1String("/")); - setUrl(url); - -+#ifndef Q_OS_GENODE - QString fileName = url.toLocalFile(); - if (fileName.isEmpty()) { - if (url.scheme() == QLatin1String("qrc")) -@@ -121,6 +122,10 @@ void QNetworkAccessFileBackend::open() - else - fileName = url.toString(QUrl::RemoveAuthority | QUrl::RemoveFragment | QUrl::RemoveQuery); - } -+#else -+ QString fileName = QLatin1String(":") + url.path(); -+#endif -+ - file.setFileName(fileName); - - if (operation() == QNetworkAccessManager::GetOperation) { -diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp -index 6909340..93a6c56 100644 ---- a/src/network/kernel/qhostinfo_unix.cpp -+++ b/src/network/kernel/qhostinfo_unix.cpp -@@ -147,6 +147,11 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName) - QHostAddress address; - if (address.setAddress(hostName)) { - // Reverse lookup -+#ifdef Q_OS_GENODE -+ results.setError(QHostInfo::HostNotFound); -+ results.setErrorString(tr("Reverse lookup is not implemented because of missing support in lwip.")); -+ return results; -+#else - // Reverse lookups using getnameinfo are broken on darwin, use gethostbyaddr instead. - #if !defined (QT_NO_GETADDRINFO) && !defined (Q_OS_DARWIN) - sockaddr_in sa4; -@@ -181,7 +186,7 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName) - if (ent) - results.setHostName(QString::fromLatin1(ent->h_name)); - #endif -- -+#endif - if (results.hostName().isEmpty()) - results.setHostName(address.toString()); - results.setAddresses(QList() << address); -diff --git a/tools/designer/src/lib/uilib/formbuilder.cpp b/tools/designer/src/lib/uilib/formbuilder.cpp -index db9c59d..df797f0 100644 ---- a/tools/designer/src/lib/uilib/formbuilder.cpp -+++ b/tools/designer/src/lib/uilib/formbuilder.cpp -@@ -44,6 +44,8 @@ - #include "formbuilderextra_p.h" - #include "ui4_p.h" - -+#include "qpluginloader.h" -+ - #include - #include - -@@ -493,7 +495,7 @@ static void insertPlugins(QObject *o, QMapbuilder.loader = this; -- -+#ifndef Q_OS_GENODE - QStringList paths; - foreach (const QString &path, QApplication::libraryPaths()) { - QString libPath = path; -@@ -640,6 +640,7 @@ QUiLoader::QUiLoader(QObject *parent) - } - - d->builder.setPluginPath(paths); -+#endif - } - - /*! diff --git a/repos/qt4/src/lib/qt4/patches/qt4_lwip_connect_semantics_adaption.patch b/repos/qt4/src/lib/qt4/patches/qt4_lwip_connect_semantics_adaption.patch deleted file mode 100644 index 0fe82d893..000000000 --- a/repos/qt4/src/lib/qt4/patches/qt4_lwip_connect_semantics_adaption.patch +++ /dev/null @@ -1,36 +0,0 @@ -qt4_lwip_connect_semantics_adaption.patch - -From: Christian Prochaska - - ---- - src/network/socket/qnativesocketengine_unix.cpp | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp -index b4e5126..9093abd 100644 ---- a/src/network/socket/qnativesocketengine_unix.cpp -+++ b/src/network/socket/qnativesocketengine_unix.cpp -@@ -430,6 +430,22 @@ bool QNativeSocketEnginePrivate::nativeConnect(const QHostAddress &addr, quint16 - case EISCONN: - socketState = QAbstractSocket::ConnectedState; - break; -+#ifdef Q_OS_GENODE -+ /* to have Arora get an error indication, socketState needs to change -+ * to "ConnectingState" before changing to "UnconnectedState" again -+ */ -+ case ECONNABORTED: -+ if (socketState == QAbstractSocket::UnconnectedState) { -+ /* interpret ECONNABORTED as EINPROGRESS */ -+ setError(QAbstractSocket::UnfinishedSocketOperationError, InvalidSocketErrorString); -+ socketState = QAbstractSocket::ConnectingState; -+ } else { -+ /* interpret ECONNABORTED as EHOSTUNREACH */ -+ setError(QAbstractSocket::NetworkError, HostUnreachableErrorString); -+ socketState = QAbstractSocket::UnconnectedState; -+ } -+ break; -+#endif - case ECONNREFUSED: - case EINVAL: - setError(QAbstractSocket::ConnectionRefusedError, ConnectionRefusedErrorString); diff --git a/repos/qt4/src/lib/qt4/patches/qt4_no_exit_on_window_close.patch b/repos/qt4/src/lib/qt4/patches/qt4_no_exit_on_window_close.patch deleted file mode 100644 index 6cbc6b562..000000000 --- a/repos/qt4/src/lib/qt4/patches/qt4_no_exit_on_window_close.patch +++ /dev/null @@ -1,40 +0,0 @@ -Don't quit the program if the last window gets closed. - -From: Christian Prochaska - - ---- - src/gui/kernel/qwidget.cpp | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp -index 3a0261e..8667688 100644 ---- a/src/gui/kernel/qwidget.cpp -+++ b/src/gui/kernel/qwidget.cpp -@@ -7929,6 +7929,26 @@ bool QWidgetPrivate::close_helper(CloseMode mode) - QPointer that = q; - QPointer parentWidget = q->parentWidget(); - -+#ifdef Q_OS_GENODE -+ /* prevent closing of the last window in the demo */ -+ if (parentWidget.isNull() || !parentWidget->isVisible() || parentWidget->testAttribute(Qt::WA_DontShowOnScreen)) { -+ QWidgetList list = QApplication::topLevelWidgets(); -+ bool lastWindowClosed = true; -+ for (int i = 0; i < list.size(); ++i) { -+ QWidget *w = list.at(i); -+ if ((w != q) && (w->isVisible() && !w->testAttribute(Qt::WA_DontShowOnScreen)) -+ && !w->parentWidget()) { -+ lastWindowClosed = false; -+ break; -+ } -+ } -+ if (lastWindowClosed) { -+ data.is_closing = 0; -+ return false; -+ } -+ } -+#endif -+ - #ifdef QT3_SUPPORT - bool isMain = (QApplicationPrivate::main_widget == q); - #endif diff --git a/repos/qt4/src/lib/qt4/patches/qt4_no_search_for_resolv_lib.patch b/repos/qt4/src/lib/qt4/patches/qt4_no_search_for_resolv_lib.patch deleted file mode 100644 index 12d58efcb..000000000 --- a/repos/qt4/src/lib/qt4/patches/qt4_no_search_for_resolv_lib.patch +++ /dev/null @@ -1,29 +0,0 @@ -Don't search for the "resolv" lib at runtime. - -From: Christian Prochaska - - ---- - src/network/kernel/qhostinfo_unix.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp -index 93a6c56..cc13a22 100644 ---- a/src/network/kernel/qhostinfo_unix.cpp -+++ b/src/network/kernel/qhostinfo_unix.cpp -@@ -94,6 +94,7 @@ static res_state_ptr local_res = 0; - - static void resolveLibrary() - { -+#ifndef Q_OS_GENODE - #ifndef QT_NO_LIBRARY - QLibrary lib(QLatin1String("resolv")); - lib.setLoadHints(QLibrary::ImprovedSearchHeuristics); -@@ -119,6 +120,7 @@ static void resolveLibrary() - local_res_ninit = 0; - } - #endif -+#endif /* Q_OS_GENODE */ - } - - QHostInfo QHostInfoAgent::fromName(const QString &hostName) diff --git a/repos/qt4/src/lib/qt4/patches/qt4_nonblocking_sockets.patch b/repos/qt4/src/lib/qt4/patches/qt4_nonblocking_sockets.patch deleted file mode 100644 index df53e3bbf..000000000 --- a/repos/qt4/src/lib/qt4/patches/qt4_nonblocking_sockets.patch +++ /dev/null @@ -1,22 +0,0 @@ -Use 'ioctl()' to set nonblocking socket mode. - -From: Christian Prochaska - - ---- - src/network/socket/qnativesocketengine_unix.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp -index 9093abd..9f852a5 100644 ---- a/src/network/socket/qnativesocketengine_unix.cpp -+++ b/src/network/socket/qnativesocketengine_unix.cpp -@@ -296,7 +296,7 @@ bool QNativeSocketEnginePrivate::setOption(QNativeSocketEngine::SocketOption opt - break; - case QNativeSocketEngine::NonBlockingSocketOption: { - // Make the socket nonblocking. --#if !defined(Q_OS_VXWORKS) -+#if !defined(Q_OS_VXWORKS) && !defined(Q_OS_GENODE) - int flags = ::fcntl(socketDescriptor, F_GETFL, 0); - if (flags == -1) { - #ifdef QNATIVESOCKETENGINE_DEBUG diff --git a/repos/qt4/src/lib/qt4/patches/qt4_renderwidget.patch b/repos/qt4/src/lib/qt4/patches/qt4_renderwidget.patch deleted file mode 100644 index 4158e2777..000000000 --- a/repos/qt4/src/lib/qt4/patches/qt4_renderwidget.patch +++ /dev/null @@ -1,25 +0,0 @@ -- revert a change introduced in Qt 4.7 that caused the mouse mask not being updated when loading a Nitpicker plugin in Arora - -From: Christian Prochaska - - ---- - .../Source/WebCore/rendering/RenderWidget.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/RenderWidget.cpp b/src/3rdparty/webkit/Source/WebCore/rendering/RenderWidget.cpp -index 5a00374..025f921 100644 ---- a/src/3rdparty/webkit/Source/WebCore/rendering/RenderWidget.cpp -+++ b/src/3rdparty/webkit/Source/WebCore/rendering/RenderWidget.cpp -@@ -291,6 +291,11 @@ void RenderWidget::paint(PaintInfo& paintInfo, int tx, int ty) - } - - if (m_widget) { -+ // Move the widget if necessary. We normally move and resize widgets during layout, but sometimes -+ // widgets can move without layout occurring (most notably when you scroll a document that -+ // contains fixed positioned elements). -+ m_widget->move(tx + borderLeft() + paddingLeft(), ty + borderTop() + paddingTop()); -+ - // Tell the widget to paint now. This is the only time the widget is allowed - // to paint itself. That way it will composite properly with z-indexed layers. - if (m_substituteImage) diff --git a/repos/qt4/src/lib/qt4/patches/qt4_serialized_dns_lookup.patch b/repos/qt4/src/lib/qt4/patches/qt4_serialized_dns_lookup.patch deleted file mode 100644 index 6f9045f33..000000000 --- a/repos/qt4/src/lib/qt4/patches/qt4_serialized_dns_lookup.patch +++ /dev/null @@ -1,26 +0,0 @@ -Serialize DNS lookups - -From: Christian Prochaska - -'getaddrinfo()' is currently not thread-safe on Genode ---- - src/network/kernel/qhostinfo.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp -index 4a5589d..6725d43 100644 ---- a/src/network/kernel/qhostinfo.cpp -+++ b/src/network/kernel/qhostinfo.cpp -@@ -543,7 +543,12 @@ QHostInfoLookupManager::QHostInfoLookupManager() : mutex(QMutex::Recursive), was - { - moveToThread(QCoreApplicationPrivate::mainThread()); - connect(QCoreApplication::instance(), SIGNAL(destroyed()), SLOT(waitForThreadPoolDone()), Qt::DirectConnection); -+#ifdef Q_OS_GENODE -+ /* 'getaddrinfo()' is currently not thread-safe on Genode */ -+ threadPool.setMaxThreadCount(1); -+#else - threadPool.setMaxThreadCount(5); // do 5 DNS lookups in parallel -+#endif - } - - QHostInfoLookupManager::~QHostInfoLookupManager() diff --git a/repos/qt4/src/lib/qt4/patches/qt4_ssl_peer_verification.patch b/repos/qt4/src/lib/qt4/patches/qt4_ssl_peer_verification.patch deleted file mode 100644 index 5150dc484..000000000 --- a/repos/qt4/src/lib/qt4/patches/qt4_ssl_peer_verification.patch +++ /dev/null @@ -1,27 +0,0 @@ -Disable SSL peer verification - -From: Christian Prochaska - -With enabled peer verification, currently often a 'handshake error' -occurs. This patch disables the peer verification until a fix for -the handshake problem has been found. ---- - src/network/ssl/qsslconfiguration_p.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/network/ssl/qsslconfiguration_p.h b/src/network/ssl/qsslconfiguration_p.h -index 9c634f2..62ae400 100644 ---- a/src/network/ssl/qsslconfiguration_p.h -+++ b/src/network/ssl/qsslconfiguration_p.h -@@ -81,7 +81,11 @@ class QSslConfigurationPrivate: public QSharedData - public: - QSslConfigurationPrivate() - : protocol(QSsl::SecureProtocols), -+#ifdef Q_OS_GENODE -+ peerVerifyMode(QSslSocket::VerifyNone), -+#else - peerVerifyMode(QSslSocket::AutoVerifyPeer), -+#endif - peerVerifyDepth(0), - sslOptions(QSsl::SslOptionDisableEmptyFragments - |QSsl::SslOptionDisableLegacyRenegotiation diff --git a/repos/qt4/src/lib/qt4/patches/qt4_virtual_deletelater.patch b/repos/qt4/src/lib/qt4/patches/qt4_virtual_deletelater.patch deleted file mode 100644 index b8c6b965c..000000000 --- a/repos/qt4/src/lib/qt4/patches/qt4_virtual_deletelater.patch +++ /dev/null @@ -1,22 +0,0 @@ -qt4_virtual_deletelater.patch - -From: Christian Prochaska - - ---- - src/corelib/kernel/qobject.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h -index 1974bef..ba6c83b 100644 ---- a/src/corelib/kernel/qobject.h -+++ b/src/corelib/kernel/qobject.h -@@ -276,7 +276,7 @@ public: - { return const_cast(this)->qt_metacast(classname) != 0; } - - public Q_SLOTS: -- void deleteLater(); -+ virtual void deleteLater(); - - protected: - QObject *sender() const; diff --git a/repos/qt4/src/lib/qt4/patches/qt4_webkit_crash.patch b/repos/qt4/src/lib/qt4/patches/qt4_webkit_crash.patch deleted file mode 100644 index a43d9ae4a..000000000 --- a/repos/qt4/src/lib/qt4/patches/qt4_webkit_crash.patch +++ /dev/null @@ -1,38 +0,0 @@ -Webkit: print an error message before crashing - -From: Christian Prochaska - - ---- - .../webkit/Source/JavaScriptCore/wtf/Assertions.h | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Assertions.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Assertions.h -index 862158b..77adac3 100644 ---- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Assertions.h -+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Assertions.h -@@ -50,6 +50,10 @@ - #include - #endif - -+#if OS(GENODE) -+#include -+#endif -+ - #if OS(SYMBIAN) - #include - #include -@@ -179,6 +183,13 @@ WTF_EXPORT_PRIVATE void WTFLogVerbose(const char* file, int line, const char* fu - *(int *)(uintptr_t)0xbbadbeef = 0; \ - ((void(*)())0)(); /* More reliable, but doesn't say BBADBEEF */ \ - } while(false) -+#elif OS(GENODE) -+#define CRASH() do { \ -+ PERR("WebKit CRASH in '%s'", WTF_PRETTY_FUNCTION); \ -+ PERR(" in %s:%d", __FILE__, __LINE__); \ -+ *(int *)(uintptr_t)0xbbadbeef = 0; \ -+ ((void(*)())0)(); /* More reliable, but doesn't say BBADBEEF */ \ -+} while(false) - #else - #define CRASH() do { \ - WTFReportBacktrace(); \ diff --git a/repos/qt4/src/lib/qt4/patches/qt4_webkit_munmap.patch b/repos/qt4/src/lib/qt4/patches/qt4_webkit_munmap.patch deleted file mode 100644 index e3e82996d..000000000 --- a/repos/qt4/src/lib/qt4/patches/qt4_webkit_munmap.patch +++ /dev/null @@ -1,34 +0,0 @@ -Webkit: don't crash because of unimplemented partial unmap - -From: Christian Prochaska - - ---- - .../Source/JavaScriptCore/wtf/OSAllocatorPosix.cpp | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/OSAllocatorPosix.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/OSAllocatorPosix.cpp -index 5ba5410..e17316f 100644 ---- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/OSAllocatorPosix.cpp -+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/OSAllocatorPosix.cpp -@@ -150,9 +150,20 @@ void OSAllocator::decommit(void* address, size_t bytes) - - void OSAllocator::releaseDecommitted(void* address, size_t bytes) - { -+#if OS(GENODE) -+ /* -+ * 'releaseDecommitted()' sometimes gets called with a start address -+ * different than the one returned by 'mmap()' to release only a part of the -+ * allocated memory. This feature is currently not supported by Genode's -+ * 'munmap()' implementation, so we don't crash on purpose if the result of -+ * 'munmap()' is -1. -+ */ -+ munmap(address, bytes); -+#else - int result = munmap(address, bytes); - if (result == -1) - CRASH(); -+#endif - } - - } // namespace WTF diff --git a/repos/qt4/src/lib/qt4/patches/qt4_webkit_websockets.patch b/repos/qt4/src/lib/qt4/patches/qt4_webkit_websockets.patch deleted file mode 100644 index 3c48c5f1b..000000000 --- a/repos/qt4/src/lib/qt4/patches/qt4_webkit_websockets.patch +++ /dev/null @@ -1,22 +0,0 @@ -Webkit: disable websockets - -From: Christian Prochaska - - ---- - src/3rdparty/webkit/Source/WebCore/features.pri | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/3rdparty/webkit/Source/WebCore/features.pri b/src/3rdparty/webkit/Source/WebCore/features.pri -index f04d0b4..67f3b33 100644 ---- a/src/3rdparty/webkit/Source/WebCore/features.pri -+++ b/src/3rdparty/webkit/Source/WebCore/features.pri -@@ -106,7 +106,7 @@ contains(DEFINES, ENABLE_SINGLE_THREADED=1) { - } - - # Web Socket support. --!contains(DEFINES, ENABLE_WEB_SOCKETS=.): DEFINES += ENABLE_WEB_SOCKETS=1 -+#!contains(DEFINES, ENABLE_WEB_SOCKETS=.): DEFINES += ENABLE_WEB_SOCKETS=1 - - # Web Timing support. - !contains(DEFINES, ENABLE_WEB_TIMING=.): DEFINES += ENABLE_WEB_TIMING=1 diff --git a/repos/qt4/src/lib/qt4/patches/qt_update.patch b/repos/qt4/src/lib/qt4/patches/qt_update.patch deleted file mode 100644 index 9b17f6bbf..000000000 --- a/repos/qt4/src/lib/qt4/patches/qt_update.patch +++ /dev/null @@ -1,103 +0,0 @@ -qt_update.patch - -From: Christian Prochaska - - ---- - configure | 12 ++++++------ - mkspecs/genode-g++/qmake.conf | 1 + - mkspecs/genode-g++/qplatformdefs.h | 1 + - mkspecs/qws/genode-generic-g++/qmake.conf | 1 + - mkspecs/qws/genode-generic-g++/qplatformdefs.h | 1 + - src/corelib/global/qconfig-genode.h | 1 + - 6 files changed, 11 insertions(+), 6 deletions(-) - create mode 120000 mkspecs/genode-g++/qmake.conf - create mode 120000 mkspecs/genode-g++/qplatformdefs.h - create mode 120000 mkspecs/qws/genode-generic-g++/qmake.conf - create mode 120000 mkspecs/qws/genode-generic-g++/qplatformdefs.h - create mode 120000 src/corelib/global/qconfig-genode.h - -diff --git a/configure b/configure -index e3d464b..259a128 100755 ---- a/configure -+++ b/configure -@@ -793,14 +793,14 @@ CFG_WEBKIT=auto # (yes|no|auto|debug) - CFG_JAVASCRIPTCORE_JIT=auto - CFG_STACK_PROTECTOR_STRONG=auto - --CFG_GFX_AVAILABLE="linuxfb transformed qvfb vnc multiscreen directfb" -+CFG_GFX_AVAILABLE="linuxfb transformed qvfb vnc multiscreen directfb nitpicker" - CFG_GFX_ON="linuxfb multiscreen" - CFG_GFX_PLUGIN_AVAILABLE= - CFG_GFX_PLUGIN= - CFG_GFX_OFF= --CFG_KBD_AVAILABLE="tty linuxinput qvfb" -+CFG_KBD_AVAILABLE="tty linuxinput qvfb nitpicker" - CFG_KBD_ON="tty" #default, see QMakeVar above --CFG_MOUSE_AVAILABLE="pc linuxtp linuxinput tslib qvfb" -+CFG_MOUSE_AVAILABLE="pc linuxtp linuxinput tslib qvfb nitpicker" - CFG_MOUSE_ON="pc linuxtp" #default, see QMakeVar above - - if [ -f "$relpath/src/gui/embedded/qscreenqnx_qws.cpp" ]; then -@@ -856,7 +856,7 @@ CFG_SSE4_1=auto - CFG_SSE4_2=auto - CFG_AVX=auto - CFG_REDUCE_RELOCATIONS=no --CFG_IPV6=auto -+CFG_IPV6=no - CFG_NAS=no - CFG_QWS_DEPTHS=all - CFG_USER_BUILD_KEY= -@@ -869,10 +869,10 @@ CFG_ARMFPA=auto - CFG_IWMMXT=no - CFG_NEON=auto - CFG_CLOCK_GETTIME=auto --CFG_CLOCK_MONOTONIC=auto -+CFG_CLOCK_MONOTONIC=no - CFG_MREMAP=auto - CFG_GETADDRINFO=auto --CFG_IPV6IFNAME=auto -+CFG_IPV6IFNAME=no - CFG_GETIFADDRS=auto - CFG_INOTIFY=auto - CFG_RPATH=yes -diff --git a/mkspecs/genode-g++/qmake.conf b/mkspecs/genode-g++/qmake.conf -new file mode 120000 -index 0000000..a771e53 ---- /dev/null -+++ b/mkspecs/genode-g++/qmake.conf -@@ -0,0 +1 @@ -+/home/christian/projects/genode/genode/qt4/src/lib/qt4/mkspecs/genode-g++/qmake.conf -\ No newline at end of file -diff --git a/mkspecs/genode-g++/qplatformdefs.h b/mkspecs/genode-g++/qplatformdefs.h -new file mode 120000 -index 0000000..16442bd ---- /dev/null -+++ b/mkspecs/genode-g++/qplatformdefs.h -@@ -0,0 +1 @@ -+/home/christian/projects/genode/genode/qt4/src/lib/qt4/mkspecs/genode-g++/qplatformdefs.h -\ No newline at end of file -diff --git a/mkspecs/qws/genode-generic-g++/qmake.conf b/mkspecs/qws/genode-generic-g++/qmake.conf -new file mode 120000 -index 0000000..1e8bd9b ---- /dev/null -+++ b/mkspecs/qws/genode-generic-g++/qmake.conf -@@ -0,0 +1 @@ -+/home/christian/projects/genode/genode/qt4/src/lib/qt4/mkspecs/qws/genode-generic-g++/qmake.conf -\ No newline at end of file -diff --git a/mkspecs/qws/genode-generic-g++/qplatformdefs.h b/mkspecs/qws/genode-generic-g++/qplatformdefs.h -new file mode 120000 -index 0000000..b0f6b49 ---- /dev/null -+++ b/mkspecs/qws/genode-generic-g++/qplatformdefs.h -@@ -0,0 +1 @@ -+/home/christian/projects/genode/genode/qt4/src/lib/qt4/mkspecs/qws/genode-generic-g++/qplatformdefs.h -\ No newline at end of file -diff --git a/src/corelib/global/qconfig-genode.h b/src/corelib/global/qconfig-genode.h -new file mode 120000 -index 0000000..5309d22 ---- /dev/null -+++ b/src/corelib/global/qconfig-genode.h -@@ -0,0 +1 @@ -+../../../../../include/qt4/QtCore/qconfig-genode.h -\ No newline at end of file diff --git a/repos/qt4/src/lib/qt4/patches/series b/repos/qt4/src/lib/qt4/patches/series deleted file mode 100644 index 9dbac2bf6..000000000 --- a/repos/qt4/src/lib/qt4/patches/series +++ /dev/null @@ -1,16 +0,0 @@ -qt_update.patch -previewer_example.patch -textedit_example.patch -qt4_genode.patch -qt4_connection_close.patch -qt4_lwip_connect_semantics_adaption.patch -qt4_no_exit_on_window_close.patch -qt4_no_search_for_resolv_lib.patch -qt4_nonblocking_sockets.patch -qt4_renderwidget.patch -qt4_virtual_deletelater.patch -qt4_webkit_crash.patch -qt4_webkit_munmap.patch -qt4_webkit_websockets.patch -qt4_ssl_peer_verification.patch -qt4_serialized_dns_lookup.patch diff --git a/repos/qt4/src/lib/qt4/patches/textedit_example.patch b/repos/qt4/src/lib/qt4/patches/textedit_example.patch deleted file mode 100644 index 5f9e47dc2..000000000 --- a/repos/qt4/src/lib/qt4/patches/textedit_example.patch +++ /dev/null @@ -1,102 +0,0 @@ -textedit_example.patch - -From: Christian Prochaska - - ---- - demos/textedit/main.cpp | 23 ++++++++++++++++++++++- - demos/textedit/textedit.cpp | 8 ++++---- - demos/textedit/textedit.pro | 5 ----- - 3 files changed, 26 insertions(+), 10 deletions(-) - -diff --git a/demos/textedit/main.cpp b/demos/textedit/main.cpp -index 0fc0b57..4fe6bfc 100644 ---- a/demos/textedit/main.cpp -+++ b/demos/textedit/main.cpp -@@ -39,16 +39,37 @@ - ** - ****************************************************************************/ - -+/* Genode includes */ -+#include -+ -+/* Qt4 includes */ - #include "textedit.h" - #include - -+/* disable "not implemented yet" messages */ -+extern "C" void _sigprocmask() { } -+extern "C" void sigprocmask() { } -+ - int main( int argc, char ** argv ) - { - Q_INIT_RESOURCE(textedit); - -+ unsigned int x = 300; -+ unsigned int y = 0; -+ unsigned int w = 700; -+ unsigned int h = 700; -+ -+ try { Genode::config()->xml_node().attribute("xpos").value(&x); } catch (...) { } -+ try { Genode::config()->xml_node().attribute("ypos").value(&y); } catch (...) { } -+ try { Genode::config()->xml_node().attribute("width").value(&w); } catch (...) { } -+ try { Genode::config()->xml_node().attribute("height").value(&h); } catch (...) { } -+ - QApplication a( argc, argv ); - TextEdit mw; -- mw.resize( 700, 800 ); -+ -+ mw.move(x, y); -+ mw.resize(w, h); -+ - mw.show(); - 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 @@ void TextEdit::fileNew() - void TextEdit::fileOpen() - { - QString fn = QFileDialog::getOpenFileName(this, tr("Open File..."), -- QString(), tr("HTML-Files (*.htm *.html);;All Files (*)")); -+ QString("/"), tr("HTML-Files (*.htm *.html);;All Files (*)")); - if (!fn.isEmpty()) - load(fn); - } -@@ -483,11 +483,11 @@ bool TextEdit::fileSave() - bool TextEdit::fileSaveAs() - { - QString fn = QFileDialog::getSaveFileName(this, tr("Save as..."), -- QString(), tr("ODF files (*.odt);;HTML-Files (*.htm *.html);;All Files (*)")); -+ QString("/"), tr("HTML-Files (*.htm *.html);;All Files (*)")); - if (fn.isEmpty()) - return false; -- if (! (fn.endsWith(".odt", Qt::CaseInsensitive) || fn.endsWith(".htm", Qt::CaseInsensitive) || fn.endsWith(".html", Qt::CaseInsensitive)) ) -- fn += ".odt"; // default -+ if (! (fn.endsWith(".htm", Qt::CaseInsensitive) || fn.endsWith(".html", Qt::CaseInsensitive)) ) -+ fn += ".html"; // default - setCurrentFileName(fn); - 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 @@ SOURCES = textedit.cpp \ - main.cpp - - RESOURCES += textedit.qrc --build_all:!build_pass { -- CONFIG -= build_all -- CONFIG += release --} - - # install - target.path = $$[QT_INSTALL_DEMOS]/textedit -@@ -19,4 +15,3 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.doc images - sources.path = $$[QT_INSTALL_DEMOS]/textedit - INSTALLS += target sources - --symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) diff --git a/repos/qt4/src/lib/qt4/src/corelib/global/qconfig.cpp b/repos/qt4/src/lib/qt4/src/corelib/global/qconfig.cpp deleted file mode 100644 index d230be552..000000000 --- a/repos/qt4/src/lib/qt4/src/corelib/global/qconfig.cpp +++ /dev/null @@ -1,32 +0,0 @@ -/* License Info */ -static const char qt_configure_licensee_str [256 + 12] = "qt_lcnsuser=Open Source\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; -static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=OpenSource\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; - -/* Installation date */ -static const char qt_configure_installation [12+11] = "qt_instdate=2010-05-19"; -/* Installation Info */ -static const char qt_configure_prefix_path_str [256 + 12] = "qt_prfxpath=/usr/local/Trolltech/QtEmbedded-4.6.2-i386\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; -static const char qt_configure_documentation_path_str[256 + 12] = "qt_docspath=/usr/local/Trolltech/QtEmbedded-4.6.2-i386/doc\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; -static const char qt_configure_headers_path_str [256 + 12] = "qt_hdrspath=/usr/local/Trolltech/QtEmbedded-4.6.2-i386/include\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; -static const char qt_configure_libraries_path_str [256 + 12] = "qt_libspath=/usr/local/Trolltech/QtEmbedded-4.6.2-i386/lib\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; -static const char qt_configure_binaries_path_str [256 + 12] = "qt_binspath=/usr/local/Trolltech/QtEmbedded-4.6.2-i386/bin\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; -static const char qt_configure_plugins_path_str [256 + 12] = "qt_plugpath=/usr/local/Trolltech/QtEmbedded-4.6.2-i386/plugins\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; -static const char qt_configure_data_path_str [256 + 12] = "qt_datapath=/usr/local/Trolltech/QtEmbedded-4.6.2-i386\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; -static const char qt_configure_translations_path_str [256 + 12] = "qt_trnspath=/usr/local/Trolltech/QtEmbedded-4.6.2-i386/translations\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; -static const char qt_configure_settings_path_str [256 + 12] = "qt_stngpath=/etc/xdg\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; -static const char qt_configure_examples_path_str [256 + 12] = "qt_xmplpath=/usr/local/Trolltech/QtEmbedded-4.6.2-i386/examples\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; -static const char qt_configure_demos_path_str [256 + 12] = "qt_demopath=/usr/local/Trolltech/QtEmbedded-4.6.2-i386/demos\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; -/* strlen( "qt_lcnsxxxx" ) == 12 */ -#define QT_CONFIGURE_LICENSEE qt_configure_licensee_str + 12; -#define QT_CONFIGURE_LICENSED_PRODUCTS qt_configure_licensed_products_str + 12; -#define QT_CONFIGURE_PREFIX_PATH qt_configure_prefix_path_str + 12; -#define QT_CONFIGURE_DOCUMENTATION_PATH qt_configure_documentation_path_str + 12; -#define QT_CONFIGURE_HEADERS_PATH qt_configure_headers_path_str + 12; -#define QT_CONFIGURE_LIBRARIES_PATH qt_configure_libraries_path_str + 12; -#define QT_CONFIGURE_BINARIES_PATH qt_configure_binaries_path_str + 12; -#define QT_CONFIGURE_PLUGINS_PATH qt_configure_plugins_path_str + 12; -#define QT_CONFIGURE_DATA_PATH qt_configure_data_path_str + 12; -#define QT_CONFIGURE_TRANSLATIONS_PATH qt_configure_translations_path_str + 12; -#define QT_CONFIGURE_SETTINGS_PATH qt_configure_settings_path_str + 12; -#define QT_CONFIGURE_EXAMPLES_PATH qt_configure_examples_path_str + 12; -#define QT_CONFIGURE_DEMOS_PATH qt_configure_demos_path_str + 12; diff --git a/repos/qt4/src/lib/qt4/src/corelib/io/qprocess_genode.cpp b/repos/qt4/src/lib/qt4/src/corelib/io/qprocess_genode.cpp deleted file mode 100644 index c35a97800..000000000 --- a/repos/qt4/src/lib/qt4/src/corelib/io/qprocess_genode.cpp +++ /dev/null @@ -1,275 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -//#define QPROCESS_DEBUG -#include "qdebug.h" - -#ifndef QT_NO_PROCESS - -#include "qplatformdefs.h" - -#include "qprocess.h" -#include "qprocess_p.h" - -#ifdef Q_OS_MAC -#include -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -QT_BEGIN_NAMESPACE - -#ifdef Q_OS_INTEGRITY -static inline char *strdup(const char *data) -{ - return qstrdup(data); -} -#endif - -struct QProcessInfo { - QProcess *process; - int deathPipe; - int exitResult; - pid_t pid; - int serialNumber; -}; - - -void QProcessPrivate::destroyPipe(int *pipe) -{ -#if defined QPROCESS_DEBUG -qDebug() << "destroyPipe()"; -#endif -} - -#ifdef Q_OS_MAC -Q_GLOBAL_STATIC(QMutex, cfbundleMutex); -#endif - -void QProcessPrivate::startProcess() -{ - Q_Q(QProcess); - -#if defined (QPROCESS_DEBUG) - qDebug("QProcessPrivate::startProcess()"); -#endif - - // Start the process (platform dependent) - q->setProcessState(QProcess::Starting); - - - launchpad_child = launchpad()->start_child(program.toAscii().constData(), - ram_quota_hash()->value(program), - Genode::Dataspace_capability()); - if (launchpad_child) { - _q_startupNotification(); - } -} - - -bool QProcessPrivate::processStarted() -{ -#if defined QPROCESS_DEBUG -qDebug() << "QProcessPrivate::processStarted()"; -#endif -return false; -} - -qint64 QProcessPrivate::bytesAvailableFromStdout() const -{ -#if defined QPROCESS_DEBUG -qDebug() << "QProcessPrivate::bytesAvailableFromStdout()"; -#endif -return 0; -} - -qint64 QProcessPrivate::bytesAvailableFromStderr() const -{ -#if defined QPROCESS_DEBUG -qDebug() << "QProcessPrivate::bytesAvailableFromStderr()"; -#endif -return 0; -} - -qint64 QProcessPrivate::readFromStdout(char *data, qint64 maxlen) -{ -#if defined QPROCESS_DEBUG -qDebug() << "QProcessPrivate::readFromStdout()"; -#endif -return 0; -} - -qint64 QProcessPrivate::readFromStderr(char *data, qint64 maxlen) -{ -#if defined QPROCESS_DEBUG -qDebug() << "QProcessPrivate::readFromStderr()"; -#endif -return 0; -} - - -qint64 QProcessPrivate::writeToStdin(const char *data, qint64 maxlen) -{ -#if defined QPROCESS_DEBUG -qDebug() << "writeToStdin()"; -#endif -return 0; -} - -void QProcessPrivate::terminateProcess() -{ -#if defined (QPROCESS_DEBUG) - qDebug("QProcessPrivate::terminateProcess()"); -#endif -} - -void QProcessPrivate::killProcess() -{ -#if defined (QPROCESS_DEBUG) - qDebug("QProcessPrivate::killProcess()"); -#endif - - if (launchpad_child) { - launchpad()->exit_child(launchpad_child); - } -} - -bool QProcessPrivate::waitForStarted(int msecs) -{ - Q_Q(QProcess); - -#if defined (QPROCESS_DEBUG) - qDebug("QProcessPrivate::waitForStarted(%d) waiting for child to start (fd = %d)", msecs, - childStartedPipe[0]); -#endif - -return false; -} - -bool QProcessPrivate::waitForReadyRead(int msecs) -{ - Q_Q(QProcess); -#if defined (QPROCESS_DEBUG) - qDebug("QProcessPrivate::waitForReadyRead(%d)", msecs); -#endif - -return false; -} - -bool QProcessPrivate::waitForBytesWritten(int msecs) -{ - Q_Q(QProcess); -#if defined (QPROCESS_DEBUG) - qDebug("QProcessPrivate::waitForBytesWritten(%d)", msecs); -#endif - -return false; -} - -bool QProcessPrivate::waitForFinished(int msecs) -{ - Q_Q(QProcess); -#if defined (QPROCESS_DEBUG) - qDebug("QProcessPrivate::waitForFinished(%d)", msecs); -#endif - -return false; -} - -void QProcessPrivate::findExitCode() -{ -#ifdef QPROCESS_DEBUG -qDebug() << "QProcessPrivate::findExitCode()"; -#endif -} - -bool QProcessPrivate::waitForDeadChild() -{ -#ifdef QPROCESS_DEBUG -qDebug() << QProcessPrivate::waitForDeadChild(); -#endif - -return false; -} - -void QProcessPrivate::_q_notified() -{ -#ifdef QPROCESS_DEBUG -qDebug() << "QProcessPrivate::_q_notified()"; -#endif -} - - -/*! \internal - */ -bool QProcessPrivate::startDetached(const QString &program, const QStringList &arguments, const QString &workingDirectory, qint64 *pid) -{ -#ifdef QPROCESS_DEBUG -qDebug() << "QProcessPrivate::startDetached()"; -#endif - -return false; -} - -void QProcessPrivate::initializeProcessManager() -{ -#ifdef QPROCESS_DEBUG -qDebug() << "QProcessPrivate::initializeProcessManager()"; -#endif -} - -QT_END_NAMESPACE - -#endif // QT_NO_PROCESS diff --git a/repos/qt4/src/lib/qt4/src/corelib/kernel/qeventdispatcher_genode.cpp b/repos/qt4/src/lib/qt4/src/corelib/kernel/qeventdispatcher_genode.cpp deleted file mode 100644 index a211a2456..000000000 --- a/repos/qt4/src/lib/qt4/src/corelib/kernel/qeventdispatcher_genode.cpp +++ /dev/null @@ -1,990 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qplatformdefs.h" - -#include "qcoreapplication.h" -#include "qpair.h" -#include "qsocketnotifier.h" -#include "qthread.h" - -#include "qeventdispatcher_genode_p.h" -#include -#include -#include - -#include -#include -#include - -// VxWorks doesn't correctly set the _POSIX_... options -#if defined(Q_OS_VXWORKS) -# if defined(_POSIX_MONOTONIC_CLOCK) && (_POSIX_MONOTONIC_CLOCK <= 0) -# undef _POSIX_MONOTONIC_CLOCK -# define _POSIX_MONOTONIC_CLOCK 1 -# endif -# include -# include -#endif - -#if (_POSIX_MONOTONIC_CLOCK-0 <= 0) || defined(QT_BOOTSTRAPPED) -# include -#endif - -#include -#define perror PERR - -QT_BEGIN_NAMESPACE - -Q_CORE_EXPORT bool qt_disable_lowpriority_timers=false; - -#ifndef Q_OS_GENODE -/***************************************************************************** - UNIX signal handling - *****************************************************************************/ - -static sig_atomic_t signal_received; -static sig_atomic_t signals_fired[NSIG]; - -static void signalHandler(int sig) -{ - signals_fired[sig] = 1; - signal_received = 1; -} -#endif - -#if defined(Q_OS_INTEGRITY) || defined(Q_OS_VXWORKS) -static void initThreadPipeFD(int fd) -{ - int ret = fcntl(fd, F_SETFD, FD_CLOEXEC); - if (ret == -1) - perror("QEventDispatcherGenodePrivate: Unable to init thread pipe"); - - int flags = fcntl(fd, F_GETFL); - if (flags == -1) - perror("QEventDispatcherGenodePrivate: Unable to get flags on thread pipe"); - - ret = fcntl(fd, F_SETFL, flags | O_NONBLOCK); - if (ret == -1) - perror("QEventDispatcherGenodePrivate: Unable to set flags on thread pipe"); -} -#endif - -extern "C" in_addr_t inet_addr(const char *cp); - -QEventDispatcherGenodePrivate::QEventDispatcherGenodePrivate() -{ - extern Qt::HANDLE qt_application_thread_id; - mainThread = (QThread::currentThreadId() == qt_application_thread_id); - bool pipefail = false; - - // initialize the common parts of the event loop -#if defined(Q_OS_INTEGRITY) - // INTEGRITY doesn't like a "select" on pipes, so use socketpair instead - if (socketpair(AF_INET, SOCK_STREAM, PF_INET, thread_pipe) == -1) { - perror("QEventDispatcherUNIXPrivate(): Unable to create socket pair"); - pipefail = true; - } else { - initThreadPipeFD(thread_pipe[0]); - initThreadPipeFD(thread_pipe[1]); - } -#elif defined(Q_OS_VXWORKS) - char name[20]; - qsnprintf(name, sizeof(name), "/pipe/qt_%08x", int(taskIdCurrent)); - - // make sure there is no pipe with this name - pipeDevDelete(name, true); - // create the pipe - if (pipeDevCreate(name, 128 /*maxMsg*/, 1 /*maxLength*/) != OK) { - perror("QEventDispatcherUNIXPrivate(): Unable to create thread pipe device"); - pipefail = true; - } else { - if ((thread_pipe[0] = open(name, O_RDWR, 0)) < 0) { - perror("QEventDispatcherUNIXPrivate(): Unable to create thread pipe"); - pipefail = true; - } else { - initThreadPipeFD(thread_pipe[0]); - thread_pipe[1] = thread_pipe[0]; - } - } -#else - if (qt_safe_pipe(thread_pipe, O_NONBLOCK) == -1) { - perror("QEventDispatcherUNIXPrivate(): Unable to create thread pipe"); - pipefail = true; - } -#endif - - if (pipefail) - qFatal("QEventDispatcherUNIXPrivate(): Can not continue without a thread pipe"); - - sn_highest = -1; - - interrupt = false; -} - -QEventDispatcherGenodePrivate::~QEventDispatcherGenodePrivate() -{ -#if defined(Q_OS_VXWORKS) - close(thread_pipe[0]); - - char name[20]; - qsnprintf(name, sizeof(name), "/pipe/qt_%08x", int(taskIdCurrent)); - - pipeDevDelete(name, true); -#else - // cleanup the common parts of the event loop - close(thread_pipe[0]); - close(thread_pipe[1]); -#endif - - // cleanup timers - qDeleteAll(timerList); -} - -int QEventDispatcherGenodePrivate::doSelect(QEventLoop::ProcessEventsFlags flags, timeval *timeout) -{ - Q_Q(QEventDispatcherGenode); - - // needed in QEventDispatcherGenode::select() - timerList.updateCurrentTime(); - - int nsel; - - do { -#ifndef Q_OS_GENODE - if (mainThread) { - while (signal_received) { - signal_received = 0; - for (int i = 0; i < NSIG; ++i) { - if (signals_fired[i]) { - signals_fired[i] = 0; - emit QCoreApplication::instance()->unixSignal(i); - } - } - } - } -#endif - // Process timers and socket notifiers - the common UNIX stuff - int highest = 0; - if (! (flags & QEventLoop::ExcludeSocketNotifiers) && (sn_highest >= 0)) { - // return the highest fd we can wait for input on - sn_vec[0].select_fds = sn_vec[0].enabled_fds; - sn_vec[1].select_fds = sn_vec[1].enabled_fds; - sn_vec[2].select_fds = sn_vec[2].enabled_fds; - highest = sn_highest; - } else { - FD_ZERO(&sn_vec[0].select_fds); - FD_ZERO(&sn_vec[1].select_fds); - FD_ZERO(&sn_vec[2].select_fds); - } - - FD_SET(thread_pipe[0], &sn_vec[0].select_fds); - highest = qMax(highest, thread_pipe[0]); - - nsel = q->select(highest + 1, - &sn_vec[0].select_fds, - &sn_vec[1].select_fds, - &sn_vec[2].select_fds, - timeout); - } while (nsel == -1 && (errno == EINTR || errno == EAGAIN)); - - if (nsel == -1) { - if (errno == EBADF) { - // it seems a socket notifier has a bad fd... find out - // which one it is and disable it - fd_set fdset; - timeval tm; - tm.tv_sec = tm.tv_usec = 0l; - - for (int type = 0; type < 3; ++type) { - QSockNotType::List &list = sn_vec[type].list; - if (list.size() == 0) - continue; - - for (int i = 0; i < list.size(); ++i) { - QSockNot *sn = list[i]; - - FD_ZERO(&fdset); - FD_SET(sn->fd, &fdset); - - int ret = -1; - do { - switch (type) { - case 0: // read - ret = select(sn->fd + 1, &fdset, 0, 0, &tm); - break; - case 1: // write - ret = select(sn->fd + 1, 0, &fdset, 0, &tm); - break; - case 2: // except - ret = select(sn->fd + 1, 0, 0, &fdset, &tm); - break; - } - } while (ret == -1 && (errno == EINTR || errno == EAGAIN)); - - if (ret == -1 && errno == EBADF) { - // disable the invalid socket notifier - static const char *t[] = { "Read", "Write", "Exception" }; - qWarning("QSocketNotifier: Invalid socket %d and type '%s', disabling...", - sn->fd, t[type]); - sn->obj->setEnabled(false); - } - } - } - } else { - // EINVAL... shouldn't happen, so let's complain to stderr - // and hope someone sends us a bug report - perror("select"); - } - } - - // some other thread woke us up... consume the data on the thread pipe so that - // select doesn't immediately return next time - int nevents = 0; - if (nsel > 0 && FD_ISSET(thread_pipe[0], &sn_vec[0].select_fds)) { -#if defined(Q_OS_VXWORKS) - char c[16]; - ::read(thread_pipe[0], c, sizeof(c)); - ::ioctl(thread_pipe[0], FIOFLUSH, 0); -#elif defined(Q_OS_GENODE) - char c[16]; - /*while (*/::read(thread_pipe[0], c, sizeof(c))/* > 0)*/ // FIXME: the while loop only works in non-blocking mode - ; -#else - char c[16]; - while (::read(thread_pipe[0], c, sizeof(c)) > 0) - ; -#endif - if (!wakeUps.testAndSetRelease(1, 0)) { - // hopefully, this is dead code - qWarning("QEventDispatcherGenode: internal error, wakeUps.testAndSetRelease(1, 0) failed!"); - } - ++nevents; - } - - // activate socket notifiers - if (! (flags & QEventLoop::ExcludeSocketNotifiers) && nsel > 0 && sn_highest >= 0) { - // if select says data is ready on any socket, then set the socket notifier - // to pending - for (int i=0; i<3; i++) { - QSockNotType::List &list = sn_vec[i].list; - for (int j = 0; j < list.size(); ++j) { - QSockNot *sn = list[j]; - if (FD_ISSET(sn->fd, &sn_vec[i].select_fds)) - q->setSocketNotifierPending(sn->obj); - } - } - } - return (nevents + q->activateSocketNotifiers()); -} - -/* - * Internal functions for manipulating timer data structures. The - * timerBitVec array is used for keeping track of timer identifiers. - */ - -QTimerInfoList::QTimerInfoList() -{ - currentTime = qt_gettime(); - -#if (_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC) - if (!qt_gettime_is_monotonic()) { - // not using monotonic timers, initialize the timeChanged() machinery - previousTime = currentTime; - - tms unused; - previousTicks = times(&unused); - - ticksPerSecond = sysconf(_SC_CLK_TCK); - msPerTick = 1000/ticksPerSecond; - } else { - // detected monotonic timers - previousTime.tv_sec = previousTime.tv_usec = 0; - previousTicks = 0; - ticksPerSecond = 0; - msPerTick = 0; - } -#endif - - firstTimerInfo = currentTimerInfo = 0; -} - -timeval QTimerInfoList::updateCurrentTime() -{ - return (currentTime = qt_gettime()); -} - -#if ((_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC)) || defined(QT_BOOTSTRAPPED) - -template <> -timeval qAbs(const timeval &t) -{ - timeval tmp = t; - if (tmp.tv_sec < 0) { - tmp.tv_sec = -tmp.tv_sec - 1; - tmp.tv_usec -= 1000000; - } - if (tmp.tv_sec == 0 && tmp.tv_usec < 0) { - tmp.tv_usec = -tmp.tv_usec; - } - return normalizedTimeval(tmp); -} - -/* - Returns true if the real time clock has changed by more than 10% - relative to the processor time since the last time this function was - called. This presumably means that the system time has been changed. - - If /a delta is nonzero, delta is set to our best guess at how much the system clock was changed. -*/ -bool QTimerInfoList::timeChanged(timeval *delta) -{ - struct tms unused; - clock_t currentTicks = times(&unused); - - clock_t elapsedTicks = currentTicks - previousTicks; - timeval elapsedTime = currentTime - previousTime; - - timeval elapsedTimeTicks; - elapsedTimeTicks.tv_sec = elapsedTicks / ticksPerSecond; - elapsedTimeTicks.tv_usec = (((elapsedTicks * 1000) / ticksPerSecond) % 1000) * 1000; - - timeval dummy; - if (!delta) - delta = &dummy; - *delta = elapsedTime - elapsedTimeTicks; - - previousTicks = currentTicks; - previousTime = currentTime; - - // If tick drift is more than 10% off compared to realtime, we assume that the clock has - // been set. Of course, we have to allow for the tick granularity as well. - timeval tickGranularity; - tickGranularity.tv_sec = 0; - tickGranularity.tv_usec = msPerTick * 1000; - return elapsedTimeTicks < ((qAbs(*delta) - tickGranularity) * 10); -} - -void QTimerInfoList::repairTimersIfNeeded() -{ - if (qt_gettime_is_monotonic()) - return; - timeval delta; - if (timeChanged(&delta)) - timerRepair(delta); -} - -#else // !(_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(QT_BOOTSTRAPPED) - -void QTimerInfoList::repairTimersIfNeeded() -{ -} - -#endif - -/* - insert timer info into list -*/ -void QTimerInfoList::timerInsert(QTimerInfo *ti) -{ - int index = size(); - while (index--) { - register const QTimerInfo * const t = at(index); - if (!(ti->timeout < t->timeout)) - break; - } - insert(index+1, ti); -} - -/* - repair broken timer -*/ -void QTimerInfoList::timerRepair(const timeval &diff) -{ - // repair all timers - for (int i = 0; i < size(); ++i) { - register QTimerInfo *t = at(i); - t->timeout = t->timeout + diff; - } -} - -/* - Returns the time to wait for the next timer, or null if no timers - are waiting. -*/ -bool QTimerInfoList::timerWait(timeval &tm) -{ - timeval currentTime = updateCurrentTime(); - repairTimersIfNeeded(); - - // Find first waiting timer not already active - QTimerInfo *t = 0; - for (QTimerInfoList::const_iterator it = constBegin(); it != constEnd(); ++it) { - if (!(*it)->inTimerEvent) { - t = *it; - break; - } - } - - if (!t) - return false; - - if (currentTime < t->timeout) { - // time to wait - tm = t->timeout - currentTime; - } else { - // no time to wait - tm.tv_sec = 0; - tm.tv_usec = 0; - } - - return true; -} - -void QTimerInfoList::registerTimer(int timerId, int interval, QObject *object) -{ - QTimerInfo *t = new QTimerInfo; - t->id = timerId; - t->interval.tv_sec = interval / 1000; - t->interval.tv_usec = (interval % 1000) * 1000; - t->timeout = updateCurrentTime() + t->interval; - t->obj = object; - t->inTimerEvent = false; - - timerInsert(t); -} - -bool QTimerInfoList::unregisterTimer(int timerId) -{ - // set timer inactive - for (int i = 0; i < count(); ++i) { - register QTimerInfo *t = at(i); - if (t->id == timerId) { - // found it - removeAt(i); - if (t == firstTimerInfo) - firstTimerInfo = 0; - if (t == currentTimerInfo) - currentTimerInfo = 0; - - // release the timer id - if (!QObjectPrivate::get(t->obj)->inThreadChangeEvent) - QAbstractEventDispatcherPrivate::releaseTimerId(timerId); - - delete t; - return true; - } - } - // id not found - return false; -} - -bool QTimerInfoList::unregisterTimers(QObject *object) -{ - if (isEmpty()) - return false; - for (int i = 0; i < count(); ++i) { - register QTimerInfo *t = at(i); - if (t->obj == object) { - // object found - removeAt(i); - if (t == firstTimerInfo) - firstTimerInfo = 0; - if (t == currentTimerInfo) - currentTimerInfo = 0; - - // release the timer id - if (!QObjectPrivate::get(t->obj)->inThreadChangeEvent) - QAbstractEventDispatcherPrivate::releaseTimerId(t->id); - - delete t; - // move back one so that we don't skip the new current item - --i; - } - } - return true; -} - -QList > QTimerInfoList::registeredTimers(QObject *object) const -{ - QList > list; - for (int i = 0; i < count(); ++i) { - register const QTimerInfo * const t = at(i); - if (t->obj == object) - list << QPair(t->id, t->interval.tv_sec * 1000 + t->interval.tv_usec / 1000); - } - return list; -} - -/* - Activate pending timers, returning how many where activated. -*/ -int QTimerInfoList::activateTimers() -{ - if (qt_disable_lowpriority_timers || isEmpty()) - return 0; // nothing to do - - bool firstTime = true; - timeval currentTime; - int n_act = 0, maxCount = count(); - - QTimerInfo *saveFirstTimerInfo = firstTimerInfo; - QTimerInfo *saveCurrentTimerInfo = currentTimerInfo; - firstTimerInfo = currentTimerInfo = 0; - - while (maxCount--) { - currentTime = updateCurrentTime(); - if (firstTime) { - repairTimersIfNeeded(); - firstTime = false; - } - - if (isEmpty()) - break; - - currentTimerInfo = first(); - if (currentTime < currentTimerInfo->timeout) - break; // no timer has expired - - if (!firstTimerInfo) { - firstTimerInfo = currentTimerInfo; - } else if (firstTimerInfo == currentTimerInfo) { - // avoid sending the same timer multiple times - break; - } else if (currentTimerInfo->interval < firstTimerInfo->interval - || currentTimerInfo->interval == firstTimerInfo->interval) { - firstTimerInfo = currentTimerInfo; - } - - // remove from list - removeFirst(); - - // determine next timeout time - currentTimerInfo->timeout += currentTimerInfo->interval; - if (currentTimerInfo->timeout < currentTime) - currentTimerInfo->timeout = currentTime + currentTimerInfo->interval; - - // reinsert timer - timerInsert(currentTimerInfo); - if (currentTimerInfo->interval.tv_usec > 0 || currentTimerInfo->interval.tv_sec > 0) - n_act++; - - if (!currentTimerInfo->inTimerEvent) { - // send event, but don't allow it to recurse - currentTimerInfo->inTimerEvent = true; - - QTimerEvent e(currentTimerInfo->id); - QCoreApplication::sendEvent(currentTimerInfo->obj, &e); - - if (currentTimerInfo) - currentTimerInfo->inTimerEvent = false; - } - } - - firstTimerInfo = saveFirstTimerInfo; - currentTimerInfo = saveCurrentTimerInfo; - - return n_act; -} - -QEventDispatcherGenode::QEventDispatcherGenode(QObject *parent) - : QAbstractEventDispatcher(*new QEventDispatcherGenodePrivate, parent) -{ } - -QEventDispatcherGenode::QEventDispatcherGenode(QEventDispatcherGenodePrivate &dd, QObject *parent) - : QAbstractEventDispatcher(dd, parent) -{ } - -QEventDispatcherGenode::~QEventDispatcherGenode() -{ - Q_D(QEventDispatcherGenode); - d->threadData->eventDispatcher = 0; -} - -int QEventDispatcherGenode::select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, - timeval *timeout) -{ - /* if < 50ms round up to the 50ms minimum granularity supported by - * the timed semaphore */ - if (timeout && (timeout->tv_sec == 0) && (timeout->tv_usec > 0) && (timeout->tv_usec < 10000)) - timeout->tv_usec = 10000; - - return qt_safe_select(nfds, readfds, writefds, exceptfds, timeout); -} - -/*! - \internal -*/ -void QEventDispatcherGenode::registerTimer(int timerId, int interval, QObject *obj) -{ -#ifndef QT_NO_DEBUG - if (timerId < 1 || interval < 0 || !obj) { - qWarning("QEventDispatcherGenode::registerTimer: invalid arguments"); - return; - } else if (obj->thread() != thread() || thread() != QThread::currentThread()) { - qWarning("QObject::startTimer: timers cannot be started from another thread"); - return; - } -#endif - - Q_D(QEventDispatcherGenode); - d->timerList.registerTimer(timerId, interval, obj); -} - -/*! - \internal -*/ -bool QEventDispatcherGenode::unregisterTimer(int timerId) -{ -#ifndef QT_NO_DEBUG - if (timerId < 1) { - qWarning("QEventDispatcherGenode::unregisterTimer: invalid argument"); - return false; - } else if (thread() != QThread::currentThread()) { - qWarning("QObject::killTimer: timers cannot be stopped from another thread"); - return false; - } -#endif - - Q_D(QEventDispatcherGenode); - return d->timerList.unregisterTimer(timerId); -} - -/*! - \internal -*/ -bool QEventDispatcherGenode::unregisterTimers(QObject *object) -{ -#ifndef QT_NO_DEBUG - if (!object) { - qWarning("QEventDispatcherGenode::unregisterTimers: invalid argument"); - return false; - } else if (object->thread() != thread() || thread() != QThread::currentThread()) { - qWarning("QObject::killTimers: timers cannot be stopped from another thread"); - return false; - } -#endif - - Q_D(QEventDispatcherGenode); - return d->timerList.unregisterTimers(object); -} - -QList -QEventDispatcherGenode::registeredTimers(QObject *object) const -{ - if (!object) { - qWarning("QEventDispatcherGenode:registeredTimers: invalid argument"); - return QList(); - } - - Q_D(const QEventDispatcherGenode); - return d->timerList.registeredTimers(object); -} - -/***************************************************************************** - Socket notifier type - *****************************************************************************/ -QSockNotType::QSockNotType() -{ - FD_ZERO(&select_fds); - FD_ZERO(&enabled_fds); - FD_ZERO(&pending_fds); -} - -QSockNotType::~QSockNotType() -{ - for (int i = 0; i < list.size(); ++i) - delete list[i]; -} - -/***************************************************************************** - QEventDispatcher implementations for Genode - *****************************************************************************/ - -void QEventDispatcherGenode::registerSocketNotifier(QSocketNotifier *notifier) -{ - Q_ASSERT(notifier); - int sockfd = notifier->socket(); - int type = notifier->type(); -#ifndef QT_NO_DEBUG - if (sockfd < 0 - || unsigned(sockfd) >= FD_SETSIZE) { - qWarning("QSocketNotifier: Internal error"); - return; - } else if (notifier->thread() != thread() - || thread() != QThread::currentThread()) { - qWarning("QSocketNotifier: socket notifiers cannot be enabled from another thread"); - return; - } -#endif - - Q_D(QEventDispatcherGenode); - QSockNotType::List &list = d->sn_vec[type].list; - fd_set *fds = &d->sn_vec[type].enabled_fds; - QSockNot *sn; - - sn = new QSockNot; - sn->obj = notifier; - sn->fd = sockfd; - sn->queue = &d->sn_vec[type].pending_fds; - - int i; - for (i = 0; i < list.size(); ++i) { - QSockNot *p = list[i]; - if (p->fd < sockfd) - break; - if (p->fd == sockfd) { - static const char *t[] = { "Read", "Write", "Exception" }; - qWarning("QSocketNotifier: Multiple socket notifiers for " - "same socket %d and type %s", sockfd, t[type]); - } - } - list.insert(i, sn); - - FD_SET(sockfd, fds); - d->sn_highest = qMax(d->sn_highest, sockfd); -} - -void QEventDispatcherGenode::unregisterSocketNotifier(QSocketNotifier *notifier) -{ - Q_ASSERT(notifier); - int sockfd = notifier->socket(); - int type = notifier->type(); -#ifndef QT_NO_DEBUG - if (sockfd < 0 - || unsigned(sockfd) >= FD_SETSIZE) { - qWarning("QSocketNotifier: Internal error"); - return; - } else if (notifier->thread() != thread() - || thread() != QThread::currentThread()) { - qWarning("QSocketNotifier: socket notifiers cannot be disabled from another thread"); - return; - } -#endif - - Q_D(QEventDispatcherGenode); - QSockNotType::List &list = d->sn_vec[type].list; - fd_set *fds = &d->sn_vec[type].enabled_fds; - QSockNot *sn = 0; - int i; - for (i = 0; i < list.size(); ++i) { - sn = list[i]; - if(sn->obj == notifier && sn->fd == sockfd) - break; - } - if (i == list.size()) // not found - return; - - FD_CLR(sockfd, fds); // clear fd bit - FD_CLR(sockfd, sn->queue); - d->sn_pending_list.removeAll(sn); // remove from activation list - list.removeAt(i); // remove notifier found above - delete sn; - - if (d->sn_highest == sockfd) { // find highest fd - d->sn_highest = -1; - for (int i=0; i<3; i++) { - if (!d->sn_vec[i].list.isEmpty()) - d->sn_highest = qMax(d->sn_highest, // list is fd-sorted - d->sn_vec[i].list[0]->fd); - } - } -} - -void QEventDispatcherGenode::setSocketNotifierPending(QSocketNotifier *notifier) -{ - Q_ASSERT(notifier); - int sockfd = notifier->socket(); - int type = notifier->type(); -#ifndef QT_NO_DEBUG - if (sockfd < 0 - || unsigned(sockfd) >= FD_SETSIZE) { - qWarning("QSocketNotifier: Internal error"); - return; - } - Q_ASSERT(notifier->thread() == thread() && thread() == QThread::currentThread()); -#endif - - Q_D(QEventDispatcherGenode); - QSockNotType::List &list = d->sn_vec[type].list; - QSockNot *sn = 0; - int i; - for (i = 0; i < list.size(); ++i) { - sn = list[i]; - if(sn->obj == notifier && sn->fd == sockfd) - break; - } - if (i == list.size()) // not found - return; - - // We choose a random activation order to be more fair under high load. - // If a constant order is used and a peer early in the list can - // saturate the IO, it might grab our attention completely. - // Also, if we're using a straight list, the callback routines may - // delete other entries from the list before those other entries are - // processed. - if (! FD_ISSET(sn->fd, sn->queue)) { - if (d->sn_pending_list.isEmpty()) { - d->sn_pending_list.append(sn); - } else { - d->sn_pending_list.insert((qrand() & 0xff) % - (d->sn_pending_list.size()+1), sn); - } - FD_SET(sn->fd, sn->queue); - } -} - -int QEventDispatcherGenode::activateTimers() -{ - Q_ASSERT(thread() == QThread::currentThread()); - Q_D(QEventDispatcherGenode); - return d->timerList.activateTimers(); -} - -int QEventDispatcherGenode::activateSocketNotifiers() -{ - Q_D(QEventDispatcherGenode); - if (d->sn_pending_list.isEmpty()) - return 0; - - // activate entries - int n_act = 0; - QEvent event(QEvent::SockAct); - while (!d->sn_pending_list.isEmpty()) { - QSockNot *sn = d->sn_pending_list.takeFirst(); - if (FD_ISSET(sn->fd, sn->queue)) { - FD_CLR(sn->fd, sn->queue); - QCoreApplication::sendEvent(sn->obj, &event); - ++n_act; - } - } - return n_act; -} - -bool QEventDispatcherGenode::processEvents(QEventLoop::ProcessEventsFlags flags) -{ - Q_D(QEventDispatcherGenode); - d->interrupt = false; - - // we are awake, broadcast it - emit awake(); - QCoreApplicationPrivate::sendPostedEvents(0, 0, d->threadData); - - int nevents = 0; - const bool canWait = (d->threadData->canWait - && !d->interrupt - && (flags & QEventLoop::WaitForMoreEvents)); - - if (canWait) - emit aboutToBlock(); - - if (!d->interrupt) { - // return the maximum time we can wait for an event. - timeval *tm = 0; - timeval wait_tm = { 0l, 0l }; - if (!(flags & QEventLoop::X11ExcludeTimers)) { - if (d->timerList.timerWait(wait_tm)) - tm = &wait_tm; - } - - if (!canWait) { - if (!tm) - tm = &wait_tm; - - // no time to wait - tm->tv_sec = 0l; - tm->tv_usec = 0l; - } - - nevents = d->doSelect(flags, tm); - - // activate timers - if (! (flags & QEventLoop::X11ExcludeTimers)) { - nevents += activateTimers(); - } - } - // return true if we handled events, false otherwise - return (nevents > 0); -} - -bool QEventDispatcherGenode::hasPendingEvents() -{ - extern uint qGlobalPostedEventsCount(); // from qapplication.cpp - return qGlobalPostedEventsCount(); -} - -void QEventDispatcherGenode::wakeUp() -{ - Q_D(QEventDispatcherGenode); - if (d->wakeUps.testAndSetAcquire(0, 1)) { - char c = 0; - qt_safe_write( d->thread_pipe[1], &c, 1 ); - } -} - -void QEventDispatcherGenode::interrupt() -{ - Q_D(QEventDispatcherGenode); - d->interrupt = true; - wakeUp(); -} - -void QEventDispatcherGenode::flush() -{ } - - - -#ifndef Q_OS_GENODE -void QCoreApplication::watchUnixSignal(int sig, bool watch) -{ - if (sig < NSIG) { - struct sigaction sa; - sigemptyset(&(sa.sa_mask)); - sa.sa_flags = 0; - if (watch) - sa.sa_handler = signalHandler; - else - sa.sa_handler = SIG_DFL; - sigaction(sig, &sa, 0); - } -} -#endif -QT_END_NAMESPACE diff --git a/repos/qt4/src/lib/qt4/src/corelib/thread/qmutex_genode.cpp b/repos/qt4/src/lib/qt4/src/corelib/thread/qmutex_genode.cpp deleted file mode 100644 index 508bfa021..000000000 --- a/repos/qt4/src/lib/qt4/src/corelib/thread/qmutex_genode.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qplatformdefs.h" -#include "qmutex.h" -#include "qstring.h" - -#ifndef QT_NO_THREAD - -#include "qmutex_p.h" -#include "qthread.h" - -#include -#include - -QMutexPrivate::QMutexPrivate(QMutex::RecursionMode mode) - : QMutexData(mode), maximumSpinTime(MaximumSpinTimeThreshold), averageWaitTime(0), owner(0), count(0) -{ -} - -QMutexPrivate::~QMutexPrivate() -{ -} - -bool QMutexPrivate::wait(int timeout) -{ - bool result; - - if (contenders.fetchAndAddAcquire(1) == 0) { - // lock acquired without waiting - return true; - } - - if (timeout == 0) { - result = false; /* timed out */ - } else if (timeout < 0) { - sem.down(); - result = true; /* woken up */ - } else { - try { - sem.down(timeout); - result = true; - } catch(Genode::Timeout_exception) { - result = false; - } - } - - contenders.deref(); - - return result; -} - -void QMutexPrivate::wakeUp() -{ - sem.up(); -} - -#endif // QT_NO_THREAD diff --git a/repos/qt4/src/lib/qt4/src/corelib/thread/qthread_genode.cpp b/repos/qt4/src/lib/qt4/src/corelib/thread/qthread_genode.cpp deleted file mode 100644 index 24564ea51..000000000 --- a/repos/qt4/src/lib/qt4/src/corelib/thread/qthread_genode.cpp +++ /dev/null @@ -1,455 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qthread.h" - -#include "qplatformdefs.h" - -#include -#include - -#include "qthreadstorage.h" - -#include "qthread_p.h" - -#include "qdebug.h" - -QT_BEGIN_NAMESPACE - -#ifndef QT_NO_THREAD - -#include -#include - -QHash QThreadPrivate::tls; - -QThreadData *QThreadData::current() -{ - // create an entry for the thread-specific data of the current thread - if (!QThreadPrivate::tls.contains(QThread::currentThreadId())) { - QThreadPrivate::tls.insert(QThread::currentThreadId(), - (struct QThreadPrivate::tls_struct){0, true}); - } - - QThreadData *data = QThreadPrivate::tls.value(QThread::currentThreadId()).data; - if (!data) { - void *a; - if (QInternal::activateCallbacks(QInternal::AdoptCurrentThread, &a)) { - QThread *adopted = static_cast(a); - Q_ASSERT(adopted); - data = QThreadData::get2(adopted); - - struct QThreadPrivate::tls_struct tls_elem = - QThreadPrivate::tls.value(QThread::currentThreadId()); - tls_elem.data = data; - QThreadPrivate::tls.insert(QThread::currentThreadId(), tls_elem); - - adopted->d_func()->running = true; - adopted->d_func()->finished = false; - static_cast(adopted)->init(); - } else { - data = new QThreadData; - - struct QThreadPrivate::tls_struct tls_elem = - QThreadPrivate::tls.value(QThread::currentThreadId()); - tls_elem.data = data; - QThreadPrivate::tls.insert(QThread::currentThreadId(), tls_elem); - - data->thread = new QAdoptedThread(data); - data->threadId = QThread::currentThreadId(); - data->deref(); - } - if (!QCoreApplicationPrivate::theMainThread) - QCoreApplicationPrivate::theMainThread = data->thread; - } - - return data; -} - - -void QAdoptedThread::init() -{ - d_func()->thread_id = QThread::currentThreadId(); -} - -/* - QThreadPrivate -*/ - -#if defined(Q_C_CALLBACKS) -extern "C" { -#endif - -typedef void*(*QtThreadCallback)(void*); - -#if defined(Q_C_CALLBACKS) -} -#endif - -#endif // QT_NO_THREAD - -void QThreadPrivate::createEventDispatcher(QThreadData *data) -{ - data->eventDispatcher = new QEventDispatcherGenode; - data->eventDispatcher->startingUp(); -} - -#ifndef QT_NO_THREAD - -void QThreadPrivate::start(QThread *thr) -{ - thr->d_func()->thread_id = QThread::currentThreadId(); - - QThread::setTerminationEnabled(false); - - QThreadData *data = QThreadData::get2(thr); - - // create an entry for the thread-specific data of the current thread - if (!QThreadPrivate::tls.contains(QThread::currentThreadId())) { - QThreadPrivate::tls.insert(QThread::currentThreadId(), - (struct QThreadPrivate::tls_struct){0, true}); - } - - struct QThreadPrivate::tls_struct tls_elem = - QThreadPrivate::tls.value(QThread::currentThreadId()); - tls_elem.data = data; - QThreadPrivate::tls.insert(QThread::currentThreadId(), tls_elem); - - data->ref(); - data->quitNow = false; - - // ### TODO: allow the user to create a custom event dispatcher - createEventDispatcher(data); - - emit thr->started(); - - QThread::setTerminationEnabled(true); - - thr->run(); -} - -void QThreadPrivate::finish(QThread *thr) -{ - QThreadPrivate *d = thr->d_func(); - QMutexLocker locker(&d->mutex); - - d->priority = QThread::InheritPriority; - d->running = false; - d->finished = true; - if (d->terminated) - emit thr->terminated(); - d->terminated = false; - emit thr->finished(); - - if (d->data->eventDispatcher) { - d->data->eventDispatcher->closingDown(); - QAbstractEventDispatcher *eventDispatcher = d->data->eventDispatcher; - d->data->eventDispatcher = 0; - delete eventDispatcher; - } - - void *data = &d->data->tls; - QThreadStorageData::finish((void **)data); - - QThreadPrivate::tls.remove(QThread::currentThreadId()); - - d->thread_id = 0; - d->thread_done.wakeAll(); -} - - - - -/************************************************************************** - ** QThread - *************************************************************************/ - -/*! - Returns the thread handle of the currently executing thread. - - \warning The handle returned by this function is used for internal - purposes and should not be used in any application code. On - Windows, the returned value is a pseudo-handle for the current - thread that cannot be used for numerical comparison. -*/ -Qt::HANDLE QThread::currentThreadId() -{ - return (Qt::HANDLE)QThreadPrivate::Genode_thread::myself(); -} - -/*! - Returns the ideal number of threads that can be run on the system. This is done querying - the number of processor cores, both real and logical, in the system. This function returns -1 - if the number of processor cores could not be detected. -*/ -int QThread::idealThreadCount() -{ - return 1; -} - -void QThread::yieldCurrentThread() -{ -} - -/*! - Forces the current thread to sleep for \a secs seconds. - - \sa msleep(), usleep() -*/ -void QThread::sleep(unsigned long secs) -{ - static Timer::Connection timer; - timer.msleep(secs * 1000); -} - -/*! - Causes the current thread to sleep for \a msecs milliseconds. - - \sa sleep(), usleep() -*/ -void QThread::msleep(unsigned long msecs) -{ - static Timer::Connection timer; - timer.msleep(msecs); -} - -/*! - Causes the current thread to sleep for \a usecs microseconds. - - \sa sleep(), msleep() -*/ -void QThread::usleep(unsigned long usecs) -{ - static Timer::Connection timer; - timer.msleep(usecs / 1000); -} - -/*! - Begins execution of the thread by calling run(), which should be - reimplemented in a QThread subclass to contain your code. The - operating system will schedule the thread according to the \a - priority parameter. If the thread is already running, this - function does nothing. - - \sa run(), terminate() -*/ -void QThread::start(Priority priority) -{ - Q_D(QThread); - QMutexLocker locker(&d->mutex); - if (d->running) - return; - - d->running = true; - d->finished = false; - d->terminated = false; - - d->priority = priority; - - d->genode_thread = new QThreadPrivate::Genode_thread(this); - - if (d->genode_thread) { - - /* set stacksize */ - if (d->stackSize > 0) { - if (!d->genode_thread->set_stack_size(d->stackSize)) { - qWarning("QThread::start: Thread stack size error"); - - // we failed to set the stacksize, and as the documentation states, - // the thread will fail to run... - d->running = false; - d->finished = false; - return; - } - } - - d->genode_thread->start(); - - } else { - qWarning("QThread::start: Thread creation error"); - - d->running = false; - d->finished = false; - d->thread_id = 0; - } -} - -/*! - Terminates the execution of the thread. The thread may or may not - be terminated immediately, depending on the operating systems - scheduling policies. Use QThread::wait() after terminate() for - synchronous termination. - - When the thread is terminated, all threads waiting for the thread - to finish will be woken up. - - \warning This function is dangerous and its use is discouraged. - The thread can be terminate at any point in its code path. - Threads can be terminated while modifying data. There is no - chance for the thread to cleanup after itself, unlock any held - mutexes, etc. In short, use this function only if absolutely - necessary. - - Termination can be explicitly enabled or disabled by calling - QThread::setTerminationEnabled(). Calling this function while - termination is disabled results in the termination being - deferred, until termination is re-enabled. See the documentation - of QThread::setTerminationEnabled() for more information. - - \sa setTerminationEnabled() -*/ -void QThread::terminate() -{ - Q_D(QThread); - QMutexLocker locker(&d->mutex); - - if (QThreadPrivate::tls.value(QThread::currentThreadId()).termination_enabled) { - - if (d->genode_thread) { - delete d->genode_thread; - d->genode_thread = 0; - } - - d->terminated = true; - d->running = false; - } -} - - -static inline void join_and_delete_genode_thread(QThreadPrivate *d) -{ - if (d->genode_thread) { - d->genode_thread->join(); - delete d->genode_thread; - d->genode_thread = 0; - } -} - - -/*! - Blocks the thread until either of these conditions is met: - - \list - \o The thread associated with this QThread object has finished - execution (i.e. when it returns from \l{run()}). This function - will return true if the thread has finished. It also returns - true if the thread has not been started yet. - \o \a time milliseconds has elapsed. If \a time is ULONG_MAX (the - default), then the wait will never timeout (the thread must - return from \l{run()}). This function will return false if the - wait timed out. - \endlist - - This provides similar functionality to the POSIX \c - pthread_join() function. - - \sa sleep(), terminate() -*/ -bool QThread::wait(unsigned long time) -{ - Q_D(QThread); - QMutexLocker locker(&d->mutex); - - if (d->thread_id == QThread::currentThreadId()) { - qWarning("QThread::wait: Thread tried to wait on itself"); - return false; - } - - if (d->finished || !d->running) { - join_and_delete_genode_thread(d); - return true; - } - - while (d->running) { - if (!d->thread_done.wait(locker.mutex(), time)) - return false; - } - - join_and_delete_genode_thread(d); - - return true; -} - -/*! - Enables or disables termination of the current thread based on the - \a enabled parameter. The thread must have been started by - QThread. - - When \a enabled is false, termination is disabled. Future calls - to QThread::terminate() will return immediately without effect. - Instead, the termination is deferred until termination is enabled. - - When \a enabled is true, termination is enabled. Future calls to - QThread::terminate() will terminate the thread normally. If - termination has been deferred (i.e. QThread::terminate() was - called with termination disabled), this function will terminate - the calling thread \e immediately. Note that this function will - not return in this case. - - \sa terminate() -*/ -void QThread::setTerminationEnabled(bool enabled) -{ - Q_ASSERT_X(currentThread() != 0, "QThread::setTerminationEnabled()", - "Current thread was not started with QThread."); - - struct QThreadPrivate::tls_struct tls_elem = - QThreadPrivate::tls.value(QThread::currentThreadId()); - tls_elem.termination_enabled = enabled; - QThreadPrivate::tls.insert(QThread::currentThreadId(), tls_elem); -} - -void QThread::setPriority(Priority priority) -{ - Q_D(QThread); - QMutexLocker locker(&d->mutex); - if (!d->running) { - qWarning("QThread::setPriority: Cannot set priority, thread is not running"); - return; - } - - d->priority = priority; -} - -#endif // QT_NO_THREAD - -QT_END_NAMESPACE - diff --git a/repos/qt4/src/lib/qt4/src/corelib/thread/qwaitcondition_genode.cpp b/repos/qt4/src/lib/qt4/src/corelib/thread/qwaitcondition_genode.cpp deleted file mode 100644 index 9e4d7c5fa..000000000 --- a/repos/qt4/src/lib/qt4/src/corelib/thread/qwaitcondition_genode.cpp +++ /dev/null @@ -1,264 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qplatformdefs.h" - -#ifndef QT_NO_THREAD - -#include "qwaitcondition.h" -#include "qmutex.h" -#include "qatomic.h" -#include "qmutex_p.h" - -#include - -struct QWaitConditionPrivate { - Genode::Lock mutex; - Genode::Timed_semaphore sem; -}; - - -/*! - \class QWaitCondition - \brief The QWaitCondition class provides a condition variable for - synchronizing threads. - - \threadsafe - - \ingroup thread - \ingroup environment - - QWaitCondition allows a thread to tell other threads that some - sort of condition has been met. One or many threads can block - waiting for a QWaitCondition to set a condition with wakeOne() or - wakeAll(). Use wakeOne() to wake one randomly selected condition or - wakeAll() to wake them all. - - For example, let's suppose that we have three tasks that should - be performed whenever the user presses a key. Each task could be - split into a thread, each of which would have a - \l{QThread::run()}{run()} body like this: - - \code - forever { - mutex.lock(); - keyPressed.wait(&mutex); - do_something(); - mutex.unlock(); - } - \endcode - - Here, the \c keyPressed variable is a global variable of type - QWaitCondition. - - A fourth thread would read key presses and wake the other three - threads up every time it receives one, like this: - - \code - forever { - getchar(); - keyPressed.wakeAll(); - } - \endcode - - The order in which the three threads are woken up is undefined. - Also, if some of the threads are still in \c do_something() when - the key is pressed, they won't be woken up (since they're not - waiting on the condition variable) and so the task will not be - performed for that key press. This issue can be solved using a - counter and a QMutex to guard it. For example, here's the new - code for the worker threads: - - \code - forever { - mutex.lock(); - keyPressed.wait(&mutex); - ++count; - mutex.unlock(); - - do_something(); - - mutex.lock(); - --count; - mutex.unlock(); - } - \endcode - - Here's the code for the fourth thread: - - \code - forever { - getchar(); - - mutex.lock(); - // Sleep until there are no busy worker threads - while (count > 0) { - mutex.unlock(); - sleep(1); - mutex.lock(); - } - keyPressed.wakeAll(); - mutex.unlock(); - } - \endcode - - The mutex is necessary because the results of two threads - attempting to change the value of the same variable - simultaneously are unpredictable. - - Wait conditions are a powerful thread synchronization primitive. - The \l{threads/waitconditions}{Wait Conditions} example shows how - to use QWaitCondition as an alternative to QSemaphore for - controlling access to a circular buffer shared by a producer - thread and a consumer thread. - - \sa QMutex, QSemaphore, QThread, {Wait Conditions Example} -*/ - -/*! - Constructs a new wait condition object. -*/ -QWaitCondition::QWaitCondition() -{ - d = new QWaitConditionPrivate; -} - - -/*! - Destroys the wait condition object. -*/ -QWaitCondition::~QWaitCondition() -{ - delete d; -} - -/*! - Wakes one thread waiting on the wait condition. The thread that - is woken up depends on the operating system's scheduling - policies, and cannot be controlled or predicted. - - If you want to wake up a specific thread, the solution is - typically to use different wait conditions and have different - threads wait on different conditions. - - \sa wakeAll() -*/ -void QWaitCondition::wakeOne() -{ - Genode::Lock::Guard lock_guard(d->mutex); - - if (d->sem.cnt() < 0) { - d->sem.up(); - } -} - -/*! - Wakes all threads waiting on the wait condition. The order in - which the threads are woken up depends on the operating system's - scheduling policies and cannot be controlled or predicted. - - \sa wakeOne() - */ -void QWaitCondition::wakeAll() -{ - Genode::Lock::Guard lock_guard(d->mutex); - - while (d->sem.cnt() < 0) { - d->sem.up(); - } -} - -/*! - Releases the locked \a mutex and wait on the wait condition. - The \a mutex must be initially locked by the calling thread. If - \a mutex is not in a locked state, this function returns - immediately. If \a mutex is a recursive mutex, this function - returns immediately. The \a mutex will be unlocked, and the - calling thread will block until either of these conditions is - met: - - \list - \o Another thread signals it using wakeOne() or wakeAll(). This - function will return true in this case. - \o \a time milliseconds has elapsed. If \a time is \c ULONG_MAX - (the default), then the wait will never timeout (the event - must be signalled). This function will return false if the - wait timed out. - \endlist - - The mutex will be returned to the same locked state. This - function is provided to allow the atomic transition from the - locked state to the wait state. - - \sa wakeOne(), wakeAll() - */ -bool QWaitCondition::wait(QMutex *mutex, unsigned long time) -{ - bool result; - - if (! mutex) - return false; - - if (mutex->d->recursive) { - qWarning("QWaitCondition: cannot wait on recursive mutexes"); - return false; - } - - mutex->unlock(); - - if (time == ULONG_MAX) { - /* Timeout: never */ - d->sem.down(); - result = true; - } else { - try { - d->sem.down((Genode::Alarm::Time) time); - result = true; - } catch (Genode::Timeout_exception) { - result = false; - } - } - - mutex->lock(); - - return result; -} -#endif // QT_NO_THREAD diff --git a/repos/qt4/src/lib/qt4/src/gui/embedded/qinputnitpicker_qws.cpp b/repos/qt4/src/lib/qt4/src/gui/embedded/qinputnitpicker_qws.cpp deleted file mode 100644 index ae1c1679a..000000000 --- a/repos/qt4/src/lib/qt4/src/gui/embedded/qinputnitpicker_qws.cpp +++ /dev/null @@ -1,109 +0,0 @@ -#include -#include - -#include -#include - -#include -#include -#include - -#include "qinputnitpicker_qws.h" - -#if !defined(QT_NO_QWS_MOUSE_NITPICKER) || !defined(QT_NO_QWS_KEYBOARD_NITPICKER) - -using namespace Genode; - -QNitpickerInputHandler::QNitpickerInputHandler(QScreen *screen, - Input::Session_capability input_session_cap, - const QString &driver, - const QString &device) -{ - input = new Input::Session_client(input_session_cap); - - ev_buf = static_cast - (env()->rm_session()->attach(input->dataspace())); - - qDebug() << "QNitpickerInputHandler: input buffer at " << ev_buf; - -#ifndef QT_NO_QWS_MOUSE_NITPICKER - mouse = new QNitpickerMouseHandler(); - qwsServer->setDefaultMouse("None"); -#endif - -#ifndef QT_NO_QWS_KEYBOARD_NITPICKER - keyboard = new QNitpickerKeyboardHandler(); - qwsServer->setDefaultKeyboard("None"); -#endif - - setScreen(screen); - - timer = new QTimer(this); - connect(timer, SIGNAL(timeout()), this, SLOT(readInputData())); - timer->start(10); -} - -QNitpickerInputHandler::~QNitpickerInputHandler() -{ - delete timer; - delete input; - -#ifndef QT_NO_QWS_MOUSE_NITPICKER - delete mouse; -#endif - -#ifndef QT_NO_QWS_KEYBOARD_NITPICKER - delete keyboard; -#endif -} - -void QNitpickerInputHandler::setScreen(const QScreen *screen) -{ -#ifndef QT_NO_QWS_MOUSE_NITPICKER - if (mouse) { - mouse->setScreen(screen); - } -#endif -} - -void QNitpickerInputHandler::readInputData() -{ -// qDebug() << "QNitpickerInputHandler::readInputData()"; - - int i, num_ev; - - if (input->is_pending()) { - for (i = 0, num_ev = input->flush(); i < num_ev; i++) { - - Input::Event *ev = &ev_buf[i]; - - bool const is_key_event = ev->type() == Input::Event::PRESS - || ev->type() == Input::Event::RELEASE; - - bool const is_mouse_button_event = - is_key_event && (ev->code() == Input::BTN_LEFT - || ev->code() == Input::BTN_MIDDLE - || ev->code() == Input::BTN_RIGHT); - - if (ev->type() == Input::Event::MOTION - || ev->type() == Input::Event::WHEEL - || is_mouse_button_event) { - -#ifndef QT_NO_QWS_MOUSE_NITPICKER - mouse->processMouseEvent(ev); -#endif - - } else if (is_key_event && (ev->code() < 128)) { - -#ifndef QT_NO_QWS_KEYBOARD_NITPICKER - keyboard->processKeyEvent(ev); -#endif - } - } - - } - -// qDebug() << "QNitpickerInputHandler::readInputData() finished"; -} - -#endif // !defined(QT_NO_QWS_MOUSE_NITPICKER) || !defined(QT_NO_QWS_KEYBOARD_NITPICKER) diff --git a/repos/qt4/src/lib/qt4/src/gui/embedded/qkbdnitpicker_qws.cpp b/repos/qt4/src/lib/qt4/src/gui/embedded/qkbdnitpicker_qws.cpp deleted file mode 100644 index 983f04df2..000000000 --- a/repos/qt4/src/lib/qt4/src/gui/embedded/qkbdnitpicker_qws.cpp +++ /dev/null @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qkbdnitpicker_qws.h" - -#ifndef QT_NO_QWS_KEYBOARD -#ifndef QT_NO_QWS_KBD_NITPICKER - -#include -#include - -QNitpickerKeyboardHandler::QNitpickerKeyboardHandler(const QString &device) - : QWSPC101KeyboardHandler(device) -{ -} - -QNitpickerKeyboardHandler::~QNitpickerKeyboardHandler() -{ -} - -void QNitpickerKeyboardHandler::processKeyEvent(Input::Event *ev) -{ - int keycode = ev->code(); - - if (ev->type() == Input::Event::RELEASE) { - keycode |= 0x80; - } - - doKey(keycode); -} - -#endif // QT_NO_QWS_KBD_NITPICKER -#endif // QT_NO_QWS_KEYBOARD diff --git a/repos/qt4/src/lib/qt4/src/gui/embedded/qkbdpc101_qws.cpp b/repos/qt4/src/lib/qt4/src/gui/embedded/qkbdpc101_qws.cpp deleted file mode 100644 index 6600785cd..000000000 --- a/repos/qt4/src/lib/qt4/src/gui/embedded/qkbdpc101_qws.cpp +++ /dev/null @@ -1,493 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qkbdpc101_qws.h" - -#ifndef QT_NO_QWS_KEYBOARD - -#include "qscreen_qws.h" -#include "qwindowsystem_qws.h" -#include "qnamespace.h" -#include "qapplication.h" - -#include -#include -#include -#include -#include -#include - -#ifdef Q_OS_LINUX -#include -#include -#endif - -QT_BEGIN_NAMESPACE - -static const QWSKeyMap pc101KeyM[] = { - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, - { Qt::Key_Escape, 27 , 27 , 0xffff }, - { Qt::Key_1, '1' , '!' , 0xffff }, - { Qt::Key_2, '2' , '@' , 0xffff }, - { Qt::Key_3, '3' , '#' , 0xffff }, - { Qt::Key_4, '4' , '$' , 0xffff }, - { Qt::Key_5, '5' , '%' , 0xffff }, - { Qt::Key_6, '6' , '^' , 0xffff }, - { Qt::Key_7, '7' , '&' , 0xffff }, - { Qt::Key_8, '8' , '*' , 0xffff }, - { Qt::Key_9, '9' , '(' , 0xffff }, // 10 - { Qt::Key_0, '0' , ')' , 0xffff }, - { Qt::Key_Minus, '-' , '_' , 0xffff }, - { Qt::Key_Equal, '=' , '+' , 0xffff }, - { Qt::Key_Backspace, 8 , 8 , 0xffff }, - { Qt::Key_Tab, 9 , 9 , 0xffff }, - { Qt::Key_Q, 'q' , 'Q' , 'Q'-64 }, - { Qt::Key_W, 'w' , 'W' , 'W'-64 }, - { Qt::Key_E, 'e' , 'E' , 'E'-64 }, - { Qt::Key_R, 'r' , 'R' , 'R'-64 }, - { Qt::Key_T, 't' , 'T' , 'T'-64 }, // 20 - { Qt::Key_Y, 'y' , 'Y' , 'Y'-64 }, - { Qt::Key_U, 'u' , 'U' , 'U'-64 }, - { Qt::Key_I, 'i' , 'I' , 'I'-64 }, - { Qt::Key_O, 'o' , 'O' , 'O'-64 }, - { Qt::Key_P, 'p' , 'P' , 'P'-64 }, - { Qt::Key_BraceLeft, '[' , '{' , 0xffff }, - { Qt::Key_BraceRight, ']' , '}' , 0xffff }, - { Qt::Key_Return, 13 , 13 , 0xffff }, - { Qt::Key_Control, 0xffff , 0xffff , 0xffff }, - { Qt::Key_A, 'a' , 'A' , 'A'-64 }, // 30 - { Qt::Key_S, 's' , 'S' , 'S'-64 }, - { Qt::Key_D, 'd' , 'D' , 'D'-64 }, - { Qt::Key_F, 'f' , 'F' , 'F'-64 }, - { Qt::Key_G, 'g' , 'G' , 'G'-64 }, - { Qt::Key_H, 'h' , 'H' , 'H'-64 }, - { Qt::Key_J, 'j' , 'J' , 'J'-64 }, - { Qt::Key_K, 'k' , 'K' , 'K'-64 }, - { Qt::Key_L, 'l' , 'L' , 'L'-64 }, - { Qt::Key_Semicolon, ';' , ':' , 0xffff }, - { Qt::Key_Apostrophe, '\'' , '"' , 0xffff }, // 40 - { Qt::Key_QuoteLeft, '`' , '~' , 0xffff }, - { Qt::Key_Shift, 0xffff , 0xffff , 0xffff }, - { Qt::Key_Backslash, '\\' , '|' , 0xffff }, - { Qt::Key_Z, 'z' , 'Z' , 'Z'-64 }, - { Qt::Key_X, 'x' , 'X' , 'X'-64 }, - { Qt::Key_C, 'c' , 'C' , 'C'-64 }, - { Qt::Key_V, 'v' , 'V' , 'V'-64 }, - { Qt::Key_B, 'b' , 'B' , 'B'-64 }, - { Qt::Key_N, 'n' , 'N' , 'N'-64 }, - { Qt::Key_M, 'm' , 'M' , 'M'-64 }, // 50 - { Qt::Key_Comma, ',' , '<' , 0xffff }, - { Qt::Key_Period, '.' , '>' , 0xffff }, - { Qt::Key_Slash, '/' , '?' , 0xffff }, - { Qt::Key_Shift, 0xffff , 0xffff , 0xffff }, - { Qt::Key_Asterisk, '*' , '*' , 0xffff }, - { Qt::Key_Alt, 0xffff , 0xffff , 0xffff }, - { Qt::Key_Space, ' ' , ' ' , 0xffff }, - { Qt::Key_CapsLock, 0xffff , 0xffff , 0xffff }, - { Qt::Key_F1, 0xffff , 0xffff , 0xffff }, - { Qt::Key_F2, 0xffff , 0xffff , 0xffff }, // 60 - { Qt::Key_F3, 0xffff , 0xffff , 0xffff }, - { Qt::Key_F4, 0xffff , 0xffff , 0xffff }, - { Qt::Key_F5, 0xffff , 0xffff , 0xffff }, - { Qt::Key_F6, 0xffff , 0xffff , 0xffff }, - { Qt::Key_F7, 0xffff , 0xffff , 0xffff }, - { Qt::Key_F8, 0xffff , 0xffff , 0xffff }, - { Qt::Key_F9, 0xffff , 0xffff , 0xffff }, - { Qt::Key_F10, 0xffff , 0xffff , 0xffff }, - { Qt::Key_NumLock, 0xffff , 0xffff , 0xffff }, - { Qt::Key_ScrollLock, 0xffff , 0xffff , 0xffff }, // 70 - { Qt::Key_7, '7' , '7' , 0xffff }, - { Qt::Key_8, '8' , '8' , 0xffff }, - { Qt::Key_9, '9' , '9' , 0xffff }, - { Qt::Key_Minus, '-' , '-' , 0xffff }, - { Qt::Key_4, '4' , '4' , 0xffff }, - { Qt::Key_5, '5' , '5' , 0xffff }, - { Qt::Key_6, '6' , '6' , 0xffff }, - { Qt::Key_Plus, '+' , '+' , 0xffff }, - { Qt::Key_1, '1' , '1' , 0xffff }, - { Qt::Key_2, '2' , '2' , 0xffff }, // 80 - { Qt::Key_3, '3' , '3' , 0xffff }, - { Qt::Key_0, '0' , '0' , 0xffff }, - { Qt::Key_Period, '.' , '.' , 0xffff }, - { Qt::Key_SysReq, 0xffff , 0xffff , 0xffff }, - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, - { Qt::Key_Less, '<' , '>' , 0xffff }, - { Qt::Key_F11, 0xffff , 0xffff , 0xffff }, - { Qt::Key_F12, 0xffff , 0xffff , 0xffff }, - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 90 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, - { Qt::Key_Enter, 13 , 13 , 0xffff }, - { Qt::Key_Control, 0xffff , 0xffff , 0xffff }, - { Qt::Key_Slash, '/' , '/' , 0xffff }, - { Qt::Key_SysReq, 0xffff , 0xffff , 0xffff }, - { Qt::Key_Meta, 0xffff , 0xffff , 0xffff }, // 100 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // break - { Qt::Key_Home, 0xffff , 0xffff , 0xffff }, - { Qt::Key_Up, 0xffff , 0xffff , 0xffff }, - { Qt::Key_PageUp, 0xffff , 0xffff , 0xffff }, - { Qt::Key_Left, 0xffff , 0xffff , 0xffff }, - { Qt::Key_Right, 0xffff , 0xffff , 0xffff }, - { Qt::Key_End, 0xffff , 0xffff , 0xffff }, - { Qt::Key_Down, 0xffff , 0xffff , 0xffff }, - { Qt::Key_PageDown, 0xffff , 0xffff , 0xffff }, - { Qt::Key_Insert, 0xffff , 0xffff , 0xffff }, // 110 - { Qt::Key_Delete, 0xffff , 0xffff , 0xffff }, - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // macro - { Qt::Key_F13, 0xffff , 0xffff , 0xffff }, - { Qt::Key_F14, 0xffff , 0xffff , 0xffff }, - { Qt::Key_Help, 0xffff , 0xffff , 0xffff }, - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // do - { Qt::Key_F17, 0xffff , 0xffff , 0xffff }, - { Qt::Key_Plus, '+' , '-' , 0xffff }, - { Qt::Key_Pause, 0xffff , 0xffff , 0xffff }, - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, - { 0, 0xffff , 0xffff , 0xffff } -}; - -static const int keyMSize = sizeof(pc101KeyM)/sizeof(QWSKeyMap)-1; - -//=========================================================================== - -// -// PC-101 type keyboards -// - -/*! - \class QWSPC101KeyboardHandler - \ingroup qws - - \internal -*/ - -QWSPC101KeyboardHandler::QWSPC101KeyboardHandler(const QString&) -{ - shift = false; - alt = false; - ctrl = false; - extended = 0; - prevuni = 0; - prevkey = 0; - caps = false; -#if defined(QT_QWS_IPAQ) - // iPAQ Action Key has ScanCode 0x60: 0x60|0x80 = 0xe0 == extended mode 1 ! - ipaq_return_pressed = false; -#endif -} - -QWSPC101KeyboardHandler::~QWSPC101KeyboardHandler() -{ -} - -const QWSKeyMap *QWSPC101KeyboardHandler::keyMap() const -{ - return pc101KeyM; -} - -void QWSPC101KeyboardHandler::doKey(uchar code) -{ - int keyCode = Qt::Key_unknown; - bool release = false; - int keypad = 0; -#ifdef Q_OS_GENODE - bool softwareRepeat = true; -#else - bool softwareRepeat = false; -#endif - -#ifndef QT_QWS_USE_KEYCODES - // extended? - if (code == 224 -#if defined(QT_QWS_IPAQ) - && !ipaq_return_pressed -#endif - ) { - extended = 1; - return; - } else if (code == 225) { - extended = 2; - return; - } -#endif - - if (code & 0x80) { - release = true; - code &= 0x7f; - } - -#ifndef QT_QWS_USE_KEYCODES - if (extended == 1) { - switch (code) { - case 72: - keyCode = Qt::Key_Up; - break; - case 75: - keyCode = Qt::Key_Left; - break; - case 77: - keyCode = Qt::Key_Right; - break; - case 80: - keyCode = Qt::Key_Down; - break; - case 82: - keyCode = Qt::Key_Insert; - break; - case 71: - keyCode = Qt::Key_Home; - break; - case 73: - keyCode = Qt::Key_PageUp; - break; - case 83: - keyCode = Qt::Key_Delete; - break; - case 79: - keyCode = Qt::Key_End; - break; - case 81: - keyCode = Qt::Key_PageDown; - break; - case 28: - keyCode = Qt::Key_Enter; - break; - case 53: - keyCode = Qt::Key_Slash; - break; - case 0x1d: - keyCode = Qt::Key_Control; - break; - case 0x2a: - keyCode = Qt::Key_Print; - break; - case 0x38: - keyCode = Qt::Key_Alt; - break; - case 0x5b: - keyCode = Qt::Key_Super_L; - break; - case 0x5c: - keyCode = Qt::Key_Super_R; - break; - case 0x5d: - keyCode = Qt::Key_Menu; - break; -#if 0 - default: - qDebug("extended1 code %x release %d", code, release); - break; -#endif - } - } else if (extended == 2) { - switch (code) { - case 0x1d: - return; - case 0x45: - keyCode = Qt::Key_Pause; - break; - } - } else -#endif - { - if (code < keyMSize) { - keyCode = pc101KeyM[code].key_code; - } - -#if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) - softwareRepeat = true; - - switch (code) { - case 0x7a: case 0x7b: case 0x7c: case 0x7d: - keyCode = code - 0x7a + Qt::Key_F9; - softwareRepeat = false; - break; - case 0x79: - keyCode = Qt::Key_SysReq; - softwareRepeat = false; - break; - case 0x78: -# ifdef QT_QWS_IPAQ - keyCode = Qt::Key_F24; // record -# else - keyCode = Qt::Key_Escape; -# endif - softwareRepeat = false; - break; - case 0x60: - keyCode = Qt::Key_Return; -# ifdef QT_QWS_IPAQ - ipaq_return_pressed = !release; -# endif - break; - case 0x67: - keyCode = Qt::Key_Right; - break; - case 0x69: - keyCode = Qt::Key_Up; - break; - case 0x6a: - keyCode = Qt::Key_Down; - break; - case 0x6c: - keyCode = Qt::Key_Left; - break; - } - - if (qt_screen->isTransformed() - && keyCode >= Qt::Key_Left && keyCode <= Qt::Key_Down) - { - keyCode = transformDirKey(keyCode); - } -#endif - /* - Translate shift+Qt::Key_Tab to Qt::Key_Backtab - */ - if ((keyCode == Qt::Key_Tab) && shift) - keyCode = Qt::Key_Backtab; - } - -#ifndef QT_QWS_USE_KEYCODES - /* - Qt::Keypad consists of extended keys 53 and 28, - and non-extended keys 55 and 71 through 83. - */ - if ((extended == 1) ? (code == 53 || code == 28) : - (code == 55 || (code >= 71 && code <= 83))) -#else - if (code == 55 || code >= 71 && code <= 83 || code == 96 - || code == 98 || code == 118) -#endif - { - keypad = Qt::KeypadModifier; - } - - // Ctrl-Alt-Backspace exits qws - if (ctrl && alt && keyCode == Qt::Key_Backspace) { - qApp->quit(); - } - - if (keyCode == Qt::Key_Alt) { - alt = !release; - } else if (keyCode == Qt::Key_Control) { - ctrl = !release; - } else if (keyCode == Qt::Key_Shift) { - shift = !release; - } else if (keyCode == Qt::Key_CapsLock && release) { - caps = !caps; -#if defined(Q_OS_LINUX) - char leds; - ioctl(0, KDGETLED, &leds); - leds = leds & ~LED_CAP; - if (caps) leds |= LED_CAP; - ioctl(0, KDSETLED, leds); -#endif - } - if (keyCode != Qt::Key_unknown) { - bool bAlt = alt; - bool bCtrl = ctrl; - bool bShift = shift; - int unicode = 0; - if (code < keyMSize) { - if (!extended) { - bool bCaps = shift || - (caps ? QChar(keyMap()[code].unicode).isLetter() : false); - if (bCtrl) - unicode = keyMap()[code].ctrl_unicode ? keyMap()[code].ctrl_unicode : 0xffff; - else if (bCaps) - unicode = keyMap()[code].shift_unicode ? keyMap()[code].shift_unicode : 0xffff; - else - unicode = keyMap()[code].unicode ? keyMap()[code].unicode : 0xffff; -#ifndef QT_QWS_USE_KEYCODES - } else if (extended==1) { - if (code == 53) - unicode = '/'; -#endif - } - } - - modifiers = 0; - if (bAlt) modifiers |= Qt::AltModifier; - if (bCtrl) modifiers |= Qt::ControlModifier; - if (bShift) modifiers |= Qt::ShiftModifier; - if (keypad) modifiers |= Qt::KeypadModifier; - - if (softwareRepeat && release) - endAutoRepeat(); - - // looks wrong -- WWA - bool repeat = false; - if (prevuni == unicode && prevkey == keyCode && !release) - repeat = true; - - processKeyEvent(unicode, keyCode, modifiers, !release, repeat); - - if (!release) { - prevuni = unicode; - prevkey = keyCode; - } else { - prevkey = prevuni = 0; - } - } - - if (softwareRepeat && !release) { - // process all pending events before starting the autorepeat timer to prevent unwanted repetitions - QApplication::processEvents(); - - beginAutoRepeat(prevuni, prevkey, modifiers); - } - - extended = 0; -} - -QT_END_NAMESPACE - -#endif // QT_NO_QWS_KEYBOARD diff --git a/repos/qt4/src/lib/qt4/src/gui/embedded/qmousenitpicker_qws.cpp b/repos/qt4/src/lib/qt4/src/gui/embedded/qmousenitpicker_qws.cpp deleted file mode 100644 index 8ff41e2af..000000000 --- a/repos/qt4/src/lib/qt4/src/gui/embedded/qmousenitpicker_qws.cpp +++ /dev/null @@ -1,126 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT_NO_QWS_MOUSE_NITPICKER - -#include - -#include - -#include - -#include - -QNitpickerMouseHandler::QNitpickerMouseHandler(const QString &driver, const QString &device) - : QWSMouseHandler(driver, device) -{ -qDebug() << "QNitpickerMouseHandler()"; - state = Qt::NoButton; -} - -QNitpickerMouseHandler::~QNitpickerMouseHandler() -{ -} - -void QNitpickerMouseHandler::resume() -{ -} - -void QNitpickerMouseHandler::suspend() -{ -} - -void QNitpickerMouseHandler::processMouseEvent(Input::Event *ev) -{ - QPoint position(ev->ax(), ev->ay()); - - int wheel = 0; - - switch (ev->type()) { - case Input::Event::PRESS: - switch (ev->code()) { - case Input::BTN_LEFT: - state |= Qt::LeftButton; - break; - case Input::BTN_RIGHT: - state |= Qt::RightButton; - break; - case Input::BTN_MIDDLE: - state |= Qt::MidButton; - break; - case Input::BTN_SIDE: - state |= Qt::XButton1; - break; - case Input::BTN_EXTRA: - state |= Qt::XButton2; - break; - } - break; - case Input::Event::RELEASE: - switch (ev->code()) { - case Input::BTN_LEFT: - state &= ~Qt::LeftButton; - break; - case Input::BTN_RIGHT: - state &= ~Qt::RightButton; - break; - case Input::BTN_MIDDLE: - state &= ~Qt::MidButton; - break; - case Input::BTN_SIDE: - state &= ~Qt::XButton1; - break; - case Input::BTN_EXTRA: - state &= ~Qt::XButton2; - break; - } - break; - case Input::Event::WHEEL: - wheel = ev->ry() * 120; // WHEEL_DELTA - break; - default: - break; - } - - mouseChanged(position, state, wheel); -} - -#endif // QT_NO_QWS_MOUSE_NITPICKER diff --git a/repos/qt4/src/lib/qt4/src/gui/embedded/qscreennitpicker_qws.cpp b/repos/qt4/src/lib/qt4/src/gui/embedded/qscreennitpicker_qws.cpp deleted file mode 100644 index f66333aae..000000000 --- a/repos/qt4/src/lib/qt4/src/gui/embedded/qscreennitpicker_qws.cpp +++ /dev/null @@ -1,294 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT_NO_QWS_NITPICKER - -#include -#include -#include -#include - -#include - -#include -#include -#include -#include - -#include "qinputnitpicker_qws.h" - -#include "qscreennitpicker_qws.h" - -/*! - \internal - - \class QNitpickerScreen - \ingroup qws - - \brief The QNitpickerScreen class implements a screen driver for the - virtual framebuffer. - - Note that this class is only available in \l {Qtopia Core}. - Custom screen drivers can be added by subclassing the - QScreenDriverPlugin class, using the QScreenDriverFactory class to - dynamically load the driver into the application, but there should - only be one screen object per application. - - The Qtopia Core platform provides a \l {The Virtual - Framebuffer}{virtual framebuffer} for development and debugging; - the virtual framebuffer allows Qtopia Core programs to be - developed on a desktop machine, without switching between consoles - and X11. - - \sa QScreen, QScreenDriverPlugin, {Running Applications} -*/ - -/*! - \fn bool QNitpickerScreen::connect(const QString & displaySpec) - \reimp -*/ - -/*! - \fn void QNitpickerScreen::disconnect() - \reimp -*/ - -/*! - \fn bool QNitpickerScreen::initDevice() - \reimp -*/ - -/*! - \fn void QNitpickerScreen::restore() - \reimp -*/ - -/*! - \fn void QNitpickerScreen::save() - \reimp -*/ - -/*! - \fn void QNitpickerScreen::setDirty(const QRect & r) - \reimp -*/ - -/*! - \fn void QNitpickerScreen::setMode(int nw, int nh, int nd) - \reimp -*/ - -/*! - \fn void QNitpickerScreen::shutdownDevice() - \reimp -*/ - -/*! - \fn QNitpickerScreen::QNitpickerScreen(int displayId) - - Constructs a QVNCScreen object. The \a displayId argument - identifies the Qtopia Core server to connect to. -*/ -QNitpickerScreen::QNitpickerScreen(int display_id) - : QScreen(display_id), - nitpicker(0), - framebuffer(0), - inputhandler(0) -{ -// qDebug() << "QNitpickerScreen::QNitpickerScreen()"; -} - -/*! - Destroys this QNitpickerScreen object. -*/ -QNitpickerScreen::~QNitpickerScreen() -{ -// qDebug() << "QNitpickerScreen::~QNitpickerScreen()"; -} - -using namespace Genode; - -QWSWindowSurface *QNitpickerScreen::createSurface(QWidget *widget) const -{ -// qDebug() << "QNitpickerScreen::createSurface()"; - - QWSWindowSurface *result; - - if (QApplication::type() == QApplication::GuiServer) { - result = new QWSNitpickerWindowSurface(widget, nitpicker); - } else { - result = 0; - } - -// qDebug() << "QNitpickerScreen::createSurface() finished"; - - return result; -} - -bool QNitpickerScreen::connect(const QString &displaySpec) -{ - qDebug() << "QNitpickerScreen::connect(" << displaySpec << ")"; - - /* - * Init sessions to the required external services - */ - nitpicker = new Nitpicker::Connection(); - framebuffer = new Framebuffer::Session_client(nitpicker->framebuffer_session()); - - Framebuffer::Mode const scr_mode = nitpicker->mode(); - int const scr_w = scr_mode.width(), scr_h = scr_mode.height(); - - nitpicker->buffer(scr_mode, false); - - qDebug() << "screen is " << scr_w << "x" << scr_h; - if (!scr_w || !scr_h) { - qDebug("got invalid screen - spinning"); - sleep_forever(); - } - - /* set QScreen variables */ - - data = (uchar*)env()->rm_session()->attach(framebuffer->dataspace()); - - dw = w = scr_w; - dh = h = scr_h; - d = 16; /* FIXME */ - - switch (d) { - case 1: - setPixelFormat(QImage::Format_Mono); - break; - case 8: - setPixelFormat(QImage::Format_Indexed8); - break; - case 16: - setPixelFormat(QImage::Format_RGB16); - break; - case 32: - setPixelFormat(QImage::Format_ARGB32_Premultiplied); - break; - } - - lstep = (scr_w * d) / 8; - - const int dpi = 72; - physWidth = qRound(dw * 25.4 / dpi); - physHeight = qRound(dh * 25.4 / dpi); - - size = lstep * h; - mapsize = size; - - screencols = 0; - - qDebug("Connected to Nitpicker service %s: %d x %d x %d %dx%dmm (%dx%ddpi), pixels at %p", - displaySpec.toLatin1().data(), w, h, d, - physWidth, physHeight, qRound(dw*25.4/physWidth), qRound(dh*25.4/physHeight), - data); - -#if 0 - // create a view showing the full framebuffer for debugging purposes - Capability _cap = nitpicker->create_view(); - View_client(_cap).viewport(0, 0, w, h, 0, 0, true); - View_client(_cap).stack(Capability(), true, true); - View_client(_cap).title("Qtopia Core Framebuffer"); -#endif - -#if !defined(QT_NO_QWS_MOUSE_NITPICKER) || !defined(QT_NO_QWS_KEYBOARD_NITPICKER) - - /* connect input */ - - if (qApp->type() == QApplication::GuiServer) { - - inputhandler = new QNitpickerInputHandler(this, nitpicker->input_session()); - - if (!inputhandler) { - qDebug() << "could not create input handler"; - } - } -#endif - - qDebug() << "QNitpickerScreen::connect() finished"; - - return true; -} - -void QNitpickerScreen::disconnect() -{ - delete framebuffer; - framebuffer = 0; - delete nitpicker; - nitpicker = 0; - delete inputhandler; - inputhandler = 0; -} - -bool QNitpickerScreen::initDevice() -{ -#ifndef QT_NO_QWS_CURSOR - QScreenCursor::initSoftwareCursor(); -#endif - QWSServer::setBackground(QBrush(QColor(0, 0, 0))); - return true; -} - -void QNitpickerScreen::shutdownDevice() -{ -} - -void QNitpickerScreen::setMode(int ,int ,int) -{ - PDBG("not implemented"); -} - -// save the state of the graphics card -// This is needed so that e.g. we can restore the palette when switching -// between linux virtual consoles. -void QNitpickerScreen::save() -{ - // nothing to do. -} - -// restore the state of the graphics card. -void QNitpickerScreen::restore() -{ -} - -#endif // QT_NO_QWS_NITPICKER diff --git a/repos/qt4/src/lib/qt4/src/gui/painting/qwindowsurface_nitpicker_qws.cpp b/repos/qt4/src/lib/qt4/src/gui/painting/qwindowsurface_nitpicker_qws.cpp deleted file mode 100644 index 10eb3976a..000000000 --- a/repos/qt4/src/lib/qt4/src/gui/painting/qwindowsurface_nitpicker_qws.cpp +++ /dev/null @@ -1,169 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include -#include - -#include - -#include "qwindowsystem_qws.h" // class QWSWindow - -#include "qwindowsurface_nitpicker_qws_p.h" - -QWSNitpickerWindowSurface::QWSNitpickerWindowSurface(QWidget *widget, Nitpicker::Session_client *nitpicker) - : QWSLocalMemSurface(widget), - _nitpicker(nitpicker), - moving(false) -{ -// qDebug() << "QWSNitpickerWindowSurface(widget, _nitpicker)"; - - _view_cap = _nitpicker->create_view(); - _view_client = new Nitpicker::View_client(_view_cap); - - _framebuffer_session_client = new Framebuffer::Session_client(_nitpicker->framebuffer_session()); - - connect(qwsServer, SIGNAL(windowEvent(QWSWindow*, QWSServer::WindowEvent)), - this, SLOT(windowEvent(QWSWindow*, QWSServer::WindowEvent))); -} - -QWSNitpickerWindowSurface::~QWSNitpickerWindowSurface() -{ -// qDebug() << "~QWSNitpickerWindowSurface()"; - _nitpicker->destroy_view(_view_cap); - delete _view_client; - delete _framebuffer_session_client; -} - -bool QWSNitpickerWindowSurface::move(const QPoint &offset) -{ -// qDebug() << "QWSNitpickerWindowSurface::move(" << offset << ")"; - - moving = QWSLocalMemSurface::move(offset); - -// qDebug() << "QWSNitpickerWindowSurface::move() finished"; - - return moving; -} - -void QWSNitpickerWindowSurface::flush(QWidget *widget, const QRegion ®ion, - const QPoint &offset) -{ -// qDebug() << "QWSNitpickerWindowSurface::flush()"; - - QWSLocalMemSurface::flush(widget, region, offset); - - /* refresh the view */ - QRect rect = geometry(); - _framebuffer_session_client->refresh(rect.x(), rect.y(), - rect.width(), rect.height()); - -// qDebug() << "QWSNitpickerWindowSurface::flush() finished"; -} - -void QWSNitpickerWindowSurface::windowEvent(QWSWindow *window, - QWSServer::WindowEvent eventType) -{ - if (window->winId() == winId()) { - - switch (eventType) { - - case QWSServer::Geometry: - { -// qDebug() << "QWSServer::Geometry"; - - QRect rect = geometry(); - - if (moving) { - moving = false; - /* flush() does not get called while moving, so update the viewport with refresh */ - _view_client->viewport(rect.x(), rect.y(), - rect.width(), rect.height(), - -rect.x(), -rect.y(), true); - } else { - _view_client->viewport(rect.x(), rect.y(), - rect.width(), rect.height(), - -rect.x(), -rect.y(), false); - } - - break; - } - - case QWSServer::Show: - { -// qDebug() << "QWSServer::Show"; - /* show the view */ - QRect rect = geometry(); - _view_client->viewport(rect.x(), rect.y(), - rect.width(), rect.height(), - -rect.x(), -rect.y(), false); - break; - } - - case QWSServer::Hide: - { -// qDebug() << "QWSServer::Hide"; - /* hide the view */ - _view_client->viewport(0, 0, - 0, 0, - 0, 0, true); - } - - case QWSServer::Raise: - { -// qDebug() << "QWSServer::Raise"; - /* bring view to front */ - _view_client->stack(Nitpicker::View_capability(), true, true); - break; - } - - case QWSServer::Name: - { -// qDebug() << "QWSServer::Name"; - /* update view title */ - _view_client->title(window->name().toAscii().constData()); - break; - } - default: - break; - } - } -} diff --git a/repos/qt4/src/lib/qt_main/qt_main.cc b/repos/qt4/src/lib/qt_main/qt_main.cc deleted file mode 100644 index 7f81bceee..000000000 --- a/repos/qt4/src/lib/qt_main/qt_main.cc +++ /dev/null @@ -1,77 +0,0 @@ -/* - * \brief main() wrapper for customizing main()'s stack size - * \author Christian Prochaska - * \date 2008-08-20 - */ - -/* - * Copyright (C) 2008-2013 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU General Public License version 2. - */ - -#ifdef QT_MAIN_STACK_SIZE - -#include -#include -#include - -#include - -using namespace Genode; - -extern int qt_main(int argc, char *argv[]); - -class Main_thread : public Thread_qt -{ - protected: - - int _argc; - char **_argv; - Semaphore &_finished; - int _result; - - public: - - Main_thread(int argc, char *argv[], Semaphore &finished) : - Thread_qt("Qt main thread"), - _argc(argc), - _argv(argv), - _finished(finished), - _result(0) { } - - virtual void entry() - { - /* call the real main() function */ - _result = ::qt_main(_argc, _argv); - - _finished.up(); - - sleep_forever(); - } - - int result() { return _result; } -}; - -#define qt_main main - -int main(int argc, char *argv[]) -{ -// PDBG("QT_MAIN_STACK_SIZE == %d", QT_MAIN_STACK_SIZE); - - Semaphore finished; - - Main_thread main_thread(argc, argv, finished); - main_thread.set_stack_size(QT_MAIN_STACK_SIZE); - main_thread.start(); - - /* wait for the thread to finish */ - finished.down(); - -// PDBG("main_thread finished"); - - return main_thread.result(); -} - -#endif /* QT_MAIN_STACK_SIZE */ diff --git a/repos/qt4/src/test/qpluginwidget/config.plugin b/repos/qt4/src/test/qpluginwidget/config.plugin deleted file mode 100644 index 8ee2affc0..000000000 --- a/repos/qt4/src/test/qpluginwidget/config.plugin +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/repos/qt4/src/test/qpluginwidget/main.cpp b/repos/qt4/src/test/qpluginwidget/main.cpp deleted file mode 100644 index 27a83914e..000000000 --- a/repos/qt4/src/test/qpluginwidget/main.cpp +++ /dev/null @@ -1,30 +0,0 @@ -/* - * \brief QPluginWidget test - * \author Christian Prochaska - * \date 2012-04-23 - */ - -/* Qt includes */ -#include -#include -#include - -/* Qoost includes */ -#include - -int main(int argc, char *argv[]) -{ - static QApplication app(argc, argv); - - static Compound_widget w; - - static QString plugin_args("ram_quota=3M"); - static QPluginWidget plugin_widget(&w, QUrl("rom:///test-plugin.tar"), plugin_args, 100, 100); - - w.layout()->addWidget(&plugin_widget); - w.resize(150, 150); - - w.show(); - - return app.exec(); -} diff --git a/repos/qt4/src/test/qpluginwidget/qpluginwidget.pro b/repos/qt4/src/test/qpluginwidget/qpluginwidget.pro deleted file mode 100644 index 86868fe21..000000000 --- a/repos/qt4/src/test/qpluginwidget/qpluginwidget.pro +++ /dev/null @@ -1,4 +0,0 @@ -TEMPLATE = app -TARGET = test-qpluginwidget -QT = core gui -SOURCES += main.cpp diff --git a/repos/qt4/src/test/qpluginwidget/target.mk b/repos/qt4/src/test/qpluginwidget/target.mk deleted file mode 100644 index df08d51b2..000000000 --- a/repos/qt4/src/test/qpluginwidget/target.mk +++ /dev/null @@ -1,17 +0,0 @@ -# identify the qt4 repository by searching for a file that is unique for qt4 -QT4_REP_DIR := $(call select_from_repositories,lib/import/import-qt4.inc) -QT4_REP_DIR := $(realpath $(dir $(QT4_REP_DIR))../..) - -include $(QT4_REP_DIR)/src/app/tmpl/target_defaults.inc - -include $(QT4_REP_DIR)/src/app/tmpl/target_final.inc - -LIBS += qpluginwidget - -$(TARGET): test-plugin.tar - -test-plugin.tar: config.plugin - $(VERBOSE)tar cf $@ -C $(PRG_DIR) config.plugin - -clean: - $(VERBOSE)rm test-plugin.tar diff --git a/repos/qt4/tool/Makefile b/repos/qt4/tool/Makefile deleted file mode 100644 index 986121c40..000000000 --- a/repos/qt4/tool/Makefile +++ /dev/null @@ -1,78 +0,0 @@ -# -# \brief Makefile for building the Qt4 tools -# \author Christian Prochaska -# \author Norman Feske -# \date 2009-05-15 -# - -REP_DIR := $(realpath ..) - -include $(REP_DIR)/lib/mk/qt_version.inc - -# -# Compound rule for building the tools in the right order -# -all: qmake/qmake moc/moc rcc/rcc uic/uic - -# -# Determine qmakespec to be passed to the sub makefiles -# -HOST_ARCH := $(shell uname -m) -ifneq ($(HOST_ARCH),x86_64) -HOST_ARCH=x86 -endif - -QMAKESPEC = $(REP_DIR)/contrib/$(QT4)/mkspecs/qws/linux-$(HOST_ARCH)-g++ - -# -# Build qmake -# -qmake/qmake: - QMAKESPEC=$(QMAKESPEC) make -C qmake - -# -# Build the other tools using qmake -# -vpath bootstrap.pro $(REP_DIR)/contrib/$(QT4)/src/tools/bootstrap -vpath moc.pro $(REP_DIR)/contrib/$(QT4)/src/tools/moc -vpath rcc.pro $(REP_DIR)/contrib/$(QT4)/src/tools/rcc -vpath uic.pro $(REP_DIR)/contrib/$(QT4)/src/tools/uic - -bootstrap/libbootstrap.a: bootstrap/Makefile - make -C bootstrap - -moc/moc: moc/Makefile bootstrap/libbootstrap.a - make -C moc - -rcc/rcc: rcc/Makefile bootstrap/libbootstrap.a - make -C rcc - -uic/uic: uic/Makefile bootstrap/libbootstrap.a - make -C uic - -# -# Rule to generate tool Makefiles from the respective pro files via qmake -# -# The second include path is required to resolve the Genode-specific -# 'gconfig.cpp' file. Even though this is a 'cpp' file, it is used via -# '#include'. So we have to make its location known to the 'INCLUDEPATH'. -# -%/Makefile: %.pro - mkdir -p $* - QMAKESPEC=$(QMAKESPEC) qmake/qmake -o $*/Makefile \ - QT_BUILD_TREE=$(REP_DIR)/contrib/$(QT4) \ - INCLUDEPATH+=$(REP_DIR)/include/qt4 \ - INCLUDEPATH+=$(REP_DIR)/include/qt4/QtCore \ - INCLUDEPATH+=$(REP_DIR)/src/lib/qt4/src/corelib/global \ - -after DESTDIR= \ - -after LIBS+=-L../bootstrap\ - $^ - -# -# Clean rule -# -clean: - make -C qmake clean - rm -rf bootstrap moc rcc uic - -distclean: clean diff --git a/repos/qt4/tool/lib_mk_file_generator/README b/repos/qt4/tool/lib_mk_file_generator/README deleted file mode 100644 index 7d49ba7d0..000000000 --- a/repos/qt4/tool/lib_mk_file_generator/README +++ /dev/null @@ -1,10 +0,0 @@ -The scripts in this directory have been used to generate the -'lib/mk/qt_*_generated.inc' files. - -Usage: - -- create a build directory in the 'contrib' directory -- copy the scripts into this build directory -- change into the build directory -- execute the 'create_generated_incs' script -- move the generated files into the 'lib/mk/' directory diff --git a/repos/qt4/tool/lib_mk_file_generator/create_generated_inc b/repos/qt4/tool/lib_mk_file_generator/create_generated_inc deleted file mode 100755 index 540039fad..000000000 --- a/repos/qt4/tool/lib_mk_file_generator/create_generated_inc +++ /dev/null @@ -1,122 +0,0 @@ -#!/bin/bash - -function extract_defines() -{ - sed -e '/DEFINES =/!d' \ - -e 's/DEFINES = /QT_DEFINES += /' Makefile > defines.inc - - echo -e "" >> defines.inc -} - -function extract_incpath() -{ - sed -e '/INCPATH =/!d' \ - -e 's/INCPATH = //' \ - -e 's/ / \\\n/g' \ - Makefile | sort -u > incpath.inc.tmp - - echo -e "QT_INCPATH = \\" > incpath.inc - - sed -e '/\/qt-everywhere-opensource-src.*\//!d' \ - -e 's/.*\/qt-everywhere-opensource-src-[^\/]*\// /' \ - incpath.inc.tmp >> incpath.inc - - echo -e "" >> incpath.inc -} - - -function extract_sources() -{ - sed \ - -e ':a;N;$!ba;s/\n//g' \ - -e 's/OBJECTS .*//' \ - -e 's/.*SOURCES =/QT_SOURCES = \\/' \ - -e 's/\\/\\\n/g' \ - -e 's/\.cpp \.moc/\.cpp \\\n/' \ - Makefile > sources.inc.tmp - - sed -e 's/.*\// /' \ - sources.inc.tmp > sources.inc - - echo -e "" >> sources.inc -} - - -function extract_vpath() -{ - sed \ - -e ':a;N;$!ba;s/\n//g' \ - -e 's/OBJECTS .*//' \ - -e 's/.*SOURCES =//' \ - -e 's/\\/\\\n/g' \ - -e 's/\.cpp \.moc/\.cpp \\\n/' \ - Makefile > vpath.inc.tmp - - echo -e "QT_VPATH = \\" > vpath.inc - - sed -e '/\/qt-everywhere-opensource-src.*\//!d' \ - -e 's/.*\/qt-everywhere-opensource-src-[^\/]*\// /' \ - -e 's/\/[^\/]* [\\]*$/ \\/' \ - vpath.inc.tmp | sort -u >> vpath.inc - - echo -e "" >> vpath.inc -} - - -function extract_compiler_moc_header_make_all() -{ - sed -e '/compiler_moc_header_make_all:/!d' \ - -e 's/compiler_moc_header_make_all:/COMPILER_MOC_HEADER_MAKE_ALL_FILES = \\\n /' \ - -e 's/\.moc\/release-static-emb-x86_64\///g' \ - -e 's/\.cpp /\.cpp \\\n /g' \ - Makefile > compiler_moc_header_make_all.inc.tmp - - sed -e 's/.*\// /' \ - compiler_moc_header_make_all.inc.tmp > compiler_moc_header_make_all.inc - - echo -e "" >> compiler_moc_header_make_all.inc -} - - -function extract_compiler_moc_source_make_all() -{ - sed -e '/compiler_moc_source_make_all:/!d' \ - -e 's/compiler_moc_source_make_all:/COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \\\n /' \ - -e 's/\.moc\/release-static-emb-x86_64\///g' \ - -e 's/\.moc /\.moc \\\n /g' \ - Makefile > compiler_moc_source_make_all.inc.tmp - - sed -e 's/.*\// /' \ - compiler_moc_source_make_all.inc.tmp > compiler_moc_source_make_all.inc - - echo -e "" >> compiler_moc_source_make_all.inc -} - - -extract_defines -extract_incpath -extract_sources -extract_vpath -extract_compiler_moc_header_make_all -extract_compiler_moc_source_make_all - -cat defines.inc > $1_generated.inc - -cat incpath.inc >> $1_generated.inc - -cat sources.inc >> $1_generated.inc - -cat vpath.inc >> $1_generated.inc - -echo -e "# some source files need to be generated by moc from other source/header files before" >> $1_generated.inc -echo -e "# they get #included again by the original source file in the compiling stage\n" >> $1_generated.inc - -echo -e "# source files generated from existing header files ('moc_%.cpp: %.h' rule in spec-qt4.mk)" >> $1_generated.inc -echo -e "# extracted from 'compiler_moc_header_make_all' target\n" >> $1_generated.inc - -cat compiler_moc_header_make_all.inc >> $1_generated.inc - -echo -e "# source files generated from existing source files ('%.moc: %.cpp' rule in spec-qt4.mk)" >> $1_generated.inc -echo -e "# extracted from 'compiler_moc_source_make_all' rule\n" >> $1_generated.inc - -cat compiler_moc_source_make_all.inc >> $1_generated.inc diff --git a/repos/qt4/tool/lib_mk_file_generator/create_generated_incs b/repos/qt4/tool/lib_mk_file_generator/create_generated_incs deleted file mode 100755 index dda605773..000000000 --- a/repos/qt4/tool/lib_mk_file_generator/create_generated_incs +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -./genode_qt_configure -cd src/corelib && ../../create_generated_inc qt_core && cp qt_core_generated.inc ../.. && cd ../.. -cd src/gui && ../../create_generated_inc qt_gui && cp qt_gui_generated.inc ../.. && cd ../.. -cd src/network && ../../create_generated_inc qt_network && cp qt_network_generated.inc ../.. && cd ../.. -cd src/scripttools && ../../create_generated_inc qt_scripttools && cp qt_scripttools_generated.inc ../.. && cd ../.. -cd src/svg && ../../create_generated_inc qt_svg && cp qt_svg_generated.inc ../.. && cd ../.. -cd src/xml && ../../create_generated_inc qt_xml && cp qt_xml_generated.inc ../.. && cd ../.. -cd src/3rdparty/webkit/Source/JavaScriptCore && ../../../../../create_generated_inc qt_jscore && cp qt_jscore_generated.inc ../../../../.. && cd ../../../../.. -cd src/3rdparty/webkit/Source/WebCore && ../../../../../create_generated_inc qt_webcore && cp qt_webcore_generated.inc ../../../../.. && cd ../../../../.. -cd src/3rdparty/webkit/Source/WebKit/qt && ../../../../../../create_generated_inc qt_webkit && cp qt_webkit_generated.inc ../../../../../.. && cd ../../../../../.. -cd tools/designer/src/uitools && ../../../../create_generated_inc qt_ui_tools && cp qt_ui_tools_generated.inc ../../../.. && cd ../../../.. diff --git a/repos/qt4/tool/lib_mk_file_generator/genode_qt_configure b/repos/qt4/tool/lib_mk_file_generator/genode_qt_configure deleted file mode 100755 index f6e99b90d..000000000 --- a/repos/qt4/tool/lib_mk_file_generator/genode_qt_configure +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh - -../qt-everywhere-opensource-src-4.8.4/configure \ - -opensource \ - -confirm-license \ - -qconfig genode \ - -xplatform qws/genode-generic-g++ \ - -embedded x86 \ - -static \ - -no-separate-debug-info \ - -depths 8,16,32 \ - -openssl-linked \ - -no-qt3support \ - -no-accessibility \ - -no-phonon \ - -no-libtiff \ - -no-libmng \ - -no-nis \ - -no-cups \ - -no-iconv \ - -no-dbus \ - -no-freetype \ - -no-largefile \ - -no-gfx-linuxfb \ - -no-gfx-multiscreen \ - -qt-gfx-nitpicker \ - -no-mouse-linuxtp \ - -no-mouse-pc \ - -qt-mouse-nitpicker \ - -no-kbd-tty \ - -qt-kbd-nitpicker \ - -no-mmx \ - -no-3dnow \ - -no-sse \ - -no-sse2 \ - -no-sse3 \ - -no-ssse3 \ - -no-sse4.1 \ - -no-sse4.2 \ - -no-avx \ - -no-neon \ - -make tools \ - -nomake examples \ - -nomake demos \ - -fast diff --git a/repos/qt4/tool/qmake/Makefile b/repos/qt4/tool/qmake/Makefile deleted file mode 100644 index 4223c291e..000000000 --- a/repos/qt4/tool/qmake/Makefile +++ /dev/null @@ -1,162 +0,0 @@ -# -# \brief Makefile for building QMake for Genode -# \author Christian Prochaska -# \author Norman Feske -# \date 2013-03-27 -# -# This file is based on the generated Makefile created by qt4's configure. -# - -######################################################################## -## 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 := ../.. - -include $(REP_DIR)/lib/mk/qt_version.inc - -# root of Qt4 source tree -CONTRIB_DIR := $(REP_DIR)/contrib/$(QT4) - -# tell make where to look for source codes -vpath %.h $(CONTRIB_DIR)/qmake -vpath %.cpp $(CONTRIB_DIR)/qmake -vpath %.cpp $(CONTRIB_DIR)/qmake/generators -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 -vpath %.cpp $(CONTRIB_DIR)/src/corelib/kernel -vpath %.cpp $(CONTRIB_DIR)/src/corelib/plugin -vpath %.cpp $(CONTRIB_DIR)/src/corelib/io -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 = . -QTOBJS = -QTSRCS = -QMAKESPEC = ../../src/lib/qt4/mkspecs/qws/genode-generic-g++ -LFLAGS = $(QMAKE_LFLAGS) - -#qmake code -OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o \ - mingw_make.o option.o winmakefile.o projectgenerator.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 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 \ - 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 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) - - - - -#all sources, used for the depend target -DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp generators/makefile.cpp generators/unix/unixmake2.cpp \ - generators/unix/unixmake.cpp generators/win32/winmakefile.cpp generators/projectgenerator.cpp \ - generators/mac/pbuilder_pbx.cpp generators/mac/xmloutput.cpp generators/metamakefile.cpp \ - generators/makefiledeps.cpp option.cpp generators/win32/mingw_make.cpp generators/makefile.cpp \ - generators/win32/msvc_vcproj.cpp generators/win32/msvc_vcxproj.cpp generators/win32/msvc_objectmodel.cpp generators/win32/msbuild_objectmodel.cpp generators/win32/msbuild_objectmodel.cpp generators/win32/msvc_nmake.cpp generators/win32/borland_bmake.cpp \ - generators/symbian/symmake.cpp generators/symbian/initprojectdeploy_symbian.cpp \ - $(SOURCE_PATH)/tools/shared/windows/registry.cpp \ - $(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 \ - $(SOURCE_PATH)/src/corelib/global/qmalloc.cpp \ - $(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.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/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 \ - $(SOURCE_PATH)/src/corelib/global/qlibraryinfo.cpp $(SOURCE_PATH)/src/corelib/tools/qcryptographichash.cpp \ - $(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 = -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 \ - -I$(BUILD_PATH)/src/corelib/global -I$(BUILD_PATH)/src/corelib/xml \ - -I$(SOURCE_PATH)/tools/shared \ - -I$(QCONFIG_CPP_PATH) \ - -DQT_NO_PCRE \ - -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 -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 generators/integrity) -CPPFLAGS += -I$(REP_DIR)/src/lib/qt4/src/corelib/global - -# enable automatic dependency generation -CPPFLAGS += -MMD - -CXXFLAGS = $(QMAKE_CXXFLAGS) -DQMAKE_OPENSOURCE_EDITION $(CPPFLAGS) - -first all: qmake - -qmake: $(OBJS) $(QOBJS) - $(CXX) -o "$@" $(OBJS) $(QOBJS) $(LFLAGS) - -clean:: - rm -f qmake $(OBJS) $(QOBJS) $(OBJS:.o=.d) $(QOBJS:.o=.d) - -distclean:: clean - --include *.d - -#default rules -.cpp.o: - $(CXX) -c -o $@ $(CXXFLAGS) $< - -# DO NOT DELETE THIS LINE -- make depend depends on it diff --git a/tool/builddir/etc/build.conf.optional b/tool/builddir/etc/build.conf.optional index 83ee49bd0..3664c2fa0 100644 --- a/tool/builddir/etc/build.conf.optional +++ b/tool/builddir/etc/build.conf.optional @@ -10,18 +10,10 @@ # #REPOSITORIES += $(GENODE_DIR)/repos/libports -# -# Qt4 tool kit -# -# The 'qt4' repository depends on 'libc' and 'libports' -# Make sure to execute 'make prepare' in 'qt4' prior building. -# -#REPOSITORIES += $(GENODE_DIR)/repos/qt4 - # # Ports of popular 3rd-party applications # -# The 'ports' repository depends on 'libc', 'libports', and 'qt4'. +# The 'ports' repository depends on 'libc' and 'libports'. # Make sure to execute 'make prepare' in 'ports' prior building. # #REPOSITORIES += $(GENODE_DIR)/repos/ports @@ -39,6 +31,6 @@ # # High-level Genode-specific services and applications # -# The 'gems' repository depends on 'libc', 'libports', and 'qt4'. +# The 'gems' repository depends on 'libc' and 'libports'. # #REPOSITORIES += $(GENODE_DIR)/repos/gems