diff options
| -rw-r--r-- | src/input/frontend/qinputaspect.cpp | 3 | ||||
| -rw-r--r-- | src/input/frontend/qinputdeviceintegrationfactory.cpp | 26 | ||||
| -rw-r--r-- | src/render/io/qsceneimportfactory.cpp | 22 |
3 files changed, 24 insertions, 27 deletions
diff --git a/src/input/frontend/qinputaspect.cpp b/src/input/frontend/qinputaspect.cpp index 17e39ef96..cec1ca91c 100644 --- a/src/input/frontend/qinputaspect.cpp +++ b/src/input/frontend/qinputaspect.cpp @@ -58,9 +58,6 @@ #include <Qt3DInput/qmousehandler.h> #include <QtCore/QDir> -#if QT_CONFIG(library) -#include <QtCore/QLibrary> -#endif #include <QtCore/QLibraryInfo> #include <QtCore/QPluginLoader> diff --git a/src/input/frontend/qinputdeviceintegrationfactory.cpp b/src/input/frontend/qinputdeviceintegrationfactory.cpp index 957b33542..221965a5f 100644 --- a/src/input/frontend/qinputdeviceintegrationfactory.cpp +++ b/src/input/frontend/qinputdeviceintegrationfactory.cpp @@ -50,16 +50,16 @@ QT_BEGIN_NAMESPACE namespace Qt3DInput { -#ifndef QT_NO_LIBRARY Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, (QInputDevicePlugin_iid, QLatin1String("/3dinputdevices"), Qt::CaseInsensitive)) +#if QT_CONFIG(library) Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, directLoader, (QInputDevicePlugin_iid, QLatin1String(""), Qt::CaseInsensitive)) #endif QStringList QInputDeviceIntegrationFactory::keys(const QString &pluginPath) { -#ifndef QT_NO_LIBRARY QStringList list; if (!pluginPath.isEmpty()) { +#if QT_CONFIG(library) QCoreApplication::addLibraryPath(pluginPath); list = directLoader()->keyMap().values(); if (!list.isEmpty()) { @@ -70,31 +70,29 @@ QStringList QInputDeviceIntegrationFactory::keys(const QString &pluginPath) for (QStringList::iterator it = list.begin(); it != end; ++it) (*it).append(postFix); } +#else + qWarning() << QInputDeviceIntegration::tr("Cannot query QInputDeviceIntegration plugins at %1. " + "Library loading is disabled.").arg(pluginPath); +#endif } list.append(loader()->keyMap().values()); return list; -#else - Q_UNUSED(pluginPath); - return QStringList(); -#endif } QInputDeviceIntegration *QInputDeviceIntegrationFactory::create(const QString &name, const QStringList &args, const QString &pluginPath) { -#ifndef QT_NO_LIBRARY if (!pluginPath.isEmpty()) { +#if QT_CONFIG(library) QCoreApplication::addLibraryPath(pluginPath); if (QInputDeviceIntegration *ret = qLoadPlugin<QInputDeviceIntegration, QInputDevicePlugin>(directLoader(), name, args)) return ret; - } - if (QInputDeviceIntegration *ret = qLoadPlugin<QInputDeviceIntegration, QInputDevicePlugin>(loader(), name, args)) - return ret; #else - Q_UNUSED(name); - Q_UNUSED(args); - Q_UNUSED(pluginPath); + qWarning() << QInputDeviceIntegration::tr("Cannot load QInputDeviceIntegration plugin from " + "%1. Library loading is disabled.") + .arg(pluginPath); #endif - return nullptr; + } + return qLoadPlugin<QInputDeviceIntegration, QInputDevicePlugin>(loader(), name, args); } } // Qt3DInput diff --git a/src/render/io/qsceneimportfactory.cpp b/src/render/io/qsceneimportfactory.cpp index d336c7003..587722a35 100644 --- a/src/render/io/qsceneimportfactory.cpp +++ b/src/render/io/qsceneimportfactory.cpp @@ -49,16 +49,16 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -#ifndef QT_NO_LIBRARY Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, (QSceneImportFactoryInterface_iid, QLatin1String("/sceneparsers"), Qt::CaseInsensitive)) +#ifndef QT_NO_LIBRARY Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, directLoader, (QSceneImportFactoryInterface_iid, QLatin1String(""), Qt::CaseInsensitive)) #endif QStringList QSceneImportFactory::keys(const QString &pluginPath) { -#ifndef QT_NO_LIBRARY QStringList list; if (!pluginPath.isEmpty()) { +#if QT_CONFIG(library) QCoreApplication::addLibraryPath(pluginPath); list = directLoader()->keyMap().values(); if (!list.isEmpty()) { @@ -69,26 +69,28 @@ QStringList QSceneImportFactory::keys(const QString &pluginPath) for (QStringList::iterator it = list.begin(); it != end; ++it) (*it).append(postFix); } +#else + qWarning() << QSceneImporter::tr("Cannot query QSceneImporter plugins at %1. " + "Library loading is disabled.").arg(pluginPath); +#endif } list.append(loader()->keyMap().values()); return list; -#else - return QStringList(); -#endif } QSceneImporter *QSceneImportFactory::create(const QString &name, const QStringList &args, const QString &pluginPath) { -#ifndef QT_NO_LIBRARY if (!pluginPath.isEmpty()) { +#if QT_CONFIG(library) QCoreApplication::addLibraryPath(pluginPath); if (QSceneImporter *ret = qLoadPlugin<QSceneImporter, QSceneImportPlugin>(directLoader(), name, args)) return ret; - } - if (QSceneImporter *ret = qLoadPlugin<QSceneImporter, QSceneImportPlugin>(loader(), name, args)) - return ret; +#else + qWarning() << QSceneImporter::tr("Cannot load QSceneImporter plugin from %1. " + "Library loading is disabled.").arg(pluginPath); #endif - return nullptr; + } + return qLoadPlugin<QSceneImporter, QSceneImportPlugin>(loader(), name, args); } } // namespace Qt3DRender |