Git commit 17751fd0da3e4cbc27f71cbb79985687c0d4f712 by Jeremy Whiting. Committed on 30/11/2014 at 21:44. Pushed by whiting into branch 'Plasma/5.1'. Remove KGlobal check and KComponentData object that overrode applications KAboutData when showing dialogs. REVIEW:121298 (cherry picked from commit 77e3941f234fbb129678c174d4e19a9c5fe5ac07) M +3 -14 attica-kde/kdeplugin/kdeplatformdependent.cpp http://commits.kde.org/plasma-desktop/17751fd0da3e4cbc27f71cbb79985687c0d4f= 712 diff --git a/attica-kde/kdeplugin/kdeplatformdependent.cpp b/attica-kde/kde= plugin/kdeplatformdependent.cpp index 489c03b..c9b0b55 100644 --- a/attica-kde/kdeplugin/kdeplatformdependent.cpp +++ b/attica-kde/kdeplugin/kdeplatformdependent.cpp @@ -30,9 +30,8 @@ #include #include #include -#include #include -#include +#include #include #include = @@ -41,18 +40,8 @@ using namespace Attica; KdePlatformDependent::KdePlatformDependent() : m_config(KSharedConfig::openConfig("atticarc")), m_accessManager(0),= m_wallet(0) { - // when a plain Qt application loads this plugin, it needs a valid KGl= obal object - if (!KGlobal::hasMainComponent()) { - KComponentData componentData("attica_kde"); - } - -// TODO: re-enable, see http://community.kde.org/Frameworks/Porting_No= tes -// KLocale* locale =3D KGlobal::locale(); -// if (locale) { -// locale->insertCatalog("attica_kde"); -// } - - m_accessManager =3D new KIO::Integration::AccessManager(this); + // FIXME: Investigate how to not leak this instance witohut crashing. + m_accessManager =3D new KIO::Integration::AccessManager(0); } = KdePlatformDependent::~KdePlatformDependent()