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

QMLJS: update to qmljsparser from Qt 5.6

Browse Source 
Change-Id: I29a8e07b0b34aa5e8466021cbb71450687f7e11c
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Tim Jenssen
2016-04-29 11:00:30 +02:00
parent 5c45e9ec34
commit c90a356be6
18 changed files with 1503 additions and 1279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/libs/qmljs/parser/qmlerror.cpp
View File

@@ -48,8 +48,8 @@ QT_BEGIN_NAMESPACE
file:///home/user/test.qml:7:8: Invalid property assignment: double expected
\endcode
You can use qDebug() or qWarning() to output errors to the console. This method
will attempt to open the file indicated by the error
You can use qDebug(), qInfo(), or qWarning() to output errors to the console.
This method will attempt to open the file indicated by the error
and include additional contextual information.
\code
file:///home/user/test.qml:7:8: Invalid property assignment: double expected
@@ -239,16 +239,17 @@ QString QmlError::toString() const
QUrl u(url());
int l(line());
if (u.isEmpty()) {
if (u.isEmpty() || (u.isLocalFile() && u.path().isEmpty()))
rv = QLatin1String("<Unknown File>");
} else if (l != -1) {
rv = u.toString() + QLatin1Char(':') + QString::number(l);
else
rv = u.toString();
if (l != -1) {
rv += QLatin1Char(':') + QString::number(l);
int c(column());
if (c != -1)
rv += QLatin1Char(':') + QString::number(c);
} else {
rv = u.toString();
}
rv += QLatin1String(": ") + description();