diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-09-06 14:14:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-08 09:00:31 +0200 |
| commit | 8ac5506f2a6a8f1f6f50d3175a28e3e695f65a81 (patch) | |
| tree | 00582e04f79809a5e8b07f989c0df995af6b6805 /src/qml/qml/qqmlobjectcreator_p.h | |
| parent | 2ed0cd0602093d316bfbce6b1f3f8f8bfe026fca (diff) | |
Fix error reporting for wrong signal parameter declarations
Record the line/column in the signal and report it together with the url
if there was an error in declaring the signals.
Change-Id: Idbbee9be271b0ca55709ffc1791637595d7ebd89
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlobjectcreator_p.h')
| -rw-r--r-- | src/qml/qml/qqmlobjectcreator_p.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlobjectcreator_p.h b/src/qml/qml/qqmlobjectcreator_p.h index 553be6f075..e62efc3439 100644 --- a/src/qml/qml/qqmlobjectcreator_p.h +++ b/src/qml/qml/qqmlobjectcreator_p.h @@ -51,9 +51,12 @@ class QQmlAbstractBinding; namespace QtQml { -struct Q_QML_EXPORT QmlObjectCreator +class Q_QML_EXPORT QmlObjectCreator { - QmlObjectCreator(QQmlEngine *engine, + Q_DECLARE_TR_FUNCTIONS(QQmlCompiler) +public: + + QmlObjectCreator(QQmlEngine *engine, const QUrl &url, // extra data/output stored in these two QQmlContextData *contextData, QQmlCompiledData *runtimeData); @@ -80,7 +83,10 @@ private: static double valueAsNumber(const QV4::CompiledData::Value *value); static bool valueAsBoolean(const QV4::CompiledData::Value *value); + void recordError(const QV4::CompiledData::Location &location, const QString &description); + QQmlEngine *engine; + QUrl url; const QV4::CompiledData::QmlUnit *unit; const QV4::CompiledData::CompilationUnit *jsUnit; QQmlContextData *context; |