diff options
author | dt <qtc-committer@nokia.com> | 2010-03-02 13:03:43 +0100 |
---|---|---|
committer | con <qtc-committer@nokia.com> | 2010-03-08 17:45:00 +0100 |
commit | 2d99f5883a739a2729b96d5dd13928685ecb9a1b (patch) | |
tree | 82cbd8b0c1004f7e6a740748009f4487b84f652d | |
parent | 701e253e03d398def9248ac092a659664b151eb1 (diff) |
Remove work around again 4.2.0
Reviewed-by: Friedemann Kleint <qtc-committer@nokia.com>
(cherry picked from commit 2dedde25fe322dd7afa57a275a8c86a3d7cd791f)
-rw-r--r-- | src/plugins/designer/formeditorplugin.cpp | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/plugins/designer/formeditorplugin.cpp b/src/plugins/designer/formeditorplugin.cpp index e180ce6b6c..ee8bfa5966 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; |