Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ife41f7baf8113951233186f106cdc9c1b2e2bc55

1 files changed, 8 insertions, 0 deletions

diff --git a/src/designer/src/lib/shared/pluginmanager.cpp b/src/designer/src/lib/shared/pluginmanager.cpp
index 5b31f848c..7e57379db 100644
--- 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;