diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-06-26 09:30:08 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-06-26 09:34:59 +0200 |
| commit | 1762513bad4ca36d8fd78fc87d6e3979391f4626 (patch) | |
| tree | 6d6ef4de769de2b669ddae3c719ff68e3d952a75 /src/qml/qml/qqmlengine.cpp | |
| parent | e86946b5d8575d134fdc24c782f1757a8cc22d8f (diff) | |
Clean up the QT_CONFIG(library) conditions
We can clear the engine plugins when compiled without library support as
those might be static plugins. However, explicitly loading a dynamic
plugin is pointless if compiled without library support. We can just
disable the whole function. Furthermore, the ability to load dynamic
qmldir plugins does not depend on Qt being compiled as shared library
but rather on library support being available.
Change-Id: I8553706f0f8f5bd4e98cc130bf56c4526f81b85f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlengine.cpp')
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 860c24541e..159479c76f 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -2251,6 +2251,7 @@ void QQmlEngine::setPluginPathList(const QStringList &paths) d->importDatabase.setPluginPathList(paths); } +#if QT_CONFIG(library) /*! Imports the plugin named \a filePath with the \a uri provided. Returns true if the plugin was successfully imported; otherwise returns false. @@ -2264,6 +2265,7 @@ bool QQmlEngine::importPlugin(const QString &filePath, const QString &uri, QList Q_D(QQmlEngine); return d->importDatabase.importDynamicPlugin(filePath, uri, QString(), -1, errors); } +#endif /*! \property QQmlEngine::offlineStoragePath |