Revert "Revert "Qt Designer: Temporarily disable loading of QDeclarativeView plugin.""

This reverts commit f7f37e7fa2d98f777cc7b6035bb6ff924c75e1fa.

The crash reocurred, disable the QDeclarativeView plugin again.

Task-number: QTCREATORBUG-10273
Task-number: QTBUG-35006

Change-Id: I20406066e0752c6410223ca34abecda8d9b020f6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

diff --git a/src/designer/src/lib/shared/pluginmanager.cpp b/src/designer/src/lib/shared/pluginmanager.cpp
index 5b31f84..7e57379 100644 (file)
--- a/src/designer/src/lib/shared/pluginmanager.cpp
+++ b/src/designer/src/lib/shared/pluginmanager.cpp
@@ -698,6 +698,14 @@ 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;