[gentoo-commits] gentoo-x86 commit in kde-base/qguiplatformplugin_kde/files: qguiplatformplugin_kde-4.11.1-missingicons.patch

[gentoo-commits] gentoo-x86 commit in kde-base/qguiplatformplugin_kde/files: qguiplatformplugin_kde-4.11.1-missingicons.patch

[Michael Palimaka (kensington)]

kensington    13/09/11 17:06:16

  Added:                qguiplatformplugin_kde-4.11.1-missingicons.patch
  Log:
  Backport patch from upstream fixing a race condition causing application-specific icons not to be loaded, wrt bug #484368.
  
  (Portage version: 2.2.2/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)

Revision  Changes    Path
1.1                  kde-base/qguiplatformplugin_kde/files/qguiplatformplugin_kde-4.11.1-missingicons.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/qguiplatformplugin_kde/files/qguiplatformplugin_kde-4.11.1-missingicons.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/qguiplatformplugin_kde/files/qguiplatformplugin_kde-4.11.1-missingicons.patch?rev=1.1&content-type=text/plain

Index: qguiplatformplugin_kde-4.11.1-missingicons.patch
===================================================================
From 2e5a2450762f8dedf9ffd77028ed06b3a39a807d Mon Sep 17 00:00:00 2001
From: Weng Xuetian <wengxt@gmail.com>
Date: Mon, 9 Sep 2013 11:43:06 -0400
Subject: [PATCH] Delay KDE class initialization to main loop

Gui platform plugin is loaded during QApplication construction, but it
relies on some KApplication/QApplication data to work correctly.

This patch delays the initialization to main loop, to ensure
KApplication/QApplication is already constructed.

BUG: 324574
FIXED-IN: 4.11.2
REVIEW: 112602
---
 qguiplatformplugin_kde/qguiplatformplugin_kde.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp b/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
index ce22622..4f67cc5 100644
--- a/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
+++ b/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
@@ -28,6 +28,7 @@
 #include <KDE/KFileDialog>
 #include <KDE/KColorDialog>
 #include <QtCore/QHash>
+#include <QtCore/QTimer>
 #include <QtGui/QFileDialog>
 #include <QtGui/QColorDialog>
 #include <QtGui/QApplication>
@@ -153,9 +154,7 @@ class KQGuiPlatformPlugin : public QGuiPlatformPlugin
 public:
     KQGuiPlatformPlugin()
     {
-        connect(KIconLoader::global(), SIGNAL(iconLoaderSettingsChanged()), this, SLOT(updateToolbarIcons()));
-        connect(KGlobalSettings::self(), SIGNAL(toolbarAppearanceChanged(int)), this, SLOT(updateToolbarStyle()));
-        connect(KGlobalSettings::self(), SIGNAL(kdisplayStyleChanged()), this, SLOT(updateWidgetStyle()));
+        QMetaObject::invokeMethod(this, "init", Qt::QueuedConnection);
     }
 
     virtual QStringList keys() const { return QStringList() << QLatin1String("kde"); }
@@ -340,6 +339,13 @@ public: // ColorDialog
     }
 
 private slots:
+    void init()
+    {
+        connect(KIconLoader::global(), SIGNAL(iconLoaderSettingsChanged()), this, SLOT(updateToolbarIcons()));
+        connect(KGlobalSettings::self(), SIGNAL(toolbarAppearanceChanged(int)), this, SLOT(updateToolbarStyle()));
+        connect(KGlobalSettings::self(), SIGNAL(kdisplayStyleChanged()), this, SLOT(updateWidgetStyle()));
+    }
+
     void updateToolbarStyle()
     {
         //from gtksymbol.cpp
-- 
1.8.3.2

[gentoo-commits] gentoo-x86 commit in kde-base/qguiplatformplugin_kde/files: qguiplatformplugin_kde-4.11.1-missingicons.patch

[Johannes Huber (johu)]

johu        13/12/14 22:25:31

  Removed:              qguiplatformplugin_kde-4.11.1-missingicons.patch
  Log:
  Remove unused patch.
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)