From d40c15abea817cf8c3e6b155a3faff7af527bbd3 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 8 Apr 2011 14:02:12 +0200 Subject: [PATCH] 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 --- src/plugins/qmljstools/qmljsplugindumper.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmljstools/qmljsplugindumper.cpp b/src/plugins/qmljstools/qmljsplugindumper.cpp index c4cc381f8a1..cdc82cc8800 100644 --- a/src/plugins/qmljstools/qmljsplugindumper.cpp +++ b/src/plugins/qmljstools/qmljsplugindumper.cpp @@ -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();