diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-05-16 10:18:40 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-05-16 10:18:40 +0200 |
| commit | 3f2c8a55b18b669e2515325b5f47d220a221471a (patch) | |
| tree | 18d4c6c8358ee275481ebdec2717acc2cec1b95e /src/plugins/qtsupport | |
| parent | 7d97f4ce2d431d24dcc5f9fe5f2e4467b22b6692 (diff) | |
| parent | ccefc5cf471ae68f44d25f8533fd0e0c44fb8bf8 (diff) | |
| download | qt-creator-3f2c8a55b18b669e2515325b5f47d220a221471a.tar.gz | |
Merge remote-tracking branch 'origin/4.7'
Change-Id: I0ef2f6ac30fb0c020e0f59d2a014d0dd3bab7d81
Diffstat (limited to 'src/plugins/qtsupport')
| -rw-r--r-- | src/plugins/qtsupport/qtoutputformatter.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/plugins/qtsupport/qtoutputformatter.cpp b/src/plugins/qtsupport/qtoutputformatter.cpp index 08a817dadc..67984fce30 100644 --- a/src/plugins/qtsupport/qtoutputformatter.cpp +++ b/src/plugins/qtsupport/qtoutputformatter.cpp @@ -57,7 +57,7 @@ public: : qmlError(QLatin1String("(" QML_URL_REGEXP // url ":\\d+" // colon, line "(?::\\d+)?)" // colon, column (optional) - "[: \t]")) // colon, space or tab + "[: \t)]")) // colon, space, tab or brace , qtError(QLatin1String("Object::.*in (.*:\\d+)")) , qtAssert(QLatin1String("ASSERT: .* in file (.+, line \\d+)")) , qtAssertX(QLatin1String("ASSERT failure in .*: \".*\", file (.+, line \\d+)")) @@ -353,6 +353,11 @@ void QtSupportPlugin::testQtOutputFormatter_data() << 0 << 18 << QString::fromLatin1("qrc:///main.qml:20") << QString::fromLatin1("/main.qml") << 20 << -1; + QTest::newRow("onClicked (qrc:/main.qml:20)") + << QString::fromLatin1("onClicked (qrc:/main.qml:20)") + << 11 << 27 << QString::fromLatin1("qrc:/main.qml:20") + << QString::fromLatin1("/main.qml") << 20 << -1; + QTest::newRow("file:///main.qml:20") << QString::fromLatin1("file:///main.qml:20 Unexpected token `identifier'") << 0 << 19 << QString::fromLatin1("file:///main.qml:20") |