diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2014-12-09 08:37:57 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2014-12-09 10:07:43 +0100 |
| commit | b81d09d9416bd4f3153ce24fc291617832eac8b2 (patch) | |
| tree | a3c7db3d678c3b3a462e955dc4a0c63c0f205c8d | |
| parent | bd5e9d8685783f842f631a1355dee9f3471ae8f7 (diff) | |
Revert "Revert "Revert "Qt Designer: Temporarily disable loading of QDeclarativeView plugin."
Re-enable the QDeclarativeView plugin.
This reverts commit a60aa90f5ca00e32a1271a476f5da650dddebfda.
Task-number: QTCREATORBUG-10273
Task-number: QTCREATORBUG-13616
Task-number: QTBUG-35006
Change-Id: Id8c34e040508f7509501533eceaa75613a46baa8
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| -rw-r--r-- | src/designer/src/lib/shared/pluginmanager.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/designer/src/lib/shared/pluginmanager.cpp b/src/designer/src/lib/shared/pluginmanager.cpp index 68a33dbfb..4dbac43b4 100644 --- a/src/designer/src/lib/shared/pluginmanager.cpp +++ b/src/designer/src/lib/shared/pluginmanager.cpp @@ -690,14 +690,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; |