Date: Monday, November 4, 2013 @ 16:14:52 Author: andrea Revision: 198791
Cleanup Deleted: kdebase-workspace/trunk/kdebug-324574.patch ---------------------+ kdebug-324574.patch | 55 -------------------------------------------------- 1 file changed, 55 deletions(-) Deleted: kdebug-324574.patch =================================================================== --- kdebug-324574.patch 2013-11-04 15:14:12 UTC (rev 198790) +++ kdebug-324574.patch 2013-11-04 15:14:52 UTC (rev 198791) @@ -1,55 +0,0 @@ -From: Weng Xuetian <[email protected]> -Date: Mon, 09 Sep 2013 15:43:06 +0000 -Subject: Delay KDE class initialization to main loop -X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=2e5a2450762f8dedf9ffd77028ed06b3a39a807d ---- -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 ---- - - ---- 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 @@ - 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 @@ - } - - 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 -
