1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QFactoryLoader: unconditionally provide toJson

Browse Source 
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>
This commit is contained in:
Fabian Kosmale 2021-11-08 16:35:54 +01:00
parent aee0021fc8
commit 76b4739e07
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/plugin/qfactoryloader.cpp
View File

@ -105,7 +105,6 @@ bool QPluginParsedMetaData::parse(QByteArrayView raw)
return true; return true;
} }
#if QT_CONFIG(library)
QJsonObject QPluginParsedMetaData::toJson() const QJsonObject QPluginParsedMetaData::toJson() const
{ {
// convert from the internal CBOR representation to an external JSON one // convert from the internal CBOR representation to an external JSON one
@ -127,7 +126,6 @@ QJsonObject QPluginParsedMetaData::toJson() const
} }
return o; return o;
} }
#endif
class QFactoryLoaderPrivate : public QObjectPrivate class QFactoryLoaderPrivate : public QObjectPrivate
{ {