Fix and enable the qmldirparser autotest

Change-Id: I2e9b64e5df63dbd9fffc204b7058d3c77255b09c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

diff --git a/src/qml/qml/qqmldirparser.cpp b/src/qml/qml/qqmldirparser.cpp
index 6b6bee3..8fcab2e 100644 (file)
--- 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 f52c9b0..b080a82 100644 (file)
--- 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 268198d..0be38a0 100644 (file)
--- 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 cd8f050..bf76c07 100644 (file)
--- 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>