AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't attempt to load an empty generic plugin if no environment variable is set.

Browse Source 
Also warn if a requested generic plugin is not available.

Change-Id: Iab1f1f87be435b4ad446881cba25d0b19a564f08
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
This commit is contained in:
Robin Burchell 2014-11-22 20:08:10 -08:00
parent 99e69dce78
commit b52ec2ec6b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/kernel/qguiapplication.cpp
View File

@ -1089,6 +1089,8 @@ static void init_plugins(const QList<QByteArray> &pluginList)
QLatin1String(pluginSpec.mid(colonPos+1)));
if (plugin)
QGuiApplicationPrivate::generic_plugin_list.append(plugin);
else
qWarning() << "No such plugin for spec " << pluginSpec;
}
}
@ -1254,8 +1256,11 @@ void QGuiApplicationPrivate::init()
}
// Load environment exported generic plugins
foreach (const QByteArray &plugin, qgetenv("QT_QPA_GENERIC_PLUGINS").split(','))
pluginList << plugin;
QByteArray envPlugins = qgetenv("QT_QPA_GENERIC_PLUGINS");
if (!envPlugins.isEmpty()) {
foreach (const QByteArray &plugin, envPlugins.split(','))
pluginList << plugin;
}
if (platform_integration == 0)
createPlatformIntegration();