From 188d50dc1db51cc00caebb5efceb483472d34afb Mon Sep 17 00:00:00 2001
From: Fawzi Mohamed <fawzi.mohamed@digia.com>
Date: Thu, 16 Jan 2014 11:48:07 +0100
Subject: [PATCH] qml: make dumping errors more chatty
Change-Id: I1471ba9459a1e48a03e26aa5dc008072460447be
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
---
src/plugins/qmljstools/qmljsmodelmanager.cpp | 3 +++
src/plugins/qmljstools/qmljsplugindumper.cpp | 2 ++
2 files changed, 5 insertions(+)
diff --git a/src/plugins/qmljstools/qmljsmodelmanager.cpp b/src/plugins/qmljstools/qmljsmodelmanager.cpp
index 4342d9b126e..660525f82e3 100644
--- a/src/plugins/qmljstools/qmljsmodelmanager.cpp
+++ b/src/plugins/qmljstools/qmljsmodelmanager.cpp
@@ -639,6 +639,9 @@ void ModelManager::updateDocument(Document::Ptr doc)
void ModelManager::updateLibraryInfo(const QString &path, const LibraryInfo &info)
{
+ if (!info.pluginTypeInfoError().isEmpty())
+ qDebug() << "Dumping errors for " << path << ":" << info.pluginTypeInfoError();
+
{
QMutexLocker locker(&m_mutex);
_validSnapshot.insertLibraryInfo(path, info);
diff --git a/src/plugins/qmljstools/qmljsplugindumper.cpp b/src/plugins/qmljstools/qmljsplugindumper.cpp
index 01c2d8518ef..f8b2edcccfe 100644
--- a/src/plugins/qmljstools/qmljsplugindumper.cpp
+++ b/src/plugins/qmljstools/qmljsplugindumper.cpp
@@ -330,6 +330,7 @@ void PluginDumper::qmlPluginTypeDumpDone(int exitCode)
if (!error.isEmpty()) {
libraryInfo.setPluginTypeInfoStatus(LibraryInfo::DumpError,
qmldumpErrorMessage(libraryPath, error));
+ printParseWarnings(libraryPath, libraryInfo.pluginTypeInfoError());
} else {
libraryInfo.setMetaObjects(objectsList.values());
libraryInfo.setModuleApis(moduleApis);
@@ -413,6 +414,7 @@ void PluginDumper::loadQmltypesFile(const QStringList &qmltypesFilePaths,
if (errors.isEmpty()) {
libraryInfo.setPluginTypeInfoStatus(LibraryInfo::TypeInfoFileDone);
} else {
+ printParseWarnings(libraryPath, errors.join(QLatin1String("\n")));
errors.prepend(tr("Errors while reading typeinfo files:"));
libraryInfo.setPluginTypeInfoStatus(LibraryInfo::TypeInfoFileError, errors.join(QLatin1String("\n")));
}
--
GitLab