genode/repos/libports/src/lib/qt5/patches/qt5_configuration.patch

qt5_configuration.patch

From: Christian Prochaska <christian.prochaska@genode-labs.com>


---
 configure                                          |    2 
 qt.pro                                             |   42 +-
 qtbase/configure                                   |    8 
 qtbase/mkspecs/genode-g++/qmake.conf               |   12 
 qtbase/mkspecs/genode-g++/qplatformdefs.h          |  112 ++++
 qtbase/src/corelib/global/qconfig-genode.h         |  546 ++++++++++++++++++++
 qtdeclarative/examples/quick/quick.pro             |    6 
 qtdeclarative/src/imports/imports.pro              |    2 
 qtdeclarative/tests/tests.pro                      |    4 
 qtquick1/examples/declarative/declarative.pro      |    1 
 qtwebkit/Tools/qmake/mkspecs/features/features.prf |    6 
 11 files changed, 707 insertions(+), 34 deletions(-)
 create mode 100644 qtbase/mkspecs/genode-g++/qmake.conf
 create mode 100644 qtbase/mkspecs/genode-g++/qplatformdefs.h
 create mode 100644 qtbase/src/corelib/global/qconfig-genode.h

diff --git a/configure b/configure
index 9ba24b5..d0f1357 100755
--- a/configure
+++ b/configure
@@ -60,4 +60,4 @@ echo "+ cd .."
 cd ..
 
 echo "+ qtbase/bin/qmake $srcpath"
-exec qtbase/bin/qmake "$srcpath"
+exec qtbase/bin/qmake -r "$srcpath"
diff --git a/qt.pro b/qt.pro
index 218701a..bb4c037 100644
--- a/qt.pro
+++ b/qt.pro
@@ -54,33 +54,33 @@ defineTest(addModule) {
 # it may not build.
 
 addModule(qtbase)
-addModule(qtx11extras, qtbase)
-addModule(qlalr, qtbase)
+#addModule(qtx11extras, qtbase)
+#addModule(qlalr, qtbase)
 addModule(qtsvg, qtbase)
 addModule(qtxmlpatterns, qtbase)
 addModule(qtjsbackend, qtbase)
 addModule(qtdeclarative, qtjsbackend, qtsvg qtxmlpatterns)
-addModule(qtquickcontrols, qtdeclarative)
-addModule(qtmultimedia, qtdeclarative)
-addModule(qtactiveqt, qtbase)
-addModule(qt3d, qtdeclarative)
-addModule(qtjsondb, qtdeclarative)
-addModule(qtsystems, qtbase, qtdeclarative qtjsondb)
-addModule(qtlocation, qtbase, qt3d qtjsondb qtsystems qtmultimedia)
-addModule(qtsensors, qtbase, qtdeclarative)
-addModule(qtconnectivity, qtsystems)
-addModule(qtfeedback, qtdeclarative, qtmultimedia)
-addModule(qtpim, qtdeclarative, qtjsondb)
+#addModule(qtquickcontrols, qtdeclarative)
+#addModule(qtmultimedia, qtdeclarative)
+#addModule(qtactiveqt, qtbase)
+#addModule(qt3d, qtdeclarative)
+#addModule(qtjsondb, qtdeclarative)
+#addModule(qtsystems, qtbase, qtdeclarative qtjsondb)
+#addModule(qtlocation, qtbase, qt3d qtjsondb qtsystems qtmultimedia)
+#addModule(qtsensors, qtbase, qtdeclarative)
+#addModule(qtconnectivity, qtsystems)
+#addModule(qtfeedback, qtdeclarative, qtmultimedia)
+#addModule(qtpim, qtdeclarative, qtjsondb)
 addModule(qtwebkit, qtdeclarative, qtlocation qtsensors, WebKit.pro)
 addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit)
 addModule(qtwebkit-examples, qtwebkit qttools)
 addModule(qtimageformats, qtbase)
-addModule(qtgraphicaleffects, qtdeclarative)
+#addModule(qtgraphicaleffects, qtdeclarative)
 addModule(qtscript, qtbase)
-addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit qttools)
-addModule(qtdocgallery, qtdeclarative, qtjsondb)
-!win32:!mac:addModule(qtwayland, qtbase, qtdeclarative)
-addModule(qtserialport, qtbase)
-addModule(qttranslations, qttools)
-addModule(qtdoc, qtdeclarative)
-addModule(qtqa, qtbase)
+#addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit qttools)
+#addModule(qtdocgallery, qtdeclarative, qtjsondb)
+#!win32:!mac:addModule(qtwayland, qtbase, qtdeclarative)
+#addModule(qtserialport, qtbase)
+#addModule(qttranslations, qttools)
+#addModule(qtdoc, qtdeclarative)
+#addModule(qtqa, qtbase)
diff --git a/qtbase/configure b/qtbase/configure
index d7c9674..956c3e1 100755
--- a/qtbase/configure
+++ b/qtbase/configure
@@ -857,10 +857,10 @@ CFG_XINERAMA=runtime
 CFG_XFIXES=runtime
 CFG_ZLIB=auto
 CFG_SQLITE=qt
-CFG_GIF=auto
+CFG_GIF=yes
 CFG_PNG=yes
 CFG_LIBPNG=auto
-CFG_JPEG=auto
+CFG_JPEG=yes
 CFG_LIBJPEG=auto
 CFG_XCURSOR=runtime
 CFG_XRANDR=runtime
@@ -883,7 +883,7 @@ CFG_SKIP_MODULES=""
 CFG_COMPILE_EXAMPLES=auto
 CFG_RELEASE_QMAKE=no
 CFG_AUDIO_BACKEND=auto
-CFG_V8SNAPSHOT=auto
+CFG_V8SNAPSHOT=no
 CFG_QML_DEBUG=yes
 CFG_JAVASCRIPTCORE_JIT=auto
 CFG_PKGCONFIG=auto
@@ -949,7 +949,7 @@ CFG_GETADDRINFO=auto
 CFG_IPV6IFNAME=auto
 CFG_GETIFADDRS=auto
 CFG_INOTIFY=auto
-CFG_EVENTFD=auto
+CFG_EVENTFD=no
 CFG_RPATH=yes
 CFG_FRAMEWORK=auto
 CFG_MAC_HARFBUZZ=no
