From 2dedde25fe322dd7afa57a275a8c86a3d7cd791f Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Tue, 2 Mar 2010 13:03:43 +0100
Subject: [PATCH] Remove work around again 4.2.0 Reviewed-by: Friedemann Kleint
<qtc-committer@nokia.com>
---
src/plugins/designer/formeditorplugin.cpp | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/src/plugins/designer/formeditorplugin.cpp b/src/plugins/designer/formeditorplugin.cpp
index e180ce6b6cd..ee8bfa59665 100644
--- a/src/plugins/designer/formeditorplugin.cpp
+++ b/src/plugins/designer/formeditorplugin.cpp
@@ -115,21 +115,7 @@ bool FormEditorPlugin::initialize(const QStringList &arguments, QString *error)
qApp->installTranslator(qtr);
}
- if (qgetenv("KDE_SESSION_VERSION") == QByteArray("4")) {
- // KDE 4, possibly dangerous...
- // KDE 4.2.0 had a nasty bug, which resulted in the File/Open Dialog crashing
- // so check for that an fully load the plugins
- QProcess proc;
- proc.start(QLatin1String("kde4-config"), QStringList(QLatin1String("--version")));
- proc.waitForFinished();
- const QByteArray output = proc.readAll();
- if (output.contains("KDE: 4.2.0"))
- FormEditorW::ensureInitStage(FormEditorW::FullyInitialized);
- else
- FormEditorW::ensureInitStage(FormEditorW::RegisterPlugins);
- } else {
- FormEditorW::ensureInitStage(FormEditorW::RegisterPlugins);
- }
+ FormEditorW::ensureInitStage(FormEditorW::RegisterPlugins);
error->clear();
return true;
--
GitLab