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/qqmlimport_p.h | |
| 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/qqmlimport_p.h')
| -rw-r--r-- | src/qml/qml/qqmlimport_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlimport_p.h b/src/qml/qml/qqmlimport_p.h index d986ecfe2b..ea9c2eafb5 100644 --- a/src/qml/qml/qqmlimport_p.h +++ b/src/qml/qml/qqmlimport_p.h @@ -212,7 +212,9 @@ public: QQmlImportDatabase(QQmlEngine *); ~QQmlImportDatabase(); +#if QT_CONFIG(library) bool importDynamicPlugin(const QString &filePath, const QString &uri, const QString &importNamespace, int vmaj, QList<QQmlError> *errors); +#endif QStringList importPathList(PathType type = LocalOrRemote) const; void setImportPathList(const QStringList &paths); |