diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-06-02 21:22:42 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2017-06-22 03:24:43 +0000 |
| commit | 79414932b17199d31d9f28a4ad8669b5b5f5fc62 (patch) | |
| tree | da78ac315fa4ad2f450abfaea80fc904c385c163 /src/compositor | |
| parent | 3459308cf3ad934aae1a388a404626590b3e7897 (diff) | |
Fix all the warnings about deprecated qLoadPlugin1
qLoadPlugin is variadic and can take one argument to the plugin loader,
so just use that.
Change-Id: Ia3e896da908f42939148fffd14c481e367fdb128
Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com>
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Diffstat (limited to 'src/compositor')
| -rw-r--r-- | src/compositor/hardware_integration/qwlclientbufferintegrationfactory.cpp | 4 | ||||
| -rw-r--r-- | src/compositor/hardware_integration/qwlserverbufferintegrationfactory.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/compositor/hardware_integration/qwlclientbufferintegrationfactory.cpp b/src/compositor/hardware_integration/qwlclientbufferintegrationfactory.cpp index 0d3b8e5bd..57359190d 100644 --- a/src/compositor/hardware_integration/qwlclientbufferintegrationfactory.cpp +++ b/src/compositor/hardware_integration/qwlclientbufferintegrationfactory.cpp @@ -84,10 +84,10 @@ ClientBufferIntegration *ClientBufferIntegrationFactory::create(const QString &n // Try loading the plugin from platformPluginPath first: if (!pluginPath.isEmpty()) { QCoreApplication::addLibraryPath(pluginPath); - if (ClientBufferIntegration *ret = qLoadPlugin1<ClientBufferIntegration, ClientBufferIntegrationPlugin>(directLoader(), name, args)) + if (ClientBufferIntegration *ret = qLoadPlugin<ClientBufferIntegration, ClientBufferIntegrationPlugin>(directLoader(), name, args)) return ret; } - if (ClientBufferIntegration *ret = qLoadPlugin1<ClientBufferIntegration, ClientBufferIntegrationPlugin>(loader(), name, args)) + if (ClientBufferIntegration *ret = qLoadPlugin<ClientBufferIntegration, ClientBufferIntegrationPlugin>(loader(), name, args)) return ret; #endif return 0; diff --git a/src/compositor/hardware_integration/qwlserverbufferintegrationfactory.cpp b/src/compositor/hardware_integration/qwlserverbufferintegrationfactory.cpp index a1638f215..6425f7c38 100644 --- a/src/compositor/hardware_integration/qwlserverbufferintegrationfactory.cpp +++ b/src/compositor/hardware_integration/qwlserverbufferintegrationfactory.cpp @@ -84,10 +84,10 @@ ServerBufferIntegration *ServerBufferIntegrationFactory::create(const QString &n // Try loading the plugin from platformPluginPath first: if (!pluginPath.isEmpty()) { QCoreApplication::addLibraryPath(pluginPath); - if (ServerBufferIntegration *ret = qLoadPlugin1<ServerBufferIntegration, ServerBufferIntegrationPlugin>(directLoader(), name, args)) + if (ServerBufferIntegration *ret = qLoadPlugin<ServerBufferIntegration, ServerBufferIntegrationPlugin>(directLoader(), name, args)) return ret; } - if (ServerBufferIntegration *ret = qLoadPlugin1<ServerBufferIntegration, ServerBufferIntegrationPlugin>(loader(), name, args)) + if (ServerBufferIntegration *ret = qLoadPlugin<ServerBufferIntegration, ServerBufferIntegrationPlugin>(loader(), name, args)) return ret; #endif return 0; |