Remove QQmlDirParser from QtQmlDevTools

This class is not needed in the library.

Change-Id: Ie880086a849b62a2856d1f388a64d363b040cb56
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

src/qml/qml/qml.pri

@@ -1,11 +1,3 @@
-SOURCES += \
-    $$PWD/qqmldirparser.cpp \
-
-HEADERS += \
-    $$PWD/qqmldirparser_p.h \
-
-!qmldevtools_build {
-
 SOURCES += \
     $$PWD/qqmlopenmetaobject.cpp \
     $$PWD/qqmlvmemetaobject.cpp \
@@ -59,7 +51,8 @@ SOURCES += \
     $$PWD/qqmlvaluetypewrapper.cpp \
     $$PWD/qqmltypewrapper.cpp \
     $$PWD/qqmlfileselector.cpp \
-    $$PWD/qqmlobjectcreator.cpp
+    $$PWD/qqmlobjectcreator.cpp \
+    $$PWD/qqmldirparser.cpp
 
 HEADERS += \
     $$PWD/qqmlglobal_p.h \
@@ -133,9 +126,8 @@ HEADERS += \
     $$PWD/qqmltypewrapper_p.h \
     $$PWD/qqmlfileselector_p.h \
     $$PWD/qqmlfileselector.h \
-    $$PWD/qqmlobjectcreator_p.h
+    $$PWD/qqmlobjectcreator_p.h \
+    $$PWD/qqmldirparser_p.h
 
 include(ftw/ftw.pri)
 include(v8/v8.pri)
-
-}

src/qml/qml/qqmldirparser.cpp

@@ -294,17 +294,6 @@ bool QQmlDirParser::hasError() const
     return false;
 }
 
-#if defined(QT_BUILD_QMLDEVTOOLS_LIB) || defined(QT_QMLDEVTOOLS_LIB)
-QList<QQmlJS::DiagnosticMessage> QQmlDirParser::errors(const QString &uri) const
-{
-    QList<QQmlJS::DiagnosticMessage> errors = _errors;
-    for (int i = 0; i < errors.size(); ++i) {
-        QQmlJS::DiagnosticMessage &msg = errors[i];
-        msg.message.replace(QLatin1String("$$URI$$"), uri);
-    }
-    return errors;
-}
-#else
 void QQmlDirParser::setError(const QQmlError &e)
 {
     _errors.clear();
@@ -328,7 +317,6 @@ QList<QQmlError> QQmlDirParser::errors(const QString &uri) const
     }
     return errors;
 }
-#endif
 
 QString QQmlDirParser::typeNamespace() const
 {

src/qml/qml/qqmldirparser_p.h

@@ -66,12 +66,8 @@ public:
     bool parse(const QString &source);
 
     bool hasError() const;
-#if defined(QT_BUILD_QMLDEVTOOLS_LIB) || defined(QT_QMLDEVTOOLS_LIB)
-    QList<QQmlJS::DiagnosticMessage> errors(const QString &uri) const;
-#else
     void setError(const QQmlError &);
     QList<QQmlError> errors(const QString &uri) const;
-#endif
 
     QString typeNamespace() const;
     void setTypeNamespace(const QString &s);

src/qmldevtools/qmldevtools.pro

@@ -22,4 +22,3 @@ include(../3rdparty/masm/masm-defs.pri)
 include(../qml/parser/parser.pri)
 include(../qml/jsruntime/jsruntime.pri)
 include(../qml/compiler/compiler.pri)
-include(../qml/qml/qml.pri)

tests/auto/qmldevtools/compile/tst_compile.cpp

@@ -39,7 +39,6 @@
 #include <private/qqmlirbuilder_p.h>
 #include <private/qv4value_inl_p.h>
 #include <private/qv4codegen_p.h>
-#include <private/qqmldirparser_p.h>
 
 int main()
 {