diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-12 18:03:14 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-12 18:03:14 +0100 |
commit | 63db3b49e7134d5f65437437b49750c68bb37699 (patch) | |
tree | 019ea2c195c19ca8e1778f3c19e52d56ae94412f | |
parent | f31505c3ea464d2e200504a6280b3ba982b6e724 (diff) | |
parent | a60aa90f5ca00e32a1271a476f5da650dddebfda (diff) | |
download | qttools-63db3b49e7134d5f65437437b49750c68bb37699.tar.gz qttools-63db3b49e7134d5f65437437b49750c68bb37699.tar.bz2 qttools-63db3b49e7134d5f65437437b49750c68bb37699.zip |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Ife41f7baf8113951233186f106cdc9c1b2e2bc55
-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 5b31f848..7e57379d 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; |