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/client/inputdeviceintegration/qwaylandinputdeviceintegrationfactory.cpp | |
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/client/inputdeviceintegration/qwaylandinputdeviceintegrationfactory.cpp')
-rw-r--r-- | src/client/inputdeviceintegration/qwaylandinputdeviceintegrationfactory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationfactory.cpp b/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationfactory.cpp index c069a3645..94eca3262 100644 --- a/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationfactory.cpp +++ b/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationfactory.cpp @@ -84,10 +84,10 @@ QWaylandInputDeviceIntegration *QWaylandInputDeviceIntegrationFactory::create(co // Try loading the plugin from platformPluginPath first: if (!pluginPath.isEmpty()) { QCoreApplication::addLibraryPath(pluginPath); - if (QWaylandInputDeviceIntegration *ret = qLoadPlugin1<QWaylandInputDeviceIntegration, QWaylandInputDeviceIntegrationPlugin>(directLoader(), name, args)) + if (QWaylandInputDeviceIntegration *ret = qLoadPlugin<QWaylandInputDeviceIntegration, QWaylandInputDeviceIntegrationPlugin>(directLoader(), name, args)) return ret; } - if (QWaylandInputDeviceIntegration *ret = qLoadPlugin1<QWaylandInputDeviceIntegration, QWaylandInputDeviceIntegrationPlugin>(loader(), name, args)) + if (QWaylandInputDeviceIntegration *ret = qLoadPlugin<QWaylandInputDeviceIntegration, QWaylandInputDeviceIntegrationPlugin>(loader(), name, args)) return ret; #endif return Q_NULLPTR; |