diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-11-08 16:35:54 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-11-10 09:18:07 +0100 |
| commit | 76b4739e0714414fa6a8ae999bc93a692f5c81aa (patch) | |
| tree | ab33ec7407cbf5df29e8797baee832addf42deb7 /src/corelib | |
| parent | aee0021fc8de2ba3cdd227fbdfc149acf78db583 (diff) | |
QFactoryLoader: unconditionally provide toJson
Amends c0a8cfe1677f55daec4bc8626aced41c7ebeb1c4. The StaticPluginLoader
needs it, too, and that one is available in non-library configurations.
Change-Id: I5d396e78abe7358a5df5ef816cfe92137d3ae4b5
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/plugin/qfactoryloader.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/corelib/plugin/qfactoryloader.cpp b/src/corelib/plugin/qfactoryloader.cpp index b62112b72a..a315daa199 100644 --- a/src/corelib/plugin/qfactoryloader.cpp +++ b/src/corelib/plugin/qfactoryloader.cpp @@ -105,7 +105,6 @@ bool QPluginParsedMetaData::parse(QByteArrayView raw) return true; } -#if QT_CONFIG(library) QJsonObject QPluginParsedMetaData::toJson() const { // convert from the internal CBOR representation to an external JSON one @@ -127,7 +126,6 @@ QJsonObject QPluginParsedMetaData::toJson() const } return o; } -#endif class QFactoryLoaderPrivate : public QObjectPrivate { |