diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2016-01-13 12:36:34 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-01-15 13:06:45 +0000 |
| commit | 78ad6123fb4f8597eb936e2c4b1636d307df4ecc (patch) | |
| tree | 4386192d23571615acfb405c4be4c2d9a541527a | |
| parent | 4a93090a7b51da4a1e9f66d9727003fac0df53ac (diff) | |
Don't use deprecated API for plugin loading
Change-Id: I6ea0e9cc8dc296f00a0547f71cda67a9d26443a5
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| -rw-r--r-- | src/input/frontend/qinputdeviceintegrationfactory.cpp | 4 | ||||
| -rw-r--r-- | 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<QInputDeviceIntegration, QInputDevicePlugin>(directLoader(), name, args)) + if (QInputDeviceIntegration *ret = qLoadPlugin<QInputDeviceIntegration, QInputDevicePlugin>(directLoader(), name, args)) return ret; } - if (QInputDeviceIntegration *ret = qLoadPlugin1<QInputDeviceIntegration, QInputDevicePlugin>(loader(), name, args)) + if (QInputDeviceIntegration *ret = qLoadPlugin<QInputDeviceIntegration, QInputDevicePlugin>(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<QAbstractSceneParser, QSceneParserPlugin>(directLoader(), name, args)) + if (QAbstractSceneParser *ret = qLoadPlugin<QAbstractSceneParser, QSceneParserPlugin>(directLoader(), name, args)) return ret; } - if (QAbstractSceneParser *ret = qLoadPlugin1<QAbstractSceneParser, QSceneParserPlugin>(loader(), name, args)) + if (QAbstractSceneParser *ret = qLoadPlugin<QAbstractSceneParser, QSceneParserPlugin>(loader(), name, args)) return ret; #endif return Q_NULLPTR; |