From f7f37e7fa2d98f777cc7b6035bb6ff924c75e1fa Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 27 Nov 2013 08:44:30 +0100 Subject: [PATCH] Revert "Qt Designer: Temporarily disable loading of QDeclarativeView plugin." This reverts commit 8334921061a3e4cfc5ce08e5a837564d40f70714. The issue has been fixed in Qt. Task-number: QTCREATORBUG-10273 Task-number: QTBUG-35006 Change-Id: I8891e5c7821f89e9a83442685b2833fa6a0de10e Reviewed-by: Simon Hausmann --- src/designer/src/lib/shared/pluginmanager.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/designer/src/lib/shared/pluginmanager.cpp b/src/designer/src/lib/shared/pluginmanager.cpp index 7e57379..5b31f84 100644 --- a/src/designer/src/lib/shared/pluginmanager.cpp +++ b/src/designer/src/lib/shared/pluginmanager.cpp @@ -698,14 +698,6 @@ void QDesignerPluginManager::registerPlugin(const QString &plugin) if (m_d->m_registeredPlugins.contains(plugin)) return; - // ###fixme: Temporary workaround for QTCREATORBUG-10273 - if (QCoreApplication::applicationName() == QLatin1String("QtCreator") - && plugin.contains(QLatin1String("declarativeview"), Qt::CaseInsensitive)) { - const QString errorMessage = tr("Not loaded due to potential symbol clashes (QTCREATORBUG-10273)"); - m_d->m_failedPlugins.insert(plugin, errorMessage); - return; - } - QPluginLoader loader(plugin); if (loader.isLoaded() || loader.load()) { m_d->m_registeredPlugins += plugin; -- 2.7.4