main/qt: upgrade to 4.8.5

many bug fixes. rebase the theme patch too.

1 files changed, 26 insertions, 30 deletions

diff --git a/main/qt/qt-gtk-theme-fix.patch b/main/qt/qt-gtk-theme-fix.patch
index 5939b1fd1a..a9e4dc7da4 100644
--- a/main/qt/qt-gtk-theme-fix.patch
+++ b/main/qt/qt-gtk-theme-fix.patch
@@ -7,34 +7,19 @@ It still tries to detect if GTK-Qt is in use and refuse to run with that
 as it would cause obvious recursion, however that might be not always
 possible.
 
---- qt-everywhere-opensource-src-4.8.0/src/gui/styles/qgtkstyle_p.h.orig
-+++ qt-everywhere-opensource-src-4.8.0/src/gui/styles/qgtkstyle_p.h
-@@ -338,6 +338,7 @@
-     static bool getGConfBool(const QString &key, bool fallback = 0);
-     static QString getGConfString(const QString &key, const QString &fallback = QString());
- 
-+    static QString getThemeNameGuess();
-     static QString getThemeName();
-     virtual int getSpinboxArrowSize() const;
- 
---- qt-everywhere-opensource-src-4.8.0/src/gui/styles/qgtkstyle_p.cpp.orig
-+++ qt-everywhere-opensource-src-4.8.0/src/gui/styles/qgtkstyle_p.cpp
-@@ -504,12 +504,9 @@
+diff -rup qt-everywhere-opensource-src-4.8.5.orig/src/gui/styles/qgtkstyle_p.cpp qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp
+--- qt-everywhere-opensource-src-4.8.5.orig/src/gui/styles/qgtkstyle_p.cpp	2013-06-07 05:16:59.000000000 +0000
++++ qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp	2013-09-25 16:37:34.703506640 +0000
+@@ -505,7 +505,7 @@ void QGtkStylePrivate::initGtkWidgets()
  
      static QString themeName;
      if (!gtkWidgetMap()->contains("GtkWindow") && themeName.isEmpty()) {
 -        themeName = getThemeName();
 +        themeName = getThemeNameGuess();
  
--        if (themeName.isEmpty()) {
--            qWarning("QGtkStyle was unable to detect the current GTK+ theme.");
--            return;
--        } else if (themeName == QLS("Qt") || themeName == QLS("Qt4")) {
-+        if (themeName == QLS("Qt") || themeName == QLS("Qt4")) {
+         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.");
-@@ -650,7 +647,7 @@
+@@ -648,7 +648,7 @@ bool QGtkStylePrivate::getGConfBool(cons
      return retVal;
  }
  
@@ -43,13 +28,10 @@ possible.
  {
      QString themeName;
      // We try to parse the gtkrc file first
-@@ -684,6 +681,19 @@
-     // Fall back to gconf
-     if (themeName.isEmpty() && resolveGConf())
-         themeName = getGConfString(QLS("/desktop/gnome/interface/gtk_theme"));
-+
-+    return themeName;
-+}
+@@ -685,6 +685,19 @@ QString QGtkStylePrivate::getThemeName()
+ 
+     return themeName;
+ }
 +
 +QString QGtkStylePrivate::getThemeName()
 +{
@@ -60,6 +42,20 @@ possible.
 +    g_object_get(settings, "gtk-theme-name", &theme_name, NULL);
 +    themeName = QString::fromUtf8(theme_name);
 +    g_free(theme_name);
++
++    return themeName;
++}
+ 
+ // Get size of the arrow controls in a GtkSpinButton
+ int QGtkStylePrivate::getSpinboxArrowSize() const
+diff -rup qt-everywhere-opensource-src-4.8.5.orig/src/gui/styles/qgtkstyle_p.h qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.h
+--- qt-everywhere-opensource-src-4.8.5.orig/src/gui/styles/qgtkstyle_p.h	2013-06-07 05:16:59.000000000 +0000
++++ qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.h	2013-09-25 16:29:11.310167033 +0000
+@@ -338,6 +338,7 @@ public:
+     static bool getGConfBool(const QString &key, bool fallback = 0);
+     static QString getGConfString(const QString &key, const QString &fallback = QString());
+ 
++    static QString getThemeNameGuess();
+     static QString getThemeName();
+     virtual int getSpinboxArrowSize() const;
  
-     return themeName;
- }