diff --git a/qtbase/mkspecs/genode-g++/qmake.conf b/qtbase/mkspecs/genode-g++/qmake.conf
new file mode 100644
index 0000000..f99671f
--- /dev/null
+++ b/qtbase/mkspecs/genode-g++/qmake.conf
@@ -0,0 +1,12 @@
+#
+# qmake configuration for genode-g++
+#
+
+MAKEFILE_GENERATOR	= UNIX
+CONFIG += incremental gdb_dwarf_index
+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/qtbase/mkspecs/genode-g++/qplatformdefs.h b/qtbase/mkspecs/genode-g++/qplatformdefs.h
new file mode 100644
index 0000000..4d2c580
--- /dev/null
+++ b/qtbase/mkspecs/genode-g++/qplatformdefs.h
@@ -0,0 +1,112 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** 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, Digia gives you certain additional
+** rights.  These rights are described in the Digia 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.
+**
+**
+** $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 <unistd.h>
+
+
+// We are hot - unistd.h should have turned on the specific APIs we requested
+
+#ifndef Q_OS_GENODE
+#include <features.h>
+#endif
+#include <pthread.h>
+#include <dirent.h>
+#include <fcntl.h>
+#include <grp.h>
+#include <pwd.h>
+#include <signal.h>
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/ipc.h>
+#include <sys/time.h>
+#ifndef Q_OS_GENODE
+#include <sys/shm.h>
+#endif
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <netinet/in.h>
+#ifdef Q_OS_GENODE
+#define QT_NO_IPV6IFNAME
+#endif
+#ifndef QT_NO_IPV6IFNAME
+#include <net/if.h>
+#endif
+
+#define QT_USE_XOPEN_LFS_EXTENSIONS
+#include "../common/posix/qplatformdefs.h"
+
+#ifdef Q_OS_GENODE
+#undef QT_OPEN_LARGEFILE
+#define QT_OPEN_LARGEFILE 0
+#endif
+
+#undef QT_SOCKLEN_T
+
+#if (defined(__GLIBC__) && (__GLIBC__ >= 2)) || defined(Q_OS_GENODE)
+#define QT_SOCKLEN_T            socklen_t
+#else
+#define QT_SOCKLEN_T            int
+#endif
+
+#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
+#define QT_SNPRINTF		::snprintf
+#define QT_VSNPRINTF		::vsnprintf
+#endif
+
+#endif // QPLATFORMDEFS_H
diff --git a/qtbase/src/corelib/global/qconfig-genode.h b/qtbase/src/corelib/global/qconfig-genode.h
new file mode 100644
index 0000000..6227a0c
--- /dev/null
+++ b/qtbase/src/corelib/global/qconfig-genode.h
@@ -0,0 +1,546 @@
+/* Data structures */
+#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_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_SETTINGS
+//#  define QT_NO_SETTINGS
+//#endif
+//#ifndef QT_NO_LIBRARY
+//#  define QT_NO_LIBRARY
+//#endif
+
+/* Fonts */
+//#ifndef QT_NO_FREETYPE
+//#  define QT_NO_FREETYPE
+//#endif
+#ifndef QT_NO_QWS_QPF2
+#  define QT_NO_QWS_QPF2
+#endif
+
+/* Images */
+//#ifndef QT_NO_IMAGEFORMATPLUGIN
+//#  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_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_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_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
+#ifndef QT_NO_QWS_CURSOR
+#  define QT_NO_QWS_CURSOR
+#endif
+//#ifndef QT_NO_QWS_DECORATION_DEFAULT
+//#  define QT_NO_QWS_DECORATION_DEFAULT
+//#endif
+//#ifndef QT_NO_QWS_DECORATION_STYLED
+//#  define QT_NO_QWS_DECORATION_STYLED
+//#endif
+//#ifndef QT_NO_QWS_DECORATION_WINDOWS
+//#  define QT_NO_QWS_DECORATION_WINDOWS
+//#endif
+//#ifndef QT_NO_QWS_MANAGER
+//#  define QT_NO_QWS_MANAGER
+//#endif
+//#ifndef QT_NO_QWS_KEYBOARD
+//#  define QT_NO_QWS_KEYBOARD
+//#endif
+//#ifndef QT_NO_QWS_MOUSE
+//#  define QT_NO_QWS_MOUSE
+//#endif
+//#ifndef QT_NO_QWS_MOUSE_AUTO
+//#  define QT_NO_QWS_MOUSE_AUTO
+//#endif
+//#ifndef QT_NO_QWS_MOUSE_MANUAL
+//#  define QT_NO_QWS_MOUSE_MANUAL
+//#endif
+#ifndef QT_NO_QWS_MULTIPROCESS
+#  define QT_NO_QWS_MULTIPROCESS
+#endif
+#ifndef QT_NO_QWS_SOUNDSERVER
+#  define QT_NO_QWS_SOUNDSERVER
+#endif
+//#ifndef QT_NO_QWS_PROPERTIES
+//#  define QT_NO_QWS_PROPERTIES
+//#endif
+//#ifndef QT_NO_QWS_PROXYSCREEN
+//#  define QT_NO_QWS_PROXYSCREEN
+//#endif
+//#ifndef QT_NO_QWS_DYNAMICSCREENTRANSFORMATION
+//#  define QT_NO_QWS_DYNAMICSCREENTRANSFORMATION
+//#endif
+
+/* SVG */
+//#ifndef QT_NO_SVG
+//#  define QT_NO_SVG
+//#endif
+//#ifndef QT_NO_GRAPHICSSVGITEM
+//#  define QT_NO_GRAPHICSSVGITEM
+//#endif
+//#ifndef QT_NO_SVGGENERATOR
+//#  define QT_NO_SVGGENERATOR
+//#endif
+//#ifndef QT_NO_SVGRENDERER
+//#  define QT_NO_SVGRENDERER
+//#endif
+//#ifndef QT_NO_SVGWIDGET
+//#  define QT_NO_SVGWIDGET
+//#endif
+
+/* Styles */
+//#ifndef QT_NO_STYLE_FUSION
+//#  define QT_NO_STYLE_FUSION
+//#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
+//#ifndef QT_NO_GESTURES
+//#  define QT_NO_GESTURES
+//#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_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/qtdeclarative/examples/quick/quick.pro b/qtdeclarative/examples/quick/quick.pro
index 311e264..b356a56 100644
--- a/qtdeclarative/examples/quick/quick.pro
+++ b/qtdeclarative/examples/quick/quick.pro
@@ -12,7 +12,6 @@ SUBDIRS = accessibility \
             positioners \
             righttoleft \
             scenegraph \
