summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2013-12-14 22:25:31 +0000
committerJohannes Huber <johu@gentoo.org>2013-12-14 22:25:31 +0000
commitdcdd424e381194e4c9f595f0af955ff83096c5c5 (patch)
tree8c69ba2da6b58ac4299fee90c9ba59ad20a73807 /kde-base/qguiplatformplugin_kde
parentRemove unused patches. (diff)
downloadgentoo-2-dcdd424e381194e4c9f595f0af955ff83096c5c5.tar.gz
gentoo-2-dcdd424e381194e4c9f595f0af955ff83096c5c5.tar.bz2
gentoo-2-dcdd424e381194e4c9f595f0af955ff83096c5c5.zip
Remove unused patch.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
Diffstat (limited to 'kde-base/qguiplatformplugin_kde')
-rw-r--r--kde-base/qguiplatformplugin_kde/ChangeLog6
-rw-r--r--kde-base/qguiplatformplugin_kde/files/qguiplatformplugin_kde-4.11.1-missingicons.patch58
2 files changed, 5 insertions, 59 deletions
diff --git a/kde-base/qguiplatformplugin_kde/ChangeLog b/kde-base/qguiplatformplugin_kde/ChangeLog
index d5fa80bec388..5a7c35f25887 100644
--- a/kde-base/qguiplatformplugin_kde/ChangeLog
+++ b/kde-base/qguiplatformplugin_kde/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/qguiplatformplugin_kde
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qguiplatformplugin_kde/ChangeLog,v 1.143 2013/12/12 03:37:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qguiplatformplugin_kde/ChangeLog,v 1.144 2013/12/14 22:25:30 johu Exp $
+
+ 14 Dec 2013; Johannes Huber <johu@gentoo.org>
+ -files/qguiplatformplugin_kde-4.11.1-missingicons.patch:
+ Remove unused patch.
12 Dec 2013; Agostino Sarubbo <ago@gentoo.org>
-qguiplatformplugin_kde-4.10.5.ebuild:
diff --git a/kde-base/qguiplatformplugin_kde/files/qguiplatformplugin_kde-4.11.1-missingicons.patch b/kde-base/qguiplatformplugin_kde/files/qguiplatformplugin_kde-4.11.1-missingicons.patch
deleted file mode 100644
index ee5ca697b73f..000000000000
--- a/kde-base/qguiplatformplugin_kde/files/qguiplatformplugin_kde-4.11.1-missingicons.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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
-