diff options
| -rw-r--r-- | src/qml/qml/qml.pri | 16 | ||||
| -rw-r--r-- | src/qml/qml/qqmldirparser.cpp | 12 | ||||
| -rw-r--r-- | src/qml/qml/qqmldirparser_p.h | 4 | ||||
| -rw-r--r-- | src/qmldevtools/qmldevtools.pro | 1 | ||||
| -rw-r--r-- | tests/auto/qmldevtools/compile/tst_compile.cpp | 1 |
5 files changed, 4 insertions, 30 deletions
diff --git a/src/qml/qml/qml.pri b/src/qml/qml/qml.pri index cad839ba9d..74514a313f 100644 --- a/src/qml/qml/qml.pri +++ b/src/qml/qml/qml.pri @@ -1,12 +1,4 @@ SOURCES += \ - $$PWD/qqmldirparser.cpp \ - -HEADERS += \ - $$PWD/qqmldirparser_p.h \ - -!qmldevtools_build { - -SOURCES += \ $$PWD/qqmlopenmetaobject.cpp \ $$PWD/qqmlvmemetaobject.cpp \ $$PWD/qqmlengine.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) - -} diff --git a/src/qml/qml/qqmldirparser.cpp b/src/qml/qml/qqmldirparser.cpp index 2c126a996d..7f6310d58e 100644 --- a/src/qml/qml/qqmldirparser.cpp +++ b/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 { diff --git a/src/qml/qml/qqmldirparser_p.h b/src/qml/qml/qqmldirparser_p.h index 0486187a5c..9e90abcffb 100644 --- a/src/qml/qml/qqmldirparser_p.h +++ b/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); diff --git a/src/qmldevtools/qmldevtools.pro b/src/qmldevtools/qmldevtools.pro index 5af5443df7..589b90a71f 100644 --- a/src/qmldevtools/qmldevtools.pro +++ b/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) diff --git a/tests/auto/qmldevtools/compile/tst_compile.cpp b/tests/auto/qmldevtools/compile/tst_compile.cpp index b7115eef3e..b19260779c 100644 --- a/tests/auto/qmldevtools/compile/tst_compile.cpp +++ b/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() { |