Commit d40c15ab authored by Kai Koehne's avatar Kai Koehne

QmlJSEditor: Don't warn about failing dumps if dumper is from 2.1

Ignore dumper failures if dumper is from 2.1. This is the case e.g.
for the time being with the Qt SDK 1.1. The type info might still
be available if a .qmltypes file is available.

Task-number: QTCREATORBUG-4380
Reviewed-by: Erik Verbruggen
parent cd995e08
......@@ -164,7 +164,17 @@ void PluginDumper::qmlPluginTypeDumpDone(int exitCode)
Core::MessageManager *messageManager = Core::MessageManager::instance();
const QString errorMessages = process->readAllStandardError();
messageManager->printToOutputPane(qmldumpErrorMessage(libraryPath, errorMessages));
libraryInfo.setDumpStatus(LibraryInfo::DumpError, qmldumpFailedMessage(errorMessages));
if (errorMessages.contains(QLatin1String("Usage: qmldump [plugin/import/path plugin.uri]"))) {
// outdated qmldump from 2.1.
// TODO: Show a warning that qmldump should be recompiled.
libraryInfo.setDumpStatus(LibraryInfo::DumpDone);
if (!libraryPath.isEmpty())
m_modelManager->updateLibraryInfo(libraryPath, libraryInfo);
return;
} else {
libraryInfo.setDumpStatus(LibraryInfo::DumpError, qmldumpFailedMessage(errorMessages));
}
}
const QByteArray output = process->readAllStandardOutput();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment