From b52ec2ec6b92fd6771e4266c3baa22454c9c2dc1 Mon Sep 17 00:00:00 2001 From: Robin Burchell Date: Sat, 22 Nov 2014 20:08:10 -0800 Subject: [PATCH] Don't attempt to load an empty generic plugin if no environment variable is set. Also warn if a requested generic plugin is not available. Change-Id: Iab1f1f87be435b4ad446881cba25d0b19a564f08 Reviewed-by: Laszlo Agocs --- src/gui/kernel/qguiapplication.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index ded3788dbf..8c77ff95f2 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -1089,6 +1089,8 @@ static void init_plugins(const QList &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();