feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

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

Browse Source 
This reverts commit d40c15abea.
Was superseded by 284b0827 (QmlJS: Don't warn user about imports if static info is available).
This commit is contained in:
Kai Koehne
2011-04-12 10:49:47 +02:00
parent 3e07024e10
commit 3e0061aaba
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qmljstools/qmljsplugindumper.cpp
View File

@@ -164,17 +164,7 @@ void PluginDumper::qmlPluginTypeDumpDone(int exitCode)
Core::MessageManager *messageManager = Core::MessageManager::instance(); Core::MessageManager *messageManager = Core::MessageManager::instance();
const QString errorMessages = process->readAllStandardError(); const QString errorMessages = process->readAllStandardError();
messageManager->printToOutputPane(qmldumpErrorMessage(libraryPath, errorMessages)); 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(); const QByteArray output = process->readAllStandardOutput();