diff options
| author | Thomas Hartmann <thomas.hartmann@qt.io> | 2022-03-24 12:35:54 +0100 |
|---|---|---|
| committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2022-03-24 11:41:53 +0000 |
| commit | 3b5c56bcfad99dd702a319ca56a07d845ec9680f (patch) | |
| tree | 8a96091e20ed697fa3ecbef0de04784f4a5fcb7f | |
| parent | d3dae6b7ddbc1edc15e30b2ac5cd8625d0f333f5 (diff) | |
| download | qt-creator-3b5c56bcfad99dd702a319ca56a07d845ec9680f.tar.gz | |
QmlDesigner: Add invalid ids to QmlJSCheck
Also improving document message for exceptions.
Change-Id: I7878987ce73f5d4891ced3c702c7804b25b07eb3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| -rw-r--r-- | src/libs/qmljs/qmljscheck.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/qmldesigner/designercore/model/documentmessage.cpp | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp index 7fe9885bdd..d9fe7df36c 100644 --- a/src/libs/qmljs/qmljscheck.cpp +++ b/src/libs/qmljs/qmljscheck.cpp @@ -570,7 +570,8 @@ public: "x", "y", "opacity", "parent", "item", "flow", "color", "margin", "padding", "print", "border", "font", "text", "source", "state", "visible", "focus", "data", - "clip", "layer", "scale", "enabled", "anchors"}) + "clip", "layer", "scale", "enabled", "anchors", + "texture", "shaderInfo", "sprite", "spriteSequence", "baseState"}) {} }; diff --git a/src/plugins/qmldesigner/designercore/model/documentmessage.cpp b/src/plugins/qmldesigner/designercore/model/documentmessage.cpp index 7039caca6c..00782087f2 100644 --- a/src/plugins/qmldesigner/designercore/model/documentmessage.cpp +++ b/src/plugins/qmldesigner/designercore/model/documentmessage.cpp @@ -42,7 +42,7 @@ DocumentMessage::DocumentMessage(Exception *exception): m_line(exception->line()), m_column(-1), m_description(exception->description()), - m_url(exception->file()) + m_url(QUrl::fromLocalFile(exception->file())) { } @@ -84,14 +84,14 @@ QString DocumentMessage::toString() const if (line() != -1) { if (!str.isEmpty()) str += QLatin1Char(' '); - str += ::QmlDesigner::DocumentMessage::tr("line %1").arg(line()); + str += ::QmlDesigner::DocumentMessage::tr("line %1\n").arg(line()); } if (column() != -1) { if (!str.isEmpty()) str += QLatin1Char(' '); - str += ::QmlDesigner::DocumentMessage::tr("column %1").arg(column()); + str += ::QmlDesigner::DocumentMessage::tr("column %1\n").arg(column()); } if (!str.isEmpty()) |