diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2016-01-06 13:26:40 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2016-01-06 17:45:36 +0000 |
| commit | 80a741f3616290897ba0d9f1cbd3c9c5ee62da37 (patch) | |
| tree | e303e99db3c91dc49ecdb0f58781454d3e17d590 | |
| parent | aaf0b72a816ba430442d4ea956db95fa8e286e9f (diff) | |
Make template instantiation in QFactoryLoader explicit
gcc 4.9.2 does not understand it otherwise.
Change-Id: I131a14c526c1213665fdbbeb75032e41eac6cd63
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| -rw-r--r-- | src/corelib/plugin/qfactoryloader_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/plugin/qfactoryloader_p.h b/src/corelib/plugin/qfactoryloader_p.h index a4690c3f03..e67bb98976 100644 --- a/src/corelib/plugin/qfactoryloader_p.h +++ b/src/corelib/plugin/qfactoryloader_p.h @@ -164,7 +164,7 @@ PluginInterface *qLoadPlugin(const QFactoryLoader *loader, template <class PluginInterface, class FactoryInterface, typename Arg> Q_DECL_DEPRECATED PluginInterface *qLoadPlugin1(const QFactoryLoader *loader, const QString &key, Arg &&arg) -{ return qLoadPlugin(loader, key, std::forward<Arg>(arg)); } +{ return qLoadPlugin<PluginInterface, FactoryInterface>(loader, key, std::forward<Arg>(arg)); } QT_END_NAMESPACE |