From 76b4739e0714414fa6a8ae999bc93a692f5c81aa Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Mon, 8 Nov 2021 16:35:54 +0100 Subject: 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 Reviewed-by: Andrei Golubev Reviewed-by: Qt CI Bot Reviewed-by: Thiago Macieira --- src/corelib/plugin/qfactoryloader.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/corelib/plugin') 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 { -- cgit v1.2.3