diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-05-06 13:50:06 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-05-10 13:14:44 +0200 |
| commit | 510378d180cdaa85be47e7e3af6844d20e772037 (patch) | |
| tree | 666d937afd15eb3830fcbc40519493f37f0576b9 | |
| parent | f38e071f5b353cbf9ce6c6c104bd82099ae0aa14 (diff) | |
Remove QUrl-related special casing in the compiler
QUrl is being added to the bootstrap set.
Change-Id: Ia96bbcf6e0ef808435ecddfa114fdcd213361bbf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | src/qml/compiler/qv4codegen.cpp | 9 | ||||
| -rw-r--r-- | src/qml/compiler/qv4codegen_p.h | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp index d17d58588c..b145ceb51e 100644 --- a/src/qml/compiler/qv4codegen.cpp +++ b/src/qml/compiler/qv4codegen.cpp @@ -53,10 +53,7 @@ #include <private/qv4compilercontrolflow_p.h> #include <private/qv4bytecodegenerator_p.h> #include <private/qv4compilerscanfunctions_p.h> - -#ifndef V4_BOOTSTRAP -# include <qqmlerror.h> -#endif +#include <qqmlerror.h> #include <cmath> #include <iostream> @@ -3947,8 +3944,6 @@ Codegen::VolatileMemoryLocations Codegen::scanVolatileMemoryLocations(AST::Node } -#ifndef V4_BOOTSTRAP - QList<QQmlError> Codegen::qmlErrors() const { QList<QQmlError> qmlErrors; @@ -3972,8 +3967,6 @@ QList<QQmlError> Codegen::qmlErrors() const return qmlErrors; } -#endif // V4_BOOTSTRAP - bool Codegen::RValue::operator==(const RValue &other) const { switch (type) { diff --git a/src/qml/compiler/qv4codegen_p.h b/src/qml/compiler/qv4codegen_p.h index 8cf56b6cb7..e519da0142 100644 --- a/src/qml/compiler/qv4codegen_p.h +++ b/src/qml/compiler/qv4codegen_p.h @@ -662,9 +662,7 @@ protected: public: QList<DiagnosticMessage> errors() const; -#ifndef V4_BOOTSTRAP QList<QQmlError> qmlErrors() const; -#endif Reference binopHelper(QSOperator::Op oper, Reference &left, Reference &right); Reference jumpBinop(QSOperator::Op oper, Reference &left, Reference &right); |