diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-06-17 09:55:40 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-06-17 11:44:07 +0200 |
| commit | 227f7ed60cfb34f7c3d91b27b07ddc5bbd1a2922 (patch) | |
| tree | a7fbba1528244045c55e2d8e31e83b569a366fb9 | |
| parent | 21705ae91e727812ebaef80583136c29505e977d (diff) | |
Fix and enable the qmldirparser autotest
Change-Id: I2e9b64e5df63dbd9fffc204b7058d3c77255b09c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| -rw-r--r-- | src/qml/qml/qqmldirparser.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qml/qml.pro | 1 | ||||
| -rw-r--r-- | tests/auto/qml/qqmldirparser/qqmldirparser.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp | 1 |
4 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/qml/qqmldirparser.cpp b/src/qml/qml/qqmldirparser.cpp index 6b6bee3406..8fcab2e570 100644 --- a/src/qml/qml/qqmldirparser.cpp +++ b/src/qml/qml/qqmldirparser.cpp @@ -160,7 +160,7 @@ bool QQmlDirParser::parse(const QString &source) } if (!firstLine) { reportError(lineNumber, 0, - QString::fromUtf8("module identifier directive must be the first command in a qmldir file")); + QString::fromUtf8("module identifier directive must be the first directive in a qmldir file")); continue; } diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro index f52c9b0352..b080a824cf 100644 --- a/tests/auto/qml/qml.pro +++ b/tests/auto/qml/qml.pro @@ -33,6 +33,7 @@ PRIVATETESTS += \ qqmlecmascript \ qqmlcontext \ qqmlexpression \ + qqmldirparser \ qqmlglobal \ qqmlinstruction \ qqmllanguage \ diff --git a/tests/auto/qml/qqmldirparser/qqmldirparser.pro b/tests/auto/qml/qqmldirparser/qqmldirparser.pro index 268198d050..0be38a0a35 100644 --- a/tests/auto/qml/qqmldirparser/qqmldirparser.pro +++ b/tests/auto/qml/qqmldirparser/qqmldirparser.pro @@ -1,6 +1,6 @@ CONFIG += testcase TARGET = tst_qqmldirparser -QT += qml testlib +QT += qml testlib qml-private macx:CONFIG -= app_bundle SOURCES += tst_qqmldirparser.cpp diff --git a/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp b/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp index cd8f050d2d..bf76c07970 100644 --- a/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp +++ b/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp @@ -45,7 +45,6 @@ #include <QObject> #include <QQmlEngine> #include <QQmlComponent> -#include <private/v8.h> #include <private/qqmldirparser_p.h> #include <QDebug> |