-            shadereffects \
             text \
             threading \
             touchinteraction \
@@ -29,6 +28,11 @@ qtHaveModule(widgets) {
     SUBDIRS += embeddedinwidgets
 }
 
+# OpenGL dependent examples
+qtHaveModule(opengl) {
+	SUBDIRS += shadereffects
+}
+
 EXAMPLE_FILES = \
     ui-components \
     shared
diff --git a/qtdeclarative/src/imports/imports.pro b/qtdeclarative/src/imports/imports.pro
index 733c7c4..fb1a413 100644
--- a/qtdeclarative/src/imports/imports.pro
+++ b/qtdeclarative/src/imports/imports.pro
@@ -16,4 +16,4 @@ qtHaveModule(quick) {
 
 qtHaveModule(xmlpatterns) : SUBDIRS += xmllistmodel
 
-qtHaveModule(widgets) : SUBDIRS += widgets
+qtHaveModule(widgets),qtHaveModule(quick): SUBDIRS += widgets
diff --git a/qtdeclarative/tests/tests.pro b/qtdeclarative/tests/tests.pro
index 85e4f3a..9aa752b 100644
--- a/qtdeclarative/tests/tests.pro
+++ b/qtdeclarative/tests/tests.pro
@@ -1,2 +1,2 @@
-TEMPLATE = subdirs
-SUBDIRS +=  auto
+#TEMPLATE = subdirs
+#SUBDIRS +=  auto
diff --git a/qtquick1/examples/declarative/declarative.pro b/qtquick1/examples/declarative/declarative.pro
index 91378da..123539f 100644
--- a/qtquick1/examples/declarative/declarative.pro
+++ b/qtquick1/examples/declarative/declarative.pro
@@ -16,7 +16,6 @@ SUBDIRS = \
     righttoleft \
     rssnews \
     samegame \
-    shadereffects \
     snake \
     sqllocalstorage \
     text \
diff --git a/qtwebkit/Tools/qmake/mkspecs/features/features.prf b/qtwebkit/Tools/qmake/mkspecs/features/features.prf
index ddbccf9..e4d3999 100644
--- a/qtwebkit/Tools/qmake/mkspecs/features/features.prf
+++ b/qtwebkit/Tools/qmake/mkspecs/features/features.prf
@@ -39,8 +39,8 @@ defineTest(detectFeatures) {
 
     config_libxml2: WEBKIT_CONFIG += use_libxml2
     config_libxslt: WEBKIT_CONFIG += xslt
-    config_libzlib: WEBKIT_CONFIG += use_zlib
-    config_libwebp: WEBKIT_CONFIG += use_webp
+    #config_libzlib: WEBKIT_CONFIG += use_zlib
+    #config_libwebp: WEBKIT_CONFIG += use_webp
 
     # We can't use Qt's 3rdparty sources for libjpeg and libpng outside of qtbase, but if Qt
     # is using the system libraries, use them to take advantage of the WebCore image decoders as well.
@@ -81,7 +81,7 @@ defineTest(detectFeatures) {
 
     # Enable the USE(3D_GRAPHICS) flag when QtOpenGL is enabled.
     # Disable on Windows CE for now, as ANGLE won't compile.
-    !wince*:contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics
+    #!wince*:contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics
 
     # Temporarily disable FTPDIR on Windows CE (missing functions from time.h)
     wince* {