diff options
Diffstat (limited to 'src/qml/jsruntime')
-rw-r--r-- | src/qml/jsruntime/qv4numberobject.cpp | 1 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4object.cpp | 4 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4object_p.h | 1 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4objectiterator.cpp | 5 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4objectproto.cpp | 3 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4profiling_p.h | 2 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4reflect.cpp | 1 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4regexpobject.cpp | 2 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4regexpobject_p.h | 4 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4runtime.cpp | 6 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4runtime_p.h | 1 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4script.cpp | 3 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4sequenceobject.cpp | 2 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4sparsearray.cpp | 4 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4string.cpp | 3 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4stringobject.cpp | 2 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4typedarray.cpp | 2 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4urlobject.cpp | 1 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4variantobject.cpp | 1 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4vme_moth.cpp | 1 |
20 files changed, 6 insertions, 43 deletions
diff --git a/src/qml/jsruntime/qv4numberobject.cpp b/src/qml/jsruntime/qv4numberobject.cpp index ce1a492cea..d744e569f5 100644 --- a/src/qml/jsruntime/qv4numberobject.cpp +++ b/src/qml/jsruntime/qv4numberobject.cpp @@ -3,7 +3,6 @@ #include "qv4numberobject_p.h" #include "qv4runtime_p.h" -#include "qv4string_p.h" #include <QtCore/qnumeric.h> #include <QtCore/qmath.h> diff --git a/src/qml/jsruntime/qv4object.cpp b/src/qml/jsruntime/qv4object.cpp index a160998242..77325580d3 100644 --- a/src/qml/jsruntime/qv4object.cpp +++ b/src/qml/jsruntime/qv4object.cpp @@ -2,16 +2,12 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qv4object_p.h" -#include "qv4objectproto_p.h" #include "qv4stringobject_p.h" #include "qv4argumentsobject_p.h" #include <private/qv4mm_p.h> #include "qv4lookup_p.h" #include "qv4scopedvalue_p.h" #include "qv4memberdata_p.h" -#include "qv4objectiterator_p.h" -#include "qv4identifierhash_p.h" -#include "qv4string_p.h" #include "qv4identifiertable_p.h" #include "qv4jscall_p.h" #include "qv4symbol_p.h" diff --git a/src/qml/jsruntime/qv4object_p.h b/src/qml/jsruntime/qv4object_p.h index 11174f7cb3..0f67af8913 100644 --- a/src/qml/jsruntime/qv4object_p.h +++ b/src/qml/jsruntime/qv4object_p.h @@ -21,7 +21,6 @@ #include "qv4scopedvalue_p.h" #include "qv4value_p.h" #include "qv4internalclass_p.h" -#include "qv4string_p.h" QT_BEGIN_NAMESPACE diff --git a/src/qml/jsruntime/qv4objectiterator.cpp b/src/qml/jsruntime/qv4objectiterator.cpp index 75e75e91ad..90eb326d65 100644 --- a/src/qml/jsruntime/qv4objectiterator.cpp +++ b/src/qml/jsruntime/qv4objectiterator.cpp @@ -2,12 +2,9 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qv4objectiterator_p.h" #include "qv4object_p.h" -#include "qv4stringobject_p.h" -#include "qv4identifierhash_p.h" -#include "qv4argumentsobject_p.h" -#include "qv4string_p.h" #include "qv4iterator_p.h" #include "qv4propertykey_p.h" +#include <QtQml/private/qv4functionobject_p.h> using namespace QV4; diff --git a/src/qml/jsruntime/qv4objectproto.cpp b/src/qml/jsruntime/qv4objectproto.cpp index 15dff2f4cc..e7f96a12ba 100644 --- a/src/qml/jsruntime/qv4objectproto.cpp +++ b/src/qml/jsruntime/qv4objectproto.cpp @@ -7,10 +7,7 @@ #include "qv4argumentsobject_p.h" #include <private/qv4mm_p.h> #include "qv4scopedvalue_p.h" -#include "qv4runtime_p.h" #include "qv4objectiterator_p.h" -#include "qv4string_p.h" -#include "qv4jscall_p.h" #include "qv4symbol_p.h" #include "qv4propertykey_p.h" diff --git a/src/qml/jsruntime/qv4profiling_p.h b/src/qml/jsruntime/qv4profiling_p.h index ee0213d89a..61937e85ab 100644 --- a/src/qml/jsruntime/qv4profiling_p.h +++ b/src/qml/jsruntime/qv4profiling_p.h @@ -15,7 +15,7 @@ // We mean it. // -#include "qv4global_p.h" +#include <QtQml/private/qv4global_p.h> #include "qv4engine_p.h" #include "qv4function_p.h" diff --git a/src/qml/jsruntime/qv4reflect.cpp b/src/qml/jsruntime/qv4reflect.cpp index abcc60726a..a24064b29a 100644 --- a/src/qml/jsruntime/qv4reflect.cpp +++ b/src/qml/jsruntime/qv4reflect.cpp @@ -2,7 +2,6 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qv4reflect_p.h" -#include "qv4symbol_p.h" #include "qv4runtimeapi_p.h" #include "qv4objectproto_p.h" #include "qv4propertykey_p.h" diff --git a/src/qml/jsruntime/qv4regexpobject.cpp b/src/qml/jsruntime/qv4regexpobject.cpp index 365593e207..1b62717efc 100644 --- a/src/qml/jsruntime/qv4regexpobject.cpp +++ b/src/qml/jsruntime/qv4regexpobject.cpp @@ -2,9 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qv4regexpobject_p.h" -#include "qv4objectproto_p.h" #include "qv4regexp_p.h" -#include "qv4stringobject_p.h" #include <private/qv4mm_p.h> #include "qv4scopedvalue_p.h" #include "qv4jscall_p.h" diff --git a/src/qml/jsruntime/qv4regexpobject_p.h b/src/qml/jsruntime/qv4regexpobject_p.h index 2f278f70a7..e99b64fec6 100644 --- a/src/qml/jsruntime/qv4regexpobject_p.h +++ b/src/qml/jsruntime/qv4regexpobject_p.h @@ -14,14 +14,10 @@ // We mean it. // -#include "qv4runtime_p.h" #include "qv4engine_p.h" #include "qv4context_p.h" #include "qv4functionobject_p.h" -#include "qv4string_p.h" #include "qv4managed_p.h" -#include "qv4property_p.h" -#include "qv4objectiterator_p.h" #include "qv4regexp_p.h" #include <QtCore/QString> diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp index 71892454d2..f1f26ee53a 100644 --- a/src/qml/jsruntime/qv4runtime.cpp +++ b/src/qml/jsruntime/qv4runtime.cpp @@ -5,15 +5,10 @@ #include "qv4runtime_p.h" #include "qv4engine_p.h" #include "qv4object_p.h" -#include "qv4objectproto_p.h" #include "qv4globalobject_p.h" -#include "qv4stringobject_p.h" #include "qv4argumentsobject_p.h" -#include "qv4objectiterator_p.h" -#include "qv4dateobject_p.h" #include "qv4lookup_p.h" #include "qv4function_p.h" -#include "qv4numberobject_p.h" #include "qv4regexp_p.h" #include "qv4regexpobject_p.h" #include "private/qlocale_tools_p.h" @@ -28,6 +23,7 @@ #include "qv4qobjectwrapper_p.h" #include "qv4symbol_p.h" #include "qv4generatorobject_p.h" +#include <QtQml/private/qv4math_p.h> #include <QtCore/QDebug> #include <cassert> diff --git a/src/qml/jsruntime/qv4runtime_p.h b/src/qml/jsruntime/qv4runtime_p.h index 1ec5edf315..40994633f0 100644 --- a/src/qml/jsruntime/qv4runtime_p.h +++ b/src/qml/jsruntime/qv4runtime_p.h @@ -16,7 +16,6 @@ #include "qv4global_p.h" #include "qv4value_p.h" -#include "qv4math_p.h" #include "qv4runtimeapi_p.h" #include <QtCore/qnumeric.h> diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp index 122c30611b..c72e1c4e19 100644 --- a/src/qml/jsruntime/qv4script.cpp +++ b/src/qml/jsruntime/qv4script.cpp @@ -3,13 +3,10 @@ #include "qv4script_p.h" #include <private/qv4mm_p.h> -#include "qv4functionobject_p.h" #include "qv4function_p.h" #include "qv4context_p.h" #include "qv4debugging_p.h" -#include "qv4profiling_p.h" #include "qv4scopedvalue_p.h" -#include "qv4jscall_p.h" #include <private/qqmljsengine_p.h> #include <private/qqmljslexer_p.h> diff --git a/src/qml/jsruntime/qv4sequenceobject.cpp b/src/qml/jsruntime/qv4sequenceobject.cpp index 4dc15009c9..6ed27d9d02 100644 --- a/src/qml/jsruntime/qv4sequenceobject.cpp +++ b/src/qml/jsruntime/qv4sequenceobject.cpp @@ -10,8 +10,6 @@ #include <private/qqmlengine_p.h> #include <private/qv4scopedvalue_p.h> #include <private/qv4jscall_p.h> -#include "qv4runtime_p.h" -#include "qv4objectiterator_p.h" #include <private/qqmlmetatype_p.h> #include <private/qqmltype_p_p.h> diff --git a/src/qml/jsruntime/qv4sparsearray.cpp b/src/qml/jsruntime/qv4sparsearray.cpp index 5dcdef1247..656c496a2a 100644 --- a/src/qml/jsruntime/qv4sparsearray.cpp +++ b/src/qml/jsruntime/qv4sparsearray.cpp @@ -2,10 +2,6 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qv4sparsearray_p.h" -#include "qv4runtime_p.h" -#include "qv4object_p.h" -#include "qv4functionobject_p.h" -#include "qv4scopedvalue_p.h" #include <stdlib.h> #ifdef QT_QMAP_DEBUG diff --git a/src/qml/jsruntime/qv4string.cpp b/src/qml/jsruntime/qv4string.cpp index df9fab76d8..118382d5dc 100644 --- a/src/qml/jsruntime/qv4string.cpp +++ b/src/qml/jsruntime/qv4string.cpp @@ -5,8 +5,7 @@ #include "qv4value_p.h" #include "qv4identifiertable_p.h" #include "qv4runtime_p.h" -#include "qv4objectproto_p.h" -#include "qv4stringobject_p.h" +#include <QtQml/private/qv4mm_p.h> #include <QtCore/QHash> #include <QtCore/private/qnumeric_p.h> diff --git a/src/qml/jsruntime/qv4stringobject.cpp b/src/qml/jsruntime/qv4stringobject.cpp index 07fd16ee4e..614171503e 100644 --- a/src/qml/jsruntime/qv4stringobject.cpp +++ b/src/qml/jsruntime/qv4stringobject.cpp @@ -5,7 +5,6 @@ #include "qv4stringobject_p.h" #include "qv4regexp_p.h" #include "qv4regexpobject_p.h" -#include "qv4objectproto_p.h" #include <private/qv4mm_p.h> #include "qv4scopedvalue_p.h" #include "qv4symbol_p.h" @@ -15,6 +14,7 @@ #include <QtCore/QDateTime> #include <QtCore/QDebug> #include <QtCore/QStringList> +#include <QtQml/private/qv4runtime_p.h> #include <cassert> diff --git a/src/qml/jsruntime/qv4typedarray.cpp b/src/qml/jsruntime/qv4typedarray.cpp index 4961a63e8b..938675b2a6 100644 --- a/src/qml/jsruntime/qv4typedarray.cpp +++ b/src/qml/jsruntime/qv4typedarray.cpp @@ -4,8 +4,6 @@ #include "qv4typedarray_p.h" #include "qv4arrayiterator_p.h" #include "qv4arraybuffer_p.h" -#include "qv4string_p.h" -#include "qv4jscall_p.h" #include "qv4symbol_p.h" #include "qv4runtime_p.h" #include <QtCore/qatomic.h> diff --git a/src/qml/jsruntime/qv4urlobject.cpp b/src/qml/jsruntime/qv4urlobject.cpp index 7f4a078d13..8b6db439e2 100644 --- a/src/qml/jsruntime/qv4urlobject.cpp +++ b/src/qml/jsruntime/qv4urlobject.cpp @@ -3,7 +3,6 @@ #include "qv4arrayiterator_p.h" #include "qv4urlobject_p.h" -#include "qv4stringobject_p.h" #include <QtCore/QUrl> diff --git a/src/qml/jsruntime/qv4variantobject.cpp b/src/qml/jsruntime/qv4variantobject.cpp index c1b66fef94..478ad773b5 100644 --- a/src/qml/jsruntime/qv4variantobject.cpp +++ b/src/qml/jsruntime/qv4variantobject.cpp @@ -3,7 +3,6 @@ #include "qv4variantobject_p.h" #include "qv4functionobject_p.h" -#include "qv4objectproto_p.h" #include <private/qqmlvaluetypewrapper_p.h> #include <private/qv4qobjectwrapper_p.h> diff --git a/src/qml/jsruntime/qv4vme_moth.cpp b/src/qml/jsruntime/qv4vme_moth.cpp index 8eb1503e28..fa699b0e5e 100644 --- a/src/qml/jsruntime/qv4vme_moth.cpp +++ b/src/qml/jsruntime/qv4vme_moth.cpp @@ -24,6 +24,7 @@ #include <private/qv4alloca_p.h> #include <private/qqmljavascriptexpression_p.h> #include <private/qv4qmlcontext_p.h> +#include <QtQml/private/qv4runtime_p.h> #include <iostream> #if QT_CONFIG(qml_jit) |