build only qtscript using -O1 (#1580047)

qmake-based projects default to using gcc-c++, and since
these are largely legacy apps/packages, let's minimize churn
by adding the dep here

.gitignore

@@ -1,10 +1,3 @@
-hi128-app-qt4-logo.png
-hi48-app-qt4-logo.png
-gstreamer-logo.svg
-hi128-phonon-gstreamer.png
-hi16-phonon-gstreamer.png
-hi22-phonon-gstreamer.png
-hi32-phonon-gstreamer.png
-hi48-phonon-gstreamer.png
-hi64-phonon-gstreamer.png
-qt-x11-opensource-src-4.5.3.tar.gz
+/hi128-app-qt4-logo.png
+/hi48-app-qt4-logo.png
+/qt-everywhere-opensource-src-4.8.7.tar.gz

0001-This-patch-uses-object-name-as-a-fallback-for-window.patch

@@ -1,117 +0,0 @@
-From b48e2091871516496cf0b133249fbf5326a55831 Mon Sep 17 00:00:00 2001
-From: Lubos Lunak <l.lunak@kde.org>
-Date: Sat, 23 Feb 2008 16:44:52 +0100
-Subject: [PATCH 01/18] This patch uses object name as a fallback for window role if no window
- role is set explicitly using setWindowRole(). Since Qt3 always used
- the object name as the window role and most Qt3/KDE3 code is ported to
- call setObjectName(),
-
-this makes the window role set in many cases (which KWin uses for window identifying).
-
-NOTE: It is suggested to apply patch #0209 as well when this patch is used.
-
-qt-bugs@ issue : 167704
-Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refused)
----
- src/corelib/kernel/qobject.cpp |    8 ++++++++
- src/corelib/kernel/qobject_p.h |    3 +++
- src/gui/kernel/qwidget_p.h     |    1 +
- src/gui/kernel/qwidget_x11.cpp |   27 +++++++++++++++++++++------
- 4 files changed, 33 insertions(+), 6 deletions(-)
-
-diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
-index 6487194..ef0369e 100644
---- a/src/corelib/kernel/qobject.cpp
-+++ b/src/corelib/kernel/qobject.cpp
-@@ -993,8 +993,16 @@ void QObject::setObjectName(const QString &name)
- {
-     Q_D(QObject);
-     d->objectName = name;
-+#if defined(Q_WS_X11)
-+    d->checkWindowRole();
-+#endif
- }
- 
-+#if defined(Q_WS_X11)
-+void QObjectPrivate::checkWindowRole()
-+{
-+}
-+#endif
- 
- #ifdef QT3_SUPPORT
- /*! \internal
-diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
-index 0bcccba..6ab9e10 100644
---- a/src/corelib/kernel/qobject_p.h
-+++ b/src/corelib/kernel/qobject_p.h
-@@ -144,6 +144,9 @@ public:
-     mutable quint32 connectedSignals;
- 
-     QString objectName;
-+#if defined(Q_WS_X11)
-+    virtual void checkWindowRole();
-+#endif
- 
-     // Note: you must hold the signalSlotLock() before accessing the lists below or calling the functions
-     struct Connection
-diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
-index 774e390..176d6fa 100644
---- a/src/gui/kernel/qwidget_p.h
-+++ b/src/gui/kernel/qwidget_p.h
-@@ -358,6 +358,7 @@ public:
- 
- #if defined(Q_WS_X11)
-     void setWindowRole();
-+    virtual void checkWindowRole();
-     void sendStartupMessage(const char *message) const;
-     void setNetWmWindowTypes();
-     void x11UpdateIsOpaque();
-diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
-index 79ee8c9..b56849c 100644
---- a/src/gui/kernel/qwidget_x11.cpp
-+++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -778,13 +778,17 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
-         data.fstrut_dirty = 1;
- 
-         // declare the widget's window role
-+        QByteArray windowRole;
-         if (QTLWExtra *topData = maybeTopData()) {
--            if (!topData->role.isEmpty()) {
--                QByteArray windowRole = topData->role.toUtf8();
--                XChangeProperty(dpy, id,
--                                ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
--                                (unsigned char *)windowRole.constData(), windowRole.length());
--            }
-+            if (!topData->role.isEmpty())
-+                windowRole = topData->role.toUtf8();
-+        }
-+        if (windowRole.isEmpty()) // use object name as a fallback
-+            windowRole = objectName.toUtf8();
-+        if (!windowRole.isEmpty()) {
-+            XChangeProperty(dpy, id,
-+                            ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
-+                            (unsigned char *)windowRole.constData(), windowRole.length());
-         }
- 
-         // set client leader property
-@@ -2768,6 +2772,17 @@ void QWidgetPrivate::setWindowRole()
-                     (unsigned char *)windowRole.constData(), windowRole.length());
- }
- 
-+void QWidgetPrivate::checkWindowRole()
-+{
-+    Q_Q(QWidget);
-+    if( !q->windowRole().isEmpty() || !q->internalWinId())
-+        return;
-+    QByteArray windowRole = objectName.toUtf8(); // use as a fallback
-+    XChangeProperty(X11->display, q->internalWinId(),
-+                    ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
-+                    (unsigned char *)windowRole.constData(), windowRole.length());
-+}
-+
- Q_GLOBAL_STATIC(QX11PaintEngine, qt_widget_paintengine)
- QPaintEngine *QWidget::paintEngine() const
- {
--- 
-1.6.2.5
-

0002-This-patch-makes-override-redirect-windows-popup-me.patch

@@ -1,67 +0,0 @@
-From 339e220e29ff39b86705438b4be6f90e5618d27b Mon Sep 17 00:00:00 2001
-From: Lubos Lunak <l.lunak@kde.org>
-Date: Tue, 2 Oct 2007 16:08:32 +0200
-Subject: [PATCH 02/18] This patch makes override-redirect windows (popup menu, dropdown menu,
- tooltip, combobox, etc.) also have more window properties like WM_CLASS,
- so they can be used when compositing.
-
-qt-bugs@ issue : none
-bugs.kde.org number : none
----
- src/gui/kernel/qwidget_x11.cpp |   21 +++++++++++++++------
- 1 files changed, 15 insertions(+), 6 deletions(-)
-
-diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
-index 79ee8c9..a74a849 100644
---- a/src/gui/kernel/qwidget_x11.cpp
-+++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -719,6 +719,11 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
-         Q_ASSERT(id);
-         XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder,
-                                 &wsa);
-+        XClassHint class_hint;
-+        QByteArray appName = qAppName().toLatin1();
-+        class_hint.res_name = appName.data(); // application name
-+        class_hint.res_class = const_cast<char *>(QX11Info::appClass());   // application class
-+        XSetWMProperties(dpy, id, 0, 0, 0, 0, 0, 0, &class_hint);
-     } else if (topLevel && !desktop) {        // top-level widget
-         if (!X11->wm_client_leader)
-             create_wm_client_leader();
-@@ -769,13 +774,21 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
-         // set EWMH window types
-         setNetWmWindowTypes();
- 
-+        // when we create a toplevel widget, the frame strut should be dirty
-+        data.fstrut_dirty = 1;
-+
-+    } else {
-+        // non-toplevel widgets don't have a frame, so no need to
-+        // update the strut
-+        data.fstrut_dirty = 0;
-+    }
-+
-+    if (initializeWindow && (popup || (topLevel && !desktop))) { // properties set on all toplevel windows
-         // set _NET_WM_PID
-         long curr_pid = getpid();
-         XChangeProperty(dpy, id, ATOM(_NET_WM_PID), XA_CARDINAL, 32, PropModeReplace,
-                         (unsigned char *) &curr_pid, 1);
- 
--        // when we create a toplevel widget, the frame strut should be dirty
--        data.fstrut_dirty = 1;
- 
-         // declare the widget's window role
-         if (QTLWExtra *topData = maybeTopData()) {
-@@ -791,10 +804,6 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
-         XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER),
-                         XA_WINDOW, 32, PropModeReplace,
-                         (unsigned char *)&X11->wm_client_leader, 1);
--    } else {
--        // non-toplevel widgets don't have a frame, so no need to
--        // update the strut
--        data.fstrut_dirty = 0;
-     }
- 
-     if (initializeWindow && q->internalWinId()) {
--- 
-1.6.2.5
-

0003-This-patch-changes-QObjectPrivateVersion-thus-preve.patch

@@ -1,37 +0,0 @@
-From 68eaa07de69e873b89d4aba341c6ed1ca81f6819 Mon Sep 17 00:00:00 2001
-From: Lubos Lunak <l.lunak@kde.org>
-Date: Wed, 30 Jan 2008 14:24:01 +0100
-Subject: [PATCH 03/18] This patch changes QObjectPrivateVersion, thus preventing mixing
- parts of upstream Qt and qt-copy. In general it is a bad idea to mix
- e.g. libQtCore from one build and libQtGui from another one, and other
- qt-copy patches could make changes in Qt internal structures that could
- cause problems when mixed with upstream Qt.
-
-This patch does not make qt-copy binary incompatible with upstream Qt.
-It only further enforces using the same sources for the whole Qt build.
-
-qt-bugs@ issue : none
-Trolltech task ID : none
-bugs.kde.org number : none
----
- src/corelib/kernel/qobject_p.h |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
-index 0bcccba..88192fd 100644
---- a/src/corelib/kernel/qobject_p.h
-+++ b/src/corelib/kernel/qobject_p.h
-@@ -83,7 +83,9 @@ extern QSignalSpyCallbackSet Q_CORE_EXPORT qt_signal_spy_callback_set;
- 
- inline QObjectData::~QObjectData() {}
- 
--enum { QObjectPrivateVersion = QT_VERSION };
-+// add 0x1000000 to mark it as qt-copy version, with possible modifications
-+// in some Q*Private class
-+enum { QObjectPrivateVersion = QT_VERSION + 0x1000000 };
- 
- class Q_CORE_EXPORT QObjectPrivate : public QObjectData
- {
--- 
-1.6.2.5
-

0004-This-patch-adds-support-for-using-isystem-to-allow.patch

@@ -1,56 +0,0 @@
-From 86fc0d43cdcf3232ae0e4e6f4f28cf8f1a45ede5 Mon Sep 17 00:00:00 2001
-From: Benjamin Reed <rangerrick@befunk.com>
-Date: Tue, 19 Feb 2008 17:37:37 +0100
-Subject: [PATCH 04/18] This patch adds support for using -isystem to allow putting an include
- directory at the end of the compiler's header search path.
-
-I don't have the exact output anymore (I've since patched Qt's configure) but
-essentially, since I have pcre.h in /opt/kde4-deps/include, it was
-conflicting with Qt's (modified) pcre.h in the WebKit bits, since
--I /opt/kde4-deps/include ends up in CXXFLAGS in the generated makefiles, it
-comes *before* the specific locations in INCPATH on the compile line, and you
-end up with a conflict with the system-installed pcre.h.
-
-Presumably, if your pcre.h is in /usr/include as on most Linux systems, you
-wouldn't notice this issue since /usr/include's already in your include path
-and people likely don't pass -I /usr/include to configure.  I suspect that on
-any platform with a regular, system-installed pcre.h (or clucene headers),
-adding -I /usr/include would exhibit this bug, just as a custom-installed
-pcre/clucene in another root would.
-
-qt-bugs@ issue : 199610
-Trolltech task ID :
-bugs.kde.org number :
----
- configure |    8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/configure b/configure
-index 2c108ad..610a201 100755
---- a/configure
-+++ b/configure
-@@ -927,6 +927,11 @@ while [ "$#" -gt 0 ]; do
-             VAL=`echo $1 | sed 's,-D,,'`
-         fi
-         ;;
-+    -isystem)
-+        VAR="add_isystempath"
-+        shift
-+        VAL="$1"
-+        ;;
-     -I?*|-I)
-         VAR="add_ipath"
-         if [ "$1" = "-I" ]; then
-@@ -1890,6 +1895,9 @@ while [ "$#" -gt 0 ]; do
-     add_ipath)
-         I_FLAGS="$I_FLAGS -I\"${VAL}\""
-         ;;
-+    add_isystempath)
-+        I_FLAGS="$I_FLAGS -isystem \"${VAL}\""
-+        ;;
-     add_lpath)
-         L_FLAGS="$L_FLAGS -L\"${VAL}\""
-         ;;
--- 
-1.6.2.5
-

0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch

@@ -1,47 +0,0 @@
-From 733d1afd03908d695aa8a6518f453b9ff0e5b8a2 Mon Sep 17 00:00:00 2001
-From: Robert Knight <robertknight@gmail.com>
-Date: Sun, 20 Apr 2008 16:28:31 +0200
-Subject: [PATCH 05/18] When tabs are inserted or removed in a QTabBar,
- QTabBarPrivate::refresh() is called to update the layout.  If the
- tabbar widget is hidden, this just sets a boolean variable
- (layoutDirty) and returns, so the parent widget's layout is not
- notified about the possible geometry change.
-
-Prior to Qt 4.4 this was not a problem because the geometry was
-recalculated in QTabBar::sizeHint() if the layoutDirty variable was
-set.  In Qt 4.4 however the layout caches size hint information in
-QWidgetItemV2.  Since the cache information is not invalidated, the
-layout may end up using out-of-date size hint information to compute
-the widget size.
-
-If the QTabBar is empty when QTabBar::sizeHint() is called, it will
-return a size with a height of 0, which will be kept in the cache and
-so the tab bar will never be shown.
-
-This patch fixes the problem by calling updateGeometry() whenever the
-tab bar's layout is refreshed.
-
-qt-bugs@ issue : 208185
-Trolltech task ID : 208349
-bugs.kde.org number : 159014
----
- src/gui/widgets/qtabbar.cpp |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/gui/widgets/qtabbar.cpp b/src/gui/widgets/qtabbar.cpp
-index 419d456..41107a0 100644
---- a/src/gui/widgets/qtabbar.cpp
-+++ b/src/gui/widgets/qtabbar.cpp
-@@ -678,8 +678,8 @@ void QTabBarPrivate::refresh()
-         layoutTabs();
-         makeVisible(currentIndex);
-         q->update();
--        q->updateGeometry();
-     }
-+    q->updateGeometry();
- }
- 
- /*!
--- 
-1.6.2.5
-

0006-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch

@@ -1,67 +0,0 @@
-From 8e28e0603a900e1b18ebfd14c4f87b16dabf4cf6 Mon Sep 17 00:00:00 2001
-From: Christian Ehrlicher <ch.ehrlicher@gmx.de>
-Date: Fri, 19 Sep 2008 17:41:26 +0200
-Subject: [PATCH 06/18] Fix configure.exe to do an out-of-source build on windows
-
-qt-bugs@ issue : N227213
-Trolltech task ID : none yet
----
- bin/syncqt             |    6 +++++-
- projects.pro           |    3 +++
- src/tools/moc/main.cpp |    6 ++++++
- 3 files changed, 14 insertions(+), 1 deletions(-)
-
-diff --git a/bin/syncqt b/bin/syncqt
-index 7a9f1d3..b5a8e1c 100755
---- a/bin/syncqt
-+++ b/bin/syncqt
-@@ -365,9 +365,13 @@ sub fixPaths {
-         $match_dir = $tmp;
-         $i = $slash;
-     }
-+    my $cnt_ofs = 0;
-+    if($match_dir =~ /^[a-zA-Z]:$/) {
-+      $cnt_ofs = 1;
-+    }
-     if($match_dir) {
-         my $after = substr($dir, length($match_dir));
--        my $count = ($after =~ tr,/,,);
-+        my $count = ($after =~ tr,/,,) - $cnt_ofs;
-         my $dots = "";
-         for(my $i = 0; $i < $count; $i++) {
-             $dots .= "../";
-diff --git a/projects.pro b/projects.pro
-index 2596c0a..3ba0688 100644
---- a/projects.pro
-+++ b/projects.pro
-@@ -127,6 +127,9 @@ unix {
-    DEFAULT_QMAKESPEC ~= s,^.*mkspecs/,,g
-    mkspecs.commands += $(DEL_FILE) $(INSTALL_ROOT)$$mkspecs.path/default; $(SYMLINK) $$DEFAULT_QMAKESPEC $(INSTALL_ROOT)$$mkspecs.path/default
- }
-+win32 {
-+   mkspecs.files += $$QT_BUILD_TREE/mkspecs/default
-+}
- INSTALLS += mkspecs
- 
- false:macx { #mac install location
-diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp
-index d519b09..7979836 100644
---- a/src/tools/moc/main.cpp
-+++ b/src/tools/moc/main.cpp
-@@ -94,7 +94,13 @@ static QByteArray combinePath(const char *infile, const char *outfile)
-         inSplitted.prepend(QLatin1String(".."));
-     }
-     inSplitted.append(inFileInfo.fileName());
-+#ifdef Q_WS_WIN
-+    const QString rel = inSplitted.join(QLatin1String("/"));
-+    const QString abs = inFileInfo.absoluteFilePath();
-+    return QFile::encodeName(rel.length() < abs.length() ? rel : abs);
-+#else
-     return QFile::encodeName(inSplitted.join(QLatin1String("/")));
-+#endif
- }
- 
- 
--- 
-1.6.2.5
-

0007-When-using-qmake-outside-qt-src-tree-it-sometimes-g.patch

@@ -1,73 +0,0 @@
-From 0afcf33127c6ccbe5dfaae4f4c5e02f28dc10ae1 Mon Sep 17 00:00:00 2001
-From: Christian Ehrlicher <ch.ehrlicher@gmx.de>
-Date: Thu, 8 May 2008 21:25:49 +0200
-Subject: [PATCH 07/18] When using qmake outside qt src tree, it sometimes generates wrong
- paths (wrong path separator)
-
-qt-bugs@ issue : none
-Trolltech task ID : 214661
----
- qmake/property.cpp |   29 ++++++++++++++++-------------
- 1 files changed, 16 insertions(+), 13 deletions(-)
-
-diff --git a/qmake/property.cpp b/qmake/property.cpp
-index 8ba89f9..dd78349 100644
---- a/qmake/property.cpp
-+++ b/qmake/property.cpp
-@@ -81,29 +81,32 @@ QMakeProperty::keyBase(bool version) const
- QString
- QMakeProperty::value(QString v, bool just_check)
- {
-+    QString ret;
-     if(v == "QT_INSTALL_PREFIX")
--        return QLibraryInfo::location(QLibraryInfo::PrefixPath);
-+        ret = QLibraryInfo::location(QLibraryInfo::PrefixPath);
-     else if(v == "QT_INSTALL_DATA")
--        return QLibraryInfo::location(QLibraryInfo::DataPath);
-+        ret = QLibraryInfo::location(QLibraryInfo::DataPath);
-     else if(v == "QT_INSTALL_DOCS")
--        return QLibraryInfo::location(QLibraryInfo::DocumentationPath);
-+        ret = QLibraryInfo::location(QLibraryInfo::DocumentationPath);
-     else if(v == "QT_INSTALL_HEADERS")
--        return QLibraryInfo::location(QLibraryInfo::HeadersPath);
-+        ret = QLibraryInfo::location(QLibraryInfo::HeadersPath);
-     else if(v == "QT_INSTALL_LIBS")
--        return QLibraryInfo::location(QLibraryInfo::LibrariesPath);
-+        ret = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
-     else if(v == "QT_INSTALL_BINS")
--        return QLibraryInfo::location(QLibraryInfo::BinariesPath);
-+        ret = QLibraryInfo::location(QLibraryInfo::BinariesPath);
-     else if(v == "QT_INSTALL_PLUGINS")
--        return QLibraryInfo::location(QLibraryInfo::PluginsPath);
-+        ret = QLibraryInfo::location(QLibraryInfo::PluginsPath);
-     else if(v == "QT_INSTALL_TRANSLATIONS")
--        return QLibraryInfo::location(QLibraryInfo::TranslationsPath);
-+        ret = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
-     else if(v == "QT_INSTALL_CONFIGURATION")
--        return QLibraryInfo::location(QLibraryInfo::SettingsPath);
-+        ret = QLibraryInfo::location(QLibraryInfo::SettingsPath);
-     else if(v == "QT_INSTALL_EXAMPLES")
--        return QLibraryInfo::location(QLibraryInfo::ExamplesPath);
-+        ret = QLibraryInfo::location(QLibraryInfo::ExamplesPath);
-     else if(v == "QT_INSTALL_DEMOS")
--        return QLibraryInfo::location(QLibraryInfo::DemosPath);
--    else if(v == "QMAKE_MKSPECS")
-+        ret = QLibraryInfo::location(QLibraryInfo::DemosPath);
-+    if(!ret.isEmpty())
-+        return QDir::toNativeSeparators(ret);
-+    if(v == "QMAKE_MKSPECS")
-         return qmake_mkspec_paths().join(Option::target_mode == Option::TARG_WIN_MODE ? ";" : ":");
-     else if(v == "QMAKE_VERSION")
-         return qmake_version();
-@@ -116,7 +119,7 @@ QMakeProperty::value(QString v, bool just_check)
-     int slash = v.lastIndexOf('/');
-     QVariant var = settings->value(keyBase(slash == -1) + v);
-     bool ok = var.isValid();
--    QString ret = var.toString();
-+    ret = var.toString();
-     if(!ok) {
-         QString version = qmake_version();
-         if(slash != -1) {
--- 
-1.6.2.5
-

0008-In-a-treeview-with-columns-like-this.patch

@@ -1,52 +0,0 @@
-From 1ec9dd029abaa0f00798535fdb1722154b1c63f6 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= <ereslibre@kde.org>
-Date: Sun, 26 Oct 2008 10:40:51 +0100
-Subject: [PATCH 08/18] In a treeview with columns like this:
-
-Column 1 | Column 2 | ... | Column k | ... | Column n
-
-When selecting with rubberband (by clicking on the blank part of the viewport) while Column k is
-hidden, you get double items on the selection model, when asking for selection(). This is becase
-ranges are incorrectly calculated when there are hidden columns. A way to reproduce:
-
-Column 1 | Column 2 | Column 4 (Column 3 is hidden)
- item
- item
- item
-  x <- press button here and move it up to select items (on this same column)
-
-If you do like this:
-
-Column 1 | Column 2 | Column 4 (Column 3 is hidden)
- item
- item
- item
-                         x <- press button here and move it up
-
-you won't be able to reproduce, since you need the hidden column to be between the one you click and
-the last one. The reason is that columnRanges returns two ranges when there is supposed to return 1
-range (even when there are hidden columns).
-
-qt-bugs@ issue : N232819
-Trolltech task ID : 232831
-bugs.kde.org number : 171436
----
- src/gui/itemviews/qtreeview.cpp |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp
-index ed6ad03..dc147f2 100644
---- a/src/gui/itemviews/qtreeview.cpp
-+++ b/src/gui/itemviews/qtreeview.cpp
-@@ -3575,7 +3575,7 @@ QList<QPair<int, int> > QTreeViewPrivate::columnRanges(const QModelIndex &topInd
-     current.first = -2; // -1 is not enough because -1+1 = 0
-     current.second = -2;
-     foreach (int logicalColumn, logicalIndexes) {
--        if (current.second + 1 != logicalColumn) {
-+        if (current.second + 1 != logicalColumn && !header->isSectionHidden(current.second + 1)) {
-             if (current.first != -2) {
-                 //let's save the current one
-                 ret += current;
--- 
-1.6.2.5
-

0009-This-patch-fixes-deserialization-of-values-with-cust.patch

@@ -1,54 +0,0 @@
-From b274bbaf4768dcfdfcf95ceda08b6402ffedb80d Mon Sep 17 00:00:00 2001
-From: George Goldberg <grundleborg@googlemail.com>
-Date: Tue, 28 Apr 2009 17:08:07 +0200
-Subject: [PATCH 09/18] This patch fixes deserialization of values with custom types when setting
- properties on dbus adaptors. It is needed, in particular by telepathy/Qt
- programs and libraries. The bug was reported to Nokia on 2009-01-07 along
- with the patch supplied here. The summary of the issue from the Qt
- Software task tracker follows:
-
-When calling the setter for a DBus property, if that property has a custom type
-(e.g. a struct with dbus type (uss)), QtDBus fails to demarshall the
-QDBusArgument before attempting to set the property on the adaptor. The result
-is that it attempts to call adaptor->setProperty() with a QDBusArgument of type
-"uss" instead of with the type of the custom struct.
-
-qt-bugs@ issue : N240326
-Qt Software task ID : 240608
-bugs.kde.org number : none
----
- src/dbus/qdbusinternalfilters.cpp |   16 +++++++++++++++-
- 1 files changed, 15 insertions(+), 1 deletions(-)
-
-diff --git a/src/dbus/qdbusinternalfilters.cpp b/src/dbus/qdbusinternalfilters.cpp
-index c71f2f4..d261d01 100644
---- a/src/dbus/qdbusinternalfilters.cpp
-+++ b/src/dbus/qdbusinternalfilters.cpp
-@@ -274,9 +274,23 @@ QDBusMessage qDBusPropertySet(const QDBusConnectionPrivate::ObjectTreeNode &node
-             QDBusAdaptorConnector::AdaptorMap::ConstIterator it;
-             it = qLowerBound(connector->adaptors.constBegin(), connector->adaptors.constEnd(),
-                              interface_name);
--            if (it != connector->adaptors.end() && interface_name == QLatin1String(it->interface))
-+            if (it != connector->adaptors.end() && interface_name == QLatin1String(it->interface)) {
-+                if (value.userType() == qMetaTypeId<QDBusArgument>()) {
-+                    QDBusArgument valueArg = qvariant_cast<QDBusArgument>(value);
-+                    if (valueArg.currentType() != -1) {
-+                        int mid = it->adaptor->metaObject()->property(it->adaptor->metaObject()->indexOfProperty(property_name)).userType();
-+                        void *null = 0;
-+                        QVariant valueStore(mid, null);
-+                        QDBusMetaType::demarshall(valueArg, mid, valueStore.data());
-+
-+                        if (it->adaptor->setProperty(property_name, valueStore))
-+                            return msg.createReply();
-+                    }
-+                }
-+
-                 if (it->adaptor->setProperty(property_name, value))
-                     return msg.createReply();
-+            }
-         }
-     }
- 
--- 
-1.6.2.5
-

0010-Import-README.qt-copy-from-the-original-qt-copy.patch

@@ -1,207 +0,0 @@
-From 9a3fe8fc4912bf82b791c4131f553c18140ca838 Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago@doriath.(none)>
-Date: Sun, 21 Jun 2009 13:17:13 -0300
-Subject: [PATCH 10/18] Import README.qt-copy from the original qt-copy
-
----
- README.kde-qt |  188 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 188 insertions(+), 0 deletions(-)
- create mode 100644 README.kde-qt
-
-diff --git a/README.kde-qt b/README.kde-qt
-new file mode 100644
-index 0000000..f605a0b
---- /dev/null
-+++ b/README.kde-qt
-@@ -0,0 +1,188 @@
-+This is a copy of Qt version 4.5.1.  It may include
-+modifications which are necessary for KDE; these are listed in the
-+patches directory.
-+
-+1. Qt-copy patches
-+==================
-+
-+You may also consider running the apply_patches script before configuring qt-copy,
-+which will apply all not yet applied patches from the patches/ directory that
-+are considered safe (they mostly include optimizations and features that don't
-+add new API). Note that most of those patches haven't been accepted
-+by Qt Software yet. and therefore they'll make your qt-copy differ from official
-+Qt version.
-+
-+2. Configuring Qt
-+=================
-+
-+The recommended compile line is:
-+
-+--default-config-begin--
-+./configure -qt-gif -debug -fast -no-exceptions -no-separate-debug-info \
-+   -system-libpng -system-libjpeg -system-zlib \
-+   -dbus -webkit -no-phonon -plugin-sql-mysql \
-+   -nomake examples -nomake demos -prefix <installdir>
-+--default-config-end--
-+
-+It contains "-debug", which greatly improves the use for backtraces (but
-+also needs a lot more disk space and makes things slower). To build in
-+release mode, replace it with "-release".
-+
-+It also contains "-no-separate-debug-info", which disables separate .debug
-+files. Instead, the debug information will be built into the libraries.
-+This option is needed when you install Qt.
-+If you don't install Qt, it can be useful to disable this option,
-+thus having separate debug symbol files. With separate debug files, you can
-+just move those debug files to another directory to remove Qt debug symbols.
-+Moving the files back will enable Qt debug symbols again.
-+This is useful if you rarely need to step into Qt functions during debugging,
-+because GDB loads much faster and uses less memory without Qt debug symbols.
-+In the rare case you need to step into Qt code, you can temporarily enable
-+debug symbols again by moving the debug files back. You can even load the Qt
-+debug symbols from within GDB on demand, using the "symbol-file" command.
-+
-+It also contains the "-no-exceptions" argument, which disables C++
-+exception support. Disabling exception support may improve memory
-+consumption if GCC is being used. However, that also disables the
-+QtXmlPatterns module since that requires exception support. If you
-+plan on using that module, remove the option.
-+
-+If you are planning to compile Qt using an Icecream cluster you have to
-+pass the option -no-pch (no precompiled headers) to configure to make
-+distributed compilation work.
-+
-+3. Compiling Qt
-+===============
-+
-+To compile Qt on a Unix platform, run:
-+
-+   export MAKEFLAGS=-j2
-+   make
-+   make install
-+
-+If your computer has more than one core or processor, you may consider
-+increasing the "2" above. If you've got a compile farm available, you
-+should adjust the -j argument to match the number of slots in that
-+farm.
-+
-+4. Modifying & rebuilding Qt
-+============================
-+
-+If you make modifications to the Qt source code, you don't need to
-+build everything again. Simply go to the directory containing the
-+Makefile closest to the files you changed and run "make" again.
-+
-+For example, if you modified src/corelib/io/qiodevice.cpp, do:
-+
-+   cd src/corelib
-+   make
-+
-+Do not commit your modifications to qt-copy as such. If you have a fix
-+that benefit others, see the "Creating Qt-copy patches" section below.
-+
-+5. Building Qt examples and demos
-+=================================
-+
-+The "-nomake examples -nomake demos" arguments to the configure script
-+mean that those two sections will not be configured for
-+building. Which is unneeded for usage of the library.  If you want to
-+compile the examples or demos later; just enter either directory and
-+type:
-+
-+   qmake
-+   make
-+
-+6. Building Qt documentation (only applies to Snapshot versions of Qt)
-+============================
-+
-+To build and install the documentation, run:
-+
-+   make docs
-+   ./config.status
-+   make install
-+
-+It is necessary to do this once only, even if you rebuild Qt later.
-+
-+7. Using Qt uninstalled
-+=======================
-+
-+To use without having to install it, configure it as follows:
-+
-+   ./configure <other configure options>  -prefix $PWD
-+   make sub-src
-+   make sub-tools
-+
-+Attention: DO NOT run
-+
-+   make install
-+
-+If you do, Qt will overwrite your include/ directory with its
-+installation.
-+
-+8. Creating Qt-copy patches
-+===========================
-+
-+If you have fixed a bug in Qt or modified it in any way that may
-+benefit others, please share your change in the form of a patch. Do
-+not commit your changes directly to the qt-copy module because they
-+may be lost in a future update if they have not been added to the
-+official Qt release.
-+
-+The exception to the above rule is that if the fix has been accepted
-+by Qt Software (and so will appear in the next release of Qt), then
-+it can be applied directly to qt-copy.  In this case, the patch
-+should still be placed in patches/ as usual, but it should have a
-+header line
-+    Applied: yes
-+
-+Before creating a patch, it is recommended to contact Qt Software
-+support via qt-bugs@trolltech.com and explain the situation. There may
-+be a solution for the problem already or a new direction that should
-+be accounted for.
-+
-+To create a patch, do the following:
-+  a) make sure your Qt sources are clean of other changes. Run:
-+     svn revert -R .
-+  b) make your changes to the Qt source code and verify that it
-+  compiles, links and works.
-+  c) open the patches/README file and get the next patch number
-+  (you must read and understand the README file; if you don't, ask for
-+  help from other KDE developers)
-+  d) create the patch with:
-+     svn diff > patches/NNNN-short-description-of-your-patch.diff
-+  where NNNN is the next available number.
-+  e) open the file you've just created and add the header to it. The
-+  header should be the template in patches/README followed by a longer
-+  description of your patch.
-+
-+Don't forget to submit your patch to qt-bugs@trolltech.com along with
-+the long description of the issue found, if you haven't already.
-+Qt Software does not monitor the patches/ directory, so qt-copy
-+patches do not get automatically applied to Qt official releases.
-+
-+When you receive the issue number and task tracker numbers, update the
-+patch file.
-+
-+9. Known issues with current Qt code
-+====================================
-+
-+In case you have strange issues with non-resizing windows and similar, use
-+   export QT_USE_NATIVE_WINDOWS=1
-+before starting KDE.
-+
-+10. Troubleshooting: Re-configuring and re-compiling
-+===================================================
-+
-+For those updating the source in a directory where Qt has already
-+been compiled, you may need to run the following commands from the
-+top directory of your Qt sources:
-+
-+	find . -name '*.moc' | xargs rm
-+
-+Sometimes ./configure will refuse to run.  You may need to:
-+	rm .qmake.cache
-+
-+If you think you may have run "make install" on an install-less Qt
-+(srcdir == $QTDIR), run:
-+
-+	svn revert -R include
--- 
-1.6.2.5
-

0011-Update-this-file-to-reflect-the-workflow-with-Git-a.patch

@@ -1,257 +0,0 @@
-From 39b24a10e4dee27357b9760b735c2ab98b132963 Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago@doriath.(none)>
-Date: Sun, 21 Jun 2009 13:46:54 -0300
-Subject: [PATCH 11/18] Update this file to reflect the workflow with Git, as well as use Git commands
-
----
- README.kde-qt |  163 +++++++++++++++++++++++++++++++--------------------------
- 1 files changed, 88 insertions(+), 75 deletions(-)
-
-diff --git a/README.kde-qt b/README.kde-qt
-index f605a0b..db3feb6 100644
---- a/README.kde-qt
-+++ b/README.kde-qt
-@@ -1,27 +1,20 @@
--This is a copy of Qt version 4.5.1.  It may include
--modifications which are necessary for KDE; these are listed in the
--patches directory.
-+This is a patched version of Qt.  It may include changes made by KDE
-+and Qt developers that have either not been accepted for inclusion
-+into Qt, or have been accepted for a later version of Qt than this
-+one.
- 
--1. Qt-copy patches
--==================
--
--You may also consider running the apply_patches script before configuring qt-copy,
--which will apply all not yet applied patches from the patches/ directory that
--are considered safe (they mostly include optimizations and features that don't
--add new API). Note that most of those patches haven't been accepted
--by Qt Software yet. and therefore they'll make your qt-copy differ from official
--Qt version.
--
--2. Configuring Qt
-+1. Configuring Qt
- =================
- 
- The recommended compile line is:
- 
- --default-config-begin--
--./configure -qt-gif -debug -fast -no-exceptions -no-separate-debug-info \
--   -system-libpng -system-libjpeg -system-zlib \
--   -dbus -webkit -no-phonon -plugin-sql-mysql \
--   -nomake examples -nomake demos -prefix <installdir>
-+
-+  ./configure -qt-gif -debug -fast -no-separate-debug-info \
-+     -system-libpng -system-libjpeg -system-zlib \
-+     -dbus -webkit -plugin-sql-mysql \
-+     -nomake examples -nomake demos -prefix <installdir>
-+
- --default-config-end--
- 
- It contains "-debug", which greatly improves the use for backtraces (but
-@@ -31,6 +24,7 @@ release mode, replace it with "-release".
- It also contains "-no-separate-debug-info", which disables separate .debug
- files. Instead, the debug information will be built into the libraries.
- This option is needed when you install Qt.
-+
- If you don't install Qt, it can be useful to disable this option,
- thus having separate debug symbol files. With separate debug files, you can
- just move those debug files to another directory to remove Qt debug symbols.
-@@ -41,17 +35,11 @@ In the rare case you need to step into Qt code, you can temporarily enable
- debug symbols again by moving the debug files back. You can even load the Qt
- debug symbols from within GDB on demand, using the "symbol-file" command.
- 
--It also contains the "-no-exceptions" argument, which disables C++
--exception support. Disabling exception support may improve memory
--consumption if GCC is being used. However, that also disables the
--QtXmlPatterns module since that requires exception support. If you
--plan on using that module, remove the option.
--
- If you are planning to compile Qt using an Icecream cluster you have to
- pass the option -no-pch (no precompiled headers) to configure to make
- distributed compilation work.
- 
--3. Compiling Qt
-+2. Compiling Qt
- ===============
- 
- To compile Qt on a Unix platform, run:
-@@ -65,34 +53,49 @@ increasing the "2" above. If you've got a compile farm available, you
- should adjust the -j argument to match the number of slots in that
- farm.
- 
--4. Modifying & rebuilding Qt
-+3. Modifying & rebuilding Qt
- ============================
- 
- If you make modifications to the Qt source code, you don't need to
- build everything again. Simply go to the directory containing the
- Makefile closest to the files you changed and run "make" again.
- 
--For example, if you modified src/corelib/io/qiodevice.cpp, do:
-+For example, if you've modified src/corelib/io/qiodevice.cpp, do:
- 
-    cd src/corelib
-    make
- 
--Do not commit your modifications to qt-copy as such. If you have a fix
--that benefit others, see the "Creating Qt-copy patches" section below.
-+If you make a change that is not temporary, you should create a Git
-+commit out of it. However, you shouldn't push those changes to
-+kde-qt.git. If you have a fix that benefit others, see the "Creating
-+kde-qt.git modifications" section below.
- 
--5. Building Qt examples and demos
-+4. Building Qt examples and demos
- =================================
- 
- The "-nomake examples -nomake demos" arguments to the configure script
--mean that those two sections will not be configured for
--building. Which is unneeded for usage of the library.  If you want to
--compile the examples or demos later; just enter either directory and
--type:
-+mean that those two sections will not be configured for building,
-+which is unneeded for usage of the library.  If you want to compile
-+the examples or demos later, just enter either directory and type:
- 
-    qmake
-    make
- 
--6. Building Qt documentation (only applies to Snapshot versions of Qt)
-+5. Build Qt tests
-+=================
-+
-+(Official information: http://qt.gitorious.org/qt/pages/QtAutotestsEnvironment)
-+
-+In order to run Qt tests, you must have a "developer build" of Qt. For
-+that, you need to reconfigure Qt and add the "-developer-build"
-+option. That option is technically equivalent to the options:
-+
-+   -debug -prefix $PWD -DQT_BUILD_INTERNAL
-+
-+To run a test, go to its source dir in tests/auto/testname. Type
-+"make" to build it, then run it (either ./tst_testname, or "make install").
-+
-+6. Building Qt documentation
- ============================
- 
- To build and install the documentation, run:
-@@ -119,21 +122,25 @@ Attention: DO NOT run
- If you do, Qt will overwrite your include/ directory with its
- installation.
- 
--8. Creating Qt-copy patches
--===========================
-+8. Creating kde-qt.git modifications
-+====================================
- 
- If you have fixed a bug in Qt or modified it in any way that may
- benefit others, please share your change in the form of a patch. Do
--not commit your changes directly to the qt-copy module because they
-+not commit your changes directly to the main branch because they
- may be lost in a future update if they have not been added to the
- official Qt release.
- 
- The exception to the above rule is that if the fix has been accepted
--by Qt Software (and so will appear in the next release of Qt), then
--it can be applied directly to qt-copy.  In this case, the patch
--should still be placed in patches/ as usual, but it should have a
--header line
--    Applied: yes
-+by Qt Software (and so will appear in the very next release of Qt),
-+then it should be simply cherry-picked from the Qt development
-+branch. Note that you shouldn't do this for changes that have been
-+accepted into a release which is not the very next.
-+In this case, you should use the following command:
-+
-+   git cherry-pick -x SHA1_OF_THE_FIX
-+where SHA1_OF_THE_FIX is the SHA-1 of the commit that you want to
-+introduce. Then push the change to the server.
- 
- Before creating a patch, it is recommended to contact Qt Software
- support via qt-bugs@trolltech.com and explain the situation. There may
-@@ -141,37 +148,42 @@ be a solution for the problem already or a new direction that should
- be accounted for.
- 
- To create a patch, do the following:
--  a) make sure your Qt sources are clean of other changes. Run:
--     svn revert -R .
--  b) make your changes to the Qt source code and verify that it
--  compiles, links and works.
--  c) open the patches/README file and get the next patch number
--  (you must read and understand the README file; if you don't, ask for
--  help from other KDE developers)
--  d) create the patch with:
--     svn diff > patches/NNNN-short-description-of-your-patch.diff
--  where NNNN is the next available number.
--  e) open the file you've just created and add the header to it. The
--  header should be the template in patches/README followed by a longer
--  description of your patch.
--
--Don't forget to submit your patch to qt-bugs@trolltech.com along with
--the long description of the issue found, if you haven't already.
--Qt Software does not monitor the patches/ directory, so qt-copy
--patches do not get automatically applied to Qt official releases.
--
--When you receive the issue number and task tracker numbers, update the
--patch file.
--
--9. Known issues with current Qt code
--====================================
--
--In case you have strange issues with non-resizing windows and similar, use
--   export QT_USE_NATIVE_WINDOWS=1
--before starting KDE.
--
--10. Troubleshooting: Re-configuring and re-compiling
--===================================================
-+  a) look at the listing of branches in
-+  http://qt.gitorious.org/+kde-developers/qt/kde-qt/commits/HEAD and
-+  select the next number.
-+
-+  b) create a new branch out of a clean, released version of Qt, (for
-+  example, 4.5.1), using the number above and a brief description of
-+  your fix. For example:
-+      git checkout -b patches/0180-window-role v4.5.1
-+  You can see the available released versions of Qt with:
-+      git tag
-+
-+  c) make your changes to the Qt source code and verify that it
-+  compiles, links and works (please run the respective unit tests).
-+
-+  c) commit your changes to Git, using the "git commit" command. Please
-+  see http://qt.gitorious.org/qt/pages/GitIntroductionWithQt and
-+  http://qt.gitorious.org/qt/pages/QtCodingStyle for information on
-+  how to create commits
-+  Note that you can create multiple commits.
-+
-+  e) merge the change to the main branch, for example, 4.5.1-patched:
-+      git checkout 4.5.1-patched
-+      git merge patches/0180-window-role
-+
-+  f) push the changes you made to your branch and to the main server:
-+      git push git@gitorious.org:qt/kde-qt.git 4.5.1-patched patches/0180-window-role
-+  (Don't forget to list both branch names)
-+
-+Don't forget to submit your patch to using the Qt Contribution Model,
-+along with the long description of the issue found. See
-+http://qt.gitorious.org/qt/pages/QtContributionGuidelines for
-+information how. You can submit the branch you've just sent to the
-+server.
-+
-+9. Troubleshooting: Re-configuring and re-compiling
-+==================================================
- 
- For those updating the source in a directory where Qt has already
- been compiled, you may need to run the following commands from the
-@@ -185,4 +197,5 @@ Sometimes ./configure will refuse to run.  You may need to:
- If you think you may have run "make install" on an install-less Qt
- (srcdir == $QTDIR), run:
- 
--	svn revert -R include
-+	rm -rf include
-+	bin/syncqt
--- 
-1.6.2.5
-

0015-Make-QMenu-respect-the-minimum-width-set.patch

@@ -1,31 +0,0 @@
-From 01f26d0756839fbe783c637ca7dec5b7987f7e14 Mon Sep 17 00:00:00 2001
-From: Aaron Seigo <aseigo@kde.org>
-Date: Mon, 27 Jul 2009 21:46:22 -0600
-Subject: [PATCH 15/18] Make QMenu respect the minimum width set
-
-If one sets a minimum width on a QMenu and that size is larger than the
-smallest size needed by the large menu item, it ignores the minimum
-width and just uses the largest menu item size.
-
-This results in ugly painting artifacts. This currently affects
-(at least) the tasks widget in Plasma in KDE4.
----
- src/gui/widgets/qmenu.cpp |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp
-index 9fbbb04..5d62ea6 100644
---- a/src/gui/widgets/qmenu.cpp
-+++ b/src/gui/widgets/qmenu.cpp
-@@ -280,7 +280,7 @@ void QMenuPrivate::calcActionRects(QMap<QAction*, QRect> &actionRects, QList<QAc
- 
- 
-         if (!sz.isEmpty()) {
--            max_column_width = qMax(max_column_width, sz.width());
-+            max_column_width = qMax(q->minimumWidth(), qMax(max_column_width, sz.width()));
-             //wrapping
-             if (!scroll &&
-                y+sz.height()+vmargin > dh - (q->style()->pixelMetric(QStyle::PM_MenuDesktopFrameWidth, 0, q) * 2)) {
--- 
-1.6.2.5
-

0016-Fill-gap-of-X.org-XFree-multimedia-special-launcher.patch

@@ -1,660 +0,0 @@
-From 1a94cd7b132497f70a2b97ec2b58f6e2b1c5076a Mon Sep 17 00:00:00 2001
-From: Helio Chissini de Castro <helio@kde.org>
-Date: Fri, 10 Jul 2009 16:00:13 -0300
-Subject: [PATCH 16/18] Fill gap of X.org/XFree multimedia/special/launcher keys
- Qt up to 4.5.x is missing whole setup of multimedia keys already defined by X
-
----
- src/corelib/global/qnamespace.h   |   97 ++++++++++++-
- src/gui/kernel/qkeymapper_x11.cpp |  286 ++++++++++++++++++++++++++++++-------
- src/gui/kernel/qkeysequence.cpp   |  174 +++++++++++++++++------
- 3 files changed, 461 insertions(+), 96 deletions(-)
-
-diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
-index 3edbca7..ddf27a8 100644
---- a/src/corelib/global/qnamespace.h
-+++ b/src/corelib/global/qnamespace.h
-@@ -895,12 +895,10 @@ public:
-         Key_Dead_Horn           = 0x01001262,
- 
-         // multimedia/internet keys - ignored by default - see QKeyEvent c'tor
--
-         Key_Back  = 0x01000061,
-         Key_Forward  = 0x01000062,
-         Key_Stop  = 0x01000063,
-         Key_Refresh  = 0x01000064,
--
-         Key_VolumeDown = 0x01000070,
-         Key_VolumeMute  = 0x01000071,
-         Key_VolumeUp = 0x01000072,
-@@ -909,7 +907,6 @@ public:
-         Key_BassDown = 0x01000075,
-         Key_TrebleUp = 0x01000076,
-         Key_TrebleDown = 0x01000077,
--
-         Key_MediaPlay  = 0x01000080,
-         Key_MediaStop  = 0x01000081,
-         Key_MediaPrevious  = 0x01000082,
-@@ -918,13 +915,11 @@ public:
- #endif
-         Key_MediaNext  = 0x01000083,
-         Key_MediaRecord = 0x01000084,
--
-         Key_HomePage  = 0x01000090,
-         Key_Favorites  = 0x01000091,
-         Key_Search  = 0x01000092,
-         Key_Standby = 0x01000093,
-         Key_OpenUrl = 0x01000094,
--
-         Key_LaunchMail  = 0x010000a0,
-         Key_LaunchMedia = 0x010000a1,
-         Key_Launch0  = 0x010000a2,
-@@ -943,6 +938,98 @@ public:
-         Key_LaunchD  = 0x010000af,
-         Key_LaunchE  = 0x010000b0,
-         Key_LaunchF  = 0x010000b1,
-+        Key_MonBrightnessUp = 0x010000b2,
-+        Key_MonBrightnessDown = 0x010000b3,
-+        Key_KeyboardLightOnOff = 0x010000b4,
-+        Key_KeyboardBrightnessUp = 0x010000b5,
-+        Key_KeyboardBrightnessDown = 0x010000b6,
-+        Key_PowerOff = 0x010000b7,
-+        Key_WakeUp = 0x010000b8,
-+        Key_Eject = 0x010000b9,
-+        Key_ScreenSaver = 0x010000ba,
-+        Key_WWW = 0x010000bb,
-+        Key_Memo = 0x010000bc,
-+        Key_LightBulb = 0x010000bd,
-+        Key_Shop = 0x010000be,
-+        Key_History = 0x010000bf,
-+        Key_AddFavorite = 0x010000c0,
-+        Key_HotLinks = 0x010000c1,
-+        Key_BrightnessAdjust = 0x010000c2,
-+        Key_Finance = 0x010000c3,
-+        Key_Community = 0x010000c4,
-+        Key_AudioRewind = 0x010000c5,
-+        Key_BackForward = 0x010000c6,
-+        Key_ApplicationLeft = 0x010000c7,
-+        Key_ApplicationRight = 0x010000c8,
-+        Key_Book = 0x010000c9,
-+        Key_CD = 0x010000ca,
-+        Key_Calculator = 0x010000cb,
-+        Key_ToDoList = 0x010000cc,
-+        Key_ClearGrab = 0x010000cd,
-+        Key_Close = 0x010000ce,
-+        Key_Copy = 0x010000cf,
-+        Key_Cut = 0x010000d0,
-+        Key_Display = 0x010000d1,
-+        Key_DOS = 0x010000d2,
-+        Key_Documents = 0x010000d3,
-+        Key_Excel = 0x010000d4,
-+        Key_Explorer = 0x010000d5,
-+        Key_Game = 0x010000d6,
-+        Key_Go = 0x010000d7,
-+        Key_iTouch = 0x010000d8,
-+        Key_LogOff = 0x010000d9,
-+        Key_Market = 0x010000da,
-+        Key_Meeting = 0x010000db,
-+        Key_MenuKB = 0x010000dc,
-+        Key_MenuPB = 0x010000dd,
-+        Key_MySites = 0x010000de,
-+        Key_News = 0x010000df,
-+        Key_OfficeHome = 0x010000e0,
-+        Key_Option = 0x010000e1,
-+        Key_Paste = 0x010000e2,
-+        Key_Phone = 0x010000e3,
-+        Key_Calendar = 0x010000e4,
-+        Key_Reply = 0x010000e5,
-+        Key_Reload = 0x010000e6,
-+        Key_RotateWindows = 0x010000e7,
-+        Key_RotationPB = 0x010000e8,
-+        Key_RotationKB = 0x010000e9,
-+        Key_Save = 0x010000ea,
-+        Key_Send = 0x010000eb,
-+        Key_Spell = 0x010000ec,
-+        Key_SplitScreen = 0x010000ed,
-+        Key_Support = 0x010000ee,
-+        Key_TaskPane = 0x010000ef,
-+        Key_Terminal = 0x010000f0,
-+        Key_Tools = 0x010000f1,
-+        Key_Travel = 0x010000f2,
-+        Key_Video = 0x010000f3,
-+        Key_Word = 0x010000f4,
-+        Key_Xfer = 0x010000f5,
-+        Key_ZoomIn = 0x010000f6,
-+        Key_ZoomOut = 0x010000f7,
-+        Key_Away = 0x010000f8,
-+        Key_Messenger = 0x010000f9,
-+        Key_WebCam = 0x010000fa,
-+        Key_MailForward = 0x010000fb,
-+        Key_Pictures = 0x010000fc,
-+        Key_Music = 0x010000fd,
-+        Key_Battery = 0x010000fe,
-+        Key_Bluetooth = 0x010000ff,
-+        Key_WLAN = 0x01000100,
-+        Key_UWB = 0x01000101,
-+        Key_AudioForward = 0x01000102,
-+        Key_AudioRepeat = 0x01000103,
-+        Key_AudioRandomPlay = 0x01000104,
-+        Key_Subtitle = 0x01000105,
-+        Key_AudioCycleTrack = 0x01000106,
-+        Key_Time = 0x01000107,
-+        Key_Hibernate = 0x01000108,
-+        Key_View = 0x01000109,
-+        Key_TopMenu = 0x0100010a,
-+        Key_PowerDown = 0x0100010b,
-+        Key_Suspend = 0x0100010c,
-+        Key_ContrastAdjust = 0x0100010d,
- 
-         Key_MediaLast = 0x0100ffff,
- 
-diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp
-index 98ed61c..f55b491 100644
---- a/src/gui/kernel/qkeymapper_x11.cpp
-+++ b/src/gui/kernel/qkeymapper_x11.cpp
-@@ -714,47 +714,144 @@ extern bool qt_sm_blockUserInput;
- #define XK_KP_Delete            0xFF9F
- #endif
- 
--// the next lines are taken from XFree > 4.0 (X11/XF86keysyms.h), defining some special
-+// the next lines are taken on 10/2009 from X.org (X11/XF86keysym.h), defining some special
- // multimedia keys. They are included here as not every system has them.
--#define XF86XK_Standby          0x1008FF10
--#define XF86XK_AudioLowerVolume 0x1008FF11
--#define XF86XK_AudioMute        0x1008FF12
--#define XF86XK_AudioRaiseVolume 0x1008FF13
--#define XF86XK_AudioPlay        0x1008FF14
--#define XF86XK_AudioStop        0x1008FF15
--#define XF86XK_AudioPrev        0x1008FF16
--#define XF86XK_AudioNext        0x1008FF17
--#define XF86XK_HomePage         0x1008FF18
--#define XF86XK_Calculator       0x1008FF1D
--#define XF86XK_Mail             0x1008FF19
--#define XF86XK_Start            0x1008FF1A
--#define XF86XK_Search           0x1008FF1B
--#define XF86XK_AudioRecord      0x1008FF1C
--#define XF86XK_Back             0x1008FF26
--#define XF86XK_Forward          0x1008FF27
--#define XF86XK_Stop             0x1008FF28
--#define XF86XK_Refresh          0x1008FF29
--#define XF86XK_Favorites        0x1008FF30
--#define XF86XK_AudioPause       0x1008FF31
--#define XF86XK_AudioMedia       0x1008FF32
--#define XF86XK_MyComputer       0x1008FF33
--#define XF86XK_OpenURL          0x1008FF38
--#define XF86XK_Launch0          0x1008FF40
--#define XF86XK_Launch1          0x1008FF41
--#define XF86XK_Launch2          0x1008FF42
--#define XF86XK_Launch3          0x1008FF43
--#define XF86XK_Launch4          0x1008FF44
--#define XF86XK_Launch5          0x1008FF45
--#define XF86XK_Launch6          0x1008FF46
--#define XF86XK_Launch7          0x1008FF47
--#define XF86XK_Launch8          0x1008FF48
--#define XF86XK_Launch9          0x1008FF49
--#define XF86XK_LaunchA          0x1008FF4A
--#define XF86XK_LaunchB          0x1008FF4B
--#define XF86XK_LaunchC          0x1008FF4C
--#define XF86XK_LaunchD          0x1008FF4D
--#define XF86XK_LaunchE          0x1008FF4E
--#define XF86XK_LaunchF          0x1008FF4F
-+#define XF86XK_MonBrightnessUp     0x1008FF02
-+#define XF86XK_MonBrightnessDown   0x1008FF03
-+#define XF86XK_KbdLightOnOff       0x1008FF04
-+#define XF86XK_KbdBrightnessUp     0x1008FF05
-+#define XF86XK_KbdBrightnessDown   0x1008FF06
-+#define XF86XK_Standby             0x1008FF10
-+#define XF86XK_AudioLowerVolume	   0x1008FF11
-+#define XF86XK_AudioMute           0x1008FF12
-+#define XF86XK_AudioRaiseVolume    0x1008FF13
-+#define XF86XK_AudioPlay           0x1008FF14
-+#define XF86XK_AudioStop           0x1008FF15
-+#define XF86XK_AudioPrev           0x1008FF16
-+#define XF86XK_AudioNext           0x1008FF17
-+#define XF86XK_HomePage            0x1008FF18
-+#define XF86XK_Mail                0x1008FF19
-+#define XF86XK_Start               0x1008FF1A
-+#define XF86XK_Search              0x1008FF1B
-+#define XF86XK_AudioRecord         0x1008FF1C
-+#define XF86XK_Calculator          0x1008FF1D
-+#define XF86XK_Memo                0x1008FF1E
-+#define XF86XK_ToDoList            0x1008FF1F
-+#define XF86XK_Calendar            0x1008FF20
-+#define XF86XK_PowerDown           0x1008FF21
-+#define XF86XK_ContrastAdjust      0x1008FF22
-+#define XF86XK_Back                0x1008FF26
-+#define XF86XK_Forward             0x1008FF27
-+#define XF86XK_Stop                0x1008FF28
-+#define XF86XK_Refresh             0x1008FF29
-+#define XF86XK_PowerOff            0x1008FF2A
-+#define XF86XK_WakeUp              0x1008FF2B
-+#define XF86XK_Eject               0x1008FF2C
-+#define XF86XK_ScreenSaver         0x1008FF2D
-+#define XF86XK_WWW                 0x1008FF2E
-+#define XF86XK_Sleep               0x1008FF2F
-+#define XF86XK_Favorites           0x1008FF30
-+#define XF86XK_AudioPause          0x1008FF31
-+#define XF86XK_AudioMedia          0x1008FF32
-+#define XF86XK_MyComputer          0x1008FF33
-+#define XF86XK_LightBulb           0x1008FF35
-+#define XF86XK_Shop                0x1008FF36
-+#define XF86XK_History             0x1008FF37
-+#define XF86XK_OpenURL             0x1008FF38
-+#define XF86XK_AddFavorite         0x1008FF39
-+#define XF86XK_HotLinks            0x1008FF3A
-+#define XF86XK_BrightnessAdjust    0x1008FF3B
-+#define XF86XK_Finance             0x1008FF3C
-+#define XF86XK_Community           0x1008FF3D
-+#define XF86XK_AudioRewind         0x1008FF3E
-+#define XF86XK_BackForward         0x1008FF3F
-+#define XF86XK_Launch0             0x1008FF40
-+#define XF86XK_Launch1             0x1008FF41
-+#define XF86XK_Launch2             0x1008FF42
-+#define XF86XK_Launch3             0x1008FF43
-+#define XF86XK_Launch4             0x1008FF44
-+#define XF86XK_Launch5             0x1008FF45
-+#define XF86XK_Launch6             0x1008FF46
-+#define XF86XK_Launch7             0x1008FF47
-+#define XF86XK_Launch8             0x1008FF48
-+#define XF86XK_Launch9             0x1008FF49
-+#define XF86XK_LaunchA             0x1008FF4A
-+#define XF86XK_LaunchB             0x1008FF4B
-+#define XF86XK_LaunchC             0x1008FF4C
-+#define XF86XK_LaunchD             0x1008FF4D
-+#define XF86XK_LaunchE             0x1008FF4E
-+#define XF86XK_LaunchF             0x1008FF4F
-+#define XF86XK_ApplicationLeft     0x1008FF50
-+#define XF86XK_ApplicationRight    0x1008FF51
-+#define XF86XK_Book                0x1008FF52
-+#define XF86XK_CD                  0x1008FF53
-+#define XF86XK_Calculater          0x1008FF54
-+#define XF86XK_Clear               0x1008FF55
-+#define XF86XK_ClearGrab           0x1008FE21
-+#define XF86XK_Close               0x1008FF56
-+#define XF86XK_Copy                0x1008FF57
-+#define XF86XK_Cut                 0x1008FF58
-+#define XF86XK_Display             0x1008FF59
-+#define XF86XK_DOS                 0x1008FF5A
-+#define XF86XK_Documents           0x1008FF5B
-+#define XF86XK_Excel               0x1008FF5C
-+#define XF86XK_Explorer            0x1008FF5D
-+#define XF86XK_Game                0x1008FF5E
-+#define XF86XK_Go                  0x1008FF5F
-+#define XF86XK_iTouch              0x1008FF60
-+#define XF86XK_LogOff              0x1008FF61
-+#define XF86XK_Market              0x1008FF62
-+#define XF86XK_Meeting             0x1008FF63
-+#define XF86XK_MenuKB              0x1008FF65
-+#define XF86XK_MenuPB              0x1008FF66
-+#define XF86XK_MySites             0x1008FF67
-+#define XF86XK_News                0x1008FF69
-+#define XF86XK_OfficeHome          0x1008FF6A
-+#define XF86XK_Option              0x1008FF6C
-+#define XF86XK_Paste               0x1008FF6D
-+#define XF86XK_Phone               0x1008FF6E
-+#define XF86XK_Reply               0x1008FF72
-+#define XF86XK_Reload              0x1008FF73
-+#define XF86XK_RotateWindows       0x1008FF74
-+#define XF86XK_RotationPB          0x1008FF75
-+#define XF86XK_RotationKB          0x1008FF76
-+#define XF86XK_Save                0x1008FF77
-+#define XF86XK_Send                0x1008FF7B
-+#define XF86XK_Spell               0x1008FF7C
-+#define XF86XK_SplitScreen         0x1008FF7D
-+#define XF86XK_Support             0x1008FF7E
-+#define XF86XK_TaskPane            0x1008FF7F
-+#define XF86XK_Terminal            0x1008FF80
-+#define XF86XK_Tools               0x1008FF81
-+#define XF86XK_Travel              0x1008FF82
-+#define XF86XK_Video               0x1008FF87
-+#define XF86XK_Word                0x1008FF89
-+#define XF86XK_Xfer                0x1008FF8A
-+#define XF86XK_ZoomIn              0x1008FF8B
-+#define XF86XK_ZoomOut             0x1008FF8C
-+#define XF86XK_Away                0x1008FF8D
-+#define XF86XK_Messenger           0x1008FF8E
-+#define XF86XK_WebCam              0x1008FF8F
-+#define XF86XK_MailForward         0x1008FF90
-+#define XF86XK_Pictures            0x1008FF91
-+#define XF86XK_Music               0x1008FF92
-+#define XF86XK_Battery             0x1008FF93
-+#define XF86XK_Bluetooth           0x1008FF94
-+#define XF86XK_WLAN                0x1008FF95
-+#define XF86XK_UWB                 0x1008FF96
-+#define XF86XK_AudioForward        0x1008FF97
-+#define XF86XK_AudioRepeat         0x1008FF98
-+#define XF86XK_AudioRandomPlay     0x1008FF99
-+#define XF86XK_Subtitle            0x1008FF9A
-+#define XF86XK_AudioCycleTrack     0x1008FF9B
-+#define XF86XK_Time                0x1008FF9F
-+#define XF86XK_Select              0x1008FFA0
-+#define XF86XK_View                0x1008FFA1
-+#define XF86XK_TopMenu             0x1008FFA2
-+#define XF86XK_Suspend             0x1008FFA7
-+#define XF86XK_Hibernate           0x1008FFA8
-+
-+
- // end of XF86keysyms.h
- 
- // Special keys used by Qtopia, mapped into the X11 private keypad range.
-@@ -942,10 +1039,8 @@ static const unsigned int KeyTbl[] = {
-     XK_dead_hook,               Qt::Key_Dead_Hook,
-     XK_dead_horn,               Qt::Key_Dead_Horn,
- 
--    // Special multimedia keys
--    // currently only tested with MS internet keyboard
--
--    // browsing keys
-+    // Special keys from X.org - This include multimedia keys,
-+	// wireless/bluetooth/uwb keys, special launcher keys, etc.
-     XF86XK_Back,                Qt::Key_Back,
-     XF86XK_Forward,             Qt::Key_Forward,
-     XF86XK_Stop,                Qt::Key_Stop,
-@@ -955,8 +1050,6 @@ static const unsigned int KeyTbl[] = {
-     XF86XK_OpenURL,             Qt::Key_OpenUrl,
-     XF86XK_HomePage,            Qt::Key_HomePage,
-     XF86XK_Search,              Qt::Key_Search,
--
--    // media keys
-     XF86XK_AudioLowerVolume,    Qt::Key_VolumeDown,
-     XF86XK_AudioMute,           Qt::Key_VolumeMute,
-     XF86XK_AudioRaiseVolume,    Qt::Key_VolumeUp,
-@@ -965,13 +1058,106 @@ static const unsigned int KeyTbl[] = {
-     XF86XK_AudioPrev,           Qt::Key_MediaPrevious,
-     XF86XK_AudioNext,           Qt::Key_MediaNext,
-     XF86XK_AudioRecord,         Qt::Key_MediaRecord,
--
--    // launch keys
-     XF86XK_Mail,                Qt::Key_LaunchMail,
-     XF86XK_MyComputer,          Qt::Key_Launch0,
--    XF86XK_Calculator,          Qt::Key_Launch1,
-+    XF86XK_Calculator,          Qt::Key_Calculator,
-+    XF86XK_Memo,                Qt::Key_Memo,
-+    XF86XK_ToDoList,            Qt::Key_ToDoList,
-+    XF86XK_Calendar,            Qt::Key_Calendar,
-+    XF86XK_PowerDown,           Qt::Key_PowerDown,
-+    XF86XK_ContrastAdjust,      Qt::Key_ContrastAdjust,
-     XF86XK_Standby,             Qt::Key_Standby,
--
-+    XF86XK_MonBrightnessUp,     Qt::Key_MonBrightnessUp,
-+    XF86XK_MonBrightnessDown,   Qt::Key_MonBrightnessDown,
-+    XF86XK_KbdLightOnOff,       Qt::Key_KeyboardLightOnOff,
-+    XF86XK_KbdBrightnessUp,     Qt::Key_KeyboardBrightnessUp,
-+    XF86XK_KbdBrightnessDown,   Qt::Key_KeyboardBrightnessDown,
-+    XF86XK_PowerOff,            Qt::Key_PowerOff,
-+    XF86XK_WakeUp,              Qt::Key_WakeUp,
-+    XF86XK_Eject,               Qt::Key_Eject,
-+    XF86XK_ScreenSaver,         Qt::Key_ScreenSaver,
-+    XF86XK_WWW,                 Qt::Key_WWW,
-+    XF86XK_Sleep,               Qt::Key_Sleep,
-+    XF86XK_LightBulb,           Qt::Key_LightBulb,
-+    XF86XK_Shop,                Qt::Key_Shop,
-+    XF86XK_History,             Qt::Key_History,
-+    XF86XK_AddFavorite,         Qt::Key_AddFavorite,
-+    XF86XK_HotLinks,            Qt::Key_HotLinks,
-+    XF86XK_BrightnessAdjust,    Qt::Key_BrightnessAdjust,
-+    XF86XK_Finance,             Qt::Key_Finance,
-+    XF86XK_Community,           Qt::Key_Community,
-+    XF86XK_AudioRewind,         Qt::Key_AudioRewind,
-+    XF86XK_BackForward,         Qt::Key_BackForward,
-+    XF86XK_ApplicationLeft,     Qt::Key_ApplicationLeft,
-+    XF86XK_ApplicationRight,    Qt::Key_ApplicationRight,
-+    XF86XK_Book,                Qt::Key_Book,
-+    XF86XK_CD,                  Qt::Key_CD,
-+    XF86XK_Calculater,          Qt::Key_Calculator,
-+    XF86XK_Clear,               Qt::Key_Clear,
-+    XF86XK_ClearGrab,           Qt::Key_ClearGrab,
-+    XF86XK_Close,               Qt::Key_Close,
-+    XF86XK_Copy,                Qt::Key_Copy,
-+    XF86XK_Cut,                 Qt::Key_Cut,
-+    XF86XK_Display,             Qt::Key_Display,
-+    XF86XK_DOS,                 Qt::Key_DOS,
-+    XF86XK_Documents,           Qt::Key_Documents,
-+    XF86XK_Excel,               Qt::Key_Excel,
-+    XF86XK_Explorer,            Qt::Key_Explorer,
-+    XF86XK_Game,                Qt::Key_Game,
-+    XF86XK_Go,                  Qt::Key_Go,
-+    XF86XK_iTouch,              Qt::Key_iTouch,
-+    XF86XK_LogOff,              Qt::Key_LogOff,
-+    XF86XK_Market,              Qt::Key_Market,
-+    XF86XK_Meeting,             Qt::Key_Meeting,
-+    XF86XK_MenuKB,              Qt::Key_MenuKB,
-+    XF86XK_MenuPB,              Qt::Key_MenuPB,
-+    XF86XK_MySites,             Qt::Key_MySites,
-+    XF86XK_News,                Qt::Key_News,
-+    XF86XK_OfficeHome,          Qt::Key_OfficeHome,
-+    XF86XK_Option,              Qt::Key_Option,
-+    XF86XK_Paste,               Qt::Key_Paste,
-+    XF86XK_Phone,               Qt::Key_Phone,
-+    XF86XK_Reply,               Qt::Key_Reply,
-+    XF86XK_Reload,              Qt::Key_Reload,
-+    XF86XK_RotateWindows,       Qt::Key_RotateWindows,
-+    XF86XK_RotationPB,          Qt::Key_RotationPB,
-+    XF86XK_RotationKB,          Qt::Key_RotationKB,
-+    XF86XK_Save,                Qt::Key_Save,
-+    XF86XK_Send,                Qt::Key_Send,
-+    XF86XK_Spell,               Qt::Key_Spell,
-+    XF86XK_SplitScreen,         Qt::Key_SplitScreen,
-+    XF86XK_Support,             Qt::Key_Support,
-+    XF86XK_TaskPane,            Qt::Key_TaskPane,
-+    XF86XK_Terminal,            Qt::Key_Terminal,
-+    XF86XK_Tools,               Qt::Key_Tools,
-+    XF86XK_Travel,              Qt::Key_Travel,
-+    XF86XK_Video,               Qt::Key_Video,
-+    XF86XK_Word,                Qt::Key_Word,
-+    XF86XK_Xfer,                Qt::Key_Xfer,
-+    XF86XK_ZoomIn,              Qt::Key_ZoomIn,
-+    XF86XK_ZoomOut,             Qt::Key_ZoomOut,
-+    XF86XK_Away,                Qt::Key_Away,
-+    XF86XK_Messenger,           Qt::Key_Messenger,
-+    XF86XK_WebCam,              Qt::Key_WebCam,
-+    XF86XK_MailForward,         Qt::Key_MailForward,
-+    XF86XK_Pictures,            Qt::Key_Pictures,
-+    XF86XK_Music,               Qt::Key_Music,
-+    XF86XK_Battery,             Qt::Key_Battery,
-+    XF86XK_Bluetooth,           Qt::Key_Bluetooth,
-+    XF86XK_WLAN,                Qt::Key_WLAN,
-+    XF86XK_UWB,                 Qt::Key_UWB,
-+    XF86XK_AudioForward,        Qt::Key_AudioForward,
-+    XF86XK_AudioRepeat,         Qt::Key_AudioRepeat,
-+    XF86XK_AudioRandomPlay,     Qt::Key_AudioRandomPlay,
-+    XF86XK_Subtitle,            Qt::Key_Subtitle,
-+    XF86XK_AudioCycleTrack,     Qt::Key_AudioCycleTrack,
-+    XF86XK_Time,                Qt::Key_Time,
-+    XF86XK_Select,              Qt::Key_Select,
-+    XF86XK_View,                Qt::Key_View,
-+    XF86XK_TopMenu,             Qt::Key_TopMenu,
-+    XF86XK_Bluetooth,           Qt::Key_Bluetooth,
-+    XF86XK_Suspend,             Qt::Key_Suspend,
-+    XF86XK_Hibernate,           Qt::Key_Hibernate,
-     XF86XK_Launch0,             Qt::Key_Launch2,
-     XF86XK_Launch1,             Qt::Key_Launch3,
-     XF86XK_Launch2,             Qt::Key_Launch4,
-diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
-index 894f663..665c058 100644
---- a/src/gui/kernel/qkeysequence.cpp
-+++ b/src/gui/kernel/qkeysequence.cpp
-@@ -396,47 +396,139 @@ static const struct {
-     { Qt::Key_Menu,         QT_TRANSLATE_NOOP("QShortcut", "Menu") },
-     { Qt::Key_Help,         QT_TRANSLATE_NOOP("QShortcut", "Help") },
- 
--    // Multimedia keys
--    { Qt::Key_Back,         QT_TRANSLATE_NOOP("QShortcut", "Back") },
--    { Qt::Key_Forward,      QT_TRANSLATE_NOOP("QShortcut", "Forward") },
--    { Qt::Key_Stop,         QT_TRANSLATE_NOOP("QShortcut", "Stop") },
--    { Qt::Key_Refresh,      QT_TRANSLATE_NOOP("QShortcut", "Refresh") },
--    { Qt::Key_VolumeDown,   QT_TRANSLATE_NOOP("QShortcut", "Volume Down") },
--    { Qt::Key_VolumeMute,   QT_TRANSLATE_NOOP("QShortcut", "Volume Mute") },
--    { Qt::Key_VolumeUp,     QT_TRANSLATE_NOOP("QShortcut", "Volume Up") },
--    { Qt::Key_BassBoost,    QT_TRANSLATE_NOOP("QShortcut", "Bass Boost") },
--    { Qt::Key_BassUp,       QT_TRANSLATE_NOOP("QShortcut", "Bass Up") },
--    { Qt::Key_BassDown,     QT_TRANSLATE_NOOP("QShortcut", "Bass Down") },
--    { Qt::Key_TrebleUp,     QT_TRANSLATE_NOOP("QShortcut", "Treble Up") },
--    { Qt::Key_TrebleDown,   QT_TRANSLATE_NOOP("QShortcut", "Treble Down") },
--    { Qt::Key_MediaPlay,    QT_TRANSLATE_NOOP("QShortcut", "Media Play") },
--    { Qt::Key_MediaStop,    QT_TRANSLATE_NOOP("QShortcut", "Media Stop") },
--    { Qt::Key_MediaPrevious,QT_TRANSLATE_NOOP("QShortcut", "Media Previous") },
--    { Qt::Key_MediaNext,    QT_TRANSLATE_NOOP("QShortcut", "Media Next") },
--    { Qt::Key_MediaRecord,  QT_TRANSLATE_NOOP("QShortcut", "Media Record") },
--    { Qt::Key_HomePage,     QT_TRANSLATE_NOOP("QShortcut", "Home Page") },
--    { Qt::Key_Favorites,    QT_TRANSLATE_NOOP("QShortcut", "Favorites") },
--    { Qt::Key_Search,       QT_TRANSLATE_NOOP("QShortcut", "Search") },
--    { Qt::Key_Standby,      QT_TRANSLATE_NOOP("QShortcut", "Standby") },
--    { Qt::Key_OpenUrl,      QT_TRANSLATE_NOOP("QShortcut", "Open URL") },
--    { Qt::Key_LaunchMail,   QT_TRANSLATE_NOOP("QShortcut", "Launch Mail") },
--    { Qt::Key_LaunchMedia,  QT_TRANSLATE_NOOP("QShortcut", "Launch Media") },
--    { Qt::Key_Launch0,      QT_TRANSLATE_NOOP("QShortcut", "Launch (0)") },
--    { Qt::Key_Launch1,      QT_TRANSLATE_NOOP("QShortcut", "Launch (1)") },
--    { Qt::Key_Launch2,      QT_TRANSLATE_NOOP("QShortcut", "Launch (2)") },
--    { Qt::Key_Launch3,      QT_TRANSLATE_NOOP("QShortcut", "Launch (3)") },
--    { Qt::Key_Launch4,      QT_TRANSLATE_NOOP("QShortcut", "Launch (4)") },
--    { Qt::Key_Launch5,      QT_TRANSLATE_NOOP("QShortcut", "Launch (5)") },
--    { Qt::Key_Launch6,      QT_TRANSLATE_NOOP("QShortcut", "Launch (6)") },
--    { Qt::Key_Launch7,      QT_TRANSLATE_NOOP("QShortcut", "Launch (7)") },
--    { Qt::Key_Launch8,      QT_TRANSLATE_NOOP("QShortcut", "Launch (8)") },
--    { Qt::Key_Launch9,      QT_TRANSLATE_NOOP("QShortcut", "Launch (9)") },
--    { Qt::Key_LaunchA,      QT_TRANSLATE_NOOP("QShortcut", "Launch (A)") },
--    { Qt::Key_LaunchB,      QT_TRANSLATE_NOOP("QShortcut", "Launch (B)") },
--    { Qt::Key_LaunchC,      QT_TRANSLATE_NOOP("QShortcut", "Launch (C)") },
--    { Qt::Key_LaunchD,      QT_TRANSLATE_NOOP("QShortcut", "Launch (D)") },
--    { Qt::Key_LaunchE,      QT_TRANSLATE_NOOP("QShortcut", "Launch (E)") },
--    { Qt::Key_LaunchF,      QT_TRANSLATE_NOOP("QShortcut", "Launch (F)") },
-+    // Special keys
-+    // Includes multimedia, launcher, lan keys ( bluetooth, wireless )
-+    // window navigation
-+    { Qt::Key_Back,                       QT_TRANSLATE_NOOP("QShortcut", "Back") },
-+    { Qt::Key_Forward,                    QT_TRANSLATE_NOOP("QShortcut", "Forward") },
-+    { Qt::Key_Stop,                       QT_TRANSLATE_NOOP("QShortcut", "Stop") },
-+    { Qt::Key_Refresh,                    QT_TRANSLATE_NOOP("QShortcut", "Refresh") },
-+    { Qt::Key_VolumeDown,                 QT_TRANSLATE_NOOP("QShortcut", "Volume Down") },
-+    { Qt::Key_VolumeMute,                 QT_TRANSLATE_NOOP("QShortcut", "Volume Mute") },
-+    { Qt::Key_VolumeUp,                   QT_TRANSLATE_NOOP("QShortcut", "Volume Up") },
-+    { Qt::Key_BassBoost,                  QT_TRANSLATE_NOOP("QShortcut", "Bass Boost") },
-+    { Qt::Key_BassUp,                     QT_TRANSLATE_NOOP("QShortcut", "Bass Up") },
-+    { Qt::Key_BassDown,                   QT_TRANSLATE_NOOP("QShortcut", "Bass Down") },
-+    { Qt::Key_TrebleUp,                   QT_TRANSLATE_NOOP("QShortcut", "Treble Up") },
-+    { Qt::Key_TrebleDown,                 QT_TRANSLATE_NOOP("QShortcut", "Treble Down") },
-+    { Qt::Key_MediaPlay,                  QT_TRANSLATE_NOOP("QShortcut", "Media Play") },
-+    { Qt::Key_MediaStop,                  QT_TRANSLATE_NOOP("QShortcut", "Media Stop") },
-+    { Qt::Key_MediaPrevious,              QT_TRANSLATE_NOOP("QShortcut", "Media Previous") },
-+    { Qt::Key_MediaNext,                  QT_TRANSLATE_NOOP("QShortcut", "Media Next") },
-+    { Qt::Key_MediaRecord,                QT_TRANSLATE_NOOP("QShortcut", "Media Record") },
-+    { Qt::Key_HomePage,                   QT_TRANSLATE_NOOP("QShortcut", "Home Page") },
-+    { Qt::Key_Favorites,                  QT_TRANSLATE_NOOP("QShortcut", "Favorites") },
-+    { Qt::Key_Search,                     QT_TRANSLATE_NOOP("QShortcut", "Search") },
-+    { Qt::Key_Standby,                    QT_TRANSLATE_NOOP("QShortcut", "Standby") },
-+    { Qt::Key_OpenUrl,                    QT_TRANSLATE_NOOP("QShortcut", "Open URL") },
-+    { Qt::Key_LaunchMail,                 QT_TRANSLATE_NOOP("QShortcut", "Launch Mail") },
-+    { Qt::Key_LaunchMedia,                QT_TRANSLATE_NOOP("QShortcut", "Launch Media") },
-+    { Qt::Key_Launch0,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (0)") },
-+    { Qt::Key_Launch1,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (1)") },
-+    { Qt::Key_Launch2,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (2)") },
-+    { Qt::Key_Launch3,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (3)") },
-+    { Qt::Key_Launch4,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (4)") },
-+    { Qt::Key_Launch5,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (5)") },
-+    { Qt::Key_Launch6,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (6)") },
-+    { Qt::Key_Launch7,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (7)") },
-+    { Qt::Key_Launch8,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (8)") },
-+    { Qt::Key_Launch9,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (9)") },
-+    { Qt::Key_LaunchA,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (A)") },
-+    { Qt::Key_LaunchB,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (B)") },
-+    { Qt::Key_LaunchC,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (C)") },
-+    { Qt::Key_LaunchD,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (D)") },
-+    { Qt::Key_LaunchE,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (E)") },
-+    { Qt::Key_LaunchF,                    QT_TRANSLATE_NOOP("QShortcut", "Launch (F)") },
-+    { Qt::Key_MonBrightnessUp,            QT_TRANSLATE_NOOP("QShortcut", "Monitor Brightness Up") },
-+    { Qt::Key_MonBrightnessDown,          QT_TRANSLATE_NOOP("QShortcut", "Monitor Brightness Down") },
-+    { Qt::Key_KeyboardLightOnOff,         QT_TRANSLATE_NOOP("QShortcut", "Keyboard Light On/Off") },
-+    { Qt::Key_KeyboardBrightnessUp,       QT_TRANSLATE_NOOP("QShortcut", "Keyboard Brightness Up") },
-+    { Qt::Key_KeyboardBrightnessDown,     QT_TRANSLATE_NOOP("QShortcut", "Keyboard Brightness Down") },
-+    { Qt::Key_PowerOff,                   QT_TRANSLATE_NOOP("QShortcut", "Power Off") },
-+    { Qt::Key_WakeUp,                     QT_TRANSLATE_NOOP("QShortcut", "Wake Up") },
-+    { Qt::Key_Eject,                      QT_TRANSLATE_NOOP("QShortcut", "Eject") },
-+    { Qt::Key_ScreenSaver,                QT_TRANSLATE_NOOP("QShortcut", "Screensaver") },
-+    { Qt::Key_WWW,                        QT_TRANSLATE_NOOP("QShortcut", "WWW") },
-+    { Qt::Key_Sleep,                      QT_TRANSLATE_NOOP("QShortcut", "Sleep") },
-+    { Qt::Key_LightBulb,                  QT_TRANSLATE_NOOP("QShortcut", "LightBulb") },
-+    { Qt::Key_Shop,                       QT_TRANSLATE_NOOP("QShortcut", "Shop") },
-+    { Qt::Key_History,                    QT_TRANSLATE_NOOP("QShortcut", "History") },
-+    { Qt::Key_AddFavorite,                QT_TRANSLATE_NOOP("QShortcut", "Add Favorite") },
-+    { Qt::Key_HotLinks,                   QT_TRANSLATE_NOOP("QShortcut", "Hot Links") },
-+    { Qt::Key_BrightnessAdjust,           QT_TRANSLATE_NOOP("QShortcut", "Adjust Brightness") },
-+    { Qt::Key_Finance,                    QT_TRANSLATE_NOOP("QShortcut", "Finance") },
-+    { Qt::Key_Community,                  QT_TRANSLATE_NOOP("QShortcut", "Community") },
-+    { Qt::Key_AudioRewind,                QT_TRANSLATE_NOOP("QShortcut", "Audio Rewind") },
-+    { Qt::Key_BackForward,                QT_TRANSLATE_NOOP("QShortcut", "Back Forward") },
-+    { Qt::Key_ApplicationLeft,            QT_TRANSLATE_NOOP("QShortcut", "Application Left") },
-+    { Qt::Key_ApplicationRight,           QT_TRANSLATE_NOOP("QShortcut", "Application Right") },
-+    { Qt::Key_Book,                       QT_TRANSLATE_NOOP("QShortcut", "Book") },
-+    { Qt::Key_CD,                         QT_TRANSLATE_NOOP("QShortcut", "CD") },
-+    { Qt::Key_Calculator,                 QT_TRANSLATE_NOOP("QShortcut", "Calculator") },
-+    { Qt::Key_Clear,                      QT_TRANSLATE_NOOP("QShortcut", "Clear") },
-+    { Qt::Key_ClearGrab,                  QT_TRANSLATE_NOOP("QShortcut", "Clear Grab") },
-+    { Qt::Key_Close,                      QT_TRANSLATE_NOOP("QShortcut", "Close") },
-+    { Qt::Key_Copy,                       QT_TRANSLATE_NOOP("QShortcut", "Copy") },
-+    { Qt::Key_Cut,                        QT_TRANSLATE_NOOP("QShortcut", "Cut") },
-+    { Qt::Key_Display,                    QT_TRANSLATE_NOOP("QShortcut", "Display") },
-+    { Qt::Key_DOS,                        QT_TRANSLATE_NOOP("QShortcut", "DOS") },
-+    { Qt::Key_Documents,                  QT_TRANSLATE_NOOP("QShortcut", "Documents") },
-+    { Qt::Key_Excel,                      QT_TRANSLATE_NOOP("QShortcut", "Spreadsheet") },
-+    { Qt::Key_Explorer,                   QT_TRANSLATE_NOOP("QShortcut", "Browser") },
-+    { Qt::Key_Game,                       QT_TRANSLATE_NOOP("QShortcut", "Game") },
-+    { Qt::Key_Go,                         QT_TRANSLATE_NOOP("QShortcut", "Go") },
-+    { Qt::Key_iTouch,                     QT_TRANSLATE_NOOP("QShortcut", "iTouch") },
-+    { Qt::Key_LogOff,                     QT_TRANSLATE_NOOP("QShortcut", "Logoff") },
-+    { Qt::Key_Market,                     QT_TRANSLATE_NOOP("QShortcut", "Market") },
-+    { Qt::Key_Meeting,                    QT_TRANSLATE_NOOP("QShortcut", "Meeting") },
-+    { Qt::Key_MenuKB,                     QT_TRANSLATE_NOOP("QShortcut", "Keyboard Menu") },
-+    { Qt::Key_MenuPB,                     QT_TRANSLATE_NOOP("QShortcut", "Menu PB") },
-+    { Qt::Key_MySites,                    QT_TRANSLATE_NOOP("QShortcut", "My Sites") },
-+    { Qt::Key_News,                       QT_TRANSLATE_NOOP("QShortcut", "News") },
-+    { Qt::Key_OfficeHome,                 QT_TRANSLATE_NOOP("QShortcut", "Home Office") },
-+    { Qt::Key_Option,                     QT_TRANSLATE_NOOP("QShortcut", "Option") },
-+    { Qt::Key_Paste,                      QT_TRANSLATE_NOOP("QShortcut", "Paste") },
-+    { Qt::Key_Phone,                      QT_TRANSLATE_NOOP("QShortcut", "Phone") },
-+    { Qt::Key_Reply,                      QT_TRANSLATE_NOOP("QShortcut", "Reply") },
-+    { Qt::Key_Reload,                     QT_TRANSLATE_NOOP("QShortcut", "Reload") },
-+    { Qt::Key_RotateWindows,              QT_TRANSLATE_NOOP("QShortcut", "Rotate Windows") },
-+    { Qt::Key_RotationPB,                 QT_TRANSLATE_NOOP("QShortcut", "Rotation PB") },
-+    { Qt::Key_RotationKB,                 QT_TRANSLATE_NOOP("QShortcut", "Rotation KB") },
-+    { Qt::Key_Save,                       QT_TRANSLATE_NOOP("QShortcut", "Save") },
-+    { Qt::Key_Send,                       QT_TRANSLATE_NOOP("QShortcut", "Send") },
-+    { Qt::Key_Spell,                      QT_TRANSLATE_NOOP("QShortcut", "Spellchecker") },
-+    { Qt::Key_SplitScreen,                QT_TRANSLATE_NOOP("QShortcut", "Split Screen") },
-+    { Qt::Key_Support,                    QT_TRANSLATE_NOOP("QShortcut", "Support") },
-+    { Qt::Key_TaskPane,                   QT_TRANSLATE_NOOP("QShortcut", "Task Panel") },
-+    { Qt::Key_Terminal,                   QT_TRANSLATE_NOOP("QShortcut", "Terminal") },
-+    { Qt::Key_Tools,                      QT_TRANSLATE_NOOP("QShortcut", "Tools") },
-+    { Qt::Key_Travel,                     QT_TRANSLATE_NOOP("QShortcut", "Travel") },
-+    { Qt::Key_Video,                      QT_TRANSLATE_NOOP("QShortcut", "Video") },
-+    { Qt::Key_Word,                       QT_TRANSLATE_NOOP("QShortcut", "Word Processor") },
-+    { Qt::Key_Xfer,                       QT_TRANSLATE_NOOP("QShortcut", "XFer") },
-+    { Qt::Key_ZoomIn,                     QT_TRANSLATE_NOOP("QShortcut", "Zoom In") },
-+    { Qt::Key_ZoomOut,                    QT_TRANSLATE_NOOP("QShortcut", "Zoom Out") },
-+    { Qt::Key_Away,                       QT_TRANSLATE_NOOP("QShortcut", "Away") },
-+    { Qt::Key_Messenger,                  QT_TRANSLATE_NOOP("QShortcut", "Messenger") },
-+    { Qt::Key_WebCam,                     QT_TRANSLATE_NOOP("QShortcut", "WebCam") },
-+    { Qt::Key_MailForward,                QT_TRANSLATE_NOOP("QShortcut", "Mail Forward") },
-+    { Qt::Key_Pictures,                   QT_TRANSLATE_NOOP("QShortcut", "Pictures") },
-+    { Qt::Key_Music,                      QT_TRANSLATE_NOOP("QShortcut", "Music") },
-+    { Qt::Key_Battery,                    QT_TRANSLATE_NOOP("QShortcut", "Battery") },
-+    { Qt::Key_Bluetooth,                  QT_TRANSLATE_NOOP("QShortcut", "Bluetooth") },
-+    { Qt::Key_WLAN,                       QT_TRANSLATE_NOOP("QShortcut", "Wireless") },
-+    { Qt::Key_UWB,                        QT_TRANSLATE_NOOP("QShortcut", "Ultra Wide Band") },
-+    { Qt::Key_AudioForward,               QT_TRANSLATE_NOOP("QShortcut", "Audio Forward") },
-+    { Qt::Key_AudioRepeat,                QT_TRANSLATE_NOOP("QShortcut", "Audio Repeat") },
-+    { Qt::Key_AudioRandomPlay,            QT_TRANSLATE_NOOP("QShortcut", "Audio Random Play") },
-+    { Qt::Key_Subtitle,                   QT_TRANSLATE_NOOP("QShortcut", "Subtitle") },
-+    { Qt::Key_AudioCycleTrack,            QT_TRANSLATE_NOOP("QShortcut", "Audio Cycle Track") },
-+    { Qt::Key_Time,                       QT_TRANSLATE_NOOP("QShortcut", "Time") },
-+    { Qt::Key_Select,                     QT_TRANSLATE_NOOP("QShortcut", "Select") },
-+    { Qt::Key_View,                       QT_TRANSLATE_NOOP("QShortcut", "View") },
-+    { Qt::Key_TopMenu,                    QT_TRANSLATE_NOOP("QShortcut", "Top Menu") },
-+    { Qt::Key_Suspend,                    QT_TRANSLATE_NOOP("QShortcut", "Suspend") },
-+    { Qt::Key_Hibernate,                  QT_TRANSLATE_NOOP("QShortcut", "Hibernate") },
- 
-     // --------------------------------------------------------------
-     // More consistent namings
--- 
-1.6.2.5
-

0017-Add-context-to-tr-calls-in-QShortcut.patch

@@ -1,70 +0,0 @@
-From 9eb3560cfd5cd0bc9c7bf79f2c27657ee07b8f95 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Sat, 8 Aug 2009 14:40:25 +0200
-Subject: [PATCH 17/18] Add context to tr calls in QShortcut
-
-Some languages have special rules for using "+" to concatenate strings and
-for example it needs to be Ctrl + Shift instead of Ctrl+Shift, adding
-context to these strings helps creating a more correct translation
----
- src/gui/kernel/qkeysequence.cpp |   20 ++++++++++----------
- 1 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
-index 894f663..c17f253 100644
---- a/src/gui/kernel/qkeysequence.cpp
-+++ b/src/gui/kernel/qkeysequence.cpp
-@@ -991,10 +991,10 @@ int QKeySequencePrivate::decodeString(const QString &str, QKeySequence::Sequence
- 
-     QList<QModifKeyName> modifs;
-     if (nativeText) {
--        modifs << QModifKeyName(Qt::CTRL, QShortcut::tr("Ctrl").toLower().append(QLatin1Char('+')))
--               << QModifKeyName(Qt::SHIFT, QShortcut::tr("Shift").toLower().append(QLatin1Char('+')))
--               << QModifKeyName(Qt::ALT, QShortcut::tr("Alt").toLower().append(QLatin1Char('+')))
--               << QModifKeyName(Qt::META, QShortcut::tr("Meta").toLower().append(QLatin1Char('+')));
-+        modifs << QModifKeyName(Qt::CTRL, QShortcut::tr("Ctrl", "Ctrl key, used for shortcuts").toLower().append(QLatin1Char('+')))
-+               << QModifKeyName(Qt::SHIFT, QShortcut::tr("Shift", "Shift key, used for shortcuts").toLower().append(QLatin1Char('+')))
-+               << QModifKeyName(Qt::ALT, QShortcut::tr("Alt", "Alt key, used for shortcuts").toLower().append(QLatin1Char('+')))
-+               << QModifKeyName(Qt::META, QShortcut::tr("Meta", "Meta key, used for shortcuts").toLower().append(QLatin1Char('+')));
-     }
-     modifs += *gmodifs; // Test non-translated ones last
- 
-@@ -1086,7 +1086,7 @@ QString QKeySequence::encodeString(int key)
- static inline void addKey(QString &str, const QString &theKey, QKeySequence::SequenceFormat format)
- {
-     if (!str.isEmpty())
--        str += (format == QKeySequence::NativeText) ? QShortcut::tr("+")
-+        str += (format == QKeySequence::NativeText) ? QShortcut::tr("+", "Symbol used to concatenate keys in shortcuts")
-                                                     : QString::fromLatin1("+");
-     str += theKey;
- }
-@@ -1111,13 +1111,13 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat
-     {
-         // On other systems the order is Meta, Control, Alt, Shift
-         if ((key & Qt::META) == Qt::META)
--            s = nativeText ? QShortcut::tr("Meta") : QString::fromLatin1("Meta");
-+            s = nativeText ? QShortcut::tr("Meta", "Meta key, used for shortcuts") : QString::fromLatin1("Meta");
-         if ((key & Qt::CTRL) == Qt::CTRL)
--            addKey(s, nativeText ? QShortcut::tr("Ctrl") : QString::fromLatin1("Ctrl"), format);
-+            addKey(s, nativeText ? QShortcut::tr("Ctrl", "Ctrl key, used for shortcuts") : QString::fromLatin1("Ctrl"), format);
-         if ((key & Qt::ALT) == Qt::ALT)
--            addKey(s, nativeText ? QShortcut::tr("Alt") : QString::fromLatin1("Alt"), format);
-+            addKey(s, nativeText ? QShortcut::tr("Alt", "Alt key, used for shortcuts") : QString::fromLatin1("Alt"), format);
-         if ((key & Qt::SHIFT) == Qt::SHIFT)
--            addKey(s, nativeText ? QShortcut::tr("Shift") : QString::fromLatin1("Shift"), format);
-+            addKey(s, nativeText ? QShortcut::tr("Shift", "Shift key, used for shortcuts") : QString::fromLatin1("Shift"), format);
-     }
- 
- 
-@@ -1132,7 +1132,7 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat
-             p += QChar((key-0x10000)%400+0xdc00);
-         }
-     } else if (key >= Qt::Key_F1 && key <= Qt::Key_F35) {
--            p = nativeText ? QShortcut::tr("F%1").arg(key - Qt::Key_F1 + 1)
-+            p = nativeText ? QShortcut::tr("F%1", "Fx key, used for shortcuts").arg(key - Qt::Key_F1 + 1)
-                            : QString::fromLatin1("F%1").arg(key - Qt::Key_F1 + 1);
-     } else if (key) {
-         int i=0;
--- 
-1.6.2.5
-

0118-qtcopy-define.diff

@@ -1,24 +0,0 @@
-qt-bugs@ issue : none
-Trolltech task ID : none
-applied: yes
-author: David Faure <faure@kde.org>
-
-Needed to distinguish qt-copy from released versions of qt, at least while
-we backport API additions to qt-copy.
-
-Index: src/corelib/global/qglobal.h
-===================================================================
---- src/corelib/global/qglobal.h        (revision 536662)
-+++ src/corelib/global/qglobal.h        (working copy)
-@@ -38,6 +38,11 @@
- #include <QtCore/qconfig.h>
- #endif
-
-+/* QT_KDE_QT_COPY is set in qt-copy so that we know when we can use features backported to qt-copy
-+   Keep in mind that it should also work with the right release of Qt, so use something like:
-+      #if defined(QT_KDE_QT_COPY) || QT_VERSION >= 0x040200 */
-+#define QT_KDE_QT_COPY
-+
- /*
-    The operating system, must be one of: (Q_OS_x)
-

0274-shm-native-image-fix.patch

@@ -1,88 +0,0 @@
-diff -up qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage.cpp.me qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage.cpp
---- qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage.cpp.me	2009-10-02 18:26:02.000000000 +0200
-+++ qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage.cpp	2009-10-02 18:27:13.000000000 +0200
-@@ -144,7 +144,7 @@ QImage::Format QNativeImage::systemForma
- #elif defined(Q_WS_X11) && !defined(QT_NO_MITSHM)
- 
- QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /* isTextBuffer */, QWidget *widget)
--    : xshmimg(0), xshmpm(0)
-+    : xshmimg(0)
- {
-     if (!X11->use_mitshm) {
-         image = QImage(width, height, format);
-@@ -195,11 +195,6 @@ QNativeImage::QNativeImage(int width, in
-             shmctl(xshminfo.shmid, IPC_RMID, 0);
-         return;
-     }
--    xshmpm = XShmCreatePixmap(X11->display, DefaultRootWindow(X11->display), xshmimg->data,
--                              &xshminfo, width, height, dd);
--    if (!xshmpm) {
--        qWarning() << "QNativeImage: Unable to create shared Pixmap.";
--    }
- }
- 
- 
-@@ -208,10 +203,6 @@ QNativeImage::~QNativeImage()
-     if (!xshmimg)
-         return;
- 
--    if (xshmpm) {
--        XFreePixmap(X11->display, xshmpm);
--        xshmpm = 0;
--    }
-     XShmDetach(X11->display, &xshminfo);
-     xshmimg->data = 0;
-     XDestroyImage(xshmimg);
-diff -up qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage_p.h.me qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage_p.h
---- qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage_p.h.me	2009-10-02 18:33:38.000000000 +0200
-+++ qt-x11-opensource-src-4.5.3/src/gui/image/qnativeimage_p.h	2009-10-02 18:34:01.000000000 +0200
-@@ -90,7 +90,6 @@ public:
- 
- #elif defined(Q_WS_X11) && !defined(QT_NO_MITSHM)
-     XImage *xshmimg;
--    Pixmap xshmpm;
-     XShmSegmentInfo xshminfo;
- 
- #elif defined(Q_WS_MAC)
-diff -up qt-x11-opensource-src-4.5.3/src/gui/kernel/qapplication_x11.cpp.me qt-x11-opensource-src-4.5.3/src/gui/kernel/qapplication_x11.cpp
---- qt-x11-opensource-src-4.5.3/src/gui/kernel/qapplication_x11.cpp.me	2009-10-02 18:27:55.000000000 +0200
-+++ qt-x11-opensource-src-4.5.3/src/gui/kernel/qapplication_x11.cpp	2009-10-02 18:33:30.000000000 +0200
-@@ -1959,12 +1959,9 @@ void qt_init(QApplicationPrivate *priv, 
-             bool local = displayName.isEmpty() || displayName.lastIndexOf(QLatin1Char(':')) == 0;
-             if (local && (qgetenv("QT_X11_NO_MITSHM").toInt() == 0)) {
-                 Visual *defaultVisual = DefaultVisual(X11->display, DefaultScreen(X11->display));
--                X11->use_mitshm = mitshm_pixmaps && ((defaultVisual->red_mask == 0xff0000
--                                                      || defaultVisual->red_mask == 0xf800)
--                                                     && (defaultVisual->green_mask == 0xff00
--                                                         || defaultVisual->green_mask == 0x7e0)
--                                                     && (defaultVisual->blue_mask == 0xff
--                                                         || defaultVisual->blue_mask == 0x1f));
-+                X11->use_mitshm = (defaultVisual->red_mask == 0xff0000 || defaultVisual->red_mask == 0xf800)
-+                                   && (defaultVisual->green_mask == 0xff00 || defaultVisual->green_mask == 0x7e0)
-+                                   && (defaultVisual->blue_mask == 0xff || defaultVisual->blue_mask == 0x1f);
-             }
-         }
- #endif // QT_NO_MITSHM
-diff -up qt-x11-opensource-src-4.5.3/src/gui/painting/qwindowsurface_raster.cpp.me qt-x11-opensource-src-4.5.3/src/gui/painting/qwindowsurface_raster.cpp
---- qt-x11-opensource-src-4.5.3/src/gui/painting/qwindowsurface_raster.cpp.me	2009-10-02 18:34:18.000000000 +0200
-+++ qt-x11-opensource-src-4.5.3/src/gui/painting/qwindowsurface_raster.cpp	2009-10-02 18:35:54.000000000 +0200
-@@ -220,9 +220,16 @@ void QRasterWindowSurface::flush(QWidget
- 
-     QRect br = rgn.boundingRect().translated(offset);
- #ifndef QT_NO_MITSHM
--    if (d_ptr->image->xshmpm) {
--        XCopyArea(X11->display, d_ptr->image->xshmpm, widget->handle(), d_ptr->gc,
--                  br.x(), br.y(), br.width(), br.height(), wbr.x(), wbr.y());
-+    if (d_ptr->image->xshmimg && (br.width() * br.height() > 65536)) {
-+        const QImage &src = d->image->image;
-+        br = br.intersected(src.rect());
-+        // Hack to make sure we satisify the PutImage() constraints in the X server,
-+        // since the doShmPutImage() route currently forces a migration to system ram.
-+        wbr.setX(wbr.x() - br.x());
-+        br.setX(0);
-+        br.setWidth(src.width());
-+        XShmPutImage(X11->display, widget->handle(), d_ptr->gc, d_ptr->image->xshmimg,
-+                     br.x(), br.y(), wbr.x(), wbr.y(), br.width(), br.height(), False);
-         XSync(X11->display, False);
-     } else
- #endif

0283-do-not-deduce-scrollbar-extent-twice.diff

@@ -1,35 +0,0 @@
-qt-bugs@ issue : none
-Qt Software task ID : none
-bugs.kde.org number : none
-applied: no
-author: Aurélien Gâteau <agateau@kde.org>
-
-Do not deduce scrollbar extent twice if scrollbar policy is
-Qt::ScrollBarAlwaysOn.
-
-This patch has been merged in master but won't be in 4.5.
-http://qt.gitorious.org/qt/qt/merge_requests/432
-
---- src/gui/itemviews/qlistview.cpp
-+++ src/gui/itemviews/qlistview.cpp
-@@ -1969,10 +1969,16 @@ void QListViewPrivate::prepareItemsLayout()
-     int frameAroundContents = 0;
-     if (q->style()->styleHint(QStyle::SH_ScrollView_FrameOnlyAroundContents))
-         frameAroundContents = q->style()->pixelMetric(QStyle::PM_DefaultFrameWidth) * 2;
--    int verticalMargin = vbarpolicy==Qt::ScrollBarAlwaysOff ? 0 :
--        q->style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, q->verticalScrollBar()) + frameAroundContents;
--    int horizontalMargin =  hbarpolicy==Qt::ScrollBarAlwaysOff ? 0 :
--        q->style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, q->horizontalScrollBar()) + frameAroundContents;
-+
-+    // maximumViewportSize() already takes scrollbar into account if policy is
-+    // Qt::ScrollBarAlwaysOn but scrollbar extent must be deduced if policy
-+    // is Qt::ScrollBarAsNeeded
-+    int verticalMargin = vbarpolicy==Qt::ScrollBarAsNeeded
-+        ? q->style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, q->verticalScrollBar()) + frameAroundContents
-+        : 0;
-+    int horizontalMargin =  hbarpolicy==Qt::ScrollBarAsNeeded
-+        ? q->style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, q->horizontalScrollBar()) + frameAroundContents
-+        : 0;
- 
-     layoutBounds.adjust(0, 0, -verticalMargin, -horizontalMargin);
- 

0285-qgv-dontshowchildren.diff

@@ -1,24 +0,0 @@
-qt-bugs@ issue : unknows
-Qt Software task ID : 197802
-bugs.kde.org number : bugs on the issue not reported yed
-applied: no
-author: Marco Martin <notmart@gmail.com>
-
-This patch makes children items of an hidden qgraphicsitem not be shown if show() is called on them. fixes several issues like the opensocial plasma widget and the Plasma desktop toolbox behaviour.
-
-Index: src/gui/graphicsview/qgraphicsitem.cpp
-===================================================================
---- src/gui/graphicsview/qgraphicsitem.cpp	(revision 958522)
-+++ src/gui/graphicsview/qgraphicsitem.cpp	(working copy)
-@@ -1522,6 +1522,11 @@
-     if (visible == quint32(newVisible))
-         return;
- 
-+    QGraphicsItem *parent(q_ptr->parentItem());
-+    if (parent && newVisible && !parent->d_ptr->visible) {
-+        return;
-+    }
-+
-     // Modify the property.
-     const QVariant newVisibleVariant(q_ptr->itemChange(QGraphicsItem::ItemVisibleChange,
-                                                        quint32(newVisible)));

assistant.desktop

@@ -1,9 +1,9 @@
 [Desktop Entry]
 Name=Qt4 Assistant 
+GenericName=Documentation viewer
 Comment=Shows Qt4 documentation and examples
 Exec=assistant-qt4
 Icon=assistant
 Terminal=false
-Encoding=UTF-8
 Type=Application
 Categories=Qt;Development;Documentation;

designer.desktop

@@ -6,6 +6,5 @@ Exec=designer-qt4
 Icon=designer
 MimeType=application/x-designer;
 Terminal=false
-Encoding=UTF-8
 Type=Application
 Categories=Qt;Development;

kde-qt-patches.sh

@@ -1,4 +0,0 @@
-# quick-n-dirty method to fetch patches from -patched git branch
-# unfortunately, requires an already checked-out copy of the git repo
-
-git format-patch --output-directory kde-qt-patches v4.5.3..4.5.3-patched

linguist.desktop

@@ -1,10 +1,10 @@
 [Desktop Entry]
 Name=Qt4 Linguist 
+GenericName=Translation tool
 Comment=Add translations to Qt4 applications
 Exec=linguist-qt4
 Icon=linguist
-MimeType=application/x-linguist;
+MimeType=text/vnd.trolltech.linguist;application/x-linguist;
 Terminal=false
-Encoding=UTF-8
 Type=Application
 Categories=Qt;Development;

macros.qt4

@@ -0,0 +1,33 @@
+%_qt4 @@NAME@@
+%_qt4_epoch @@EPOCH@@
+%_qt4_version @@VERSION@@
+%_qt4_evr @@EVR@@
+%_qt48 %{_qt4_version}
+%_qt4_prefix %{_libdir}/qt4
+%_qt4_bindir %{_qt4_prefix}/bin
+%_qt4_datadir %{_qt4_prefix}
+%_qt4_demosdir %{_qt4_prefix}/demos
+%_qt4_docdir %{_docdir}/qt4
+%_qt4_examples %{_qt4_prefix}/examples
+%_qt4_examplesdir %{_qt4_prefix}/examples
+%_qt4_headerdir %{_includedir}
+%_qt4_importdir %{_qt4_prefix}/imports
+%_qt4_libdir %{_libdir}
+%_qt4_plugindir %{_qt4_prefix}/plugins
+%_qt4_qmake %{_qt4_bindir}/qmake
+%_qt4_sysconfdir %{_sysconfdir}
+%_qt4_translationdir %{_datadir}/qt4/translations 
+
+%_qt4_ldflags %{?__global_ldflags}
+%_qt4_optflags %{optflags}
+
+%_qt4_qmake_flags \\\
+  QMAKE_CFLAGS_DEBUG="${CFLAGS:-%{_qt4_optflags}}" \\\
+  QMAKE_CFLAGS_RELEASE="${CFLAGS:-%{_qt4_optflags}}" \\\
+  QMAKE_CXXFLAGS_DEBUG="${CXXFLAGS:-%{_qt4_optflags}}" \\\
+  QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS:-%{_qt4_optflags}}" \\\
+  QMAKE_LFLAGS_DEBUG="${LDFLAGS:-%{_qt4_ldflags}}" \\\
+  QMAKE_LFLAGS_RELEASE="${LDFLAGS:-%{_qt4_ldflags}}" \\\
+  QMAKE_STRIP=
+
+%qmake_qt4 %{_qt4_qmake} %{_qt4_qmake_flags}

qconfig-multilib.h

@@ -4,24 +4,20 @@
  *
  * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */
 
-#if defined(__x86_64__)
-# include <QtCore/qconfig-x86_64.h>
-#elif defined(__i386__)
-# include <QtCore/qconfig-i386.h>
-#elif defined(__powerpc64__)
-# include <QtCore/qconfig-ppc64.h>
-#elif defined(__powerpc__)
-# include <QtCore/qconfig-ppc.h>
-#elif defined(__s390x__)
-# include <QtCore/qconfig-s390x.h>
-#elif defined(__s390__)
-# include <QtCore/qconfig-s390.h> 
-#elif defined(__sparc__) && defined (__arch64__)
-# include <QtCore/qconfig-sparc64.h>
-#elif defined(__sparc__)
-# include <QtCore/qconfig-sparc.h>
-#else
-/* Should never reach this point, if so see bugzilla.redhat.com/223663 */
-#error "This qt4-devel package does not work your architecture?"
+#ifndef QCONFIG_MULTILIB_H
+#define QCONFIG_MULTILIB_H
+
+#ifndef __WORDSIZE
+#include <bits/wordsize.h>
+#endif
+
+#if __WORDSIZE == 32
+#include "QtCore/qconfig-32.h"
+#elif __WORDSIZE == 64
+#include "QtCore/qconfig-64.h"
+#else
+#error "unexpected value for __WORDSIZE macro"
+#endif
+
 #endif
 

qdbusviewer.desktop

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Qt4 QDbusViewer 
+GenericName=D-Bus Debugger
+Comment=Debug D-Bus applications
+Exec=qdbusviewer
+Icon=qdbusviewer
+Terminal=false
+Type=Application
+Categories=Qt;Development;Debugger;
+

qeventdispatcher_glib_fix.diff

@@ -1,282 +0,0 @@
-commit 063bded33b417cdf92fd51366fc7fdb06dea00ba
-Author: Bradley T. Hughes <bradley.hughes@nokia.com>
-Date:   Wed Sep 23 13:51:17 2009 +0200
-
-    Fix regressions in qeventloop, qtimer, and qsocketnotifier autotests
-    
-    Commit ed375675d4a4f6fd63edeb242e23c87b3de4be6f triggers a behavior in
-    Glib's mainloop implementation where some event sources are not
-    "serviced" every iteration of the mainloop context. This breaks an
-    invariant that many tests relied on, so we need to solve the problem.
-    
-    The invariant is that a newly added timer that would normally fire on
-    the next pass of the event loop (liker a zero timer) SHOULD actually
-    fire. We do this by registering 2 timer event sources with Glib's
-    mainloop: one normal priority source and one idle priority source. The
-    idle priority source is the one that will send events most of the
-    time, with the normal priority one taking over only when
-    processEvents() is called manually.
-    
-    Task-number: QT-877
-    Reviewed-by: jbache
-    Reviewed-by: thiago
-    Reviewed-by: denis
-    (cherry picked from commit d0d0fdb8e46351b4ab8492de31e5363ef6662b57)
-    (cherry picked from commit 0ed23e95fa756fd851f509a565f91ab43fc30449)
-
-diff --git a/src/corelib/kernel/qeventdispatcher_glib.cpp b/src/corelib/kernel/qeventdispatcher_glib.cpp
-index 87e9728..7f6dbb6 100644
---- a/src/corelib/kernel/qeventdispatcher_glib.cpp
-+++ b/src/corelib/kernel/qeventdispatcher_glib.cpp
-@@ -127,16 +127,11 @@ struct GTimerSource
-     GSource source;
-     QTimerInfoList timerList;
-     QEventLoop::ProcessEventsFlags processEventsFlags;
-+    bool runWithIdlePriority;
- };
- 
--static gboolean timerSourcePrepare(GSource *source, gint *timeout)
-+static gboolean timerSourcePrepareHelper(GTimerSource *src, gint *timeout)
- {
--    gint dummy;
--    if (!timeout)
--        timeout = &dummy;
--
--    GTimerSource *src = reinterpret_cast<GTimerSource *>(source);
--
-     timeval tv = { 0l, 0l };
-     if (!(src->processEventsFlags & QEventLoop::X11ExcludeTimers) && src->timerList.timerWait(tv))
-         *timeout = (tv.tv_sec * 1000) + (tv.tv_usec / 1000);
-@@ -146,10 +141,8 @@ static gboolean timerSourcePrepare(GSource *source, gint *timeout)
-     return (*timeout == 0);
- }
- 
--static gboolean timerSourceCheck(GSource *source)
-+static gboolean timerSourceCheckHelper(GTimerSource *src)
- {
--    GTimerSource *src = reinterpret_cast<GTimerSource *>(source);
--
-     if (src->timerList.isEmpty()
-         || (src->processEventsFlags & QEventLoop::X11ExcludeTimers))
-         return false;
-@@ -160,9 +153,35 @@ static gboolean timerSourceCheck(GSource *source)
-     return true;
- }
- 
-+static gboolean timerSourcePrepare(GSource *source, gint *timeout)
-+{
-+    gint dummy;
-+    if (!timeout)
-+        timeout = &dummy;
-+
-+    GTimerSource *src = reinterpret_cast<GTimerSource *>(source);
-+    if (src->runWithIdlePriority) {
-+        if (timeout)
-+            *timeout = -1;
-+        return false;
-+    }
-+
-+    return timerSourcePrepareHelper(src, timeout);
-+}
-+
-+static gboolean timerSourceCheck(GSource *source)
-+{
-+    GTimerSource *src = reinterpret_cast<GTimerSource *>(source);
-+    if (src->runWithIdlePriority)
-+        return false;
-+    return timerSourceCheckHelper(src);
-+}
-+
- static gboolean timerSourceDispatch(GSource *source, GSourceFunc, gpointer)
- {
--    (void) reinterpret_cast<GTimerSource *>(source)->timerList.activateTimers();
-+    GTimerSource *timerSource = reinterpret_cast<GTimerSource *>(source);
-+    timerSource->runWithIdlePriority = true;
-+    (void) timerSource->timerList.activateTimers();
-     return true; // ??? don't remove, right again?
- }
- 
-@@ -175,6 +194,53 @@ static GSourceFuncs timerSourceFuncs = {
-     NULL
- };
- 
-+struct GIdleTimerSource
-+{
-+    GSource source;
-+    GTimerSource *timerSource;
-+};
-+
-+static gboolean idleTimerSourcePrepare(GSource *source, gint *timeout)
-+{
-+    GIdleTimerSource *idleTimerSource = reinterpret_cast<GIdleTimerSource *>(source);
-+    GTimerSource *timerSource = idleTimerSource->timerSource;
-+    if (!timerSource->runWithIdlePriority) {
-+        // Yield to the normal priority timer source
-+        if (timeout)
-+            *timeout = -1;
-+        return false;
-+    }
-+
-+    return timerSourcePrepareHelper(timerSource, timeout);
-+}
-+
-+static gboolean idleTimerSourceCheck(GSource *source)
-+{
-+    GIdleTimerSource *idleTimerSource = reinterpret_cast<GIdleTimerSource *>(source);
-+    GTimerSource *timerSource = idleTimerSource->timerSource;
-+    if (!timerSource->runWithIdlePriority) {
-+        // Yield to the normal priority timer source
-+        return false;
-+    }
-+    return timerSourceCheckHelper(timerSource);
-+}
-+
-+static gboolean idleTimerSourceDispatch(GSource *source, GSourceFunc, gpointer)
-+{
-+    GTimerSource *timerSource = reinterpret_cast<GIdleTimerSource *>(source)->timerSource;
-+    (void) timerSourceDispatch(&timerSource->source, 0, 0);
-+    return true;
-+}
-+
-+static GSourceFuncs idleTimerSourceFuncs = {
-+    idleTimerSourcePrepare,
-+    idleTimerSourceCheck,
-+    idleTimerSourceDispatch,
-+    NULL,
-+    NULL,
-+    NULL
-+};
-+
- struct GPostEventSource
- {
-     GSource source;
-@@ -235,14 +301,15 @@ QEventDispatcherGlibPrivate::QEventDispatcherGlibPrivate(GMainContext *context)
-         g_main_context_ref(mainContext);
-     } else {
-         QCoreApplication *app = QCoreApplication::instance();
--	if (app && QThread::currentThread() == app->thread()) {
--	    mainContext = g_main_context_default();
--	    g_main_context_ref(mainContext);
--	} else {
--	    mainContext = g_main_context_new();
--	}
-+        if (app && QThread::currentThread() == app->thread()) {
-+            mainContext = g_main_context_default();
-+            g_main_context_ref(mainContext);
-+        } else {
-+            mainContext = g_main_context_new();
-+        }
-     }
- 
-+    // setup post event source
-     postEventSource = reinterpret_cast<GPostEventSource *>(g_source_new(&postEventSourceFuncs,
-                                                                         sizeof(GPostEventSource)));
-     postEventSource->serialNumber = 1;
-@@ -257,14 +324,21 @@ QEventDispatcherGlibPrivate::QEventDispatcherGlibPrivate(GMainContext *context)
-     g_source_set_can_recurse(&socketNotifierSource->source, true);
-     g_source_attach(&socketNotifierSource->source, mainContext);
- 
--    // setup timerSource
-+    // setup normal and idle timer sources
-     timerSource = reinterpret_cast<GTimerSource *>(g_source_new(&timerSourceFuncs,
-                                                                 sizeof(GTimerSource)));
-     (void) new (&timerSource->timerList) QTimerInfoList();
-     timerSource->processEventsFlags = QEventLoop::AllEvents;
-+    timerSource->runWithIdlePriority = false;
-     g_source_set_can_recurse(&timerSource->source, true);
--    g_source_set_priority(&timerSource->source, G_PRIORITY_DEFAULT_IDLE);
-     g_source_attach(&timerSource->source, mainContext);
-+
-+    idleTimerSource = reinterpret_cast<GIdleTimerSource *>(g_source_new(&idleTimerSourceFuncs,
-+                                                                        sizeof(GIdleTimerSource)));
-+    idleTimerSource->timerSource = timerSource;
-+    g_source_set_can_recurse(&idleTimerSource->source, true);
-+    g_source_set_priority(&idleTimerSource->source, G_PRIORITY_DEFAULT_IDLE);
-+    g_source_attach(&idleTimerSource->source, mainContext);
- }
- 
- QEventDispatcherGlib::QEventDispatcherGlib(QObject *parent)
-@@ -272,12 +346,9 @@ QEventDispatcherGlib::QEventDispatcherGlib(QObject *parent)
- {
- }
- 
--QEventDispatcherGlib::QEventDispatcherGlib(GMainContext *mainContext,
--					   QObject *parent)
--    : QAbstractEventDispatcher(*(new QEventDispatcherGlibPrivate(mainContext)),
--			       parent)
--{
--}
-+QEventDispatcherGlib::QEventDispatcherGlib(GMainContext *mainContext, QObject *parent)
-+    : QAbstractEventDispatcher(*(new QEventDispatcherGlibPrivate(mainContext)), parent)
-+{ }
- 
- QEventDispatcherGlib::~QEventDispatcherGlib()
- {
-@@ -289,6 +360,9 @@ QEventDispatcherGlib::~QEventDispatcherGlib()
-     g_source_destroy(&d->timerSource->source);
-     g_source_unref(&d->timerSource->source);
-     d->timerSource = 0;
-+    g_source_destroy(&d->idleTimerSource->source);
-+    g_source_unref(&d->idleTimerSource->source);
-+    d->idleTimerSource = 0;
- 
-     // destroy socket notifier source
-     for (int i = 0; i < d->socketNotifierSource->pollfds.count(); ++i) {
-@@ -324,11 +398,16 @@ bool QEventDispatcherGlib::processEvents(QEventLoop::ProcessEventsFlags flags)
-     // tell postEventSourcePrepare() and timerSource about any new flags
-     QEventLoop::ProcessEventsFlags savedFlags = d->timerSource->processEventsFlags;
-     d->timerSource->processEventsFlags = flags;
--    
-+
-+    if (!(flags & QEventLoop::EventLoopExec)) {
-+        // force timers to be sent at normal priority
-+        d->timerSource->runWithIdlePriority = false;
-+    }
-+
-     bool result = g_main_context_iteration(d->mainContext, canWait);
-     while (!result && canWait)
-         result = g_main_context_iteration(d->mainContext, canWait);
--    
-+
-     d->timerSource->processEventsFlags = savedFlags;
- 
-     if (canWait)
-diff --git a/src/corelib/kernel/qeventdispatcher_glib_p.h b/src/corelib/kernel/qeventdispatcher_glib_p.h
-index eb7fb75..4103aa3 100644
---- a/src/corelib/kernel/qeventdispatcher_glib_p.h
-+++ b/src/corelib/kernel/qeventdispatcher_glib_p.h
-@@ -98,6 +98,7 @@ protected:
- struct GPostEventSource;
- struct GSocketNotifierSource;
- struct GTimerSource;
-+struct GIdleTimerSource;
- 
- class Q_CORE_EXPORT QEventDispatcherGlibPrivate : public QAbstractEventDispatcherPrivate
- {
-@@ -108,6 +109,7 @@ public:
-     GPostEventSource *postEventSource;
-     GSocketNotifierSource *socketNotifierSource;
-     GTimerSource *timerSource;
-+    GIdleTimerSource *idleTimerSource;
- };
- 
- QT_END_NAMESPACE
-diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp
-index 897bb49..903b0eb 100644
---- a/src/corelib/kernel/qeventdispatcher_unix.cpp
-+++ b/src/corelib/kernel/qeventdispatcher_unix.cpp
-@@ -423,10 +423,10 @@ bool QTimerInfoList::timerWait(timeval &tm)
-     // 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 (!(*it)->inTimerEvent) {
-+            t = *it;
-+            break;
-+        }
-     }
- 
-     if (!t)

qt-4.5-sparc64.patch

@@ -1,60 +0,0 @@
---- qt-x11-opensource-src-4.5.0/src/3rdparty/webkit/JavaScriptCore/wtf/Threading.h.orig	2009-03-15 00:21:08.000000000 -0500
-+++ qt-x11-opensource-src-4.5.0/src/3rdparty/webkit/JavaScriptCore/wtf/Threading.h	2009-03-15 00:22:38.000000000 -0500
-@@ -196,14 +196,14 @@
- #elif COMPILER(GCC)
- #define WTF_USE_LOCKFREE_THREADSAFESHARED 1
- 
--inline void atomicIncrement(int volatile* addend) { __gnu_cxx::__atomic_add(addend, 1); }
--inline int atomicDecrement(int volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, -1) - 1; }
-+inline void atomicIncrement(_Atomic_word volatile* addend) { __gnu_cxx::__atomic_add(addend, 1); }
-+inline _Atomic_word atomicDecrement(_Atomic_word volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, -1) - 1; }
- 
- #endif
- 
- template<class T> class ThreadSafeShared : Noncopyable {
- public:
--    ThreadSafeShared(int initialRefCount = 1)
-+    ThreadSafeShared(_Atomic_word initialRefCount = 1)
-         : m_refCount(initialRefCount)
-     {
-     }
-@@ -237,16 +237,16 @@
-         return refCount() == 1;
-     }
- 
--    int refCount() const
-+    _Atomic_word refCount() const
-     {
- #if !USE(LOCKFREE_THREADSAFESHARED)
-         MutexLocker locker(m_mutex);
- #endif
--        return static_cast<int const volatile &>(m_refCount);
-+        return static_cast<_Atomic_word const volatile &>(m_refCount);
-     }
- 
- private:
--    int m_refCount;
-+    _Atomic_word m_refCount;
- #if !USE(LOCKFREE_THREADSAFESHARED)
-     mutable Mutex m_mutex;
- #endif
---- qt-x11-opensource-src-4.5.0/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h.orig	2009-03-15 00:21:37.000000000 -0500
-+++ qt-x11-opensource-src-4.5.0/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h	2009-03-15 00:22:38.000000000 -0500
-@@ -214,9 +214,16 @@
- #endif
- 
- /* PLATFORM(SPARC64) */
--#if defined(__sparc64__)
-+#if defined(__sparc64__) \
-+    || defined(__sparc__) && defined(_arch64__)
- #define WTF_PLATFORM_SPARC64 1
- #define WTF_PLATFORM_BIG_ENDIAN 1
-+#else 
-+/* PLATFORM(SPARC) */
-+#if defined(__sparc__)
-+#define WTF_PLATFORM_SPARC 1
-+#define WTF_PLATFORM_BIG_ENDIAN 1
-+#endif
- #endif
- 
- /* PLATFORM(WIN_CE) && PLATFORM(QT)

qt-4.8-poll.patch

@@ -0,0 +1,812 @@
+diff -up qt-everywhere-opensource-src-4.8.6/src/corelib/io/qprocess_unix.cpp.poll qt-everywhere-opensource-src-4.8.6/src/corelib/io/qprocess_unix.cpp
+--- qt-everywhere-opensource-src-4.8.6/src/corelib/io/qprocess_unix.cpp.poll	2014-03-30 15:36:48.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.6/src/corelib/io/qprocess_unix.cpp	2014-03-31 18:04:05.958260978 -0500
+@@ -158,13 +158,6 @@ static void qt_sa_sigchld_sigaction(int
+     }
+ }
+ 
+-static inline void add_fd(int &nfds, int fd, fd_set *fdset)
+-{
+-    FD_SET(fd, fdset);
+-    if ((fd) > nfds)
+-        nfds = fd;
+-}
+-
+ struct QProcessInfo {
+     QProcess *process;
+     int deathPipe;
+@@ -256,9 +249,9 @@ QProcessManager::~QProcessManager()
+ void QProcessManager::run()
+ {
+     forever {
+-        fd_set readset;
+-        FD_ZERO(&readset);
+-        FD_SET(qt_qprocess_deadChild_pipe[0], &readset);
++	pollfd fd;
++	fd.fd = qt_qprocess_deadChild_pipe[0];
++	fd.events = POLLIN;
+ 
+ #if defined (QPROCESS_DEBUG)
+         qDebug() << "QProcessManager::run() waiting for children to die";
+@@ -267,8 +260,8 @@ void QProcessManager::run()
+         // block forever, or until activity is detected on the dead child
+         // pipe. the only other peers are the SIGCHLD signal handler, and the
+         // QProcessManager destructor.
+-        int nselect = select(qt_qprocess_deadChild_pipe[0] + 1, &readset, 0, 0, 0);
+-        if (nselect < 0) {
++        int ret = qt_safe_poll(&fd, 1, -1, /* retry_eintr */ false);
++        if (ret < 0) {
+             if (errno == EINTR)
+                 continue;
+             break;
+@@ -1027,17 +1020,6 @@ void QProcessPrivate::killProcess()
+         ::kill(pid_t(pid), SIGKILL);
+ }
+ 
+-static int select_msecs(int nfds, fd_set *fdread, fd_set *fdwrite, int timeout)
+-{
+-    if (timeout < 0)
+-        return qt_safe_select(nfds, fdread, fdwrite, 0, 0);
+-
+-    struct timeval tv;
+-    tv.tv_sec = timeout / 1000;
+-    tv.tv_usec = (timeout % 1000) * 1000;
+-    return qt_safe_select(nfds, fdread, fdwrite, 0, &tv);
+-}
+-
+ /*
+    Returns the difference between msecs and elapsed. If msecs is -1,
+    however, -1 is returned.
+@@ -1060,10 +1042,10 @@ bool QProcessPrivate::waitForStarted(int
+ 	   childStartedPipe[0]);
+ #endif
+ 
+-    fd_set fds;
+-    FD_ZERO(&fds);
+-    FD_SET(childStartedPipe[0], &fds);
+-    if (select_msecs(childStartedPipe[0] + 1, &fds, 0, msecs) == 0) {
++    pollfd fd;
++    fd.fd = childStartedPipe[0];
++    fd.events = POLLIN;
++    if (qt_safe_poll(&fd, 1, msecs) == 0) {
+         processError = QProcess::Timedout;
+         q->setErrorString(QProcess::tr("Process operation timed out"));
+ #if defined (QPROCESS_DEBUG)
+@@ -1079,6 +1061,47 @@ bool QProcessPrivate::waitForStarted(int
+     return startedEmitted;
+ }
+ 
++class QProcessFDSet {
++    pollfd fds[5];
++
++    static size_t size()
++    {
++	return sizeof(fds)/sizeof(fds[0]);
++    }
++
++public:
++    QProcessFDSet(QProcessPrivate &proc)
++    {
++	for (size_t i = 0; i < size(); ++i) {
++	    fds[i].fd = -1;
++	    fds[i].events = POLLIN;
++	}
++	death().fd = proc.deathPipe[0];
++
++        if (proc.processState == QProcess::Starting)
++	    started().fd = proc.childStartedPipe[0];
++
++	stdout().fd = proc.stdoutChannel.pipe[0];
++	stderr().fd = proc.stderrChannel.pipe[0];
++
++        if (!proc.writeBuffer.isEmpty()) {
++	    stdin().fd = proc.stdinChannel.pipe[1];
++	    stdin().events = POLLOUT;
++	}
++    }
++
++    int poll(int timeout)
++    {
++	return qt_safe_poll(fds, size(), timeout);
++    }
++
++    pollfd &death() { return fds[0]; }
++    pollfd &started() { return fds[1]; }
++    pollfd &stdout() { return fds[2]; }
++    pollfd &stderr() { return fds[3]; }
++    pollfd &stdin() { return fds[4]; }
++};
++
+ bool QProcessPrivate::waitForReadyRead(int msecs)
+ {
+     Q_Q(QProcess);
+@@ -1090,28 +1113,9 @@ bool QProcessPrivate::waitForReadyRead(i
+     stopWatch.start();
+ 
+     forever {
+-        fd_set fdread;
+-        fd_set fdwrite;
+-
+-        FD_ZERO(&fdread);
+-        FD_ZERO(&fdwrite);
+-
+-        int nfds = deathPipe[0];
+-        FD_SET(deathPipe[0], &fdread);
+-
+-        if (processState == QProcess::Starting)
+-            add_fd(nfds, childStartedPipe[0], &fdread);
+-
+-        if (stdoutChannel.pipe[0] != -1)
+-            add_fd(nfds, stdoutChannel.pipe[0], &fdread);
+-        if (stderrChannel.pipe[0] != -1)
+-            add_fd(nfds, stderrChannel.pipe[0], &fdread);
+-
+-        if (!writeBuffer.isEmpty() && stdinChannel.pipe[1] != -1)
+-            add_fd(nfds, stdinChannel.pipe[1], &fdwrite);
+-
++	QProcessFDSet fdset(*this);
+         int timeout = qt_timeout_value(msecs, stopWatch.elapsed());
+-        int ret = select_msecs(nfds + 1, &fdread, &fdwrite, timeout);
++        int ret = fdset.poll(timeout);
+         if (ret < 0) {
+             break;
+         }
+@@ -1121,18 +1125,18 @@ bool QProcessPrivate::waitForReadyRead(i
+ 	    return false;
+ 	}
+ 
+-	if (childStartedPipe[0] != -1 && FD_ISSET(childStartedPipe[0], &fdread)) {
++	if (qt_readable(fdset.started())) {
+             if (!_q_startupNotification())
+                 return false;
+ 	}
+ 
+         bool readyReadEmitted = false;
+-	if (stdoutChannel.pipe[0] != -1 && FD_ISSET(stdoutChannel.pipe[0], &fdread)) {
++	if (qt_readable(fdset.stdout())) {
+ 	    bool canRead = _q_canReadStandardOutput();
+             if (processChannel == QProcess::StandardOutput && canRead)
+                 readyReadEmitted = true;
+ 	}
+-	if (stderrChannel.pipe[0] != -1 && FD_ISSET(stderrChannel.pipe[0], &fdread)) {
++	if (qt_readable(fdset.stderr())) {
+ 	    bool canRead = _q_canReadStandardError();
+             if (processChannel == QProcess::StandardError && canRead)
+                 readyReadEmitted = true;
+@@ -1140,13 +1144,13 @@ bool QProcessPrivate::waitForReadyRead(i
+         if (readyReadEmitted)
+             return true;
+ 
+-	if (stdinChannel.pipe[1] != -1 && FD_ISSET(stdinChannel.pipe[1], &fdwrite))
++	if (qt_writable(fdset.stdin()))
+ 	    _q_canWrite();
+ 
+-	if (deathPipe[0] == -1 || FD_ISSET(deathPipe[0], &fdread)) {
++	if (qt_readable(fdset.death())) {
+             if (_q_processDied())
+                 return false;
+-        }
++	}
+     }
+     return false;
+ }
+@@ -1162,29 +1166,9 @@ bool QProcessPrivate::waitForBytesWritte
+     stopWatch.start();
+ 
+     while (!writeBuffer.isEmpty()) {
+-        fd_set fdread;
+-        fd_set fdwrite;
+-
+-        FD_ZERO(&fdread);
+-        FD_ZERO(&fdwrite);
+-
+-        int nfds = deathPipe[0];
+-        FD_SET(deathPipe[0], &fdread);
+-
+-        if (processState == QProcess::Starting)
+-            add_fd(nfds, childStartedPipe[0], &fdread);
+-
+-        if (stdoutChannel.pipe[0] != -1)
+-            add_fd(nfds, stdoutChannel.pipe[0], &fdread);
+-        if (stderrChannel.pipe[0] != -1)
+-            add_fd(nfds, stderrChannel.pipe[0], &fdread);
+-
+-
+-        if (!writeBuffer.isEmpty() && stdinChannel.pipe[1] != -1)
+-            add_fd(nfds, stdinChannel.pipe[1], &fdwrite);
+-
++	QProcessFDSet fdset(*this);
+ 	int timeout = qt_timeout_value(msecs, stopWatch.elapsed());
+-	int ret = select_msecs(nfds + 1, &fdread, &fdwrite, timeout);
++	int ret = fdset.poll(timeout);
+         if (ret < 0) {
+             break;
+         }
+@@ -1195,24 +1179,24 @@ bool QProcessPrivate::waitForBytesWritte
+ 	    return false;
+ 	}
+ 
+-	if (childStartedPipe[0] != -1 && FD_ISSET(childStartedPipe[0], &fdread)) {
++	if (qt_readable(fdset.started())) {
+ 	    if (!_q_startupNotification())
+ 		return false;
+ 	}
+ 
+-	if (stdinChannel.pipe[1] != -1 && FD_ISSET(stdinChannel.pipe[1], &fdwrite))
++	if (qt_writable(fdset.stdin()))
+ 	    return _q_canWrite();
+ 
+-	if (stdoutChannel.pipe[0] != -1 && FD_ISSET(stdoutChannel.pipe[0], &fdread))
++	if (qt_readable(fdset.stdout()))
+ 	    _q_canReadStandardOutput();
+ 
+-	if (stderrChannel.pipe[0] != -1 && FD_ISSET(stderrChannel.pipe[0], &fdread))
++	if (qt_readable(fdset.stderr()))
+ 	    _q_canReadStandardError();
+ 
+-	if (deathPipe[0] == -1 || FD_ISSET(deathPipe[0], &fdread)) {
+-            if (_q_processDied())
+-                return false;
+-        }
++	if (qt_readable(fdset.death())) {
++	    if (_q_processDied())
++		return false;
++	}
+     }
+ 
+     return false;
+@@ -1229,29 +1213,9 @@ bool QProcessPrivate::waitForFinished(in
+     stopWatch.start();
+ 
+     forever {
+-        fd_set fdread;
+-        fd_set fdwrite;
+-        int nfds = -1;
+-
+-        FD_ZERO(&fdread);
+-        FD_ZERO(&fdwrite);
+-
+-        if (processState == QProcess::Starting)
+-            add_fd(nfds, childStartedPipe[0], &fdread);
+-
+-        if (stdoutChannel.pipe[0] != -1)
+-            add_fd(nfds, stdoutChannel.pipe[0], &fdread);
+-        if (stderrChannel.pipe[0] != -1)
+-            add_fd(nfds, stderrChannel.pipe[0], &fdread);
+-
+-        if (processState == QProcess::Running)
+-            add_fd(nfds, deathPipe[0], &fdread);
+-
+-        if (!writeBuffer.isEmpty() && stdinChannel.pipe[1] != -1)
+-            add_fd(nfds, stdinChannel.pipe[1], &fdwrite);
+-
++	QProcessFDSet fdset(*this);
+ 	int timeout = qt_timeout_value(msecs, stopWatch.elapsed());
+-	int ret = select_msecs(nfds + 1, &fdread, &fdwrite, timeout);
++	int ret = fdset.poll(timeout);
+         if (ret < 0) {
+             break;
+         }
+@@ -1261,20 +1225,20 @@ bool QProcessPrivate::waitForFinished(in
+ 	    return false;
+ 	}
+ 
+-	if (childStartedPipe[0] != -1 && FD_ISSET(childStartedPipe[0], &fdread)) {
++	if (qt_readable(fdset.started())) {
+ 	    if (!_q_startupNotification())
+ 		return false;
+ 	}
+-	if (stdinChannel.pipe[1] != -1 && FD_ISSET(stdinChannel.pipe[1], &fdwrite))
++	if (qt_writable(fdset.stdin()))
+ 	    _q_canWrite();
+ 
+-	if (stdoutChannel.pipe[0] != -1 && FD_ISSET(stdoutChannel.pipe[0], &fdread))
++	if (qt_readable(fdset.stdout()))
+ 	    _q_canReadStandardOutput();
+ 
+-	if (stderrChannel.pipe[0] != -1 && FD_ISSET(stderrChannel.pipe[0], &fdread))
++	if (qt_readable(fdset.stderr()))
+ 	    _q_canReadStandardError();
+ 
+-	if (deathPipe[0] == -1 || FD_ISSET(deathPipe[0], &fdread)) {
++	if (qt_readable(fdset.death())) {
+             if (_q_processDied())
+                 return true;
+ 	}
+@@ -1284,10 +1248,10 @@ bool QProcessPrivate::waitForFinished(in
+ 
+ bool QProcessPrivate::waitForWrite(int msecs)
+ {
+-    fd_set fdwrite;
+-    FD_ZERO(&fdwrite);
+-    FD_SET(stdinChannel.pipe[1], &fdwrite);
+-    return select_msecs(stdinChannel.pipe[1] + 1, 0, &fdwrite, msecs < 0 ? 0 : msecs) == 1;
++    pollfd fd;
++    fd.fd = stdinChannel.pipe[1];
++    fd.events = POLLIN;
++    return qt_safe_poll(&fd, 1, msecs);
+ }
+ 
+ void QProcessPrivate::findExitCode()
+diff -up qt-everywhere-opensource-src-4.8.6/src/corelib/kernel/qcore_unix.cpp.poll qt-everywhere-opensource-src-4.8.6/src/corelib/kernel/qcore_unix.cpp
+--- qt-everywhere-opensource-src-4.8.6/src/corelib/kernel/qcore_unix.cpp.poll	2014-03-30 15:36:48.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.6/src/corelib/kernel/qcore_unix.cpp	2014-03-31 18:01:59.369715403 -0500
+@@ -99,4 +99,165 @@ int qt_safe_select(int nfds, fd_set *fdr
+     }
+ }
+ 
++#ifndef Q_OS_VXWORKS
++
++int qt_safe_poll(struct pollfd *fds, int nfds, int timeout_ms, bool retry_eintr)
++{
++    if (nfds == 0)
++	return 0;
++    if (nfds < 0) {
++	errno = EINVAL;
++	return -1;
++    }
++
++    // Retry on ret == 0 if the deadline has not yet passed because
++    // Linux can return early from the syscall, without setting EINTR.
++    if (timeout_ms < 0) {
++	forever {
++	    int ret = ::poll(fds, nfds, -1);
++	    if (ret > 0)
++		return ret;
++	    if (retry_eintr) {
++		if (ret == 0 || ret == -1 && errno == EINTR) {
++		    continue;
++		} else {
++		    return -1;
++		}
++	    }
++	    if (ret == 0) {
++		errno = EINTR;
++		return -1;
++	    }
++	    return ret;
++	}
++    }
++
++    timeval previous = qt_gettime();
++    timeval deadline = previous;
++    deadline.tv_sec += timeout_ms / 1000;
++    deadline.tv_usec += (timeout_ms % 1000) * 1000;
++    if (deadline.tv_usec >= 1000000) {
++	++deadline.tv_sec;
++	deadline.tv_usec -= 1000000;
++    }
++    int remaining = timeout_ms;
++
++    forever {
++	int ret = ::poll(fds, nfds, remaining);
++	if (ret > 0)
++	    return ret;
++	timeval now = qt_gettime();
++	if ((now.tv_sec > deadline.tv_sec // past deadline
++	     || (now.tv_sec == deadline.tv_sec
++		 && now.tv_usec >= deadline.tv_usec))
++	    || (now.tv_sec < previous.tv_sec // time warp
++		|| (now.tv_sec == previous.tv_sec
++		    && now.tv_usec < previous.tv_usec))
++	    || (ret < 0 && (errno != EINTR || !retry_eintr))) // other error
++	    return ret;
++	if (ret == 0 && !retry_eintr) {
++	    errno = EINTR;
++	    return -1;
++	}
++        remaining = (deadline.tv_sec - now.tv_sec) * 1000
++		     + (deadline.tv_usec - now.tv_usec) / 1000;
++	previous = now;
++    }
++}
++
++#else
++
++// Poll emulation for VxWorks.
++
++static int mark_bad_descriptors(pollfd *fds, int nfds)
++{
++    fd_set r;
++    FD_ZERO(&r);
++    struct timeval tv;
++    tv.tv_sec = 0;
++    tv.tv_usec = 0;
++    int ret = 0;
++
++    // Check each descriptor invidually for badness.
++    for (int i = 0; i < nfds; ++i) {
++        pollfd &fd(fds[i]);
++        if (fd.fd >= 0) {
++            FD_SET(fd.fd, &r);
++            int ret = qt_safe_select(fd.fd + 1, &r, NULL, NULL, &tv);
++            FD_CLR(fd.fd, &r);
++            if (ret < 0 && errno == EBADF) {
++                fd.revents = POLLNVAL;
++                ++ret;
++            }
++        }
++    }
++    Q_ASSERT(ret > 0);
++    return ret;
++}
++
++int qt_safe_poll(pollfd *fds, int nfds, int timeout, bool retry_eintr)
++{
++    fd_set r, w;
++    FD_ZERO(&r);
++    FD_ZERO(&w);
++    int maxfd = -1;
++
++    // Extract the watched descriptors.
++    for (int i = 0; i < nfds; ++i) {
++        pollfd &fd(fds[i]);
++        if (fd.fd >= 0 && fd.fd < FD_SETSIZE) {
++            if (fd.events & POLLIN) {
++                FD_SET(fd.fd, &r);
++                if (fd.fd > maxfd)
++                    maxfd = fd.fd;
++            }
++            if (fd.events & POLLOUT) {
++                FD_SET(fd.fd, &w);
++                if (fd.fd > maxfd)
++                    maxfd = fd.fd;
++            }
++        }
++    }
++
++    // If timeout is negative, wait indefinitely for activity.
++    timeval tv;
++    timeval *ptv;
++    if (timeout >= 0) {
++        tv.tv_sec = timeout / 1000;
++        tv.tv_usec = (timeout % 1000) * 1000;
++        ptv = &tv;
++    } else
++        ptv = NULL;
++
++    int ret;
++    if (retry_eintr)
++        ret = qt_safe_select(maxfd + 1, &r, &w, NULL, ptv);
++    else
++        ret = ::select(maxfd + 1, &r, &w, NULL, ptv);
++    if (ret < 0 && errno == EBADF) {
++        return mark_bad_descriptors(fds, nfds);
++    }
++    if (ret <= 0)
++        return ret;
++
++    // Set the revents flags.
++    ret = 0;
++    for (int i = 0; i < nfds; ++i) {
++        pollfd &fd(fds[i]);
++        fd.revents = 0;
++        if (fd.fd >= 0 && fd.fd < FD_SETSIZE) {
++            if ((fd.events & POLLIN) && FD_ISSET(fd.fd, &r))
++                fd.revents |= POLLIN;
++            if ((fd.events & POLLOUT) && FD_ISSET(fd.fd, &w))
++                fd.revents |= POLLOUT;
++            if (fd.revents)
++                ++ret;
++        }
++    }
++    Q_ASSERT(ret > 0);
++    return ret;
++}
++
++#endif
++
+ QT_END_NAMESPACE
+diff -up qt-everywhere-opensource-src-4.8.6/src/corelib/kernel/qcore_unix_p.h.poll qt-everywhere-opensource-src-4.8.6/src/corelib/kernel/qcore_unix_p.h
+--- qt-everywhere-opensource-src-4.8.6/src/corelib/kernel/qcore_unix_p.h.poll	2014-03-30 15:36:48.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.6/src/corelib/kernel/qcore_unix_p.h	2014-03-31 18:01:59.370715392 -0500
+@@ -345,9 +345,42 @@ static inline pid_t qt_safe_waitpid(pid_
+ 
+ timeval qt_gettime(); // in qelapsedtimer_mac.cpp or qtimestamp_unix.cpp
+ 
++// Deprecated due to FD_SETSIZE limitation, use qt_safe_poll instead.
+ Q_CORE_EXPORT int qt_safe_select(int nfds, fd_set *fdread, fd_set *fdwrite, fd_set *fdexcept,
+                                  const struct timeval *tv);
+ 
++#ifndef Q_OS_VXWORKS
++#include <poll.h>
++#else
++
++// Poll emulation for VxWorks.
++
++struct pollfd {
++  int fd;
++  short events;
++  short revents;
++};
++
++#define POLLIN 1
++#define POLLOUT 2
++#define POLLERR 4
++#define POLLHUP 8
++#define POLLNVAL 16
++#endif
++
++inline bool qt_readable(const pollfd &fd)
++{
++  return fd.fd >= 0 && (fd.revents & (POLLIN | POLLHUP | POLLERR | POLLNVAL)) != 0;
++}
++
++inline bool qt_writable(const pollfd &fd)
++{
++  return fd.fd >= 0 && (fd.revents & (POLLOUT | POLLHUP | POLLERR | POLLNVAL)) != 0;
++}
++
++Q_CORE_EXPORT int qt_safe_poll(pollfd *fds, int nfds, int timeout,
++                               bool retry_eintr = true);
++
+ // according to X/OPEN we have to define semun ourselves
+ // we use prefix as on some systems sem.h will have it
+ struct semid_ds;
+diff -up qt-everywhere-opensource-src-4.8.6/src/network/socket/qlocalserver_unix.cpp.poll qt-everywhere-opensource-src-4.8.6/src/network/socket/qlocalserver_unix.cpp
+--- qt-everywhere-opensource-src-4.8.6/src/network/socket/qlocalserver_unix.cpp.poll	2014-03-30 15:36:49.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.6/src/network/socket/qlocalserver_unix.cpp	2014-03-31 18:01:59.370715392 -0500
+@@ -208,16 +208,11 @@ void QLocalServerPrivate::_q_onNewConnec
+ 
+ void QLocalServerPrivate::waitForNewConnection(int msec, bool *timedOut)
+ {
+-    fd_set readfds;
+-    FD_ZERO(&readfds);
+-    FD_SET(listenSocket, &readfds);
++    struct pollfd fd;
++    fd.fd = listenSocket;
++    fd.events = POLLIN;
+ 
+-    timeval timeout;
+-    timeout.tv_sec = msec / 1000;
+-    timeout.tv_usec = (msec % 1000) * 1000;
+-
+-    int result = -1;
+-    result = qt_safe_select(listenSocket + 1, &readfds, 0, 0, (msec == -1) ? 0 : &timeout);
++    int result = qt_safe_poll(&fd, 1, msec);
+     if (-1 == result) {
+         setError(QLatin1String("QLocalServer::waitForNewConnection"));
+         closeServer();
+diff -up qt-everywhere-opensource-src-4.8.6/src/network/socket/qlocalsocket_unix.cpp.poll qt-everywhere-opensource-src-4.8.6/src/network/socket/qlocalsocket_unix.cpp
+--- qt-everywhere-opensource-src-4.8.6/src/network/socket/qlocalsocket_unix.cpp.poll	2014-03-30 15:36:49.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.6/src/network/socket/qlocalsocket_unix.cpp	2014-03-31 18:01:59.370715392 -0500
+@@ -56,10 +56,6 @@
+ #include <qdebug.h>
+ #include <qelapsedtimer.h>
+ 
+-#ifdef Q_OS_VXWORKS
+-#  include <selectLib.h>
+-#endif
+-
+ #define QT_CONNECT_TIMEOUT 30000
+ 
+ QT_BEGIN_NAMESPACE
+@@ -520,32 +516,17 @@ bool QLocalSocket::waitForConnected(int
+     if (state() != ConnectingState)
+         return (state() == ConnectedState);
+ 
+-    fd_set fds;
+-    FD_ZERO(&fds);
+-    FD_SET(d->connectingSocket, &fds);
+-
+-    timeval timeout;
+-    timeout.tv_sec = msec / 1000;
+-    timeout.tv_usec = (msec % 1000) * 1000;
+-
+-    // timeout can not be 0 or else select will return an error.
+-    if (0 == msec)
+-        timeout.tv_usec = 1000;
++    pollfd fd;
++    fd.fd = d->connectingSocket;
++    fd.events = POLLIN | POLLOUT;
+ 
+     int result = -1;
+     // on Linux timeout will be updated by select, but _not_ on other systems.
+     QElapsedTimer timer;
++    int remaining = msec;
+     timer.start();
+-    while (state() == ConnectingState
+-           && (-1 == msec || timer.elapsed() < msec)) {
+-#ifdef Q_OS_SYMBIAN
+-        // On Symbian, ready-to-write is signaled when non-blocking socket
+-        // connect is finised. Is ready-to-read really used on other
+-        // UNIX paltforms when using non-blocking AF_UNIX socket?
+-        result = ::select(d->connectingSocket + 1, 0, &fds, 0, &timeout);
+-#else
+-        result = ::select(d->connectingSocket + 1, &fds, 0, 0, &timeout);
+-#endif
++    while (state() == ConnectingState) {
++        result = qt_safe_poll(&fd, 1, remaining, /* retry_eintr */ false);
+         if (-1 == result && errno != EINTR) {
+             d->errorOccurred( QLocalSocket::UnknownSocketError,
+                     QLatin1String("QLocalSocket::waitForConnected"));
+@@ -553,6 +534,11 @@ bool QLocalSocket::waitForConnected(int
+         }
+         if (result > 0)
+             d->_q_connectToSocket();
++        if (msec >= 0) {
++            remaining = timer.elapsed() - msec;
++            if (remaining < 0)
++                break;
++        }
+     }
+ 
+     return (state() == ConnectedState);
+diff -up qt-everywhere-opensource-src-4.8.6/src/network/socket/qnativesocketengine_unix.cpp.poll qt-everywhere-opensource-src-4.8.6/src/network/socket/qnativesocketengine_unix.cpp
+--- qt-everywhere-opensource-src-4.8.6/src/network/socket/qnativesocketengine_unix.cpp.poll	2014-03-30 15:36:49.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.6/src/network/socket/qnativesocketengine_unix.cpp	2014-03-31 18:01:59.371715381 -0500
+@@ -1068,48 +1068,40 @@ qint64 QNativeSocketEnginePrivate::nativ
+ 
+ int QNativeSocketEnginePrivate::nativeSelect(int timeout, bool selectForRead) const
+ {
+-    fd_set fds;
+-    FD_ZERO(&fds);
+-    FD_SET(socketDescriptor, &fds);
+-
+-    struct timeval tv;
+-    tv.tv_sec = timeout / 1000;
+-    tv.tv_usec = (timeout % 1000) * 1000;
+-
+-    int retval;
+-    if (selectForRead)
+-        retval = qt_safe_select(socketDescriptor + 1, &fds, 0, 0, timeout < 0 ? 0 : &tv);
+-    else
+-        retval = qt_safe_select(socketDescriptor + 1, 0, &fds, 0, timeout < 0 ? 0 : &tv);
+-
+-    return retval;
++    struct pollfd fd;
++    fd.fd = socketDescriptor;
++    if (selectForRead) {
++	fd.events = POLLIN;
++    } else {
++	fd.events = POLLOUT;
++    }
++    return qt_safe_poll(&fd, 1, timeout);
+ }
+ 
+ int QNativeSocketEnginePrivate::nativeSelect(int timeout, bool checkRead, bool checkWrite,
+                        bool *selectForRead, bool *selectForWrite) const
+ {
+-    fd_set fdread;
+-    FD_ZERO(&fdread);
++    struct pollfd fd;
++    fd.fd = socketDescriptor;
+     if (checkRead)
+-        FD_SET(socketDescriptor, &fdread);
+-
+-    fd_set fdwrite;
+-    FD_ZERO(&fdwrite);
++	fd.events =  POLLIN;
++    else
++	fd.events = 0;
+     if (checkWrite)
+-        FD_SET(socketDescriptor, &fdwrite);
+-
+-    struct timeval tv;
+-    tv.tv_sec = timeout / 1000;
+-    tv.tv_usec = (timeout % 1000) * 1000;
+-
+-    int ret;
+-    ret = qt_safe_select(socketDescriptor + 1, &fdread, &fdwrite, 0, timeout < 0 ? 0 : &tv);
+-
++	fd.events |= POLLOUT;
++    int ret = qt_safe_poll(&fd, 1, timeout);
+     if (ret <= 0)
+-        return ret;
+-    *selectForRead = FD_ISSET(socketDescriptor, &fdread);
+-    *selectForWrite = FD_ISSET(socketDescriptor, &fdwrite);
+-
++	return ret;
++    bool r = (fd.revents & (POLLIN | POLLHUP | POLLERR)) != 0;
++    bool w = (fd.revents & (POLLOUT | POLLHUP | POLLERR)) != 0;
++    // Emulate the return value from select(2).
++    ret = 0;
++    if (r)
++	++ret;
++    if (w)
++	++ret;
++    *selectForRead = r;
++    *selectForWrite = w;
+     return ret;
+ }
+ 
+diff -up qt-everywhere-opensource-src-4.8.6/src/qt3support/network/q3socketdevice_unix.cpp.poll qt-everywhere-opensource-src-4.8.6/src/qt3support/network/q3socketdevice_unix.cpp
+--- qt-everywhere-opensource-src-4.8.6/src/qt3support/network/q3socketdevice_unix.cpp.poll	2014-03-30 15:36:49.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.6/src/qt3support/network/q3socketdevice_unix.cpp	2014-03-31 18:01:59.371715381 -0500
+@@ -68,6 +68,7 @@ static inline int qt_socket_socket(int d
+ #endif
+ 
+ #include "q3socketdevice.h"
++#include "private/qcore_unix_p.h"
+ 
+ #ifndef QT_NO_NETWORK
+ 
+@@ -588,19 +589,10 @@ Q_LONG Q3SocketDevice::waitForMore( int
+ {
+     if ( !isValid() )
+ 	return -1;
+-    if ( fd >= FD_SETSIZE )
+-	return -1;
+-
+-    fd_set fds;
+-    struct timeval tv;
+-
+-    FD_ZERO( &fds );
+-    FD_SET( fd, &fds );
+-
+-    tv.tv_sec = msecs / 1000;
+-    tv.tv_usec = (msecs % 1000) * 1000;
+ 
+-    int rv = select( fd+1, &fds, 0, 0, msecs < 0 ? 0 : &tv );
++    pollfd pfd;
++    pfd.fd = fd;
++    int rv = qt_safe_poll(&pfd, 1, msecs, /* retry_eintr */ false);
+ 
+     if ( rv < 0 )
+ 	return -1;
+diff -up qt-everywhere-opensource-src-4.8.6/src/qt3support/other/q3process_unix.cpp.poll qt-everywhere-opensource-src-4.8.6/src/qt3support/other/q3process_unix.cpp
+--- qt-everywhere-opensource-src-4.8.6/src/qt3support/other/q3process_unix.cpp.poll	2014-03-30 15:36:49.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.6/src/qt3support/other/q3process_unix.cpp	2014-03-31 18:01:59.372715370 -0500
+@@ -981,13 +981,10 @@ bool Q3Process::isRunning() const
+ 	// On heavy processing, the socket notifier for the sigchild might not
+ 	// have found time to fire yet.
+ 	if ( d->procManager && d->procManager->sigchldFd[1] < FD_SETSIZE ) {
+-	    fd_set fds;
+-	    struct timeval tv;
+-	    FD_ZERO( &fds );
+-	    FD_SET( d->procManager->sigchldFd[1], &fds );
+-	    tv.tv_sec = 0;
+-	    tv.tv_usec = 0;
+-	    if ( ::select( d->procManager->sigchldFd[1]+1, &fds, 0, 0, &tv ) > 0 )
++	    pollfd fd;
++	    fd.fd = d->procManager->sigchldFd[1];
++	    fd.events = POLLIN;
++	    if ( qt_safe_poll(&fd, 1, 0, /* retry_eintr */ false) > 0 )
+ 		d->procManager->sigchldHnd( d->procManager->sigchldFd[1] );
+ 	}
+ 
+@@ -1124,29 +1121,21 @@ void Q3Process::socketRead( int fd )
+ 	}
+     }
+ 
+-    if ( fd < FD_SETSIZE ) {
+-	fd_set fds;
+-	struct timeval tv;
+-	FD_ZERO( &fds );
+-	FD_SET( fd, &fds );
+-	tv.tv_sec = 0;
+-	tv.tv_usec = 0;
+-	while ( ::select( fd+1, &fds, 0, 0, &tv ) > 0 ) {
+-	    // prepare for the next round
+-	    FD_ZERO( &fds );
+-	    FD_SET( fd, &fds );
+-	    // read data
+-	    ba = new QByteArray( basize );
+-	    n = ::read( fd, ba->data(), basize );
+-	    if ( n > 0 ) {
+-		ba->resize( n );
+-		buffer->append( ba );
+-		ba = 0;
+-	    } else {
+-		delete ba;
+-		ba = 0;
+-		break;
+-	    }
++    pollfd pfd;
++    pfd.fd = fd;
++    pfd.events = POLLIN;
++    while (qt_safe_poll(&pfd, 1, 0)) {
++	// read data
++	ba = new QByteArray( basize );
++	n = ::read( fd, ba->data(), basize );
++	if ( n > 0 ) {
++	    ba->resize( n );
++	    buffer->append( ba );
++	    ba = 0;
++	} else {
++	    delete ba;
++	    ba = 0;
++	    break;
+ 	}
+     }
+ 

qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch

@@ -1,41 +0,0 @@
-diff -ur qt-all-opensource-src-4.4.0-rc1/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp qt-all-opensource-src-4.4.0-rc1-as_IN-437440/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp
---- qt-all-opensource-src-4.4.0-rc1/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp	2008-04-02 18:33:48.000000000 +0200
-+++ qt-all-opensource-src-4.4.0-rc1-as_IN-437440/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp	2008-04-08 04:37:45.000000000 +0200
-@@ -552,7 +552,7 @@
-     None, None, None, None,
-     None, None, None, None,
- 
--    None, None, None, None,
-+    Below, None, None, None,
-     None, None, None, None,
-     None, None, None, None,
-     None, None, None, None,
-@@ -1169,7 +1169,7 @@
-     HB_Script script = item->item.script;
-     assert(script >= HB_Script_Devanagari && script <= HB_Script_Sinhala);
-     const unsigned short script_base = 0x0900 + 0x80*(script-HB_Script_Devanagari);
--    const unsigned short ra = script_base + 0x30;
-+    unsigned short ra = script_base + 0x30;
-     const unsigned short halant = script_base + 0x4d;
-     const unsigned short nukta = script_base + 0x3c;
-     bool control = false;
-@@ -1212,6 +1212,19 @@
-         HB_UChar16 *uc = reordered;
-         bool beginsWithRa = false;
- 
-+	// Exception in Bengali Script
-+        //
-+        // Bengali script supports two languages bengali and assamese
-+        // Unfortunately for both languages there is different ra defined in same script chart
-+        // for Bengali it ra is 'Base+ 0x30' and for assamese 'Base+0x70'
-+        // Base is same 0x0980
-+        // To handle this exception we need to change ra to from const to normal variable 
-+        // and aslo need to change ra to 'Base+0x70' whenever we will get assamese language
-+	//character in data
-+	if((script == HB_Script_Bengali) && (*uc==0x09F0)){
-+	  ra  = script_base + 0x70;
-+	}
-+
-         // Rule 1: find base consonant
-         //
-         // The shaping engine finds the base consonant of the

qt-cupsEnumDests.patch

@@ -0,0 +1,238 @@
+diff -up qt-everywhere-opensource-src-4.8.4/src/gui/painting/qcups.cpp.cupsEnumDests qt-everywhere-opensource-src-4.8.4/src/gui/painting/qcups.cpp
+--- qt-everywhere-opensource-src-4.8.4/src/gui/painting/qcups.cpp.cupsEnumDests	2012-11-23 10:09:53.000000000 +0000
++++ qt-everywhere-opensource-src-4.8.4/src/gui/painting/qcups.cpp	2013-07-03 15:30:06.232936976 +0100
+@@ -50,9 +50,19 @@
+ 
+ QT_BEGIN_NAMESPACE
+ 
++typedef int (*CupsEnumDests)(unsigned flags, int msec, int *cancel,
++			     cups_ptype_t type, cups_ptype_t mask,
++			     cups_dest_cb_t cb, void *user_data);
++typedef http_t * (*CupsConnectDest)(cups_dest_t *dest, unsigned flags,
++				    int msec, int *cancel,
++				    char *resource, size_t resourcesize,
++				    cups_dest_cb_t cb, void *user_data);
++typedef int (*CupsCopyDest)(cups_dest_t *dest, int num_dests,
++			    cups_dest_t **dests);
+ typedef int (*CupsGetDests)(cups_dest_t **dests);
+ typedef void (*CupsFreeDests)(int num_dests, cups_dest_t *dests);
+ typedef const char* (*CupsGetPPD)(const char *printer);
++typedef const char* (*CupsGetPPD2)(http_t *http, const char *printer);
+ typedef int (*CupsMarkOptions)(ppd_file_t *ppd, int num_options, cups_option_t *options);
+ typedef ppd_file_t* (*PPDOpenFile)(const char *filename);
+ typedef void (*PPDMarkDefaults)(ppd_file_t *ppd);
+@@ -66,12 +76,24 @@ typedef const char* (*CupsLangEncoding)(
+ typedef int (*CupsAddOption)(const char *name, const char *value, int num_options, cups_option_t **options);
+ typedef int (*CupsTempFd)(char *name, int len);
+ typedef int (*CupsPrintFile)(const char * name, const char * filename, const char * title, int num_options, cups_option_t * options);
++typedef int (*CupsPrintFile2)(http_t *http, const char *name, const char *filename, const char *title, int num_options, cups_option_t *options);
++
++typedef struct
++{
++    cups_dest_t *printers;
++    int num_printers;
++} EnumDestsContext;
+ 
+ static bool cupsLoaded = false;
+ static int qt_cups_num_printers = 0;
++static cups_dest_t *qt_cups_printers = 0;
++static CupsEnumDests _cupsEnumDests = 0;
++static CupsConnectDest _cupsConnectDest = 0;
++static CupsCopyDest _cupsCopyDest = 0;
+ static CupsGetDests _cupsGetDests = 0;
+ static CupsFreeDests _cupsFreeDests = 0;
+ static CupsGetPPD _cupsGetPPD = 0;
++static CupsGetPPD2 _cupsGetPPD2 = 0;
+ static PPDOpenFile _ppdOpenFile = 0;
+ static PPDMarkDefaults _ppdMarkDefaults = 0;
+ static PPDClose _ppdClose = 0;
+@@ -84,14 +106,35 @@ static CupsLangEncoding _cupsLangEncodin
+ static CupsAddOption _cupsAddOption = 0;
+ static CupsTempFd _cupsTempFd = 0;
+ static CupsPrintFile _cupsPrintFile = 0;
++static CupsPrintFile2 _cupsPrintFile2 = 0;
++
++static int enum_dest_cb (void *user_data, unsigned flags, cups_dest_t *dest)
++{
++    EnumDestsContext *context = (EnumDestsContext *) user_data;
++
++    if ((flags & (CUPS_DEST_FLAGS_UNCONNECTED |
++		  CUPS_DEST_FLAGS_REMOVED |
++		  CUPS_DEST_FLAGS_ERROR |
++		  CUPS_DEST_FLAGS_RESOLVING |
++		  CUPS_DEST_FLAGS_CONNECTING |
++		  CUPS_DEST_FLAGS_CANCELED)) == 0)
++	context->num_printers = _cupsCopyDest (dest, context->num_printers,
++					       &context->printers);
++
++    return 1;
++}
+ 
+ static void resolveCups()
+ {
+     QLibrary cupsLib(QLatin1String("cups"), 2);
+     if(cupsLib.load()) {
++        _cupsEnumDests = (CupsEnumDests) cupsLib.resolve("cupsEnumDests");
++	_cupsConnectDest = (CupsConnectDest) cupsLib.resolve("cupsConnectDest");
++	_cupsCopyDest = (CupsCopyDest) cupsLib.resolve("cupsCopyDest");
+         _cupsGetDests = (CupsGetDests) cupsLib.resolve("cupsGetDests");
+         _cupsFreeDests = (CupsFreeDests) cupsLib.resolve("cupsFreeDests");
+         _cupsGetPPD = (CupsGetPPD) cupsLib.resolve("cupsGetPPD");
++        _cupsGetPPD2 = (CupsGetPPD2) cupsLib.resolve("cupsGetPPD2");
+         _cupsLangGet = (CupsLangGet) cupsLib.resolve("cupsLangGet");
+         _cupsLangEncoding = (CupsLangEncoding) cupsLib.resolve("cupsLangEncoding");
+         _ppdOpenFile = (PPDOpenFile) cupsLib.resolve("ppdOpenFile");
+@@ -104,14 +147,27 @@ static void resolveCups()
+         _cupsAddOption = (CupsAddOption) cupsLib.resolve("cupsAddOption");
+         _cupsTempFd = (CupsTempFd) cupsLib.resolve("cupsTempFd");
+         _cupsPrintFile = (CupsPrintFile) cupsLib.resolve("cupsPrintFile");
++        _cupsPrintFile2 = (CupsPrintFile2) cupsLib.resolve("cupsPrintFile2");
+ 
+-        if (_cupsGetDests && _cupsFreeDests) {
+-            cups_dest_t *printers;
++	if (_cupsEnumDests && _cupsCopyDest &&
++	    _cupsConnectDest && _cupsGetPPD2 &&
++	    _cupsPrintFile2) {
++	    EnumDestsContext context;
++	    context.printers = 0;
++	    context.num_printers = 0;
++	    _cupsEnumDests(0, -1, 0, 0, 0,
++			   enum_dest_cb, &context);
++
++	    qt_cups_printers = context.printers;
++	    qt_cups_num_printers = context.num_printers;
++	} else if (_cupsGetDests && _cupsFreeDests) {
++	    cups_dest_t *printers;
+             int num_printers = _cupsGetDests(&printers);
+-            if (num_printers)
+-                _cupsFreeDests(num_printers, printers);
+-            qt_cups_num_printers = num_printers;
+-        }
++
++	    if (num_printers)
++		_cupsFreeDests(num_printers, printers);
++	    qt_cups_num_printers = num_printers;
++	}
+     }
+     cupsLoaded = true;
+ }
+@@ -134,7 +190,15 @@ QCUPSSupport::QCUPSSupport()
+         return;
+ 
+     // Update the available printer count
+-    qt_cups_num_printers = prnCount = _cupsGetDests(&printers);
++    if (qt_cups_printers && _cupsCopyDest) {
++      int i;
++      for (i = 0; i < qt_cups_num_printers; ++i) {
++	  prnCount = _cupsCopyDest (&qt_cups_printers[i],
++				    prnCount,
++				    &printers);
++      }
++    } else
++      qt_cups_num_printers = prnCount = _cupsGetDests(&printers);
+ 
+     for (int i = 0; i <  prnCount; ++i) {
+         if (printers[i].is_default) {
+@@ -188,7 +252,19 @@ const ppd_file_t* QCUPSSupport::setCurre
+     currPPD = 0;
+     page_sizes = 0;
+ 
+-    const char *ppdFile = _cupsGetPPD(printers[index].name);
++    const char *ppdFile = 0;
++    if (_cupsConnectDest && _cupsGetPPD2) {
++	char resource[HTTP_MAX_URI];
++	http_t *http = _cupsConnectDest (&printers[index], 0, -1, 0,
++					 resource, sizeof (resource),
++					 0, 0);
++	if (http) {
++	    char *name = strrchr (resource, '/');
++	    if (name)
++		ppdFile = _cupsGetPPD2 (http, ++name);
++	}
++    } else
++	ppdFile = _cupsGetPPD(printers[index].name);
+ 
+     if (!ppdFile)
+       return 0;
+@@ -343,7 +419,29 @@ bool QCUPSSupport::printerHasPPD(const c
+ {
+     if (!isAvailable())
+         return false;
+-    const char *ppdFile = _cupsGetPPD(printerName);
++
++    const char *ppdFile = 0;
++    if (_cupsConnectDest && _cupsGetPPD2) {
++	int i;
++	for (i = 0; i < prnCount; ++i)
++	    if (!strcmp (printers[i].name, printerName))
++		break;
++
++	if (i == prnCount)
++	    return false;
++
++	char resource[HTTP_MAX_URI];
++	http_t *http = _cupsConnectDest (&printers[i], 0, -1, 0,
++					 resource, sizeof (resource),
++					 0, 0);
++	if (http) {
++	    char *name = strrchr (resource, '/');
++	    if (name)
++		ppdFile = _cupsGetPPD2 (http, ++name);
++	}
++    } else
++	ppdFile = _cupsGetPPD(printerName);
++
+     if (ppdFile)
+         unlink(ppdFile);
+     return (ppdFile != 0);
+@@ -394,6 +492,26 @@ QPair<int, QString> QCUPSSupport::tempFd
+ int QCUPSSupport::printFile(const char * printerName, const char * filename, const char * title,
+                             int num_options, cups_option_t * options)
+ {
++    if (_cupsConnectDest && _cupsPrintFile2) {
++	int i;
++	for (i = 0; i < prnCount; ++i)
++	    if (!strcmp (printers[i].name, printerName))
++		break;
++
++	if (i != prnCount) {
++	    char resource[HTTP_MAX_URI];
++	    http_t *http = _cupsConnectDest (&printers[i], 0, -1, 0,
++					     resource, sizeof (resource),
++					     0, 0);
++	    if (http) {
++		char *name = strrchr (resource, '/');
++		if (name)
++		    return _cupsPrintFile2 (http, ++name, filename, title,
++					    num_options, options);
++	    }
++	}
++    }
++
+     return _cupsPrintFile(printerName, filename, title, num_options, options);
+ }
+ 
+diff -up qt-everywhere-opensource-src-4.8.4/src/gui/painting/qcups_p.h.cupsEnumDests qt-everywhere-opensource-src-4.8.4/src/gui/painting/qcups_p.h
+--- qt-everywhere-opensource-src-4.8.4/src/gui/painting/qcups_p.h.cupsEnumDests	2012-11-23 10:09:53.000000000 +0000
++++ qt-everywhere-opensource-src-4.8.4/src/gui/painting/qcups_p.h	2013-07-03 15:27:24.733343017 +0100
+@@ -92,7 +92,7 @@ public:
+ 
+     QStringList options() const;
+ 
+-    static bool printerHasPPD(const char *printerName);
++    bool printerHasPPD(const char *printerName);
+ 
+     QString unicodeString(const char *s);
+ 
+diff -up qt-everywhere-opensource-src-4.8.4/src/gui/painting/qprinter.cpp.cupsEnumDests qt-everywhere-opensource-src-4.8.4/src/gui/painting/qprinter.cpp
+--- qt-everywhere-opensource-src-4.8.4/src/gui/painting/qprinter.cpp.cupsEnumDests	2013-07-03 15:27:24.531342277 +0100
++++ qt-everywhere-opensource-src-4.8.4/src/gui/painting/qprinter.cpp	2013-07-03 15:27:24.733343017 +0100
+@@ -844,7 +844,7 @@ void QPrinter::setPrinterName(const QStr
+     if(d->use_default_engine
+         && d->outputFormat == QPrinter::NativeFormat) {
+         if (QCUPSSupport::cupsVersion() >= 10200
+-            && QCUPSSupport::printerHasPPD(name.toLocal8Bit().constData()))
++            && QCUPSSupport().printerHasPPD(name.toLocal8Bit().constData()))
+             setOutputFormat(QPrinter::PdfFormat);
+         else
+             setOutputFormat(QPrinter::PostScriptFormat);

qt-everywhere-opensource-src-4.6.2-cups.patch

@@ -0,0 +1,84 @@
+diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp
+--- qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp	2010-02-11 16:55:22.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp	2010-02-28 04:34:16.000000000 +0100
+@@ -569,6 +569,32 @@
+ void QPrintDialogPrivate::selectPrinter(QCUPSSupport *cups)
+ {
+     options.duplex->setEnabled(cups && cups->ppdOption("Duplex"));
++
++    if (cups) {
++        const ppd_option_t* duplex = cups->ppdOption("Duplex");
++        if (duplex) {
++            // copy default ppd duplex to qt dialog
++            if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
++                options.duplexShort->setChecked(true);
++            else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
++                options.duplexLong->setChecked(true);
++            else
++                options.noDuplex->setChecked(true);
++        }
++
++        if (cups->currentPPD()) {
++            // set default color
++            if (cups->currentPPD()->color_device)
++                options.color->setChecked(true);
++            else
++                options.grayscale->setChecked(true);
++        }
++
++        // set collation
++        const ppd_option_t *collate = cups->ppdOption("Collate");
++        if (collate)
++            options.collate->setChecked(qstrcmp(collate->defchoice, "True")==0);
++    }
+ }
+ #endif
+ 
+diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp
+--- qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp	2010-02-11 16:55:22.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp	2010-02-28 04:55:15.000000000 +0100
+@@ -627,6 +627,44 @@
+                && d_ptr->paintEngine->type() != QPaintEngine::MacPrinter) {
+         setOutputFormat(QPrinter::PdfFormat);
+     }
++
++#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
++    // fill in defaults from ppd file
++    QCUPSSupport cups;
++
++    int printernum = -1;
++    for (int i = 0; i < cups.availablePrintersCount(); i++) {
++        if (printerName().toLocal8Bit() == cups.availablePrinters()[i].name)
++            printernum = i;
++    }
++    if (printernum >= 0) {
++        cups.setCurrentPrinter(printernum);
++
++        const ppd_option_t* duplex = cups.ppdOption("Duplex");
++        if (duplex) {
++            // copy default ppd duplex to qt dialog
++            if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
++                setDuplex(DuplexShortSide);
++            else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
++                setDuplex(DuplexLongSide);
++            else
++                setDuplex(DuplexNone);
++        }
++
++        if (cups.currentPPD()) {
++            // set default color
++            if (cups.currentPPD()->color_device)
++                setColorMode(Color);
++            else
++                setColorMode(GrayScale);
++        }
++
++        // set collation
++        const ppd_option_t *collate = cups.ppdOption("Collate");
++        if (collate)
++            setCollateCopies(qstrcmp(collate->defchoice, "True")==0);
++    }
++#endif
+ }
+ 
+ /*!

qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch

@@ -0,0 +1,69 @@
+diff -ur qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck/src/gui/kernel/qguieventdispatcher_glib.cpp
+--- qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp	2010-06-02 04:03:15.000000000 +0200
++++ qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck/src/gui/kernel/qguieventdispatcher_glib.cpp	2010-12-08 22:22:38.000000000 +0100
+@@ -76,7 +76,7 @@
+     GX11EventSource *source = reinterpret_cast<GX11EventSource *>(s);
+     return (XEventsQueued(X11->display, QueuedAfterFlush)
+             || (!(source->flags & QEventLoop::ExcludeUserInputEvents)
+-                && !source->d->queuedUserInputEvents.isEmpty()));
++                && source->d && !source->d->queuedUserInputEvents.isEmpty()));
+ }
+ 
+ static gboolean x11EventSourceCheck(GSource *s)
+@@ -84,7 +84,7 @@
+     GX11EventSource *source = reinterpret_cast<GX11EventSource *>(s);
+     return (XEventsQueued(X11->display, QueuedAfterFlush)
+             || (!(source->flags & QEventLoop::ExcludeUserInputEvents)
+-                && !source->d->queuedUserInputEvents.isEmpty()));
++                && source->d && !source->d->queuedUserInputEvents.isEmpty()));
+ }
+ 
+ static gboolean x11EventSourceDispatch(GSource *s, GSourceFunc callback, gpointer user_data)
+@@ -95,7 +95,7 @@
+     do {
+         XEvent event;
+         if (!(source->flags & QEventLoop::ExcludeUserInputEvents)
+-            && !source->d->queuedUserInputEvents.isEmpty()) {
++            && source->d && !source->d->queuedUserInputEvents.isEmpty()) {
+             // process a pending user input event
+             event = source->d->queuedUserInputEvents.takeFirst();
+         } else if (XEventsQueued(X11->display, QueuedAlready)) {
+@@ -112,7 +112,8 @@
+                 case XKeyRelease:
+                 case EnterNotify:
+                 case LeaveNotify:
+-                    source->d->queuedUserInputEvents.append(event);
++                    if (source->d)
++                        source->d->queuedUserInputEvents.append(event);
+                     continue;
+ 
+                 case ClientMessage:
+@@ -127,7 +128,8 @@
+                             break;
+                         }
+                     }
+-                    source->d->queuedUserInputEvents.append(event);
++                    if (source->d)
++                        source->d->queuedUserInputEvents.append(event);
+                     continue;
+ 
+                 default:
+@@ -140,7 +142,7 @@
+         }
+ 
+         // send through event filter
+-        if (source->q->filterEvent(&event))
++        if (source->q && source->q->filterEvent(&event))
+             continue;
+ 
+         if (qApp->x11ProcessEvent(&event) == 1)
+@@ -152,7 +154,8 @@
+ 
+  out:
+ 
+-    source->d->runTimersOnceWithNormalPriority();
++    if (source->d)
++        source->d->runTimersOnceWithNormalPriority();
+ 
+     if (callback)
+         callback(user_data);

qt-everywhere-opensource-src-4.8.0-QTBUG-22037.patch

@@ -0,0 +1,41 @@
+diff -up qt-everywhere-opensource-src-4.8.0/src/corelib/tools/qlist.h.QTBUG-22037 qt-everywhere-opensource-src-4.8.0/src/corelib/tools/qlist.h
+--- qt-everywhere-opensource-src-4.8.0/src/corelib/tools/qlist.h.QTBUG-22037	2011-10-03 22:44:32.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.0/src/corelib/tools/qlist.h	2011-10-15 14:25:52.238694974 -0500
+@@ -769,26 +769,18 @@ Q_OUTOFLINE_TEMPLATE void QList<T>::clea
+ template <typename T>
+ Q_OUTOFLINE_TEMPLATE int QList<T>::removeAll(const T &_t)
+ {
+-    int index = indexOf(_t);
+-    if (index == -1)
+-        return 0;
+-
++    detachShared();
+     const T t = _t;
+-    detach();
+-
+-    Node *i = reinterpret_cast<Node *>(p.at(index));
+-    Node *e = reinterpret_cast<Node *>(p.end());
+-    Node *n = i;
+-    node_destruct(i);
+-    while (++i != e) {
+-        if (i->t() == t)
+-            node_destruct(i);
+-        else
+-            *n++ = *i;
+-    }
+-
+-    int removedCount = e - n;
+-    d->end -= removedCount;
++    int removedCount=0, i=0;
++    Node *n;
++    while (i < p.size())
++        if ((n = reinterpret_cast<Node *>(p.at(i)))->t() == t) {
++            node_destruct(n);
++            p.remove(i);
++            ++removedCount;
++        } else {
++            ++i;
++        }
+     return removedCount;
+ }
+ 

qt-everywhere-opensource-src-4.8.0-s390-atomic.patch

@@ -0,0 +1,20 @@
+diff -up qt-everywhere-opensource-src-4.8.0/src/corelib/arch/qatomic_s390.h.s390-atomic qt-everywhere-opensource-src-4.8.0/src/corelib/arch/qatomic_s390.h
+--- qt-everywhere-opensource-src-4.8.0/src/corelib/arch/qatomic_s390.h.s390-atomic	2011-12-18 16:15:20.000000000 +0100
++++ qt-everywhere-opensource-src-4.8.0/src/corelib/arch/qatomic_s390.h	2011-12-18 16:17:34.000000000 +0100
+@@ -400,6 +400,16 @@ Q_INLINE_TEMPLATE T* QBasicAtomicPointer
+ 
+ 
+ template <typename T>
++Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueToAdd)
++{
++#ifndef __s390x__
++    return (T *)__CS_OLD_LOOP(&_q_value, valueToAdd * sizeof(T), "ar", "", "bcr 15,0\n");
++#else
++    return (T *)__CSG_OLD_LOOP(&_q_value, valueToAdd * sizeof(T), "agr", "", "bcr 15,0\n");
++#endif
++}
++
++template <typename T>
+ Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelaxed(qptrdiff valueToAdd)
+ {
+     return fetchAndAddOrdered(valueToAdd);

qt-everywhere-opensource-src-4.8.0-tp-multilib-optflags.patch

@@ -0,0 +1,36 @@
+diff -up qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-32/qmake.conf.multilib qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-32/qmake.conf
+--- qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-32/qmake.conf.multilib	2011-05-23 12:26:21.000000000 +0200
++++ qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-32/qmake.conf	2011-05-25 13:39:38.789054074 +0200
+@@ -12,6 +12,8 @@ QMAKE_INCREMENTAL_STYLE = sublib
+ QMAKE_CFLAGS		= -m32
+ QMAKE_LFLAGS		= -m32
+ 
++QMAKE_CFLAGS_RELEASE   += -O2
++
+ include(../common/linux.conf)
+ include(../common/gcc-base-unix.conf)
+ include(../common/g++-unix.conf)
+diff -up qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-64/qmake.conf.multilib qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-64/qmake.conf
+--- qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-64/qmake.conf.multilib	2011-05-23 12:26:21.000000000 +0200
++++ qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-64/qmake.conf	2011-05-25 13:39:47.460747770 +0200
+@@ -15,6 +15,8 @@ QMAKE_INCREMENTAL_STYLE = sublib
+ QMAKE_CFLAGS		= -m64
+ QMAKE_LFLAGS		= -m64
+ 
++QMAKE_CFLAGS_RELEASE   += -O2
++
+ include(../common/linux.conf)
+ include(../common/gcc-base-unix.conf)
+ include(../common/g++-unix.conf)
+diff -up qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++/qmake.conf.multilib qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++/qmake.conf
+--- qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++/qmake.conf.multilib	2011-05-23 12:26:21.000000000 +0200
++++ qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++/qmake.conf	2011-05-25 13:39:26.630088814 +0200
+@@ -9,6 +9,8 @@ CONFIG			+= qt warn_on release increment
+ QT			+= core gui
+ QMAKE_INCREMENTAL_STYLE = sublib
+ 
++QMAKE_CFLAGS_RELEASE   += -O2
++
+ include(../common/linux.conf)
+ include(../common/gcc-base-unix.conf)
+ include(../common/g++-unix.conf)

qt-everywhere-opensource-src-4.8.0-tp-qtreeview-kpackagekit-crash.patch

@@ -0,0 +1,12 @@
+diff -up qt-everywhere-opensource-src-4.8.0-tp/src/gui/itemviews/qtreeview.cpp.qtreeview-kpackagekit-crash qt-everywhere-opensource-src-4.8.0-tp/src/gui/itemviews/qtreeview.cpp
+--- qt-everywhere-opensource-src-4.8.0-tp/src/gui/itemviews/qtreeview.cpp.qtreeview-kpackagekit-crash	2011-05-23 12:26:21.000000000 +0200
++++ qt-everywhere-opensource-src-4.8.0-tp/src/gui/itemviews/qtreeview.cpp	2011-05-25 13:24:33.137315194 +0200
+@@ -3215,7 +3215,7 @@ int QTreeViewPrivate::itemHeight(int ite
+         return defaultItemHeight;
+     if (viewItems.isEmpty())
+         return 0;
+-    const QModelIndex &index = viewItems.at(item).index;
++    QModelIndex index = viewItems.at(item).index;
+     if (!index.isValid())
+         return 0;
+     int height = viewItems.at(item).height;

qt-everywhere-opensource-src-4.8.1-linguist_qmake-qt4.patch

@@ -0,0 +1,27 @@
+diff -up qt-everywhere-opensource-src-4.8.2/tools/linguist/lrelease/main.cpp.linguist_qtmake-qt4 qt-everywhere-opensource-src-4.8.2/tools/linguist/lrelease/main.cpp
+--- qt-everywhere-opensource-src-4.8.2/tools/linguist/lrelease/main.cpp.linguist_qtmake-qt4	2012-04-26 21:45:50.000000000 +0200
++++ qt-everywhere-opensource-src-4.8.2/tools/linguist/lrelease/main.cpp	2012-05-29 12:17:03.416561535 +0200
+@@ -314,9 +314,9 @@ int main(int argc, char **argv)
+             parseHandler.verbose = evalHandler.verbose = cd.isVerbose();
+             ProFileOption option;
+ #ifdef QT_BOOTSTRAPPED
+-            option.initProperties(binDir + QLatin1String("/qmake"));
++            option.initProperties(binDir + QLatin1String("/qmake-qt4"));
+ #else
+-            option.initProperties(app.applicationDirPath() + QLatin1String("/qmake"));
++            option.initProperties(app.applicationDirPath() + QLatin1String("/qmake-qt4"));
+ #endif
+             ProFileParser parser(0, &parseHandler);
+             ProFileEvaluator visitor(&option, &parser, &evalHandler);
+diff -up qt-everywhere-opensource-src-4.8.2/tools/linguist/lupdate/main.cpp.linguist_qtmake-qt4 qt-everywhere-opensource-src-4.8.2/tools/linguist/lupdate/main.cpp
+--- qt-everywhere-opensource-src-4.8.2/tools/linguist/lupdate/main.cpp.linguist_qtmake-qt4	2012-04-26 21:45:50.000000000 +0200
++++ qt-everywhere-opensource-src-4.8.2/tools/linguist/lupdate/main.cpp	2012-05-29 11:46:48.811134546 +0200
+@@ -765,7 +765,7 @@ int main(int argc, char **argv)
+ 
+         parseHandler.verbose = evalHandler.verbose = !!(options & Verbose);
+         ProFileOption option;
+-        option.initProperties(app.applicationDirPath() + QLatin1String("/qmake"));
++        option.initProperties(app.applicationDirPath() + QLatin1String("/qmake-qt4"));
+         option.setCommandLineArguments(QStringList() << QLatin1String("CONFIG+=lupdate_run"));
+         ProFileParser parser(0, &parseHandler);
+ 

qt-everywhere-opensource-src-4.8.1-qt3support_debuginfo.patch

@@ -0,0 +1,10 @@
+diff -up qt-everywhere-opensource-src-4.8.1/src/qt3support/qt3support.pro.debuginfo qt-everywhere-opensource-src-4.8.1/src/qt3support/qt3support.pro
+--- qt-everywhere-opensource-src-4.8.1/src/qt3support/qt3support.pro.debuginfo	2012-03-14 09:01:17.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.1/src/qt3support/qt3support.pro	2012-05-11 11:55:37.780070386 -0500
+@@ -34,6 +34,3 @@ MOCDIR = .moc
+ 
+ *-g++*: QMAKE_CXXFLAGS += -fno-strict-aliasing
+ 
+-CONFIG -= separate_debug_info
+-CONFIG += no_debug_info
+-

qt-everywhere-opensource-src-4.8.2--assistant-crash.patch

@@ -0,0 +1,13 @@
+diff -up qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp.me qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp
+--- qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp.me	2012-06-19 12:52:22.740180410 +0200
++++ qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp	2012-06-19 12:52:51.953194103 +0200
+@@ -944,8 +944,7 @@ void MainWindow::updateApplicationFont()
+     if (helpEngine.usesAppFont())
+         font = helpEngine.appFont();
+ 
+-    const QWidgetList &widgets = qApp->allWidgets();
+-    foreach (QWidget* widget, widgets)
++    foreach (QWidget* widget, QApplication::allWidgets())
+         widget->setFont(font);
+ }
+ 

qt-everywhere-opensource-src-4.8.3-icu_no_debug.patch

@@ -0,0 +1,23 @@
+diff -up qt-everywhere-opensource-src-4.8.3/src/corelib/tools/qlocale_icu.cpp.icu_no_debug qt-everywhere-opensource-src-4.8.3/src/corelib/tools/qlocale_icu.cpp
+--- qt-everywhere-opensource-src-4.8.3/src/corelib/tools/qlocale_icu.cpp.icu_no_debug	2012-09-06 02:33:45.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.3/src/corelib/tools/qlocale_icu.cpp	2012-09-11 09:04:21.542379795 -0500
+@@ -84,7 +84,9 @@ bool qt_initIcu(const QString &localeStr
+         QLibrary lib(QLatin1String("icui18n"), QLatin1String(U_ICU_VERSION_SHORT));
+         lib.setLoadHints(QLibrary::ImprovedSearchHeuristics);
+         if (!lib.load()) {
++#ifndef QT_NO_DEBUG
+             qWarning() << "Unable to load library icui18n" << lib.errorString();
++#endif
+             status = ErrorLoading;
+             return false;
+         }
+@@ -114,7 +116,9 @@ bool qt_initIcu(const QString &localeStr
+         QLibrary ucLib(QLatin1String("icuuc"), QLatin1String(U_ICU_VERSION_SHORT));
+         ucLib.setLoadHints(QLibrary::ImprovedSearchHeuristics);
+         if (!ucLib.load()) {
++#ifndef QT_NO_DEBUG
+             qWarning() << "Unable to load library icuuc" << ucLib.errorString();
++#endif
+             status = ErrorLoading;
+             return false;
+         }

qt-everywhere-opensource-src-4.8.3-no_Werror.patch

@@ -0,0 +1,12 @@
+diff -up qt-everywhere-opensource-src-4.8.3/src/3rdparty/webkit/Source/WebKit.pri.no_Werror qt-everywhere-opensource-src-4.8.3/src/3rdparty/webkit/Source/WebKit.pri
+--- qt-everywhere-opensource-src-4.8.3/src/3rdparty/webkit/Source/WebKit.pri.no_Werror	2012-09-06 02:33:50.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.3/src/3rdparty/webkit/Source/WebKit.pri	2012-09-11 09:03:19.152159783 -0500
+@@ -102,7 +102,7 @@ CONFIG -= warn_on
+ 
+ # Treat warnings as errors on x86/Linux/GCC
+ linux-g++* {
+-    !CONFIG(standalone_package):if(isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386)): QMAKE_CXXFLAGS += -Werror
++    #!CONFIG(standalone_package):if(isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386)): QMAKE_CXXFLAGS += -Werror
+ 
+     greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) {
+         if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) {

qt-everywhere-opensource-src-4.8.3-qdbusconnection_no_debug.patch

@@ -0,0 +1,14 @@
+diff -up qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp.qdbusconnection_no_debug.patch qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp
+--- qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp.qdbusconnection_no_debug.patch	2012-09-06 02:33:44.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp	2012-09-11 08:55:29.854026815 -0500
+@@ -1109,8 +1109,10 @@ public:
+         // make sure this connection is running on the main thread
+         QCoreApplication *instance = QCoreApplication::instance();
+         if (!instance) {
++#ifndef QT_NO_DEBUG
+             qWarning("QDBusConnection: %s D-Bus connection created before QCoreApplication. Application may misbehave.",
+                      type == SessionBus ? "session" : type == SystemBus ? "system" : "generic");
++#endif
+         } else if (QDBusConnectionPrivate::d(*this)) {
+             QDBusConnectionPrivate::d(*this)->moveToThread(instance->thread());
+         }

qt-everywhere-opensource-src-4.8.4-qmake_pkgconfig_requires_private.patch

@@ -0,0 +1,16 @@
+diff -up qt-everywhere-opensource-src-4.8.4/qmake/generators/makefile.cpp.qmake_pkgconfig_requires_private qt-everywhere-opensource-src-4.8.4/qmake/generators/makefile.cpp
+--- qt-everywhere-opensource-src-4.8.4/qmake/generators/makefile.cpp.qmake_pkgconfig_requires_private	2012-11-23 04:11:21.000000000 -0600
++++ qt-everywhere-opensource-src-4.8.4/qmake/generators/makefile.cpp	2013-02-11 07:36:36.192779528 -0600
+@@ -3293,6 +3293,12 @@ MakefileGenerator::writePkgConfigFile()
+         t << "Requires: " << requires << endl;
+     }
+ 
++    // requires.private
++    const QString requires_private = project->values("QMAKE_PKGCONFIG_REQUIRES_PRIVATE").join(" ");
++    if (!requires_private.isEmpty()) {
++        t << "Requires.private: " << requires_private << endl;
++    }
++
+     t << endl;
+ }
+ 

qt-everywhere-opensource-src-4.8.5-QTBUG-14467.patch

@@ -0,0 +1,24 @@
+diff -up qt-everywhere-opensource-src-4.8.5/mkspecs/features/qt_functions.prf.QTBUG-14467 qt-everywhere-opensource-src-4.8.5/mkspecs/features/qt_functions.prf
+--- qt-everywhere-opensource-src-4.8.5/mkspecs/features/qt_functions.prf.QTBUG-14467	2013-05-30 16:19:17.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.5/mkspecs/features/qt_functions.prf	2013-06-09 11:53:45.709773603 -0500
+@@ -72,7 +72,7 @@ defineTest(qtAddLibrary) {
+     }
+     isEmpty(LINKAGE) {
+        if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
+-           win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d
++           win32:LINKAGE = -l$${LIB_NAME}d$${QT_LIBINFIX}
+            mac:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}_debug
+        }
+        isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}
+diff -up qt-everywhere-opensource-src-4.8.5/mkspecs/features/win32/windows.prf.QTBUG-14467 qt-everywhere-opensource-src-4.8.5/mkspecs/features/win32/windows.prf
+--- qt-everywhere-opensource-src-4.8.5/mkspecs/features/win32/windows.prf.QTBUG-14467	2013-05-30 16:19:17.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.5/mkspecs/features/win32/windows.prf	2013-06-09 11:53:45.710773593 -0500
+@@ -6,7 +6,7 @@ contains(TEMPLATE, ".*app"){
+ 
+     qt:for(entryLib, $$list($$unique(QMAKE_LIBS_QT_ENTRY))) {
+         isEqual(entryLib, -lqtmain): {
+-            CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d
++            CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}d$${QT_LIBINFIX}
+             else: QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}
+         } else {
+             QMAKE_LIBS += $${entryLib}

qt-everywhere-opensource-src-4.8.5-QTBUG-21900.patch

@@ -0,0 +1,84 @@
+diff -up qt-everywhere-opensource-src-4.8.5/src/gui/kernel/qapplication_x11.cpp.QTBUG-21900 qt-everywhere-opensource-src-4.8.5/src/gui/kernel/qapplication_x11.cpp
+--- qt-everywhere-opensource-src-4.8.5/src/gui/kernel/qapplication_x11.cpp.QTBUG-21900	2013-05-30 16:18:05.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.5/src/gui/kernel/qapplication_x11.cpp	2013-06-09 11:53:45.891771748 -0500
+@@ -818,6 +818,27 @@ static Bool qt_sync_request_scanner(Disp
+ #endif
+ #endif // QT_NO_XSYNC
+ 
++struct qt_configure_event_data
++{
++    WId window;
++    WId parent;
++};
++
++static Bool qt_configure_event_scanner(Display*, XEvent *event, XPointer arg)
++{
++    qt_configure_event_data *data =
++        reinterpret_cast<qt_configure_event_data*>(arg);
++    if (event->type == ConfigureNotify &&
++        event->xconfigure.window == data->window) {
++        return true;
++    } else if (event->type == ReparentNotify &&
++               event->xreparent.window == data->window) {
++        data->parent = event->xreparent.parent;
++    }
++
++    return false;
++}
++
+ static void qt_x11_create_intern_atoms()
+ {
+     const char *names[QX11Data::NAtoms];
+@@ -5302,8 +5323,11 @@ bool QETWidget::translateConfigEvent(con
+         if (d->extra->compress_events) {
+             // ConfigureNotify compression for faster opaque resizing
+             XEvent otherEvent;
+-            while (XCheckTypedWindowEvent(X11->display, internalWinId(), ConfigureNotify,
+-                                          &otherEvent)) {
++            qt_configure_event_data configureData;
++            configureData.window = internalWinId();
++            configureData.parent = d->topData()->parentWinId;
++            while (XCheckIfEvent(X11->display, &otherEvent,
++                                 &qt_configure_event_scanner, (XPointer)&configureData)) {
+                 if (qt_x11EventFilter(&otherEvent))
+                     continue;
+ 
+@@ -5316,13 +5340,19 @@ bool QETWidget::translateConfigEvent(con
+                 newSize.setWidth(otherEvent.xconfigure.width);
+                 newSize.setHeight(otherEvent.xconfigure.height);
+ 
++                trust = isVisible()
++                        && (configureData.parent == XNone ||
++                            configureData.parent == QX11Info::appRootWindow());
++
+                 if (otherEvent.xconfigure.send_event || trust) {
+                     newCPos.rx() = otherEvent.xconfigure.x +
+                                    otherEvent.xconfigure.border_width;
+                     newCPos.ry() = otherEvent.xconfigure.y +
+                                    otherEvent.xconfigure.border_width;
+                     isCPos = true;
+-                }
++                } else {
++                    isCPos = false;
++               }
+             }
+ #ifndef QT_NO_XSYNC
+             qt_sync_request_event_data sync_event;
+@@ -5335,9 +5365,14 @@ bool QETWidget::translateConfigEvent(con
+         }
+ 
+         if (!isCPos) {
+-            // we didn't get an updated position of the toplevel.
+-            // either we haven't moved or there is a bug in the window manager.
+-            // anyway, let's query the position to be certain.
++            // If the last configure event didn't have a trustable position,
++            // it's necessary to query, see ICCCM 4.24:
++            //
++            //  Any real ConfigureNotify event on a top-level window implies
++            //  that the window’s position on the root may have changed, even
++            //  though the event reports that the window’s position in its
++            //  parent is unchanged because the window may have been reparented.
++
+             int x, y;
+             Window child;
+             XTranslateCoordinates(X11->display, internalWinId(),

qt-everywhere-opensource-src-4.8.5-QTBUG-35459.patch

@@ -0,0 +1,12 @@
+diff -ur qt-everywhere-opensource-src-4.8.5-CVE-2013-4549/src/xml/sax/qxml.cpp qt-everywhere-opensource-src-4.8.5-QTBUG-35459/src/xml/sax/qxml.cpp
+--- qt-everywhere-opensource-src-4.8.5-CVE-2013-4549/src/xml/sax/qxml.cpp	2013-12-05 19:23:33.000000000 +0100
++++ qt-everywhere-opensource-src-4.8.5-QTBUG-35459/src/xml/sax/qxml.cpp	2014-01-13 20:13:59.000000000 +0100
+@@ -428,7 +428,7 @@
+     // for the DTD currently being parsed.
+     static const int dtdRecursionLimit = 2;
+     // The maximum amount of characters an entity value may contain, after expansion.
+-    static const int entityCharacterLimit = 1024;
++    static const int entityCharacterLimit = 4096;
+ 
+     const QString &string();
+     void stringClear();

qt-everywhere-opensource-src-4.8.5-QTBUG-4862.patch

@@ -0,0 +1,29 @@
+diff -up qt-everywhere-opensource-src-4.8.5/src/corelib/io/qfilesystemengine_unix.cpp.QTBUG-4862 qt-everywhere-opensource-src-4.8.5/src/corelib/io/qfilesystemengine_unix.cpp
+--- qt-everywhere-opensource-src-4.8.5/src/corelib/io/qfilesystemengine_unix.cpp.QTBUG-4862	2013-06-09 12:02:50.323221694 -0500
++++ qt-everywhere-opensource-src-4.8.5/src/corelib/io/qfilesystemengine_unix.cpp	2013-06-09 12:38:53.140804742 -0500
+@@ -624,6 +624,25 @@ QString QFileSystemEngine::homePath()
+ {
+     QString home = QFile::decodeName(qgetenv("HOME"));
+     if (home.isEmpty())
++    {
++#if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD)
++        int size_max = sysconf(_SC_GETPW_R_SIZE_MAX);
++        if (size_max == -1)
++            size_max = 1024;
++        QVarLengthArray<char, 1024> buf(size_max);
++#endif
++        struct passwd *pw = 0;
++        uid_t user_id = getuid();
++        pw = getpwuid(user_id);
++#if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD)
++        struct passwd entry;
++        getpwuid_r(user_id, &entry, buf.data(), buf.size(), &pw);
++#else
++        pw = getpwuid(user_id);
++#endif
++        home = QFile::decodeName(QByteArray(pw->pw_dir));
++    }
++    if (home.isEmpty())
+         home = rootPath();
+     return QDir::cleanPath(home);
+ }

qt-everywhere-opensource-src-4.8.5-mysql_config.patch

@@ -0,0 +1,19 @@
+diff -up qt-everywhere-opensource-src-4.8.5/configure.mysql_config qt-everywhere-opensource-src-4.8.5/configure
+--- qt-everywhere-opensource-src-4.8.5/configure.mysql_config	2013-06-07 00:16:41.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.5/configure	2014-03-07 10:09:27.412071146 -0600
+@@ -5480,8 +5480,15 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
+ 		[ -z "$CFG_MYSQL_CONFIG" ] && CFG_MYSQL_CONFIG=`"$WHICH" mysql_config`
+                 if [ -x "$CFG_MYSQL_CONFIG" ]; then
+                     QT_CFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --include 2>/dev/null`
++                    $CFG_MYSQL_CONFIG --variable=pkglibdir &>/dev/null && \
++                      QT_MYSQL_PKGLIBDIR=`$CFG_MYSQL_CONFIG --variable=pkglibdir 2>/dev/null`
++                    if [ -n "$QT_MYSQL_PKGLIBDIR" ]; then
++                    QT_LFLAGS_MYSQL_R="-L$QT_MYSQL_PKGLIBDIR -lmysqlclient_r"
++                    QT_LFLAGS_MYSQL="-L$QT_MYSQL_PKGLIBDIR -lmysqlclient"
++                    else
+                     QT_LFLAGS_MYSQL_R=`$CFG_MYSQL_CONFIG --libs_r 2>/dev/null`
+                     QT_LFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --libs 2>/dev/null`
++                    fi
+ 		    QT_MYSQL_VERSION=`$CFG_MYSQL_CONFIG --version 2>/dev/null`
+                     QT_MYSQL_VERSION_MAJOR=`echo $QT_MYSQL_VERSION | cut -d . -f 1`
+                 fi

qt-everywhere-opensource-src-4.8.5-qgtkstyle_disable_gtk_theme_check.patch

@@ -0,0 +1,22 @@
+diff -up qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp.qgtkstyle_disable_gtk_theme_check qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp
+--- qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp.qgtkstyle_disable_gtk_theme_check	2013-06-09 16:28:22.938840346 -0500
++++ qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp	2013-06-09 17:03:01.781125479 -0500
+@@ -503,18 +503,6 @@ void QGtkStylePrivate::initGtkWidgets()
+         return;
+     }
+ 
+-    static QString themeName;
+-    if (!gtkWidgetMap()->contains("GtkWindow") && themeName.isEmpty()) {
+-        themeName = getThemeName();
+-
+-        if (themeName == QLS("Qt") || themeName == QLS("Qt4")) {
+-            // Due to namespace conflicts with Qt3 and obvious recursion with Qt4,
+-            // we cannot support the GTK_Qt Gtk engine
+-            qWarning("QGtkStyle cannot be used together with the GTK_Qt engine.");
+-            return;
+-        }
+-    }
+-
+     if (QGtkStylePrivate::gtk_init) {
+         // Gtk will set the Qt error handler so we have to reset it afterwards
+         x11ErrorHandler qt_x_errhandler = XSetErrorHandler(0);

qt-everywhere-opensource-src-4.8.5-qt_plugin_path.patch

@@ -0,0 +1,19 @@
+diff -up qt-everywhere-opensource-src-4.8.5/src/corelib/kernel/qcoreapplication.cpp.qt_plugin_path qt-everywhere-opensource-src-4.8.5/src/corelib/kernel/qcoreapplication.cpp
+--- qt-everywhere-opensource-src-4.8.5/src/corelib/kernel/qcoreapplication.cpp.qt_plugin_path	2013-06-07 00:16:52.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.5/src/corelib/kernel/qcoreapplication.cpp	2013-06-21 07:14:10.045039936 -0500
+@@ -2511,6 +2511,15 @@ QStringList QCoreApplication::libraryPat
+             if (!app_libpaths->contains(installPathPlugins))
+                 app_libpaths->append(installPathPlugins);
+         }
++
++        // hack in support for kde4 plugin paths -- Rex
++        QString kde4PathPlugins = QLibraryInfo::location(QLibraryInfo::LibrariesPath) + QLatin1String("/kde4/plugins");
++        if (QFile::exists(kde4PathPlugins)) {
++            // Make sure we convert from backslashes to slashes.
++            //kde4PathPlugins = QDir(kde4PathPlugins).canonicalPath();
++            if (!app_libpaths->contains(kde4PathPlugins))
++                app_libpaths->append(kde4PathPlugins);
++        }
+ #endif
+ 
+         // If QCoreApplication is not yet instantiated,

qt-everywhere-opensource-src-4.8.5-tds_no_strict_aliasing.patch

@@ -0,0 +1,12 @@
+diff -up qt-everywhere-opensource-src-4.8.5/src/sql/drivers/tds/qsql_tds.pri.tds_no_strict_aliasing qt-everywhere-opensource-src-4.8.5/src/sql/drivers/tds/qsql_tds.pri
+--- qt-everywhere-opensource-src-4.8.5/src/sql/drivers/tds/qsql_tds.pri.tds_no_strict_aliasing	2013-06-09 11:57:49.198291245 -0500
++++ qt-everywhere-opensource-src-4.8.5/src/sql/drivers/tds/qsql_tds.pri	2013-06-09 12:01:24.120100371 -0500
+@@ -1,6 +1,8 @@
+ HEADERS += $$PWD/qsql_tds.h
+ SOURCES += $$PWD/qsql_tds.cpp
+ 
++*-g++*: QMAKE_CXXFLAGS += -fno-strict-aliasing
++
+ unix|win32-g++*: {
+     LIBS += $$QT_LFLAGS_TDS
+     !contains(LIBS, .*sybdb.*):LIBS += -lsybdb

qt-everywhere-opensource-src-4.8.5-uic_multilib.patch

@@ -0,0 +1,28 @@
+diff -up qt-everywhere-opensource-src-4.8.5/src/tools/moc/moc.cpp.uic_multilib qt-everywhere-opensource-src-4.8.5/src/tools/moc/moc.cpp
+diff -up qt-everywhere-opensource-src-4.8.5/src/tools/uic3/embed.cpp.uic_multilib qt-everywhere-opensource-src-4.8.5/src/tools/uic3/embed.cpp
+--- qt-everywhere-opensource-src-4.8.5/src/tools/uic3/embed.cpp.uic_multilib	2013-05-30 16:18:04.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.5/src/tools/uic3/embed.cpp	2013-06-09 11:50:25.597813974 -0500
+@@ -152,8 +152,7 @@ void Ui3Reader::embed(const char *projec
+     for ( it = images.begin(); it != images.end(); ++it )
+         out << "**      " << *it << "\n";
+     out << "**\n";
+-    out << "** Created: " << QDateTime::currentDateTime().toString() << "\n";
+-    out << "**      by: The User Interface Compiler for Qt version " << QT_VERSION_STR << "\n";
++    out << "** Created: by: The User Interface Compiler for Qt version " << QT_VERSION_STR << "\n";
+     out << "**\n";
+     out << "** WARNING! All changes made in this file will be lost!\n";
+     out << "****************************************************************************/\n";
+diff -up qt-everywhere-opensource-src-4.8.5/src/tools/uic3/uic.cpp.uic_multilib qt-everywhere-opensource-src-4.8.5/src/tools/uic3/uic.cpp
+--- qt-everywhere-opensource-src-4.8.5/src/tools/uic3/uic.cpp.uic_multilib	2013-05-30 16:18:04.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.5/src/tools/uic3/uic.cpp	2013-06-09 11:51:28.310174526 -0500
+@@ -146,8 +146,7 @@ void Uic::writeCopyrightHeader(DomUI *ui
+         out << "/********************************************************************************\n";
+         out << "** Form generated from reading UI file '" << QFileInfo(opt.inputFile).fileName() << "'\n";
+         out << "**\n";
+-        out << "** Created: " << QDateTime::currentDateTime().toString() << "\n";
+-        out << "**      " << QString::fromLatin1("by: Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR));
++        out << "** Created by: " << QString::fromLatin1("Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR));
+         out << "**\n";
+         out << "** WARNING! All changes made in this file will be lost when recompiling UI file!\n";
+         out << "********************************************************************************/\n\n";
+diff -up qt-everywhere-opensource-src-4.8.5/src/tools/uic/uic.cpp.uic_multilib qt-everywhere-opensource-src-4.8.5/src/tools/uic/uic.cpp

qt-everywhere-opensource-src-4.8.5-webcore_debuginfo.patch

@@ -0,0 +1,16 @@
+diff -up qt-everywhere-opensource-src-4.8.5/src/3rdparty/webkit/Source/WebCore/WebCore.pri.webkit_debuginfo qt-everywhere-opensource-src-4.8.5/src/3rdparty/webkit/Source/WebCore/WebCore.pri
+--- qt-everywhere-opensource-src-4.8.5/src/3rdparty/webkit/Source/WebCore/WebCore.pri.webkit_debuginfo	2013-06-07 00:16:55.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.5/src/3rdparty/webkit/Source/WebCore/WebCore.pri	2013-07-11 14:04:19.937056249 -0500
+@@ -5,6 +5,12 @@ include(features.pri)
+ 
+ # Uncomment this to enable Texture Mapper.
+ # CONFIG += texmap
++#
++equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64)|equals(QT_ARCH, powerpc64)|equals(QT_ARCH, powerpc) {
++    message("WebCore workaround for QtWebkit: do not build with -g, but with -g1")
++    QMAKE_CXXFLAGS_RELEASE -= -g
++    QMAKE_CXXFLAGS_RELEASE += -g1
++}
+ 
+ QT *= network
+ 

qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch

@@ -0,0 +1,17 @@
+diff -up qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829 qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp
+--- qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829	2015-05-07 09:14:44.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp	2016-12-08 12:32:46.638962448 -0600
+@@ -188,8 +188,12 @@ int runMoc(int _argc, char **_argv)
+     pp.macros["Q_MOC_RUN"];
+     pp.macros["__cplusplus"];
+ 
+-    // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829
++    // Workaround a bugs while parsing some boost headers. See QTBUG-22829 
+     pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
++    pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
++    pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
++    pp.macros["BOOST_TYPE_TRAITS_HPP"];
++    pp.macros["_SYS_SYSMACROS_H_OUTER"];
+ 
+     QByteArray filename;
+     QByteArray output;

qt-everywhere-opensource-src-4.8.6-QTBUG-34614.patch

@@ -0,0 +1,94 @@
+--- src/corelib/kernel/qeventdispatcher_glib.cpp.sav	2014-03-28 15:26:37.000000000 +0100
++++ src/corelib/kernel/qeventdispatcher_glib.cpp	2014-04-24 09:44:09.358659204 +0200
+@@ -255,22 +255,30 @@ struct GPostEventSource
+     GSource source;
+     QAtomicInt serialNumber;
+     int lastSerialNumber;
++    QEventLoop::ProcessEventsFlags processEventsFlags;
+     QEventDispatcherGlibPrivate *d;
+ };
+ 
+ static gboolean postEventSourcePrepare(GSource *s, gint *timeout)
+ {
++    GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);
+     QThreadData *data = QThreadData::current();
+     if (!data)
+         return false;
+ 
++    QEventLoop::ProcessEventsFlags excludeAllFlags
++        = QEventLoop::ExcludeUserInputEvents
++        | QEventLoop::ExcludeSocketNotifiers
++        | QEventLoop::X11ExcludeTimers;
++    if ((source->processEventsFlags & excludeAllFlags) == excludeAllFlags)
++        return false;
++
+     gint dummy;
+     if (!timeout)
+         timeout = &dummy;
+     const bool canWait = data->canWaitLocked();
+     *timeout = canWait ? -1 : 0;
+ 
+-    GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);
+     return (!canWait
+             || (source->serialNumber != source->lastSerialNumber));
+ }
+@@ -284,8 +292,14 @@ static gboolean postEventSourceDispatch(
+ {
+     GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);
+     source->lastSerialNumber = source->serialNumber;
+-    QCoreApplication::sendPostedEvents();
+-    source->d->runTimersOnceWithNormalPriority();
++    QEventLoop::ProcessEventsFlags excludeAllFlags
++        = QEventLoop::ExcludeUserInputEvents
++        | QEventLoop::ExcludeSocketNotifiers
++        | QEventLoop::X11ExcludeTimers;
++    if ((source->processEventsFlags & excludeAllFlags) != excludeAllFlags) {
++        QCoreApplication::sendPostedEvents();
++        source->d->runTimersOnceWithNormalPriority();
++    }
+     return true; // i dunno, george...
+ }
+ 
+@@ -329,6 +343,7 @@ QEventDispatcherGlibPrivate::QEventDispa
+     postEventSource = reinterpret_cast<GPostEventSource *>(g_source_new(&postEventSourceFuncs,
+                                                                         sizeof(GPostEventSource)));
+     postEventSource->serialNumber = 1;
++    postEventSource->processEventsFlags = QEventLoop::AllEvents;
+     postEventSource->d = this;
+     g_source_set_can_recurse(&postEventSource->source, true);
+     g_source_attach(&postEventSource->source, mainContext);
+@@ -423,6 +438,7 @@ bool QEventDispatcherGlib::processEvents
+ 
+     // tell postEventSourcePrepare() and timerSource about any new flags
+     QEventLoop::ProcessEventsFlags savedFlags = d->timerSource->processEventsFlags;
++    d->postEventSource->processEventsFlags = flags;
+     d->timerSource->processEventsFlags = flags;
+     d->socketNotifierSource->processEventsFlags = flags;
+ 
+@@ -435,6 +451,7 @@ bool QEventDispatcherGlib::processEvents
+     while (!result && canWait)
+         result = g_main_context_iteration(d->mainContext, canWait);
+ 
++    d->postEventSource->processEventsFlags = savedFlags;
+     d->timerSource->processEventsFlags = savedFlags;
+     d->socketNotifierSource->processEventsFlags = savedFlags;
+ 
+--- src/corelib/kernel/qeventdispatcher_unix.cpp.sav	2013-06-07 07:16:52.000000000 +0200
++++ src/corelib/kernel/qeventdispatcher_unix.cpp	2014-04-24 09:43:06.927589535 +0200
+@@ -905,7 +905,15 @@ bool QEventDispatcherUNIX::processEvents
+ 
+     // we are awake, broadcast it
+     emit awake();
+-    QCoreApplicationPrivate::sendPostedEvents(0, 0, d->threadData);
++
++    QEventLoop::ProcessEventsFlags excludeAllFlags
++        = QEventLoop::ExcludeUserInputEvents
++        | QEventLoop::ExcludeSocketNotifiers
++        | QEventLoop::X11ExcludeTimers;
++    if ((flags & excludeAllFlags) == excludeAllFlags)
++        return false;
++    if(( flags & excludeAllFlags ) != excludeAllFlags )
++        QCoreApplicationPrivate::sendPostedEvents(0, 0, d->threadData);
+ 
+     int nevents = 0;
+     const bool canWait = (d->threadData->canWaitLocked()

qt-everywhere-opensource-src-4.8.6-QTBUG-37380.patch

@@ -0,0 +1,63 @@
+Author: Jan-Marek Glogowski <glogow@fbihome.de>
+Date:   Thu Mar 06 18:44:43 2014 +0100
+
+    Honor QEventLoop::ExcludeSocketNotifiers in glib event loop.
+    
+    Implements QEventLoop::ExcludeSocketNotifiers in the same way 
+    QEventLoop::X11ExcludeTimers is already implemented for the glib
+    event loop.
+
+--- qt4-x11-4.8.1.orig/src/corelib/kernel/qeventdispatcher_glib.cpp
++++ qt4-x11-4.8.1/src/corelib/kernel/qeventdispatcher_glib.cpp
+@@ -65,6 +65,7 @@ struct GPollFDWithQSocketNotifier
+ struct GSocketNotifierSource
+ {
+     GSource source;
++    QEventLoop::ProcessEventsFlags processEventsFlags;
+     QList<GPollFDWithQSocketNotifier *> pollfds;
+ };
+ 
+@@ -80,6 +81,9 @@ static gboolean socketNotifierSourceChec
+     GSocketNotifierSource *src = reinterpret_cast<GSocketNotifierSource *>(source);
+ 
+     bool pending = false;
++    if (src->processEventsFlags & QEventLoop::ExcludeSocketNotifiers)
++        return pending;
++
+     for (int i = 0; !pending && i < src->pollfds.count(); ++i) {
+         GPollFDWithQSocketNotifier *p = src->pollfds.at(i);
+ 
+@@ -103,6 +107,9 @@ static gboolean socketNotifierSourceDisp
+     QEvent event(QEvent::SockAct);
+ 
+     GSocketNotifierSource *src = reinterpret_cast<GSocketNotifierSource *>(source);
++    if (src->processEventsFlags & QEventLoop::ExcludeSocketNotifiers)
++        return true;
++
+     for (int i = 0; i < src->pollfds.count(); ++i) {
+         GPollFDWithQSocketNotifier *p = src->pollfds.at(i);
+ 
+@@ -330,6 +337,7 @@ QEventDispatcherGlibPrivate::QEventDispa
+         reinterpret_cast<GSocketNotifierSource *>(g_source_new(&socketNotifierSourceFuncs,
+                                                                sizeof(GSocketNotifierSource)));
+     (void) new (&socketNotifierSource->pollfds) QList<GPollFDWithQSocketNotifier *>();
++    socketNotifierSource->processEventsFlags = QEventLoop::AllEvents;
+     g_source_set_can_recurse(&socketNotifierSource->source, true);
+     g_source_attach(&socketNotifierSource->source, mainContext);
+ 
+@@ -415,6 +423,7 @@ bool QEventDispatcherGlib::processEvents
+     // tell postEventSourcePrepare() and timerSource about any new flags
+     QEventLoop::ProcessEventsFlags savedFlags = d->timerSource->processEventsFlags;
+     d->timerSource->processEventsFlags = flags;
++    d->socketNotifierSource->processEventsFlags = flags;
+ 
+     if (!(flags & QEventLoop::EventLoopExec)) {
+         // force timers to be sent at normal priority
+@@ -426,6 +435,7 @@ bool QEventDispatcherGlib::processEvents
+         result = g_main_context_iteration(d->mainContext, canWait);
+ 
+     d->timerSource->processEventsFlags = savedFlags;
++    d->socketNotifierSource->processEventsFlags = savedFlags;
+ 
+     if (canWait)
+         emit awake();

qt-everywhere-opensource-src-4.8.6-QTBUG-38585.patch

@@ -0,0 +1,12 @@
+--- src/gui/kernel/qclipboard_x11.cpp.sav	2014-04-25 09:52:03.855693228 +0200
++++ src/gui/kernel/qclipboard_x11.cpp	2014-04-25 09:51:58.038693777 +0200
+@@ -548,7 +548,8 @@ bool QX11Data::clipboardWaitForEvent(Win
+                 return false;
+ 
+             XSync(X11->display, false);
+-            usleep(50000);
++            if (!XPending(X11->display))
++                usleep(5000);
+ 
+             now.start();
+ 

qt-everywhere-opensource-src-4.8.6-s390.patch

@@ -0,0 +1,31 @@
+diff -up qt-everywhere-opensource-src-4.8.6/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390 qt-everywhere-opensource-src-4.8.6/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+--- qt-everywhere-opensource-src-4.8.6/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390	2014-03-30 15:36:49.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.6/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h	2014-03-31 17:59:16.846465899 -0500
+@@ -189,6 +189,18 @@
+ #define WTF_CPU_SPARC 1
+ #endif
+ 
++/* CPU(S390X) - S390 64-bit */
++#if defined(__s390x__)
++#define WTF_CPU_S390X 1
++#define WTF_CPU_BIG_ENDIAN 1
++#endif
++
++/* CPU(S390) - S390 32-bit */
++#if defined(__s390__)
++#define WTF_CPU_S390 1
++#define WTF_CPU_BIG_ENDIAN 1
++#endif
++
+ /* CPU(X86) - i386 / x86 32-bit */
+ #if   defined(__i386__) \
+     || defined(i386)     \
+@@ -903,7 +915,7 @@
+ #endif
+ 
+ #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
+-#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64)
++#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) || CPU(S390X)
+ #define WTF_USE_JSVALUE64 1
+ #elif CPU(ARM) || CPU(PPC64)
+ #define WTF_USE_JSVALUE32 1

qt-everywhere-opensource-src-4.8.6-system-clucene.patch

@@ -0,0 +1,351 @@
+diff -ur qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/fulltextsearch.pri qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/fulltextsearch.pri
+--- qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/fulltextsearch.pri	2014-04-10 20:37:12.000000000 +0200
++++ qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/fulltextsearch.pri	2014-10-26 03:33:45.000000000 +0100
+@@ -1,125 +1,7 @@
+-DEFINES += _BUILD_FOR_QT_ LUCENE_DISABLE_MEMTRACKING
+-win32:DEFINES += _CRT_SECURE_NO_DEPRECATE _MT
+-
+-CLUCENEDIR = ../../../../src/3rdparty/clucene/src/CLucene
+-
+-INCLUDEPATH += . .. \
+-               $$CLUCENEDIR \
+-               $$CLUCENEDIR/../ \
+-               $$CLUCENEDIR/analysis \
+-               $$CLUCENEDIR/analysis/standard \
+-               $$CLUCENEDIR/config \
+-               $$CLUCENEDIR/debug \
+-               $$CLUCENEDIR/document \
+-               $$CLUCENEDIR/index \
+-               $$CLUCENEDIR/queryParser \
+-               $$CLUCENEDIR/search \
+-               $$CLUCENEDIR/store \
+-               $$CLUCENEDIR/util
+-
+-
+-SOURCES += $$CLUCENEDIR/StdHeader.cpp \
+-           $$CLUCENEDIR/analysis/AnalysisHeader.cpp \
+-           $$CLUCENEDIR/analysis/Analyzers.cpp \
+-           $$CLUCENEDIR/config/gunichartables.cpp \
+-           $$CLUCENEDIR/config/repl_lltot.cpp \
+-           $$CLUCENEDIR/config/repl_tcscasecmp.cpp \
+-           $$CLUCENEDIR/config/repl_tcslwr.cpp \
+-           $$CLUCENEDIR/config/repl_tcstod.cpp \
+-           $$CLUCENEDIR/config/repl_tcstoll.cpp \
+-           $$CLUCENEDIR/config/repl_tprintf.cpp \
+-           $$CLUCENEDIR/config/threads.cpp \
+-           $$CLUCENEDIR/config/utf8.cpp \
+-           $$CLUCENEDIR/debug/condition.cpp \
+-           $$CLUCENEDIR/debug/error.cpp \
+-           $$CLUCENEDIR/debug/memtracking.cpp \
+-           $$CLUCENEDIR/document/DateField.cpp \
+-           $$CLUCENEDIR/document/Document.cpp \
+-           $$CLUCENEDIR/document/Field.cpp \
+-           $$CLUCENEDIR/index/CompoundFile.cpp \
+-           $$CLUCENEDIR/index/DocumentWriter.cpp \
+-           $$CLUCENEDIR/index/FieldInfos.cpp \
+-           $$CLUCENEDIR/index/FieldsReader.cpp \
+-           $$CLUCENEDIR/index/FieldsWriter.cpp \
+-           $$CLUCENEDIR/index/IndexModifier.cpp \
+-           $$CLUCENEDIR/index/IndexReader.cpp \
+-           $$CLUCENEDIR/index/IndexWriter.cpp \
+-           $$CLUCENEDIR/index/MultiReader.cpp \
+-           $$CLUCENEDIR/index/SegmentInfos.cpp \
+-           $$CLUCENEDIR/index/SegmentMergeInfo.cpp \
+-           $$CLUCENEDIR/index/SegmentMergeQueue.cpp \
+-           $$CLUCENEDIR/index/SegmentMerger.cpp \
+-           $$CLUCENEDIR/index/SegmentReader.cpp \
+-           $$CLUCENEDIR/index/SegmentTermDocs.cpp \
+-           $$CLUCENEDIR/index/SegmentTermEnum.cpp \
+-           $$CLUCENEDIR/index/SegmentTermPositions.cpp \
+-           $$CLUCENEDIR/index/SegmentTermVector.cpp \
+-           $$CLUCENEDIR/index/Term.cpp \
+-           $$CLUCENEDIR/index/TermInfo.cpp \
+-           $$CLUCENEDIR/index/TermInfosReader.cpp \
+-           $$CLUCENEDIR/index/TermInfosWriter.cpp \
+-           $$CLUCENEDIR/index/TermVectorReader.cpp \
+-           $$CLUCENEDIR/index/TermVectorWriter.cpp \
+-           $$CLUCENEDIR/queryParser/Lexer.cpp \
+-           $$CLUCENEDIR/queryParser/MultiFieldQueryParser.cpp \
+-           $$CLUCENEDIR/queryParser/QueryParser.cpp \
+-           $$CLUCENEDIR/queryParser/QueryParserBase.cpp \
+-           $$CLUCENEDIR/queryParser/QueryToken.cpp \
+-           $$CLUCENEDIR/queryParser/TokenList.cpp \
+-           $$CLUCENEDIR/search/BooleanQuery.cpp \
+-           $$CLUCENEDIR/search/BooleanScorer.cpp \
+-           $$CLUCENEDIR/search/CachingWrapperFilter.cpp \
+-           $$CLUCENEDIR/search/ChainedFilter.cpp \
+-           $$CLUCENEDIR/search/ConjunctionScorer.cpp \
+-           $$CLUCENEDIR/search/DateFilter.cpp \
+-           $$CLUCENEDIR/search/ExactPhraseScorer.cpp \
+-           $$CLUCENEDIR/search/Explanation.cpp \
+-           $$CLUCENEDIR/search/FieldCache.cpp \
+-           $$CLUCENEDIR/search/FieldCacheImpl.cpp \
+-           $$CLUCENEDIR/search/FieldDocSortedHitQueue.cpp \
+-           $$CLUCENEDIR/search/FieldSortedHitQueue.cpp \
+-           $$CLUCENEDIR/search/FilteredTermEnum.cpp \
+-           $$CLUCENEDIR/search/FuzzyQuery.cpp \
+-           $$CLUCENEDIR/search/HitQueue.cpp \
+-           $$CLUCENEDIR/search/Hits.cpp \
+-           $$CLUCENEDIR/search/IndexSearcher.cpp \
+-           $$CLUCENEDIR/search/MultiSearcher.cpp \
+-           $$CLUCENEDIR/search/MultiTermQuery.cpp \
+-           $$CLUCENEDIR/search/PhrasePositions.cpp \
+-           $$CLUCENEDIR/search/PhraseQuery.cpp \
+-           $$CLUCENEDIR/search/PhraseScorer.cpp \
+-           $$CLUCENEDIR/search/PrefixQuery.cpp \
+-           $$CLUCENEDIR/search/QueryFilter.cpp \
+-           $$CLUCENEDIR/search/RangeFilter.cpp \
+-           $$CLUCENEDIR/search/RangeQuery.cpp \
+-           $$CLUCENEDIR/search/SearchHeader.cpp \
+-           $$CLUCENEDIR/search/Similarity.cpp \
+-           $$CLUCENEDIR/search/SloppyPhraseScorer.cpp \
+-           $$CLUCENEDIR/search/Sort.cpp \
+-           $$CLUCENEDIR/search/TermQuery.cpp \
+-           $$CLUCENEDIR/search/TermScorer.cpp \
+-           $$CLUCENEDIR/search/WildcardQuery.cpp \
+-           $$CLUCENEDIR/search/WildcardTermEnum.cpp \
+-           $$CLUCENEDIR/store/FSDirectory.cpp \
+-           $$CLUCENEDIR/store/IndexInput.cpp \
+-           $$CLUCENEDIR/store/IndexOutput.cpp \
+-           $$CLUCENEDIR/store/Lock.cpp \
+-           $$CLUCENEDIR/store/MMapInput.cpp \
+-           $$CLUCENEDIR/store/RAMDirectory.cpp \
+-           $$CLUCENEDIR/store/TransactionalRAMDirectory.cpp \
+-           $$CLUCENEDIR/util/BitSet.cpp \
+-           $$CLUCENEDIR/util/Equators.cpp \
+-           $$CLUCENEDIR/util/FastCharStream.cpp \
+-           $$CLUCENEDIR/util/fileinputstream.cpp \
+-           $$CLUCENEDIR/util/Misc.cpp \
+-           $$CLUCENEDIR/util/Reader.cpp \
+-           $$CLUCENEDIR/util/StringBuffer.cpp \
+-           $$CLUCENEDIR/util/StringIntern.cpp \
+-           $$CLUCENEDIR/util/ThreadLocal.cpp \
+-           $$CLUCENEDIR/analysis/standard/StandardAnalyzer.cpp \
+-           $$CLUCENEDIR/analysis/standard/StandardFilter.cpp \
+-           $$CLUCENEDIR/analysis/standard/StandardTokenizer.cpp
+ 
++INCLUDEPATH += /usr/include/clucene09 $$[QT_INSTALL_LIBS]/clucene09 $$[QT_INSTALL_LIBS]
++LIBS += -L$$[QT_INSTALL_LIBS]/clucene09 -lclucene
++#DEFINES += LUCENE_ENABLE_REFCOUNT (must be set at CLucene build time!)
+ 
+ #Header files
+ HEADERS += qclucene_global_p.h \
+diff -ur qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/qclucene-config_p.h qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/qclucene-config_p.h
+--- qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/qclucene-config_p.h	2014-04-10 20:37:12.000000000 +0200
++++ qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/qclucene-config_p.h	2014-10-26 02:28:54.000000000 +0100
+@@ -15,6 +15,8 @@
+ **
+ ****************************************************************************/
+ 
++#error This header must not be included when building against system CLucene.
++
+ #ifndef QCLUCENE_CONFIG_P_H
+ #define QCLUCENE_CONFIG_P_H
+ 
+diff -ur qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/qclucene_global_p.h qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/qclucene_global_p.h
+--- qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/qclucene_global_p.h	2014-04-10 20:37:12.000000000 +0200
++++ qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/qclucene_global_p.h	2014-10-26 02:31:54.000000000 +0100
+@@ -29,20 +29,10 @@
+ // We mean it.
+ //
+ 
+-#if !defined(_MSC_VER)
+-#   include "qclucene-config_p.h"
+-#endif
+-
+ #include <QtCore/QChar>
+ #include <QtCore/QString>
+ 
+-#if !defined(_MSC_VER) && !defined(__MINGW32__) && defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T)
+-#   if !defined(TCHAR)
+-#       define TCHAR wchar_t
+-#   endif
+-#else
+-#   include <windows.h>
+-#endif
++#include <CLucene/StdHeader.h>
+ 
+ QT_BEGIN_HEADER
+ 
+@@ -56,52 +46,6 @@
+ #   define QHELP_EXPORT Q_DECL_IMPORT
+ #endif
+ 
+-//
+-//  W A R N I N G
+-//  -------------
+-//
+-// adjustments here, need to be done in 
+-// QTDIR/src/3rdparty/clucene/src/CLucene/StdHeader.h as well
+-//
+-#if defined(_LUCENE_DONTIMPLEMENT_NS_MACROS)
+-
+-#elif !defined(DISABLE_NAMESPACE)
+-#   ifdef QT_NAMESPACE
+-#       define CL_NS_DEF(sub) namespace QT_NAMESPACE { namespace lucene{ namespace sub{
+-#       define CL_NS_DEF2(sub,sub2) namespace QT_NAMESPACE { namespace lucene{ namespace sub{ namespace sub2 {
+-
+-#       define CL_NS_END }}}
+-#       define CL_NS_END2 }}}}
+-
+-#       define CL_NS_USE(sub) using namespace QT_NAMESPACE::lucene::sub;
+-#       define CL_NS_USE2(sub,sub2) using namespace QT_NAMESPACE::lucene::sub::sub2;
+-
+-#       define CL_NS(sub) QT_NAMESPACE::lucene::sub
+-#       define CL_NS2(sub,sub2) QT_NAMESPACE::lucene::sub::sub2
+-#   else
+-#       define CL_NS_DEF(sub) namespace lucene{ namespace sub{
+-#       define CL_NS_DEF2(sub,sub2) namespace lucene{ namespace sub{ namespace sub2 {
+-
+-#       define CL_NS_END }}
+-#       define CL_NS_END2 }}}
+-
+-#       define CL_NS_USE(sub) using namespace lucene::sub;
+-#       define CL_NS_USE2(sub,sub2) using namespace lucene::sub::sub2;
+-
+-#       define CL_NS(sub) lucene::sub
+-#       define CL_NS2(sub,sub2) lucene::sub::sub2
+-#   endif
+-#else
+-#   define CL_NS_DEF(sub)
+-#   define CL_NS_DEF2(sub, sub2)
+-#   define CL_NS_END
+-#   define CL_NS_END2
+-#   define CL_NS_USE(sub)
+-#   define CL_NS_USE2(sub,sub2)
+-#   define CL_NS(sub)
+-#   define CL_NS2(sub,sub2)
+-#endif
+-
+ namespace {
+     TCHAR* QStringToTChar(const QString &str)
+     {
+diff -ur qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/qindexreader.cpp qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/qindexreader.cpp
+--- qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/qindexreader.cpp	2014-04-10 20:37:12.000000000 +0200
++++ qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/qindexreader.cpp	2014-10-26 02:48:02.000000000 +0100
+@@ -18,6 +18,8 @@
+ #include "qindexreader_p.h"
+ #include "qclucene_global_p.h"
+ 
++#include <QtCore/QDir>
++
+ #include <CLucene.h>
+ #include <CLucene/index/IndexReader.h>
+ 
+@@ -59,13 +61,13 @@
+ {
+     using namespace lucene::index;
+ 
+-    return IndexReader::isLuceneFile(filename);
++    return IndexReader::isLuceneFile(filename.toLocal8Bit().constData());
+ }
+ 
+ bool QCLuceneIndexReader::indexExists(const QString &directory)
+ {
+     using namespace lucene::index;
+-    return IndexReader::indexExists(directory);
++    return IndexReader::indexExists(directory.toLocal8Bit().constData());
+ }
+ 
+ QCLuceneIndexReader QCLuceneIndexReader::open(const QString &path)
+@@ -73,7 +75,7 @@
+     using namespace lucene::index;
+ 
+     QCLuceneIndexReader indexReader;
+-    indexReader.d->reader = IndexReader::open(path);
++    indexReader.d->reader = IndexReader::open(path.toLocal8Bit().constData());
+     
+     return indexReader;
+ }
+@@ -81,25 +83,29 @@
+ void QCLuceneIndexReader::unlock(const QString &path)
+ {
+     using namespace lucene::index;
+-    IndexReader::unlock(path);
++    IndexReader::unlock(path.toLocal8Bit().constData());
+ }
+ 
+ bool QCLuceneIndexReader::isLocked(const QString &directory)
+ {
++    // The system CLucene fails here if the directory does not exist yet, unlike
++    // the bundled one. Work around that.
++    QDir::current().mkpath(directory);
++
+     using namespace lucene::index;
+-    return IndexReader::isLocked(directory);
++    return IndexReader::isLocked(directory.toLocal8Bit().constData());
+ }
+ 
+ quint64 QCLuceneIndexReader::lastModified(const QString &directory)
+ {
+     using namespace lucene::index;
+-    return quint64(IndexReader::lastModified(directory));
++    return quint64(IndexReader::lastModified(directory.toLocal8Bit().constData()));
+ }
+ 
+ qint64 QCLuceneIndexReader::getCurrentVersion(const QString &directory)
+ {
+     using namespace lucene::index;
+-    return qint64(IndexReader::getCurrentVersion(directory));
++    return qint64(IndexReader::getCurrentVersion(directory.toLocal8Bit().constData()));
+ }
+ 
+ void QCLuceneIndexReader::close()
+@@ -155,7 +161,7 @@
+ void QCLuceneIndexReader::setNorm(qint32 doc, const QString &field, qreal value)
+ {
+     TCHAR *fieldName = QStringToTChar(field);
+-    d->reader->setNorm(int32_t(doc), fieldName, qreal(value));
++    d->reader->setNorm(int32_t(doc), fieldName, (float_t)value);
+     delete [] fieldName;
+ }
+ 
+diff -ur qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/qindexwriter.cpp qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/qindexwriter.cpp
+--- qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/qindexwriter.cpp	2014-04-10 20:37:12.000000000 +0200
++++ qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/qindexwriter.cpp	2014-10-26 02:48:27.000000000 +0100
+@@ -18,6 +18,8 @@
+ #include "qindexwriter_p.h"
+ #include "qindexreader_p.h"
+ 
++#include <QtCore/QDir>
++
+ #include <CLucene.h>
+ #include <CLucene/index/IndexWriter.h>
+ 
+@@ -50,7 +52,12 @@
+     : d(new QCLuceneIndexWriterPrivate())
+     , analyzer(analyzer)
+ {
+-    d->writer = new lucene::index::IndexWriter(path, 
++    // The system CLucene cannot create directories recursively, so do it here.
++    // Ignore failure: If it failed, we will get an error from CLucene anyway.
++    if (create)
++        QDir::current().mkpath(path);
++
++    d->writer = new lucene::index::IndexWriter(path.toLocal8Bit().constData(), 
+         analyzer.d->analyzer, create, closeDir);
+ }
+ 
+diff -ur qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/qsearchable.cpp qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/qsearchable.cpp
+--- qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/qsearchable.cpp	2014-04-10 20:37:12.000000000 +0200
++++ qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/qsearchable.cpp	2014-10-26 02:48:44.000000000 +0100
+@@ -95,7 +95,7 @@
+     : QCLuceneSearcher()
+ {
+     lucene::search::IndexSearcher *searcher =
+-        new lucene::search::IndexSearcher(path);
++        new lucene::search::IndexSearcher(path.toLocal8Bit().constData());
+ 
+     reader.d->reader = searcher->getReader();
+     reader.d->deleteCLuceneIndexReader = false;
+diff -ur qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/lib.pro qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/lib.pro
+--- qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/lib.pro	2014-04-10 20:37:12.000000000 +0200
++++ qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/lib.pro	2014-10-26 02:27:55.000000000 +0100
+@@ -43,6 +43,7 @@
+     qhelp_global.cpp
+ 
+ # access to clucene
++INCLUDEPATH += /usr/include/clucene09 $$[QT_INSTALL_LIBS]/clucene09 $$[QT_INSTALL_LIBS]
+ SOURCES += qhelpsearchindexwriter_clucene.cpp \
+     qhelpsearchindexreader_clucene.cpp
+ HEADERS += qhelpenginecore.h \

qt-everywhere-opensource-src-4.8.7-QT_VERSION_CHECK.patch

@@ -0,0 +1,12 @@
+diff -up qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h.majmin qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h
+--- qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h.majmin	2015-05-07 09:14:48.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h	2016-12-08 12:10:29.677359701 -0600
+@@ -52,7 +52,7 @@
+ /*
+    can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0))
+ */
+-#define QT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
++#define QT_VERSION_CHECK(qt_version_check_major, qt_version_check_minor, qt_version_check_patch) ((qt_version_check_major<<16)|(qt_version_check_minor<<8)|(qt_version_check_patch))
+ 
+ #define QT_PACKAGEDATE_STR "2015-05-07"
+ 

qt-everywhere-opensource-src-4.8.7-alsa-1.1.patch

@@ -0,0 +1,12 @@
+diff -up qt-everywhere-opensource-src-4.8.7/config.tests/unix/alsa/alsatest.cpp.than qt-everywhere-opensource-src-4.8.7/config.tests/unix/alsa/alsatest.cpp
+--- qt-everywhere-opensource-src-4.8.7/config.tests/unix/alsa/alsatest.cpp.than	2016-02-10 16:31:02.450152334 +0100
++++ qt-everywhere-opensource-src-4.8.7/config.tests/unix/alsa/alsatest.cpp	2016-02-10 16:31:51.495307579 +0100
+@@ -40,7 +40,7 @@
+ ****************************************************************************/
+ 
+ #include <alsa/asoundlib.h>
+-#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10))
++#if(!(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 10)))
+ #error "Alsa version found too old, require >= 1.0.10"
+ #endif
+ 

qt-everywhere-opensource-src-4.8.7-firebird.patch

@@ -0,0 +1,45 @@
+diff -up qt-everywhere-opensource-src-4.8.7/config.tests/unix/ibase/ibase.cpp.ibase qt-everywhere-opensource-src-4.8.7/config.tests/unix/ibase/ibase.cpp
+--- qt-everywhere-opensource-src-4.8.7/config.tests/unix/ibase/ibase.cpp.ibase	2015-05-07 09:14:42.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.7/config.tests/unix/ibase/ibase.cpp	2016-11-30 10:55:05.825339674 -0600
+@@ -39,7 +39,7 @@
+ **
+ ****************************************************************************/
+ 
+-#include <ibase.h>
++#include <firebird/ibase.h>
+ 
+ int main(int, char **)
+ {
+diff -up qt-everywhere-opensource-src-4.8.7/config.tests/unix/ibase/ibase.pro.ibase qt-everywhere-opensource-src-4.8.7/config.tests/unix/ibase/ibase.pro
+--- qt-everywhere-opensource-src-4.8.7/config.tests/unix/ibase/ibase.pro.ibase	2015-05-07 09:14:42.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.7/config.tests/unix/ibase/ibase.pro	2016-11-30 10:56:11.017740104 -0600
+@@ -1,4 +1,4 @@
+ SOURCES = ibase.cpp
+ CONFIG -= qt dylib
+ mac:CONFIG -= app_bundle
+-LIBS += -lgds
++LIBS += -lfbclient
+diff -up qt-everywhere-opensource-src-4.8.7/src/sql/drivers/ibase/qsql_ibase.h.ibase qt-everywhere-opensource-src-4.8.7/src/sql/drivers/ibase/qsql_ibase.h
+--- qt-everywhere-opensource-src-4.8.7/src/sql/drivers/ibase/qsql_ibase.h.ibase	2015-05-07 09:14:48.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.7/src/sql/drivers/ibase/qsql_ibase.h	2016-11-30 10:57:34.516252974 -0600
+@@ -45,7 +45,7 @@
+ #include <QtSql/qsqlresult.h>
+ #include <QtSql/qsqldriver.h>
+ #include <QtSql/private/qsqlcachedresult_p.h>
+-#include <ibase.h>
++#include <firebird/ibase.h>
+ 
+ QT_BEGIN_HEADER
+ 
+diff -up qt-everywhere-opensource-src-4.8.7/src/sql/drivers/ibase/qsql_ibase.pri.ibase qt-everywhere-opensource-src-4.8.7/src/sql/drivers/ibase/qsql_ibase.pri
+--- qt-everywhere-opensource-src-4.8.7/src/sql/drivers/ibase/qsql_ibase.pri.ibase	2015-05-07 09:14:48.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.7/src/sql/drivers/ibase/qsql_ibase.pri	2016-11-30 10:57:11.783113341 -0600
+@@ -2,7 +2,7 @@ HEADERS += $$PWD/qsql_ibase.h
+ SOURCES += $$PWD/qsql_ibase.cpp
+ 
+ unix {
+-    !contains(LIBS, .*gds.*):!contains(LIBS, .*libfb.*):LIBS += -lgds
++    !contains(LIBS, .*gds.*):!contains(LIBS, .*libfb.*):LIBS += -lfbclient
+ } else {
+     !contains(LIBS, .*gds.*):!contains(LIBS, .*fbclient.*) {
+         win32-borland:LIBS += gds32.lib

qt-everywhere-opensource-src-4.8.7-gcc6.patch

@@ -0,0 +1,35 @@
+diff -up qt-everywhere-opensource-src-4.8.7/configure.gcc6 qt-everywhere-opensource-src-4.8.7/configure
+--- qt-everywhere-opensource-src-4.8.7/configure.gcc6	2016-04-15 07:04:19.430268222 -0500
++++ qt-everywhere-opensource-src-4.8.7/configure	2016-04-15 07:05:22.157568689 -0500
+@@ -7744,7 +7744,7 @@ case "$XPLATFORM" in
+     *-g++*)
+ 	# Check gcc's version
+ 	case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
+-	    5*|4*|3.4*)
++	    8*|7*|6*|5*|4*|3.4*)
+ 		;;
+             3.3*)
+                 canBuildWebKit="no"
+@@ -8060,7 +8060,7 @@ g++*)
+     3.*)
+         COMPILER_VERSION="3.*"
+         ;;
+-    5*|4.*)
++    8*|7*|6*|5*|4.*)
+         COMPILER_VERSION="4"
+         ;;
+     *)
+diff -up qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.gcc6 qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h
+--- qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.gcc6	2015-05-07 09:14:48.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h	2016-04-15 07:04:19.431268227 -0500
+@@ -70,8 +70,8 @@ namespace QPatternist
+             ForegroundShift = 10,
+             BackgroundShift = 20,
+             SpecialShift    = 20,
+-            ForegroundMask  = ((1 << ForegroundShift) - 1) << ForegroundShift,
+-            BackgroundMask  = ((1 << BackgroundShift) - 1) << BackgroundShift
++            ForegroundMask  = 0x1f << ForegroundShift,
++            BackgroundMask  = 0x7 << BackgroundShift
+         };
+ 
+     public:

qt-everywhere-opensource-src-4.8.7-gcc8_qtscript.patch

@@ -0,0 +1,13 @@
+diff -up qt-everywhere-opensource-src-4.8.7/src/script/script.pro.gcc8 qt-everywhere-opensource-src-4.8.7/src/script/script.pro
+--- qt-everywhere-opensource-src-4.8.7/src/script/script.pro.gcc8	2015-05-07 09:14:43.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.7/src/script/script.pro	2018-05-19 16:01:24.699926959 -0500
+@@ -91,6 +91,9 @@ symbian {
+     TARGET.UID3=0x2001B2E1
+ }
+ 
++# hack around gcc8 optimization bug with -O2
++QMAKE_CXXFLAGS_RELEASE += -O1
++
+ symbian {
+     symbian-abld|symbian-sbsv2 {
+         MMP_RULES += ALWAYS_BUILD_AS_ARM

qt-everywhere-opensource-src-4.8.7-icu59.patch

@@ -0,0 +1,28 @@
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Subject: Fix build with ICU >= 59
+
+ICU >= 59 requires C++11 for its header files.
+Qt can't be compiled with -std=c++11 as a whole, so only enable
+it for qlocale_icu.cpp.
+
+Index: qt-everywhere-opensource-src-4.8.7/src/corelib/tools/tools.pri
+===================================================================
+--- qt-everywhere-opensource-src-4.8.7.orig/src/corelib/tools/tools.pri
++++ qt-everywhere-opensource-src-4.8.7/src/corelib/tools/tools.pri
+@@ -102,7 +102,15 @@ contains(QT_CONFIG, zlib):include($$PWD/
+ else:include($$PWD/../../3rdparty/zlib_dependency.pri)
+ 
+ contains(QT_CONFIG,icu) {
+-    SOURCES += tools/qlocale_icu.cpp
++    cpp11.name = cpp11
++    cpp11.input = SOURCES_CPP11
++    cpp11.dependency_type = TYPE_C
++    cpp11.variable_out = OBJECTS
++    cpp11.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_IN_BASE}$${first(QMAKE_EXT_OBJ)}
++    cpp11.commands = $${QMAKE_CXX} $(CXXFLAGS) -std=c++11 $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
++    QMAKE_EXTRA_COMPILERS += cpp11
++
++    SOURCES_CPP11 += tools/qlocale_icu.cpp
+     DEFINES += QT_USE_ICU
+ }
+ 

qt-everywhere-opensource-src-4.8.7-mariadb.patch

@@ -0,0 +1,28 @@
+diff -up qt-everywhere-opensource-src-4.8.7/src/sql/drivers/mysql/qsql_mysql.cpp.mariadb qt-everywhere-opensource-src-4.8.7/src/sql/drivers/mysql/qsql_mysql.cpp
+--- qt-everywhere-opensource-src-4.8.7/src/sql/drivers/mysql/qsql_mysql.cpp.mariadb	2015-05-07 09:14:48.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.7/src/sql/drivers/mysql/qsql_mysql.cpp	2017-10-23 14:13:15.871808984 -0500
+@@ -1105,11 +1105,16 @@ static void qLibraryInit()
+     }
+ # endif // MYSQL_VERSION_ID
+ #endif // Q_NO_MYSQL_EMBEDDED
++
++#if defined(MARIADB_BASE_VERSION) || defined(MARIADB_VERSION_ID)
++    qAddPostRoutine(mysql_server_end);
++#endif
+ }
+ 
+ static void qLibraryEnd()
+ {
+ #ifndef Q_NO_MYSQL_EMBEDDED
++#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID)
+ # if MYSQL_VERSION_ID > 40000
+ #  if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003
+     mysql_library_end();
+@@ -1118,6 +1123,7 @@ static void qLibraryEnd()
+ #  endif
+ # endif
+ #endif
++#endif
+ }
+ 
+ QMYSQLDriver::QMYSQLDriver(QObject * parent)

qt-everywhere-opensource-src-4.8.7-mips64.patch

@@ -0,0 +1,13 @@
+diff -urp qt-everywhere-opensource-src-4.8.7/configure q/configure
+--- qt-everywhere-opensource-src-4.8.7/configure	2016-04-03 16:49:50.218644449 +0200
++++ q/configure	2016-04-03 17:22:35.376405024 +0200
+@@ -3331,6 +3331,9 @@ arm*)
+     CFG_ARCH=arm
+     COMPAT_ARCH=armv6
+     ;;
++mips*)
++    CFG_ARCH=mips
++    ;;
+ esac
+ 
+ if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then

qt-everywhere-opensource-src-4.8.7-openssl-1.1.patch

@@ -0,0 +1,694 @@
+diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslcertificate.cpp qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslcertificate.cpp
+--- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslcertificate.cpp	2015-05-07 16:14:44.000000000 +0200
++++ qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslcertificate.cpp	2018-01-05 17:44:16.997588265 +0100
+@@ -259,10 +259,10 @@
+ QByteArray QSslCertificate::version() const
+ {
+     QMutexLocker lock(QMutexPool::globalInstanceGet(d.data()));
+-    if (d->versionString.isEmpty() && d->x509)
++    if (d->versionString.isEmpty() && d->x509) {
+         d->versionString =
+-            QByteArray::number(qlonglong(q_ASN1_INTEGER_get(d->x509->cert_info->version)) + 1);
+-
++	    QByteArray::number(qlonglong(q_X509_get_version(d->x509)) + 1);
++    }
+     return d->versionString;
+ }
+ 
+@@ -276,7 +276,7 @@
+ {
+     QMutexLocker lock(QMutexPool::globalInstanceGet(d.data()));
+     if (d->serialNumberString.isEmpty() && d->x509) {
+-        ASN1_INTEGER *serialNumber = d->x509->cert_info->serialNumber;
++        ASN1_INTEGER *serialNumber = q_X509_get_serialNumber(d->x509);
+         // if we cannot convert to a long, just output the hexadecimal number
+         if (serialNumber->length > 4) {
+             QByteArray hexString;
+@@ -489,24 +489,33 @@
+     QSslKey key;
+ 
+     key.d->type = QSsl::PublicKey;
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     X509_PUBKEY *xkey = d->x509->cert_info->key;
++#else
++    X509_PUBKEY *xkey = q_X509_get_X509_PUBKEY(d->x509);
++#endif
+     EVP_PKEY *pkey = q_X509_PUBKEY_get(xkey);
+     Q_ASSERT(pkey);
+ 
+-    if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_RSA) {
++    int key_id;
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++    key_id = q_EVP_PKEY_type(pkey->type);
++#else
++    key_id = q_EVP_PKEY_base_id(pkey);
++#endif
++    if (key_id == EVP_PKEY_RSA) {
+         key.d->rsa = q_EVP_PKEY_get1_RSA(pkey);
+         key.d->algorithm = QSsl::Rsa;
+         key.d->isNull = false;
+-    } else if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_DSA) {
++    } else if (key_id == EVP_PKEY_DSA) {
+         key.d->dsa = q_EVP_PKEY_get1_DSA(pkey);
+         key.d->algorithm = QSsl::Dsa;
+         key.d->isNull = false;
+-    } else if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_DH) {
++    } else if (key_id == EVP_PKEY_DH) {
+         // DH unsupported
+     } else {
+         // error?
+     }
+-
+     q_EVP_PKEY_free(pkey);
+     return key;
+ }
+@@ -687,7 +696,11 @@
+         unsigned char *data = 0;
+         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
+         info[QString::fromUtf8(obj)] = QString::fromUtf8((char*)data, size);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+         q_CRYPTO_free(data);
++#else
++        q_CRYPTO_free(data, __FILE__, __LINE__);
++#endif
+     }
+     return info;
+ }
+diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslkey.cpp qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslkey.cpp
+--- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslkey.cpp	2015-05-07 16:14:44.000000000 +0200
++++ qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslkey.cpp	2018-01-05 18:00:27.453937599 +0100
+@@ -321,8 +321,19 @@
+ {
+     if (d->isNull)
+         return -1;
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     return (d->algorithm == QSsl::Rsa)
+            ? q_BN_num_bits(d->rsa->n) : q_BN_num_bits(d->dsa->p);
++#else
++    if (d->algorithm == QSsl::Rsa) {
++        return q_RSA_bits(d->rsa);
++    } else {
++        const BIGNUM *p = (const BIGNUM *) NULL;
++        q_DSA_get0_pqg(d->dsa, &p, (const BIGNUM **) NULL, (const BIGNUM **) NULL);
++        return q_BN_num_bits(p);
++    }
++#endif
++
+ }
+ 
+ /*!
+diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl.cpp qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslsocket_openssl.cpp
+--- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl.cpp	2015-05-07 16:14:44.000000000 +0200
++++ qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslsocket_openssl.cpp	2018-01-05 12:06:06.336990956 +0100
+@@ -93,6 +93,7 @@
+ bool QSslSocketPrivate::s_loadedCiphersAndCerts = false;
+ bool QSslSocketPrivate::s_loadRootCertsOnDemand = false;
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ /* \internal
+ 
+     From OpenSSL's thread(3) manual page:
+@@ -174,6 +175,8 @@
+ }
+ } // extern "C"
+ 
++#endif //OPENSSL_VERSION_NUMBER >= 0x10100000L
++
+ QSslSocketBackendPrivate::QSslSocketBackendPrivate()
+     : ssl(0),
+       ctx(0),
+@@ -222,9 +225,12 @@
+             ciph.d->encryptionMethod = descriptionList.at(4).mid(4);
+         ciph.d->exportable = (descriptionList.size() > 6 && descriptionList.at(6) == QLatin1String("export"));
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+         ciph.d->bits = cipher->strength_bits;
+         ciph.d->supportedBits = cipher->alg_bits;
+-
++#else
++	ciph.d->bits = q_SSL_CIPHER_get_bits(cipher, &ciph.d->supportedBits);
++#endif
+     }
+     return ciph;
+ }
+@@ -363,7 +369,7 @@
+         //
+         // See also: QSslContext::fromConfiguration()
+         if (caCertificate.expiryDate() >= QDateTime::currentDateTime()) {
+-            q_X509_STORE_add_cert(ctx->cert_store, (X509 *)caCertificate.handle());
++	  q_X509_STORE_add_cert(q_SSL_CTX_get_cert_store(ctx), (X509 *)caCertificate.handle());
+         }
+     }
+ 
+@@ -500,8 +506,10 @@
+ */
+ void QSslSocketPrivate::deinitialize()
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     q_CRYPTO_set_id_callback(0);
+     q_CRYPTO_set_locking_callback(0);
++#endif
+ }
+ 
+ /*!
+@@ -522,13 +530,17 @@
+         return false;
+ 
+     // Check if the library itself needs to be initialized.
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     QMutexLocker locker(openssl_locks()->initLock());
++#endif
+     if (!s_libraryLoaded) {
+         s_libraryLoaded = true;
+ 
+         // Initialize OpenSSL.
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+         q_CRYPTO_set_id_callback(id_function);
+         q_CRYPTO_set_locking_callback(locking_function);
++#endif
+         if (q_SSL_library_init() != 1)
+             return false;
+         q_SSL_load_error_strings();
+@@ -567,7 +579,9 @@
+ 
+ void QSslSocketPrivate::ensureCiphersAndCertsLoaded()
+ {
+-    QMutexLocker locker(openssl_locks()->initLock());
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++  QMutexLocker locker(openssl_locks()->initLock());
++#endif
+     if (s_loadedCiphersAndCerts)
+         return;
+     s_loadedCiphersAndCerts = true;
+@@ -659,13 +673,18 @@
+     STACK_OF(SSL_CIPHER) *supportedCiphers = q_SSL_get_ciphers(mySsl);
+     for (int i = 0; i < q_sk_SSL_CIPHER_num(supportedCiphers); ++i) {
+         if (SSL_CIPHER *cipher = q_sk_SSL_CIPHER_value(supportedCiphers, i)) {
+-            if (cipher->valid) {
++
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++	  if (cipher->valid) {
++#endif
+                 QSslCipher ciph = QSslSocketBackendPrivate::QSslCipher_from_SSL_CIPHER(cipher);
+                 if (!ciph.isNull()) {
+                     if (!ciph.name().toLower().startsWith(QLatin1String("adh")))
+                         ciphers << ciph;
+                 }
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+             }
++#endif
+         }
+     }
+ 
+diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_p.h qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslsocket_openssl_p.h
+--- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_p.h	2015-05-07 16:14:44.000000000 +0200
++++ qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslsocket_openssl_p.h	2018-01-05 12:06:06.337990940 +0100
+@@ -84,6 +84,10 @@
+ #include <openssl/tls1.h>
+ #endif
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#define OPENSSL_NO_SSL2
++#endif
++
+ #if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ typedef _STACK STACK;
+ #endif
+diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols.cpp qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslsocket_openssl_symbols.cpp
+--- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols.cpp	2015-05-07 16:14:44.000000000 +0200
++++ qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslsocket_openssl_symbols.cpp	2018-01-05 17:59:10.636973932 +0100
+@@ -111,16 +111,30 @@
+ DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **a, a, ASN1_STRING *b, b, return 0, return);
+ DEFINEFUNC4(long, BIO_ctrl, BIO *a, a, int b, b, long c, c, void *d, d, return -1, return)
+ DEFINEFUNC(int, BIO_free, BIO *a, a, return 0, return)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return 0, return)
++#else
++DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, return 0, return)
++#endif
+ DEFINEFUNC2(BIO *, BIO_new_mem_buf, void *a, a, int b, b, return 0, return)
+ DEFINEFUNC3(int, BIO_read, BIO *a, a, void *b, b, int c, c, return -1, return)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return)
++#else
++DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return)
++#endif
+ DEFINEFUNC3(int, BIO_write, BIO *a, a, const void *b, b, int c, c, return -1, return)
+ DEFINEFUNC(int, BN_num_bits, const BIGNUM *a, a, return 0, return)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ DEFINEFUNC(int, CRYPTO_num_locks, DUMMYARG, DUMMYARG, return 0, return)
+ DEFINEFUNC(void, CRYPTO_set_locking_callback, void (*a)(int, int, const char *, int), a, return, DUMMYARG)
+ DEFINEFUNC(void, CRYPTO_set_id_callback, unsigned long (*a)(), a, return, DUMMYARG)
++#endif
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
++#else
++DEFINEFUNC3(void, CRYPTO_free, void *a, a, const char *b, b, int c, c, return, DUMMYARG)
++#endif
+ DEFINEFUNC(void, DSA_free, DSA *a, a, return, DUMMYARG)
+ #if  OPENSSL_VERSION_NUMBER < 0x00908000L
+ DEFINEFUNC3(X509 *, d2i_X509, X509 **a, a, unsigned char **b, b, long c, c, return 0, return)
+@@ -157,6 +171,7 @@
+ DEFINEFUNC2(void, RAND_seed, const void *a, a, int b, b, return, DUMMYARG)
+ DEFINEFUNC(int, RAND_status, void, DUMMYARG, return -1, return)
+ DEFINEFUNC(void, RSA_free, RSA *a, a, return, DUMMYARG)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
+ DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
+ #if OPENSSL_VERSION_NUMBER >= 0x10000000L
+@@ -166,6 +181,12 @@
+ DEFINEFUNC(void, sk_free, STACK *a, a, return, DUMMYARG)
+ DEFINEFUNC2(char *, sk_value, STACK *a, a, int b, b, return 0, return)
+ #endif
++#else
++DEFINEFUNC(int, OPENSSL_sk_num, STACK *a, a, return -1, return)
++DEFINEFUNC2(void, OPENSSL_sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
++DEFINEFUNC(void, OPENSSL_sk_free, _STACK *a, a, return, DUMMYARG)
++DEFINEFUNC2(void *, OPENSSL_sk_value, STACK *a, a, int b, b, return 0, return)
++#endif
+ DEFINEFUNC(int, SSL_accept, SSL *a, a, return -1, return)
+ DEFINEFUNC(int, SSL_clear, SSL *a, a, return -1, return)
+ DEFINEFUNC3(char *, SSL_CIPHER_description, SSL_CIPHER *a, a, char *b, b, int c, c, return 0, return)
+@@ -213,8 +234,12 @@
+ #else
+ DEFINEFUNC(long, SSL_get_verify_result, SSL *a, a, return -1, return)
+ #endif
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ DEFINEFUNC(int, SSL_library_init, void, DUMMYARG, return -1, return)
+ DEFINEFUNC(void, SSL_load_error_strings, void, DUMMYARG, return, DUMMYARG)
++#else
++DEFINEFUNC2(int, OPENSSL_init_ssl, uint64_t opts, opts, const OPENSSL_INIT_SETTINGS *settings, settings, return -1, return)
++#endif
+ DEFINEFUNC(SSL *, SSL_new, SSL_CTX *a, a, return 0, return)
+ #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
+ DEFINEFUNC4(long, SSL_ctrl, SSL *a, a, int cmd, cmd, long larg, larg, void *parg, parg, return -1, return)
+@@ -229,13 +254,21 @@
+ DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return)
+ #endif
+ DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return)
++#else
++DEFINEFUNC(const SSL_METHOD *, TLS_client_method, DUMMYARG, DUMMYARG, return 0, return)
++#endif
+ DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return)
+ #ifndef OPENSSL_NO_SSL2
+ DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return)
+ #endif
+ DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return)
++#else
++DEFINEFUNC(const SSL_METHOD *, TLS_server_method, DUMMYARG, DUMMYARG, return 0, return)
++#endif
+ DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return)
+ #else
+ DEFINEFUNC(SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return)
+@@ -274,7 +307,11 @@
+ DEFINEFUNC(int, X509_STORE_CTX_get_error, X509_STORE_CTX *a, a, return -1, return)
+ DEFINEFUNC(int, X509_STORE_CTX_get_error_depth, X509_STORE_CTX *a, a, return -1, return)
+ DEFINEFUNC(X509 *, X509_STORE_CTX_get_current_cert, X509_STORE_CTX *a, a, return 0, return)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get_chain, X509_STORE_CTX *a, a, return 0, return)
++#else
++DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return 0, return)
++#endif
+ DEFINEFUNC(X509_STORE_CTX *, X509_STORE_CTX_new, DUMMYARG, DUMMYARG, return 0, return)
+ #ifdef SSLEAY_MACROS
+ DEFINEFUNC2(int, i2d_DSAPrivateKey, const DSA *a, a, unsigned char **b, b, return -1, return)
+@@ -282,10 +319,34 @@
+ DEFINEFUNC3(RSA *, d2i_RSAPrivateKey, RSA **a, a, unsigned char **b, b, long c, c, return 0, return)
+ DEFINEFUNC3(DSA *, d2i_DSAPrivateKey, DSA **a, a, unsigned char **b, b, long c, c, return 0, return)
+ #endif
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ DEFINEFUNC(void, OPENSSL_add_all_algorithms_noconf, void, DUMMYARG, return, DUMMYARG)
+ DEFINEFUNC(void, OPENSSL_add_all_algorithms_conf, void, DUMMYARG, return, DUMMYARG)
++#else
++DEFINEFUNC2(int, OPENSSL_init_crypto, uint64_t opts, opts, const OPENSSL_INIT_SETTINGS *settings, settings, return -1, return)
++#endif
+ DEFINEFUNC3(int, SSL_CTX_load_verify_locations, SSL_CTX *ctx, ctx, const char *CAfile, CAfile, const char *CApath, CApath, return 0, return)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ DEFINEFUNC(long, SSLeay, void, DUMMYARG, return 0, return)
++#else
++DEFINEFUNC(unsigned long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
++#endif
++DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *ctx, ctx, return 0, return)
++
++DEFINEFUNC(ASN1_INTEGER *, X509_get_serialNumber, X509 *x, x, return 0, return)
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++DEFINEFUNC(int, EVP_PKEY_id, const EVP_PKEY *pkey, pkey, return 0, return)
++DEFINEFUNC(int, EVP_PKEY_base_id, const EVP_PKEY *pkey, pkey, return 0, return)
++DEFINEFUNC2(int, SSL_CIPHER_get_bits, const SSL_CIPHER *cipher, cipher, int *alg_bits, alg_bits, return 0, return)
++DEFINEFUNC2(long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, long options, options, return 0, return)
++DEFINEFUNC(long, X509_get_version, X509 *x, x, return 0, return)
++DEFINEFUNC(X509_PUBKEY *, X509_get_X509_PUBKEY, X509 *x, x, return 0, return)
++DEFINEFUNC(int, RSA_bits,  const RSA *rsa, rsa, return 0, return)
++DEFINEFUNC(int, DSA_security_bits, const DSA *dsa, dsa, return 0, return)
++DEFINEFUNC(ASN1_TIME *, X509_getm_notAfter, X509 *x, x, return 0, return)
++DEFINEFUNC(ASN1_TIME *, X509_getm_notBefore, X509 *x, x, return 0, return)
++DEFINEFUNC4(void, DSA_get0_pqg, const DSA *d, d, const BIGNUM **p, p, const BIGNUM **q, q, const BIGNUM **g, g, return, return)
++#endif
+ 
+ #ifdef Q_OS_SYMBIAN
+ #define RESOLVEFUNC(func, ordinal, lib) \
+@@ -580,7 +641,11 @@
+     static volatile bool symbolsResolved = false;
+     static volatile bool triedToResolveSymbols = false;
+ #ifndef QT_NO_THREAD
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     QMutexLocker locker(QMutexPool::globalInstanceGet((void *)&q_SSL_library_init));
++#else
++    QMutexLocker locker(QMutexPool::globalInstanceGet((void *)&q_OPENSSL_init_ssl));
++#endif
+ #endif
+     if (symbolsResolved)
+         return true;
+@@ -614,9 +679,11 @@
+     RESOLVEFUNC(BIO_write, 269, libs.second )
+     RESOLVEFUNC(BN_num_bits, 387, libs.second )
+     RESOLVEFUNC(CRYPTO_free, 469, libs.second )
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     RESOLVEFUNC(CRYPTO_num_locks, 500, libs.second )
+     RESOLVEFUNC(CRYPTO_set_id_callback, 513, libs.second )
+     RESOLVEFUNC(CRYPTO_set_locking_callback, 516, libs.second )
++#endif
+     RESOLVEFUNC(DSA_free, 594, libs.second )
+     RESOLVEFUNC(ERR_error_string, 744, libs.second )
+     RESOLVEFUNC(ERR_get_error, 749, libs.second )
+@@ -674,8 +741,10 @@
+     RESOLVEFUNC(SSL_get_peer_cert_chain, 117, libs.first )
+     RESOLVEFUNC(SSL_get_peer_certificate, 118, libs.first )
+     RESOLVEFUNC(SSL_get_verify_result, 132, libs.first )
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     RESOLVEFUNC(SSL_library_init, 137, libs.first )
+     RESOLVEFUNC(SSL_load_error_strings, 139, libs.first )
++#endif
+     RESOLVEFUNC(SSL_new, 140, libs.first )
+ #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
+     RESOLVEFUNC(SSL_ctrl, 95, libs.first )
+@@ -747,9 +816,11 @@
+     RESOLVEFUNC(BIO_write)
+     RESOLVEFUNC(BN_num_bits)
+     RESOLVEFUNC(CRYPTO_free)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     RESOLVEFUNC(CRYPTO_num_locks)
+     RESOLVEFUNC(CRYPTO_set_id_callback)
+     RESOLVEFUNC(CRYPTO_set_locking_callback)
++#endif
+     RESOLVEFUNC(DSA_free)
+     RESOLVEFUNC(ERR_error_string)
+     RESOLVEFUNC(ERR_get_error)
+@@ -779,10 +850,17 @@
+     RESOLVEFUNC(RAND_seed)
+     RESOLVEFUNC(RAND_status)
+     RESOLVEFUNC(RSA_free)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     RESOLVEFUNC(sk_free)
+     RESOLVEFUNC(sk_num)
+     RESOLVEFUNC(sk_pop_free)
+     RESOLVEFUNC(sk_value)
++#else
++    RESOLVEFUNC(OPENSSL_sk_free)
++    RESOLVEFUNC(OPENSSL_sk_num)
++    RESOLVEFUNC(OPENSSL_sk_pop_free)
++    RESOLVEFUNC(OPENSSL_sk_value)
++#endif
+     RESOLVEFUNC(SSL_CIPHER_description)
+     RESOLVEFUNC(SSL_CTX_check_private_key)
+     RESOLVEFUNC(SSL_CTX_ctrl)
+@@ -797,6 +875,7 @@
+     RESOLVEFUNC(SSL_CTX_use_PrivateKey)
+     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
+     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
++    RESOLVEFUNC(SSL_CTX_get_cert_store)
+     RESOLVEFUNC(SSL_accept)
+     RESOLVEFUNC(SSL_clear)
+     RESOLVEFUNC(SSL_connect)
+@@ -807,8 +886,12 @@
+     RESOLVEFUNC(SSL_get_peer_cert_chain)
+     RESOLVEFUNC(SSL_get_peer_certificate)
+     RESOLVEFUNC(SSL_get_verify_result)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     RESOLVEFUNC(SSL_library_init)
+     RESOLVEFUNC(SSL_load_error_strings)
++#else
++    RESOLVEFUNC(OPENSSL_init_ssl)
++#endif
+     RESOLVEFUNC(SSL_new)
+ #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
+     RESOLVEFUNC(SSL_ctrl)
+@@ -819,17 +902,47 @@
+     RESOLVEFUNC(SSL_set_connect_state)
+     RESOLVEFUNC(SSL_shutdown)
+     RESOLVEFUNC(SSL_write)
++
++    RESOLVEFUNC(X509_get_serialNumber)
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++    RESOLVEFUNC(SSL_CTX_ctrl)
++    RESOLVEFUNC(EVP_PKEY_id)
++    RESOLVEFUNC(EVP_PKEY_base_id)
++    RESOLVEFUNC(SSL_CIPHER_get_bits)
++    RESOLVEFUNC(SSL_CTX_set_options)
++    RESOLVEFUNC(X509_get_version)
++    RESOLVEFUNC(X509_get_X509_PUBKEY)
++    RESOLVEFUNC(RSA_bits)
++    RESOLVEFUNC(DSA_security_bits)
++    RESOLVEFUNC(DSA_get0_pqg)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++    RESOLVEFUNC(X509_get_notAfter)
++    RESOLVEFUNC(X509_get_notBefore)
++#else
++    RESOLVEFUNC(X509_getm_notAfter)
++    RESOLVEFUNC(X509_getm_notBefore)
++#endif
++#endif
++
+ #ifndef OPENSSL_NO_SSL2
+     RESOLVEFUNC(SSLv2_client_method)
+ #endif
+     RESOLVEFUNC(SSLv3_client_method)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     RESOLVEFUNC(SSLv23_client_method)
++#else
++    RESOLVEFUNC(TLS_client_method)
++#endif
+     RESOLVEFUNC(TLSv1_client_method)
+ #ifndef OPENSSL_NO_SSL2
+     RESOLVEFUNC(SSLv2_server_method)
+ #endif
+     RESOLVEFUNC(SSLv3_server_method)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     RESOLVEFUNC(SSLv23_server_method)
++#else
++    RESOLVEFUNC(TLS_server_method)
++#endif
+     RESOLVEFUNC(TLSv1_server_method)
+     RESOLVEFUNC(X509_NAME_entry_count)
+     RESOLVEFUNC(X509_NAME_get_entry)
+@@ -846,7 +959,11 @@
+     RESOLVEFUNC(X509_STORE_CTX_get_error)
+     RESOLVEFUNC(X509_STORE_CTX_get_error_depth)
+     RESOLVEFUNC(X509_STORE_CTX_get_current_cert)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     RESOLVEFUNC(X509_STORE_CTX_get_chain)
++#else
++    RESOLVEFUNC(X509_STORE_CTX_get0_chain)
++#endif
+     RESOLVEFUNC(X509_cmp)
+ #ifndef SSLEAY_MACROS
+     RESOLVEFUNC(X509_dup)
+@@ -867,10 +984,18 @@
+     RESOLVEFUNC(d2i_DSAPrivateKey)
+     RESOLVEFUNC(d2i_RSAPrivateKey)
+ #endif
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     RESOLVEFUNC(OPENSSL_add_all_algorithms_noconf)
+     RESOLVEFUNC(OPENSSL_add_all_algorithms_conf)
++#else
++    RESOLVEFUNC(OPENSSL_init_crypto)
++#endif
+     RESOLVEFUNC(SSL_CTX_load_verify_locations)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     RESOLVEFUNC(SSLeay)
++#else
++    RESOLVEFUNC(OpenSSL_version_num)
++#endif
+ #endif // Q_OS_SYMBIAN
+     symbolsResolved = true;
+     delete libs.first;
+diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols_p.h qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslsocket_openssl_symbols_p.h
+--- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols_p.h	2015-05-07 16:14:44.000000000 +0200
++++ qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslsocket_openssl_symbols_p.h	2018-01-05 17:59:42.041550255 +0100
+@@ -207,16 +207,31 @@
+ int q_ASN1_STRING_to_UTF8(unsigned char **a, ASN1_STRING *b);
+ long q_BIO_ctrl(BIO *a, int b, long c, void *d);
+ int q_BIO_free(BIO *a);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ BIO *q_BIO_new(BIO_METHOD *a);
++#else
++BIO *q_BIO_new(const BIO_METHOD *a);
++#endif
+ BIO *q_BIO_new_mem_buf(void *a, int b);
+ int q_BIO_read(BIO *a, void *b, int c);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ BIO_METHOD *q_BIO_s_mem();
++#else
++const BIO_METHOD *q_BIO_s_mem();
++#endif
+ int q_BIO_write(BIO *a, const void *b, int c);
+ int q_BN_num_bits(const BIGNUM *a);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ int q_CRYPTO_num_locks();
+ void q_CRYPTO_set_locking_callback(void (*a)(int, int, const char *, int));
+ void q_CRYPTO_set_id_callback(unsigned long (*a)());
+ void q_CRYPTO_free(void *a);
++#else
++#define q_CRYPTO_num_locks() 1
++#define q_CRYPTO_set_locking_callback(a)
++#define q_CRYPTO_set_id_callback(a)
++void q_CRYPTO_free(void *a, const char *b, int c);
++#endif
+ void q_DSA_free(DSA *a);
+ #if OPENSSL_VERSION_NUMBER >= 0x00908000L
+ // 0.9.8 broke SC and BC by changing this function's signature.
+@@ -258,6 +273,7 @@
+ void q_RAND_seed(const void *a, int b);
+ int q_RAND_status();
+ void q_RSA_free(RSA *a);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ int q_sk_num(STACK *a);
+ void q_sk_pop_free(STACK *a, void (*b)(void *));
+ #if OPENSSL_VERSION_NUMBER >= 0x10000000L
+@@ -267,6 +283,16 @@
+ void q_sk_free(STACK *a);
+ char * q_sk_value(STACK *a, int b);
+ #endif
++#else
++int q_OPENSSL_sk_num(STACK *a);
++void q_OPENSSL_sk_pop_free(STACK *a, void (*b)(void *));
++void q_OPENSSL_sk_free(_STACK *a);
++void * q_OPENSSL_sk_value(STACK *a, int b);
++#define q_sk_num q_OPENSSL_sk_num
++#define q_sk_pop_free q_OPENSSL_sk_pop_free
++#define q_sk_free q_OPENSSL_sk_free
++#define q_sk_value q_OPENSSL_sk_value
++#endif
+ int q_SSL_accept(SSL *a);
+ int q_SSL_clear(SSL *a);
+ char *q_SSL_CIPHER_description(SSL_CIPHER *a, char *b, int c);
+@@ -314,8 +340,14 @@
+ #else
+ long q_SSL_get_verify_result(SSL *a);
+ #endif
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ int q_SSL_library_init();
+ void q_SSL_load_error_strings();
++#else
++int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
++#define q_SSL_library_init() q_OPENSSL_init_ssl(0, (const OPENSSL_INIT_SETTINGS *) NULL)
++#define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, (const OPENSSL_INIT_SETTINGS *) NULL)
++#endif
+ SSL *q_SSL_new(SSL_CTX *a);
+ #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
+ long q_SSL_ctrl(SSL *ssl,int cmd, long larg, void *parg);
+@@ -328,11 +360,21 @@
+ #if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ const SSL_METHOD *q_SSLv2_client_method();
+ const SSL_METHOD *q_SSLv3_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ const SSL_METHOD *q_SSLv23_client_method();
++#else
++const SSL_METHOD *q_TLS_client_method();
++#define q_SSLv23_client_method q_TLS_client_method
++#endif
+ const SSL_METHOD *q_TLSv1_client_method();
+ const SSL_METHOD *q_SSLv2_server_method();
+ const SSL_METHOD *q_SSLv3_server_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ const SSL_METHOD *q_SSLv23_server_method();
++#else
++const SSL_METHOD *q_TLS_server_method();
++#define q_SSLv23_server_method q_TLS_server_method
++#endif
+ const SSL_METHOD *q_TLSv1_server_method();
+ #else
+ SSL_METHOD *q_SSLv2_client_method();
+@@ -377,7 +419,12 @@
+ int q_X509_STORE_CTX_get_error(X509_STORE_CTX *ctx);
+ int q_X509_STORE_CTX_get_error_depth(X509_STORE_CTX *ctx);
+ X509 *q_X509_STORE_CTX_get_current_cert(X509_STORE_CTX *ctx);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ STACK_OF(X509) *q_X509_STORE_CTX_get_chain(X509_STORE_CTX *ctx);
++#else
++STACK_OF(X509) *q_X509_STORE_CTX_get0_chain(X509_STORE_CTX *ctx);
++#define q_X509_STORE_CTX_get_chain q_X509_STORE_CTX_get0_chain
++#endif
+ 
+ #define q_BIO_get_mem_data(b, pp) (int)q_BIO_ctrl(b,BIO_CTRL_INFO,0,(char *)pp)
+ #define q_BIO_pending(b) (int)q_BIO_ctrl(b,BIO_CTRL_PENDING,0,NULL)
+@@ -399,7 +446,25 @@
+ 		PEM_ASN1_write_bio((int (*)(void*, unsigned char**))q_i2d_DSAPrivateKey,PEM_STRING_DSA,\
+ 			bp,(char *)x,enc,kstr,klen,cb,u)
+ #endif
++
++X509_STORE * q_SSL_CTX_get_cert_store(const SSL_CTX *ctx);
++ASN1_INTEGER * q_X509_get_serialNumber(X509 *x);
++
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ #define q_SSL_CTX_set_options(ctx,op) q_SSL_CTX_ctrl((ctx),SSL_CTRL_OPTIONS,(op),NULL)
++#define q_X509_get_version(x) X509_get_version(x)
++#else
++int q_EVP_PKEY_id(const EVP_PKEY *pkey);
++int q_EVP_PKEY_base_id(const EVP_PKEY *pkey);
++int q_SSL_CIPHER_get_bits(const SSL_CIPHER *cipher, int *alg_bits);
++long q_SSL_CTX_set_options(SSL_CTX *ctx, long options);
++long q_X509_get_version(X509 *x);
++X509_PUBKEY * q_X509_get_X509_PUBKEY(X509 *x);
++int q_RSA_bits(const RSA *rsa);
++int q_DSA_security_bits(const DSA *dsa);
++void q_DSA_get0_pqg(const DSA *d, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g);
++#endif
++
+ #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
+ #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
+ #define q_sk_GENERAL_NAME_num(st) q_SKM_sk_num(GENERAL_NAME, (st))
+@@ -410,8 +475,17 @@
+ #define q_sk_SSL_CIPHER_value(st, i) q_SKM_sk_value(SSL_CIPHER, (st), (i))
+ #define q_SSL_CTX_add_extra_chain_cert(ctx,x509) \
+         q_SSL_CTX_ctrl(ctx,SSL_CTRL_EXTRA_CHAIN_CERT,0,(char *)x509)
++
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ #define q_X509_get_notAfter(x) X509_get_notAfter(x)
+ #define q_X509_get_notBefore(x) X509_get_notBefore(x)
++#else
++ASN1_TIME *q_X509_getm_notAfter(X509 *x);
++ASN1_TIME *q_X509_getm_notBefore(X509 *x);
++#define q_X509_get_notAfter(x) q_X509_getm_notAfter(x)
++#define q_X509_get_notBefore(x) q_X509_getm_notBefore(x)
++#endif
++
+ #define q_EVP_PKEY_assign_RSA(pkey,rsa) q_EVP_PKEY_assign((pkey),EVP_PKEY_RSA,\
+ 					(char *)(rsa))
+ #define q_EVP_PKEY_assign_DSA(pkey,dsa) q_EVP_PKEY_assign((pkey),EVP_PKEY_DSA,\
+@@ -421,10 +495,21 @@
+ #else
+ #define q_OpenSSL_add_all_algorithms() q_OPENSSL_add_all_algorithms_noconf()
+ #endif
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ void q_OPENSSL_add_all_algorithms_noconf();
+ void q_OPENSSL_add_all_algorithms_conf();
++#else
++int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
++#define q_OPENSSL_add_all_algorithms_conf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS | OPENSSL_INIT_ADD_ALL_DIGESTS | OPENSSL_INIT_LOAD_CONFIG, (const OPENSSL_INIT_SETTINGS *) NULL)
++#  define q_OPENSSL_add_all_algorithms_noconf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS | OPENSSL_INIT_ADD_ALL_DIGESTS, (const OPENSSL_INIT_SETTINGS *) NULL)
++#endif
+ int q_SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile, const char *CApath);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ long q_SSLeay();
++#else
++unsigned long q_OpenSSL_version_num();
++#define q_SSLeay q_OpenSSL_version_num
++#endif
+ 
+ // Helper function
+ class QDateTime;

qt-everywhere-opensource-src-4.8.7-qmake_LFLAGS.patch

@@ -0,0 +1,12 @@
+diff -up qt-everywhere-opensource-src-4.8.7/qmake/Makefile.unix.qmake_LFLAGS qt-everywhere-opensource-src-4.8.7/qmake/Makefile.unix
+--- qt-everywhere-opensource-src-4.8.7/qmake/Makefile.unix.qmake_LFLAGS	2015-05-07 09:14:42.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.7/qmake/Makefile.unix	2018-02-15 08:25:13.168838577 -0600
+@@ -3,7 +3,7 @@ BUILD_PATH = @BUILD_PATH@
+ QTOBJS = @QMAKE_QTOBJS@
+ QTSRCS = @QMAKE_QTSRCS@
+ QMAKESPEC = @QMAKESPEC@
+-LFLAGS = @QMAKE_LFLAGS@
++LFLAGS = @QMAKE_LFLAGS@ $(QMAKE_LFLAGS_RELEASE)
+ 
+ #qmake code
+ OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o  \

qt-prefer_adwaita_on_gnome.patch

@@ -0,0 +1,17 @@
+--- src/gui/kernel/qguiplatformplugin.cpp.adwaita	2015-02-12 14:32:45.217935391 +0100
++++ src/gui/kernel/qguiplatformplugin.cpp	2015-02-12 14:46:11.471866038 +0100
+@@ -165,8 +165,13 @@ QString QGuiPlatformPlugin::styleName()
+     case DE_GNOME: {
+         QStringList availableStyles = QStyleFactory::keys();
+         // Set QGtkStyle for GNOME if available
++        QString adwaitaStyleKey = QString::fromLatin1("adwaita");
+         QString gtkStyleKey = QString::fromLatin1("GTK+");
+-        if (availableStyles.contains(gtkStyleKey)) {
++        if (availableStyles.contains(adwaitaStyleKey)) {
++            stylename = adwaitaStyleKey;
++            break;
++        }
++        else if (availableStyles.contains(gtkStyleKey)) {
+             stylename = gtkStyleKey;
+             break;
+         }

qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch

@@ -1,10 +0,0 @@
---- qt-x11-opensource-src-4.2.2/qmake/project.cpp.QMAKEPATH	2006-11-27 11:26:03.000000000 -0600
-+++ qt-x11-opensource-src-4.2.2/qmake/project.cpp	2007-02-26 13:45:39.000000000 -0600
-@@ -498,6 +498,7 @@
-             ret << ((*it) + concat);
-     }
-     ret << QLibraryInfo::location(QLibraryInfo::DataPath) + concat;
-+    ret << QLibraryInfo::location(QLibraryInfo::PrefixPath) + concat;
- 
-     return ret;
- }

qt-x11-opensource-src-4.2.2-multilib-optflags.patch

@@ -1,33 +0,0 @@
---- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-64/qmake.conf.multilib	2006-11-27 11:26:42.000000000 -0600
-+++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-64/qmake.conf	2007-02-26 15:01:02.000000000 -0600
-@@ -14,6 +14,8 @@
- QMAKE_CFLAGS		= -m64
- QMAKE_LFLAGS		= -m64
- 
-+QMAKE_CFLAGS_RELEASE	+= -O2
-+
- include(../common/g++.conf)
- include(../common/linux.conf)
- 
---- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-32/qmake.conf.multilib	2006-11-27 11:26:42.000000000 -0600
-+++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-32/qmake.conf	2007-02-26 15:01:34.000000000 -0600
-@@ -11,6 +11,8 @@
- QMAKE_CFLAGS		= -m32
- QMAKE_LFLAGS		= -m32
- 
-+QMAKE_CFLAGS_RELEASE	+= -O2
-+
- include(../common/g++.conf)
- include(../common/linux.conf)
- load(qt_config)
---- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++/qmake.conf.multilib	2006-11-27 11:26:42.000000000 -0600
-+++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++/qmake.conf	2007-02-26 15:01:26.000000000 -0600
-@@ -8,6 +8,8 @@
- QT			+= core gui
- QMAKE_INCREMENTAL_STYLE = sublib
- 
-+QMAKE_CFLAGS_RELEASE	+= -O2
-+
- include(../common/g++.conf)
- include(../common/linux.conf)
- load(qt_config)

qt-x11-opensource-src-4.5.0-gcc_hack.patch

@@ -1,14 +0,0 @@
-diff -up qt-x11-opensource-src-4.5.0/src/corelib/tools/qstring.cpp.gcc_hack qt-x11-opensource-src-4.5.0/src/corelib/tools/qstring.cpp
---- qt-x11-opensource-src-4.5.0/src/corelib/tools/qstring.cpp.gcc_hack	2009-02-25 15:09:22.000000000 -0600
-+++ qt-x11-opensource-src-4.5.0/src/corelib/tools/qstring.cpp	2009-03-27 11:56:51.000000000 -0500
-@@ -102,8 +102,8 @@ static QHash<void *, QByteArray> *asciiC
- // internal
- int qFindString(const QChar *haystack, int haystackLen, int from,
-     const QChar *needle, int needleLen, Qt::CaseSensitivity cs);
--int qFindStringBoyerMoore(const QChar *haystack, int haystackLen, int from,
--    const QChar *needle, int needleLen, Qt::CaseSensitivity cs);
-+//int qFindStringBoyerMoore(const QChar *haystack, int haystackLen, int from,
-+//    const QChar *needle, int needleLen, Qt::CaseSensitivity cs);
- 
- 
- // Unicode case-insensitive comparison

qt-x11-opensource-src-4.5.0-qdoc3.patch

@@ -1,21 +0,0 @@
-diff -ur qt-orig/tools/qdoc3/qdoc3.pro qt-4.5.2/tools/qdoc3/qdoc3.pro
---- qt-orig/tools/qdoc3/qdoc3.pro	2009-06-20 06:57:59.000000000 +0200
-+++ qt-4.5.2/tools/qdoc3/qdoc3.pro	2009-06-25 20:00:12.000000000 +0200
-@@ -99,3 +99,6 @@
-            webxmlgenerator.cpp \
- 	   yyindent.cpp
- 
-+TARGET= qdoc3
-+target.path = $$[QT_INSTALL_BINS]
-+INSTALLS += target
-diff -ur qt-orig/tools/tools.pro qt-4.5.2/tools/tools.pro
---- qt-orig/tools/tools.pro	2009-06-20 06:57:59.000000000 +0200
-+++ qt-4.5.2/tools/tools.pro	2009-06-25 19:59:19.000000000 +0200
-@@ -13,6 +13,7 @@
-          SUBDIRS += designer
-      }
-      SUBDIRS     += linguist
-+     SUBDIRS     += qdoc3
-      wince*: SUBDIRS = qtestlib designer
-      unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
-      win32:!wince*:SUBDIRS += activeqt

qt-x11-opensource-src-4.5.1-kde4_plugins.patch

@@ -1,19 +0,0 @@
-diff -up qt-x11-opensource-src-4.5.1/src/corelib/kernel/qcoreapplication.cpp.kde4_plugins qt-x11-opensource-src-4.5.1/src/corelib/kernel/qcoreapplication.cpp
---- qt-x11-opensource-src-4.5.1/src/corelib/kernel/qcoreapplication.cpp.kde4_plugins	2009-04-21 18:57:41.000000000 -0500
-+++ qt-x11-opensource-src-4.5.1/src/corelib/kernel/qcoreapplication.cpp	2009-05-06 13:53:40.258081854 -0500
-@@ -2061,6 +2061,15 @@ QStringList QCoreApplication::libraryPat
-                 app_libpaths->append(installPathPlugins);
-         }
- 
-+        // hack in support for kde4 plugin paths -- Rex
-+        QString kde4PathPlugins = QLibraryInfo::location(QLibraryInfo::LibrariesPath) + QLatin1String("/kde4/plugins");
-+        if (QFile::exists(kde4PathPlugins)) {
-+            // Make sure we convert from backslashes to slashes.
-+            // kde4PathPlugins = QDir(kde4PathPlugins).canonicalPath();
-+            if (!app_libpaths->contains(kde4PathPlugins))
-+                app_libpaths->append(kde4PathPlugins);
-+        }
-+
-         // If QCoreApplication is not yet instantiated,
-         // make sure we add the application path when we construct the QCoreApplication
-         if (self) self->d_func()->appendApplicationPathToLibraryPaths();

qt-x11-opensource-src-4.5.1-mysql_config.patch

@@ -1,27 +0,0 @@
-diff -up qt-x11-opensource-src-4.5.1/configure.mysql_config qt-x11-opensource-src-4.5.1/configure
---- qt-x11-opensource-src-4.5.1/configure.mysql_config	2009-05-04 09:14:37.105826464 -0500
-+++ qt-x11-opensource-src-4.5.1/configure	2009-05-04 09:15:26.747077312 -0500
-@@ -4334,6 +4334,7 @@ if [ "$CFG_ACCESSIBILITY" = "auto" ]; th
-     CFG_ACCESSIBILITY=yes
- fi
- 
-+set -x
- # auto-detect SQL-modules support
- for _SQLDR in $CFG_SQL_AVAILABLE; do
-         case $_SQLDR in
-@@ -4342,8 +4343,15 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
- 		[ -z "$CFG_MYSQL_CONFIG" ] && CFG_MYSQL_CONFIG=`$WHICH mysql_config`
-                 if [ -x "$CFG_MYSQL_CONFIG" ]; then
-                     QT_CFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --include 2>/dev/null`
-+                    $CFG_MYSQL_CONFIG --pkglibdir &>/dev/null && \
-+                      QT_MYSQL_PKGLIBDIR=`$CFG_MYSQL_CONFIG --pkglibdir 2>/dev/null`
-+                    if [ -n "$QT_MYSQL_PKGLIBDIR" ]; then
-+                    QT_LFLAGS_MYSQL_R="-L$QT_MYSQL_PKGLIBDIR -lmysqlclient_r"
-+                    QT_LFLAGS_MYSQL="-L$QT_MYSQL_PKGLIBDIR -lmysqlclient"
-+                    else
-                     QT_LFLAGS_MYSQL_R=`$CFG_MYSQL_CONFIG --libs_r 2>/dev/null`
-                     QT_LFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --libs 2>/dev/null`
-+                    fi
- 		    QT_MYSQL_VERSION=`$CFG_MYSQL_CONFIG --version 2>/dev/null`
-                     QT_MYSQL_VERSION_MAJOR=`echo $QT_MYSQL_VERSION | cut -d . -f 1`
-                 fi

qt-x11-opensource-src-4.5.1-phonon.patch

@@ -1,38 +0,0 @@
-diff -ur qt-orig/src/phonon/phonon.pro qt-x11-opensource-src-4.5.2/src/phonon/phonon.pro
---- qt-orig/src/phonon/phonon.pro	2009-06-20 06:57:57.000000000 +0200
-+++ qt-x11-opensource-src-4.5.2/src/phonon/phonon.pro	2009-06-25 19:30:00.000000000 +0200
-@@ -112,4 +112,9 @@
-        DEFINES += QT_NO_DBUS
- }
- 
-+# install dbus service file
-+sources.files = $$PHONON_DIR/org.kde.Phonon.AudioOutput.xml
-+sources.path = /usr/share/dbus-1/interfaces
-+INSTALLS += sources
-+
- contains(QT_CONFIG, reduce_exports): CONFIG += hide_symbols
-diff -ur qt-orig/src/plugins/phonon/gstreamer/gstreamer.pro qt-x11-opensource-src-4.5.2/src/plugins/phonon/gstreamer/gstreamer.pro
---- qt-orig/src/plugins/phonon/gstreamer/gstreamer.pro	2009-06-20 06:57:58.000000000 +0200
-+++ qt-x11-opensource-src-4.5.2/src/plugins/phonon/gstreamer/gstreamer.pro	2009-06-25 19:31:36.000000000 +0200
-@@ -62,6 +62,8 @@
- }
- 
- target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend
--INSTALLS += target
-+services.files = $$PHONON_GSTREAMER_DIR/gstreamer.desktop
-+services.path = /usr/share/kde4/services/phononbackends
-+INSTALLS += target services
- 
- include(../../qpluginbase.pri)
-diff -ur qt-orig/src/3rdparty/phonon/gstreamer/gstreamer.desktop qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/gstreamer.desktop
---- qt-orig/src/3rdparty/phonon/gstreamer/gstreamer.desktop	2009-06-20 06:57:54.000000000 +0200
-+++ qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/gstreamer.desktop	2009-06-25 19:30:00.000000000 +0200
-@@ -2,7 +2,7 @@
- Type=Service
- X-KDE-ServiceTypes=PhononBackend
- MimeType=application/x-annodex;video/quicktime;video/x-quicktime;audio/x-m4a;application/x-quicktimeplayer;video/mkv;video/msvideo;video/x-msvideo;video/x-flic;audio/x-aiff;audio/aiff;audio/x-pn-aiff;audio/x-realaudio;audio/basic;audio/x-basic;audio/x-pn-au;audio/x-8svx;audio/8svx;audio/x-16sv;audio/168sv;image/x-ilbm;image/ilbm;video/x-anim;video/anim;image/png;image/x-png;video/mng;video/x-mng;audio/x-ogg;audio/x-speex+ogg;application/ogg;application/ogg;audio/vnd.rn-realaudio;audio/x-pn-realaudio-plugin;audio/x-real-audio;application/vnd.rn-realmedia;video/mpeg;video/x-mpeg;audio/x-wav;audio/wav;audio/x-pn-wav;audio/x-pn-windows-acm;audio/mpeg2;audio/x-mpeg2;audio/mpeg3;audio/x-mpeg3;audio/mpeg;audio/x-mpeg;x-mpegurl;audio/x-mpegurl;audio/mp3;audio/mpeg;
--X-KDE-Library=phonon_gstreamer
-+X-KDE-Library=libphonon_gstreamer
- X-KDE-PhononBackendInfo-InterfaceVersion=1
- X-KDE-PhononBackendInfo-Version=0.1
- X-KDE-PhononBackendInfo-Website=http://gstreamer.freedesktop.org/

qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch

@@ -1,60 +0,0 @@
-diff -up qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/audiooutput.cpp.than qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/audiooutput.cpp
---- qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/audiooutput.cpp.than	2009-08-16 14:20:43.000000000 +0200
-+++ qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/audiooutput.cpp	2009-08-16 14:45:56.000000000 +0200
-@@ -141,7 +141,9 @@ bool AudioOutput::setOutputDevice(int ne
-         // Save previous state
-         GstState oldState = GST_STATE(m_audioSink);
-         const QByteArray oldDeviceValue = GstHelper::property(m_audioSink, "device");
--        const QByteArray deviceId = deviceList.at(newDevice).gstId;
-+        const QByteArray deviceId = (deviceList.at(newDevice).gstId == "PulseAudio"
-+                                     ? "default"
-+                                     : deviceList.at(newDevice).gstId);
-         m_device = newDevice;
- 
-         // We test if the device can be opened by checking if it can go from NULL to READY state
-diff -up qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/devicemanager.cpp.than qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/devicemanager.cpp
---- qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/devicemanager.cpp.than	2009-08-15 12:39:08.000000000 +0200
-+++ qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/devicemanager.cpp	2009-08-16 14:45:13.000000000 +0200
-@@ -50,6 +50,8 @@ AudioDevice::AudioDevice(DeviceManager *
-     //get name from device
-     if (gstId == "default") {
-         description = "Default audio device";
-+    } else if (gstId == "PulseAudio") {
-+        description = QObject::tr("Pass all audio through the PulseAudio Sound Server.\n").toUtf8();
-     } else {
-         GstElement *aSink= manager->createAudioSink();
- 
-@@ -175,6 +177,18 @@ GstElement *DeviceManager::createAudioSi
-                 }
-             }
- 
-+            if (!sink) {
-+                sink = gst_element_factory_make ("pulsesink", NULL);
-+                if (canOpenDevice(sink)) {
-+                    m_backend->logMessage("AudioOutput using pulse audio sink");
-+                    m_audioSink = "pulsesink";
-+                }
-+                else if (sink) {
-+                    gst_object_unref(sink);
-+                    sink = 0;
-+                }
-+            }
-+
- #ifdef USE_ALSASINK2
-             if (!sink) {
-                 sink = gst_element_factory_make ("_k_alsasink", NULL);
-@@ -306,8 +320,12 @@ void DeviceManager::updateDeviceList()
-     QList<QByteArray> list;
- 
-     if (audioSink) {
--        list = GstHelper::extractProperties(audioSink, "device");
--        list.prepend("default");
-+        if (m_audioSink == "pulsesink") {
-+            list.append("PulseAudio");
-+        } else {
-+            list = GstHelper::extractProperties(audioSink, "device");
-+            list.prepend("default");
-+        }
- 
-         for (int i = 0 ; i < list.size() ; ++i) {
-             QByteArray gstId = list.at(i);

qt-x11-opensource-src-4.5.2-pulseaudio.patch

@@ -1,43 +0,0 @@
-diff -up qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/phonon/globalconfig.cpp.phonon-pulseaudio qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/phonon/globalconfig.cpp
---- qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/phonon/globalconfig.cpp.phonon-pulseaudio	2009-06-20 06:57:54.000000000 +0200
-+++ qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/phonon/globalconfig.cpp	2009-08-21 00:11:55.000000000 +0200
-@@ -31,6 +31,7 @@
- #include "phononnamespace_p.h"
- 
- #include <QtCore/QList>
-+#include <QtCore/QHash>
- #include <QtCore/QVariant>
- 
- QT_BEGIN_NAMESPACE
-@@ -167,6 +168,15 @@ QList<int> GlobalConfig::audioOutputDevi
-                     | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
-                     );
-         }
-+        // make PulseAudio the global default (assume it is already default in this list)
-+        if (!list.isEmpty()) {
-+            int firstIndex = list.first();
-+            if (backendIface->objectDescriptionProperties(Phonon::AudioOutputDeviceType,
-+                  firstIndex)["name"].toString() == "PulseAudio") {
-+                list.removeFirst();
-+                defaultList.prepend(firstIndex);
-+            }
-+        }
-         defaultList += list;
-     }
- 
-@@ -222,6 +232,15 @@ QList<int> GlobalConfig::audioCaptureDev
-                     | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
-                   );
-         }
-+        // make PulseAudio the global default (assume it is already default in this list)
-+        if (!list.isEmpty()) {
-+            int firstIndex = list.first();
-+            if (backendIface->objectDescriptionProperties(Phonon::AudioCaptureDeviceType,
-+                  firstIndex)["name"].toString() == "PulseAudio") {
-+                list.removeFirst();
-+                defaultList.prepend(firstIndex);
-+            }
-+        }
-         defaultList += list;
-     }
- 

qt-x11-opensource-src-4.5.3-cve-2009-2816-cors.patch

@@ -1,11 +0,0 @@
-diff -up qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/WebCore/xml/XMLHttpRequest.cpp.cve-2009-2816-cors qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/WebCore/xml/XMLHttpRequest.cpp
---- qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/WebCore/xml/XMLHttpRequest.cpp.cve-2009-2816-cors	2009-09-29 13:01:37.000000000 +0200
-+++ qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/WebCore/xml/XMLHttpRequest.cpp	2009-11-03 13:47:52.974837432 +0100
-@@ -735,7 +735,6 @@ void XMLHttpRequest::makeCrossSiteAccess
-             }
- 
-             preflightRequest.setHTTPHeaderField("Access-Control-Request-Headers", String::adopt(headerBuffer));
--            preflightRequest.addHTTPHeaderFields(m_requestHeaders);
-         }
- 
-         if (m_async) {

qt-x11-opensource-src-4.5.3-cve-2009-3384-ftp-ls-handling.patch

@@ -1,284 +0,0 @@
-diff -U0 qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/WebCore/ChangeLog.cve-2009-3384-ftp-ls-handling qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/WebCore/ChangeLog
---- qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/WebCore/ChangeLog.cve-2009-3384-ftp-ls-handling	2009-09-29 13:01:35.000000000 +0200
-+++ qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/WebCore/ChangeLog	2009-11-03 14:53:34.008898552 +0100
-@@ -0,0 +1,14 @@
-+2009-09-24  Brady Eidson  <beidson@apple.com>
-+
-+        Reviewed by Sam Weinig.
-+
-+        Merge changes from Mozilla's FTP directory parser.
-+        <rdar://problem/7227620> and https://bugs.webkit.org/show_bug.cgi?id=29294
-+
-+        FTP layout tests not possible at this time.
-+        https://bugs.webkit.org/show_bug.cgi?id=29719 tracks making them possible.
-+
-+        * loader/FTPDirectoryParser.cpp:
-+        (WebCore::ParsingFailed):
-+        (WebCore::parseOneFTPLine):
-+
-diff -up qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/WebCore/loader/FTPDirectoryParser.cpp.cve-2009-3384-ftp-ls-handling qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/WebCore/loader/FTPDirectoryParser.cpp
---- qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/WebCore/loader/FTPDirectoryParser.cpp.cve-2009-3384-ftp-ls-handling	2009-09-29 13:01:36.000000000 +0200
-+++ qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/WebCore/loader/FTPDirectoryParser.cpp	2009-11-03 14:53:34.044898565 +0100
-@@ -53,6 +53,13 @@ static struct tm *gmtimeQt(const time_t 
- #define gmtime_r(x, y) gmtime_s((y), (x))
- #endif
- 
-+static inline FTPEntryType ParsingFailed(ListState& state)
-+{
-+  if (state.parsedOne || state.listStyle) /* junk if we fail to parse */
-+    return FTPJunkEntry;      /* this time but had previously parsed sucessfully */
-+  return FTPMiscEntry;        /* its part of a comment or error message */
-+}
-+
- FTPEntryType parseOneFTPLine(const char* line, ListState& state, ListResult& result)
- {
-   result.clear();
-@@ -122,6 +129,9 @@ FTPEntryType parseOneFTPLine(const char*
-       }
-     }    
- 
-+    if (!numtoks)
-+      return ParsingFailed(state);
-+
-     linelen_sans_wsp = &(tokens[numtoks-1][toklen[numtoks-1]]) - tokens[0];
-     if (numtoks == (sizeof(tokens)/sizeof(tokens[0])) )
-     {
-@@ -352,11 +362,16 @@ FTPEntryType parseOneFTPLine(const char*
-               pos++;
-               p++;
-             }
--            if (lstyle && pos < (toklen[0]-1) && *p == ']')
-+            if (lstyle && pos < (toklen[0]-1))
-             {
-+              /* ']' was found and there is at least one character after it */
-+              ASSERT(*p == ']');
-               pos++;
-               p++;
-               tokmarker = pos; /* length of leading "[DIR1.DIR2.etc]" */
-+            } else {
-+              /* not a CMU style listing */
-+              lstyle = 0;
-             }
-           }
-           while (lstyle && pos < toklen[0] && *p != ';')
-@@ -383,7 +398,7 @@ FTPEntryType parseOneFTPLine(const char*
-           pos -= tokmarker;      /* => fnlength sans "[DIR1.DIR2.etc]" */
-           p = &(tokens[0][tokmarker]); /* offset of basename */
- 
--          if (!lstyle || pos > 80) /* VMS filenames can't be longer than that */
-+          if (!lstyle || pos == 0 || pos > 80) /* VMS filenames can't be longer than that */
-           {
-             lstyle = 0;
-           }
-@@ -776,7 +791,7 @@ FTPEntryType parseOneFTPLine(const char*
-         state.parsedOne = true;
-         state.listStyle = lstyle;
- 
--        p = &(line[linelen_sans_wsp]); /* line end sans wsp */
-+        p = &(line[linelen]); /* line end */
-         result.caseSensitive = true;
-         result.filename = tokens[3];
-         result.filenameLength = p - tokens[3];
-@@ -784,29 +799,46 @@ FTPEntryType parseOneFTPLine(const char*
- 
-         if (*tokens[2] != '<') /* not <DIR> or <JUNCTION> */
-         {
-+          // try to handle correctly spaces at the beginning of the filename
-+          // filesize (token[2]) must end at offset 38
-+          if (tokens[2] + toklen[2] - line == 38) {
-+            result.filename = &(line[39]);
-+            result.filenameLength = p - result.filename;
-+          }
-           result.type = FTPFileEntry;
-           pos = toklen[2];
-           result.fileSize = String(tokens[2], pos);
-         }
--        else if ((tokens[2][1]) != 'D') /* not <DIR> */
--        {
--          result.type = FTPJunkEntry; /* unknown until junc for sure */
--          if (result.filenameLength > 4)
-+        else {
-+          // try to handle correctly spaces at the beginning of the filename
-+          // token[2] must begin at offset 24, the length is 5 or 10
-+          // token[3] must begin at offset 39 or higher
-+          if (tokens[2] - line == 24 && (toklen[2] == 5 || toklen[2] == 10) &&
-+              tokens[3] - line >= 39) {
-+            result.filename = &(line[39]);
-+            result.filenameLength = p - result.filename;
-+          }
-+
-+          if ((tokens[2][1]) != 'D') /* not <DIR> */
-           {
--            p = result.filename;
--            for (pos = result.filenameLength - 4; pos > 0; pos--)
-+            result.type = FTPJunkEntry; /* unknown until junc for sure */
-+            if (result.filenameLength > 4)
-             {
--              if (p[0] == ' ' && p[3] == ' ' && p[2] == '>' &&
--                  (p[1] == '=' || p[1] == '-'))
-+              p = result.filename;
-+              for (pos = result.filenameLength - 4; pos > 0; pos--)
-               {
--                result.type = FTPLinkEntry;
--                result.filenameLength = p - result.filename;
--                result.linkname = p + 4;
--                result.linknameLength = &(line[linelen_sans_wsp]) 
--                                   - result.linkname;
--                break;
-+                if (p[0] == ' ' && p[3] == ' ' && p[2] == '>' &&
-+                    (p[1] == '=' || p[1] == '-'))
-+                {
-+                  result.type = FTPLinkEntry;
-+                  result.filenameLength = p - result.filename;
-+                  result.linkname = p + 4;
-+                  result.linknameLength = &(line[linelen]) 
-+                                     - result.linkname;
-+                  break;
-+                }
-+                p++;
-               }
--              p++;
-             }    
-           }
-         }
-@@ -817,8 +849,13 @@ FTPEntryType parseOneFTPLine(const char*
-           result.modifiedTime.tm_mon--;
-           result.modifiedTime.tm_mday = atoi(tokens[0]+3);
-           result.modifiedTime.tm_year = atoi(tokens[0]+6);
-+          /* if year has only two digits then assume that
-+               00-79 is 2000-2079
-+               80-99 is 1980-1999 */
-           if (result.modifiedTime.tm_year < 80)
--            result.modifiedTime.tm_year += 100;
-+            result.modifiedTime.tm_year += 2000;
-+          else if (result.modifiedTime.tm_year < 100)
-+            result.modifiedTime.tm_year += 1900;
-         }
- 
-         result.modifiedTime.tm_hour = atoi(tokens[1]+0);
-@@ -970,6 +1007,8 @@ FTPEntryType parseOneFTPLine(const char*
-        * "drwxr-xr-x  2 0  0  512 May 28 22:17 etc"
-       */
-     
-+      bool isOldHellsoft = false;
-+    
-       if (numtoks >= 6)
-       {
-         /* there are two perm formats (Hellsoft/NetWare and *IX strmode(3)).
-@@ -995,6 +1034,8 @@ FTPEntryType parseOneFTPLine(const char*
-             {
-               /* rest is FMA[S] or AFM[S] */
-               lstyle = 'U'; /* very likely one of the NetWare servers */
-+              if (toklen[0] == 10)
-+                isOldHellsoft = true;
-             }
-           }
-         }
-@@ -1059,7 +1100,7 @@ FTPEntryType parseOneFTPLine(const char*
- 
-             /* check that size is numeric */
-             p = tokens[tokmarker];
--            for (pos = 0; lstyle && pos < toklen[tokmarker]; pos++)
-+            for (unsigned int i = 0; lstyle && i < toklen[tokmarker]; ++i)
-             {
-               if (!isASCIIDigit(*p++))
-                 lstyle = 0;
-@@ -1068,11 +1109,11 @@ FTPEntryType parseOneFTPLine(const char*
-             {
-               month_num = 0;
-               p = tokens[tokmarker+1];
--              for (pos = 0;pos < (12*3); pos+=3)
-+              for (unsigned int i = 0; i < (12*3); i+=3)
-               {
--                if (p[0] == month_names[pos+0] && 
--                    p[1] == month_names[pos+1] && 
--                    p[2] == month_names[pos+2])
-+                if (p[0] == month_names[i+0] && 
-+                    p[1] == month_names[i+1] && 
-+                    p[2] == month_names[i+2])
-                   break;
-                 month_num++;
-               }
-@@ -1080,8 +1121,8 @@ FTPEntryType parseOneFTPLine(const char*
-                 lstyle = 0;
-             }
-           } /* relative position test */
--        } /* while (pos+5) < numtoks */
--      } /* if (numtoks >= 4) */
-+        } /* for (pos = (numtoks-5); !lstyle && pos > 1; pos--) */
-+      } /* if (lstyle == 'U') */
- 
-       if (lstyle == 'U')
-       {
-@@ -1140,24 +1181,49 @@ FTPEntryType parseOneFTPLine(const char*
-        
-         } /* time/year */
-         
--        result.filename = tokens[tokmarker+4];
--        result.filenameLength = (&(line[linelen_sans_wsp]))
-+        // there is exacly 1 space between filename and previous token in all
-+        // outputs except old Hellsoft
-+        if (!isOldHellsoft)
-+          result.filename = tokens[tokmarker+3] + toklen[tokmarker+3] + 1;
-+        else
-+          result.filename = tokens[tokmarker+4];
-+
-+        result.filenameLength = (&(line[linelen]))
-                            - (result.filename);
- 
-         if (result.type == FTPLinkEntry && result.filenameLength > 4)
-         {
--          p = result.filename + 1;
--          for (pos = 1; pos < (result.filenameLength - 4); pos++)
-+          /* First try to use result.fe_size to find " -> " sequence.
-+             This can give proper result for cases like "aaa -> bbb -> ccc". */
-+          unsigned int fileSize = result.fileSize.toUInt();
-+
-+          if (result.filenameLength > (fileSize + 4) &&
-+              strncmp(result.filename + result.filenameLength - fileSize - 4, " -> ", 4) == 0)
-+          {
-+            result.linkname = result.filename + (result.filenameLength - fileSize);
-+            result.linknameLength = (&(line[linelen])) - (result.linkname);
-+            result.filenameLength -= fileSize + 4;
-+          }
-+          else
-           {
--            if (*p == ' ' && p[1] == '-' && p[2] == '>' && p[3] == ' ')
-+            /* Search for sequence " -> " from the end for case when there are
-+               more occurrences. F.e. if ftpd returns "a -> b -> c" assume
-+               "a -> b" as a name. Powerusers can remove unnecessary parts
-+               manually but there is no way to follow the link when some
-+               essential part is missing. */
-+            p = result.filename + (result.filenameLength - 5);
-+            for (pos = (result.filenameLength - 5); pos > 0; pos--)
-             {
--              result.linkname = p + 4;
--              result.linknameLength = (&(line[linelen_sans_wsp]))
--                               - (result.linkname);
--              result.filenameLength = pos;
--              break;
-+              if (strncmp(p, " -> ", 4) == 0)
-+              {
-+                result.linkname = p + 4;
-+                result.linknameLength = (&(line[linelen]))
-+                                 - (result.linkname);
-+                result.filenameLength = pos;
-+                break;
-+              }
-+              p--;
-             }
--            p++;
-           }
-         }
- 
-@@ -1614,9 +1680,7 @@ FTPEntryType parseOneFTPLine(const char*
- 
-   } /* if (linelen > 0) */
- 
--  if (state.parsedOne || state.listStyle) /* junk if we fail to parse */
--    return FTPJunkEntry;      /* this time but had previously parsed sucessfully */
--  return FTPMiscEntry;        /* its part of a comment or error message */
-+  return ParsingFailed(state);
- }
- 
- } // namespace WebCore

qt-x11-opensource-src-4.5.3-glib-event-loop.patch

@@ -1,11 +0,0 @@
-diff -up qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp.than qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp
---- qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp.than	2009-10-29 16:15:58.000000000 +0100
-+++ qt-x11-opensource-src-4.5.3/src/corelib/kernel/qeventdispatcher_glib.cpp	2009-10-29 16:16:22.000000000 +0100
-@@ -263,7 +263,6 @@ QEventDispatcherGlibPrivate::QEventDispa
-     (void) new (&timerSource->timerList) QTimerInfoList();
-     timerSource->processEventsFlags = QEventLoop::AllEvents;
-     g_source_set_can_recurse(&timerSource->source, true);
--    g_source_set_priority(&timerSource->source, G_PRIORITY_DEFAULT_IDLE);
-     g_source_attach(&timerSource->source, mainContext);
- }
- 

qt-x11-opensource-src-4.5.3-javascript-disable-jit.patch

@@ -1,24 +0,0 @@
-diff -up qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri.javascriptcore-disable-jit qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
---- qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri.javascriptcore-disable-jit	2009-09-29 13:01:35.000000000 +0200
-+++ qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri	2009-10-06 10:39:55.976466622 +0200
-@@ -13,20 +13,6 @@ win32-* {
-     LIBS += -lwinmm
- }
- 
--# Disable the JIT due to numerous observed miscompilations :(
--CONFIG(release):isEqual(QT_ARCH,i386) {
--     JIT_DEFINES = ENABLE_JIT ENABLE_WREC ENABLE_JIT_OPTIMIZE_CALL ENABLE_JIT_OPTIMIZE_PROPERTY_ACCESS ENABLE_JIT_OPTIMIZE_ARITHMETIC
--     # Require gcc >= 4.1
--     linux-g++*:greaterThan(QT_GCC_MAJOR_VERSION,3):greaterThan(QT_GCC_MINOR_VERSION,0) {
--         DEFINES += $$JIT_DEFINES WTF_USE_JIT_STUB_ARGUMENT_VA_LIST
--         QMAKE_CXXFLAGS += -fno-stack-protector
--         QMAKE_CFLAGS += -fno-stack-protector
--     }
--     win32-msvc* {
--         DEFINES += $$JIT_DEFINES WTF_USE_JIT_STUB_ARGUMENT_REGISTER
--     }
--}
--
- win32-msvc*: INCLUDEPATH += $$PWD/os-win32
- wince* {
-     INCLUDEPATH += $$PWD/os-wince

qt-x11-opensource-src-4.5.3-system_ca_certificates.patch

@@ -1,25 +0,0 @@
-diff -up qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp.system_ca_certificates qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp
---- qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp.system_ca_certificates	2009-09-29 06:01:38.000000000 -0500
-+++ qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp	2009-10-02 11:20:10.674662746 -0500
-@@ -482,8 +482,20 @@ void QSslSocketPrivate::resetDefaultCiph
- 
- QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates()
- {
-+
-+    QFile caBundle;
-+
-+#ifdef Q_OS_UNIX
-+    // Check known locations for the system's default bundle.  ### On Windows,
-+    // we should use CAPI to find the bundle, and not rely on default unix
-+    // locations.
-+    caBundle.setFileName(QLatin1String("/etc/pki/tls/certs/ca-bundle.crt"));
-+    if (caBundle.open(QIODevice::ReadOnly | QIODevice::Text))
-+       return QSslCertificate::fromDevice(&caBundle);
-+#endif
-+
-     // Qt provides a default bundle of certificates
--    QFile caBundle(QLatin1String(":/trolltech/network/ssl/qt-ca-bundle.crt"));
-+    caBundle.setFileName(QLatin1String(":/trolltech/network/ssl/qt-ca-bundle.crt"));
-     if (caBundle.open(QIODevice::ReadOnly | QIODevice::Text))
-         return QSslCertificate::fromDevice(&caBundle);
- 

qtconfig.desktop

@@ -4,7 +4,5 @@ Comment=Configure Qt4 behavior, styles, fonts
 Exec=qtconfig-qt4
 Icon=qt4-logo
 Terminal=false
-Encoding=UTF-8
 Type=Application
 Categories=Qt;Settings;
-NoDisplay=true

qtdemo.desktop

@@ -4,6 +4,5 @@ Comment=Show Qt4 demos and programming examples
 Exec=qtdemo-qt4
 Icon=qt4-logo
 Terminal=false
-Encoding=UTF-8
 Type=Application
 Categories=Qt;Development;

sources

@@ -1,10 +1,3 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
-8e3924f417fea67f72b2105faed2119c  gstreamer-logo.svg
-60de9d7e1cddd019f09fd036f0e5413a  hi128-phonon-gstreamer.png
-7ca265e0cf75b3b4c81e1490d3dba3be  hi16-phonon-gstreamer.png
-0a9f69d901aded140d4fed969c22e14f  hi22-phonon-gstreamer.png
-12db12c009b722a6dc141f78feb7e330  hi32-phonon-gstreamer.png
-86c34a1b81d44980b1381f94ed6b7a23  hi48-phonon-gstreamer.png
-153505c71ec021b0a3bd4b74f2492e93  hi64-phonon-gstreamer.png
-3988cf9af68be2df8a8000ede231de9b  qt-x11-opensource-src-4.5.3.tar.gz
+d990ee66bf7ab0c785589776f35ba6ad  qt-everywhere-opensource-src-4.8.7.tar.gz