From 78ad6123fb4f8597eb936e2c4b1636d307df4ecc Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Wed, 13 Jan 2016 12:36:34 +0000 Subject: Don't use deprecated API for plugin loading Change-Id: I6ea0e9cc8dc296f00a0547f71cda67a9d26443a5 Reviewed-by: Paul Lemire --- src/input/frontend/qinputdeviceintegrationfactory.cpp | 4 ++-- src/render/io/qsceneparserfactory.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/input/frontend/qinputdeviceintegrationfactory.cpp b/src/input/frontend/qinputdeviceintegrationfactory.cpp index 246736d6c..64c862a76 100644 --- a/src/input/frontend/qinputdeviceintegrationfactory.cpp +++ b/src/input/frontend/qinputdeviceintegrationfactory.cpp @@ -78,10 +78,10 @@ QInputDeviceIntegration *QInputDeviceIntegrationFactory::create(const QString &n #ifndef QT_NO_LIBRARY if (!pluginPath.isEmpty()) { QCoreApplication::addLibraryPath(pluginPath); - if (QInputDeviceIntegration *ret = qLoadPlugin1(directLoader(), name, args)) + if (QInputDeviceIntegration *ret = qLoadPlugin(directLoader(), name, args)) return ret; } - if (QInputDeviceIntegration *ret = qLoadPlugin1(loader(), name, args)) + if (QInputDeviceIntegration *ret = qLoadPlugin(loader(), name, args)) return ret; #endif return Q_NULLPTR; diff --git a/src/render/io/qsceneparserfactory.cpp b/src/render/io/qsceneparserfactory.cpp index 8fba44db9..f02996b11 100644 --- a/src/render/io/qsceneparserfactory.cpp +++ b/src/render/io/qsceneparserfactory.cpp @@ -79,10 +79,10 @@ QAbstractSceneParser *QSceneParserFactory::create(const QString &name, const QSt #ifndef QT_NO_LIBRARY if (!pluginPath.isEmpty()) { QCoreApplication::addLibraryPath(pluginPath); - if (QAbstractSceneParser *ret = qLoadPlugin1(directLoader(), name, args)) + if (QAbstractSceneParser *ret = qLoadPlugin(directLoader(), name, args)) return ret; } - if (QAbstractSceneParser *ret = qLoadPlugin1(loader(), name, args)) + if (QAbstractSceneParser *ret = qLoadPlugin(loader(), name, args)) return ret; #endif return Q_NULLPTR; -- cgit v1.2.3