Differential D8992 Diff 22986 src/lib/plugin/kpluginmetadata.cpp

Changeset View

Standalone View

Show First 20 Lines • Show All 64 Lines • ▼ Show 20 Line(s)		62	{
65	} else if (file.endsWith(QStringLiteral(".json"))) {	65		} else if (file.endsWith(QStringLiteral(".json"))) {
66	d = new KPluginMetaDataPrivate;	66		d = new KPluginMetaDataPrivate;
67	QFile f(file);	67		QFile f(file);
68	bool b = f.open(QIODevice::ReadOnly);	68		bool b = f.open(QIODevice::ReadOnly);
69	if (!b) {	69		if (!b) {
70	qCWarning(KCOREADDONS_DEBUG) << "Couldn't open" << file;	70		qCWarning(KCOREADDONS_DEBUG) << "Couldn't open" << file;
71	return;	71		return;
72	}	72		}
73	m_metaData = QJsonDocument::fromJson(f.readAll()).object();	73
		74		QJsonParseError error;
		75		m_metaData = QJsonDocument::fromJson(f.readAll(), &error).object();
		76		if (error.error) {
		77		qCWarning(KCOREADDONS_DEBUG) << "error parsing" << file << error.errorString();
		78		}
74	m_fileName = file;	79		m_fileName = file;
75	d->metaDataFileName = file;	80		d->metaDataFileName = file;
76	} else {	81		} else {
77	QPluginLoader loader(file);	82		QPluginLoader loader(file);
78	m_fileName = QFileInfo(loader.fileName()).absoluteFilePath();	83		m_fileName = QFileInfo(loader.fileName()).absoluteFilePath();
79	m_metaData = loader.metaData().value(QStringLiteral("MetaData")).toObject();	84		m_metaData = loader.metaData().value(QStringLiteral("MetaData")).toObject();
80	}	85		}
81	}	86		}
▲ Show 20 Lines • Show All 291 Lines • Show Last 20 Lines