diff options
| author | Christian Kamm <christian.d.kamm@nokia.com> | 2011-06-29 10:06:39 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-06-30 09:02:11 +0200 |
| commit | 6feeee85f07fffeab84ba2a92ffba91dd362716b (patch) | |
| tree | 539e3e5ceb494134cd71cc94fd6aadfd85418b7c /tools | |
| parent | 32c0f5aa4f3dc67cf395b4b40e704c96ce740060 (diff) | |
qmlplugindump: Improve error message for misbehaving plugin components.
Mirrors
6244008dcb43dde15dea3becbbec07d941b4759c
in Qt Creator/2.3.
(cherry picked from commit a39e975465a5dc0548891ccd93c4ff04165b60cd)
Change-Id: I995eebe065ecf8b4f185d61987240f39ad11b57f
Reviewed-on: http://codereview.qt.nokia.com/871
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlplugindump/main.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index 206c8dfe5b..dc9ab83b3d 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -68,6 +68,9 @@ QString pluginImportPath; bool verbose = false; +QString currentProperty; +QString inObjectInstantiation; + void collectReachableMetaObjects(const QMetaObject *meta, QSet<const QMetaObject *> *metas) { if (! meta || metas->contains(meta)) @@ -81,8 +84,6 @@ void collectReachableMetaObjects(const QMetaObject *meta, QSet<const QMetaObject collectReachableMetaObjects(meta->superClass(), metas); } -QString currentProperty; - void collectReachableMetaObjects(QObject *object, QSet<const QMetaObject *> *metas) { if (! object) @@ -214,7 +215,10 @@ QSet<const QMetaObject *> collectReachableMetaObjects(const QString &importCode, QDeclarativeComponent c(engine); c.setData(code, QUrl::fromLocalFile(pluginImportPath + "/typeinstance.qml")); + inObjectInstantiation = tyName; QObject *object = c.create(); + inObjectInstantiation.clear(); + if (object) collectReachableMetaObjects(object, &metas); else @@ -436,6 +440,8 @@ void sigSegvHandler(int) { fprintf(stderr, "Error: SEGV\n"); if (!currentProperty.isEmpty()) fprintf(stderr, "While processing the property '%s', which probably has uninitialized data.\n", currentProperty.toLatin1().constData()); + if (!inObjectInstantiation.isEmpty()) + fprintf(stderr, "While instantiating the object '%s'.\n", inObjectInstantiation.toLatin1().constData()); exit(EXIT_SEGV); } #endif |