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

qmldump: Produce an error message if module import fails.

Browse Source 
Reviewed-by: Kai Koehne
This commit is contained in:
Christian Kamm
2011-01-20 16:02:28 +01:00
parent c6d0f497f3
commit 315fc34f3b
2 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
share/qtcreator/qml/qmldump/main.cpp
View File

@@ -265,12 +265,18 @@ void writeEasingCurve(QXmlStreamWriter *xml)
xml->writeEndElement();
}
enum ExitCode {
EXIT_INVALIDARGUMENTS = 1,
EXIT_SEGV = 2,
EXIT_IMPORTERROR = 3
};
#ifdef Q_OS_UNIX
void sigSegvHandler(int) {
fprintf(stderr, "Error: qmldump SEGV\n");
if (!currentProperty.isEmpty())
fprintf(stderr, "While processing the property '%s', which probably has uninitialized data.\n", currentProperty.toLatin1().constData());
exit(EXIT_FAILURE);
exit(EXIT_SEGV);
}
#endif
@@ -296,7 +302,7 @@ int main(int argc, char *argv[])
if (argc != 1 && argc != 3) {
qWarning() << "Usage: qmldump [plugin/import/path plugin.uri]";
qWarning() << "Example: ./qmldump /home/user/dev/qt-install/imports Qt.labs.particles";
return 1;
return EXIT_INVALIDARGUMENTS;
}
QString pluginImportName;
@@ -315,7 +321,7 @@ int main(int argc, char *argv[])
{
QByteArray code = "import QtQuick 1.0; Item {}";
QDeclarativeComponent c(engine);
c.setData(code, QUrl("xxx"));
c.setData(code, QUrl("qtquickcheck"));
c.create();
if (c.errors().isEmpty()) {
hasQtQuickModule = true;
@@ -341,10 +347,13 @@ int main(int argc, char *argv[])
code += "Item {}";
QDeclarativeComponent c(engine);
c.setData(code, QUrl("xxx"));
c.setData(code, QUrl("typelist"));
c.create();
if (!c.errors().isEmpty())
qDebug() << c.errorString();
if (!c.errors().isEmpty()) {
foreach (const QDeclarativeError &error, c.errors())
qWarning() << error.toString();
return EXIT_IMPORTERROR;
}
}
cppToId.insert("QString", "string");
@@ -400,7 +409,7 @@ int main(int argc, char *argv[])
code += " {}\n";
QDeclarativeComponent c(engine);
c.setData(code, QUrl("xxx"));
c.setData(code, QUrl("typeinstance"));
QObject *object = c.create();
if (object)

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

@@ -121,9 +121,17 @@ static QString qmldumpErrorMessage(const QString &libraryPath, const QString &er
return PluginDumper::tr("Type dump of QML plugin in %0 failed.\nErrors:\n%1\n").arg(libraryPath, error);
}
static QString qmldumpFailedMessage()
static QString qmldumpFailedMessage(const QString &error)
{
return PluginDumper::tr("Type dump of C++ plugin failed.\nCheck 'General Messages' output pane for details.");
QString firstLines =
QStringList(error.split(QLatin1Char('\n')).mid(0, 10)).join(QLatin1String("\n"));
return PluginDumper::tr("Type dump of C++ plugin failed.\n"
"First 10 lines or errors:\n"
"\n"
"%1"
"\n"
"Check 'General Messages' output pane for details."
).arg(firstLines);
}
static QList<FakeMetaObject::ConstPtr> parseHelper(const QByteArray &xml, QString *error)
@@ -156,8 +164,9 @@ void PluginDumper::qmlPluginTypeDumpDone(int exitCode)
if (exitCode != 0) {
Core::MessageManager *messageManager = Core::MessageManager::instance();
messageManager->printToOutputPane(qmldumpErrorMessage(libraryPath, process->readAllStandardError()));
libraryInfo.setDumpStatus(LibraryInfo::DumpError, qmldumpFailedMessage());
const QString errorMessages = process->readAllStandardError();
messageManager->printToOutputPane(qmldumpErrorMessage(libraryPath, errorMessages));
libraryInfo.setDumpStatus(LibraryInfo::DumpError, qmldumpFailedMessage(errorMessages));
}
const QByteArray output = process->readAllStandardOutput();
@@ -188,12 +197,13 @@ void PluginDumper::qmlPluginTypeDumpError(QProcess::ProcessError)
const QString libraryPath = m_runningQmldumps.take(process);
Core::MessageManager *messageManager = Core::MessageManager::instance();
messageManager->printToOutputPane(qmldumpErrorMessage(libraryPath, process->readAllStandardError()));
const QString errorMessages = process->readAllStandardError();
messageManager->printToOutputPane(qmldumpErrorMessage(libraryPath, errorMessages));
if (!libraryPath.isEmpty()) {
const Snapshot snapshot = m_modelManager->snapshot();
LibraryInfo libraryInfo = snapshot.libraryInfo(libraryPath);
libraryInfo.setDumpStatus(LibraryInfo::DumpError, qmldumpFailedMessage());
libraryInfo.setDumpStatus(LibraryInfo::DumpError, qmldumpFailedMessage(errorMessages));
m_modelManager->updateLibraryInfo(libraryPath, libraryInfo);
}
}