diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-12-06 14:30:32 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-06 14:02:37 +0100 |
| commit | a60aa90f5ca00e32a1271a476f5da650dddebfda (patch) | |
| tree | 6e756d534b6218d2b277aaff6b08f0e10e830497 | |
| parent | f141efdc4d81d2ab9042e1ada971c9dce1b8f03d (diff) | |
Revert "Revert "Qt Designer: Temporarily disable loading of QDeclarativeView plugin.""v5.2.0
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>
| -rw-r--r-- | src/designer/src/lib/shared/pluginmanager.cpp | 8 |
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; |