qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Get rid of qv4value_inl_p.h and replace it by qv4typedvalue_p.h 

This is a cleaner separation and further reduces include dependencies
in the definitions of our basic data structured.

Change-Id: I18aa86cdea0c0dfbc16075d4d617af97e638811e
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
This commit is contained in:
Lars Knoll 2015-02-14 22:46:41 +01:00 committed by Simon Hausmann
parent 3e4cf5498b
commit 0a499043fb
73 changed files with 148 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/imports/xmllistmodel/qqmlxmllistmodel.cpp
View File

@ -36,7 +36,7 @@
#include <qqmlcontext.h>
#include <private/qqmlengine_p.h>
#include <private/qv8engine_p.h>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
#include <private/qv4engine_p.h>
#include <private/qv4object_p.h>

2
src/particles/qquickv4particledata_p.h
View File

@ -36,7 +36,7 @@
#include <private/qv8engine_p.h>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
QT_BEGIN_NAMESPACE

2
src/qml/compiler/qqmlirbuilder.cpp
View File

@ -33,7 +33,7 @@
#include "qqmlirbuilder_p.h"
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
#include <private/qv4compileddata_p.h>
#include <private/qqmljsparser_p.h>
#include <private/qqmljslexer_p.h>

2
src/qml/compiler/qv4codegen.cpp
View File

@ -44,7 +44,7 @@
#include <QtCore/QStack>
#include <private/qqmljsast_p.h>
#include <private/qv4string_p.h>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
#ifndef V4_BOOTSTRAP
#include <qv4context_p.h>

2
src/qml/compiler/qv4compileddata.cpp
View File

@ -33,7 +33,7 @@
#include "qv4compileddata_p.h"
#include "qv4jsir_p.h"
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
#ifndef V4_BOOTSTRAP
#include <private/qv4engine_p.h>
#include <private/qv4function_p.h>

2
src/qml/compiler/qv4compiler.cpp
View File

@ -35,7 +35,7 @@
#include <qv4compileddata_p.h>
#include <qv4isel_p.h>
#include <private/qv4string_p.h>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
QV4::Compiler::StringTableGenerator::StringTableGenerator()
{

2
src/qml/compiler/qv4isel_p.cpp
View File

@ -36,7 +36,7 @@
#include "qv4jsir_p.h"
#include "qv4isel_p.h"
#include "qv4isel_util_p.h"
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
#ifndef V4_BOOTSTRAP
#include <private/qqmlpropertycache_p.h>
#endif

2
src/qml/jit/qv4regalloc.cpp
View File

@ -35,7 +35,7 @@
#include <QtCore/QDebug>
#include "qv4regalloc_p.h"
#include "qv4alloca_p.h"
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
#include <algorithm>
#if defined(Q_CC_MINGW)

2
src/qml/jsapi/qjsvalue.cpp
View File

@ -37,7 +37,7 @@
#include "qjsengine.h"
#include "qjsvalue.h"
#include "qjsvalue_p.h"
#include "qv4value_inl_p.h"
#include "qv4value_p.h"
#include "qv4object_p.h"
#include "qv4functionobject_p.h"
#include "qv4dateobject_p.h"

2
src/qml/jsapi/qjsvalue_p.h
View File

@ -47,7 +47,7 @@
#include <qjsvalue.h>
#include <private/qtqmlglobal_p.h>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
#include <private/qv4string_p.h>
#include <private/qv4engine_p.h>
#include <private/qv4object_p.h>

3
src/qml/jsruntime/jsruntime.pri
View File

@ -83,6 +83,7 @@ HEADERS += \
$$PWD/qv4serialize_p.h \
$$PWD/qv4script_p.h \
$$PWD/qv4scopedvalue_p.h \
$$PWD/qv4typedvalue_p.h \
$$PWD/qv4util_p.h \
$$PWD/qv4executableallocator_p.h \
$$PWD/qv4sequenceobject_p.h \
@ -100,7 +101,7 @@ HEADERS += \
HEADERS += \
$$PWD/qv4runtime_p.h \
$$PWD/qv4value_inl_p.h \
$$PWD/qv4value_p.h \
$$PWD/qv4string_p.h \
$$PWD/qv4value_p.h

1
src/qml/jsruntime/qv4argumentsobject.cpp
View File

@ -33,6 +33,7 @@
#include <qv4argumentsobject_p.h>
#include <qv4alloca_p.h>
#include <qv4scopedvalue_p.h>
#include "qv4string_p.h"
using namespace QV4;

1
src/qml/jsruntime/qv4arraybuffer.cpp
View File

@ -33,6 +33,7 @@
#include "qv4arraybuffer_p.h"
#include "qv4typedarray_p.h"
#include "qv4dataview_p.h"
#include "qv4string_p.h"
using namespace QV4;

1
src/qml/jsruntime/qv4arraydata.cpp
View File

@ -36,6 +36,7 @@
#include <private/qv4mm_p.h>
#include "qv4runtime_p.h"
#include "qv4argumentsobject_p.h"
#include "qv4string_p.h"
using namespace QV4;

1
src/qml/jsruntime/qv4arrayobject.cpp
View File

@ -37,6 +37,7 @@
#include "qv4scopedvalue_p.h"
#include "qv4argumentsobject_p.h"
#include "qv4runtime_p.h"
#include "qv4string_p.h"
using namespace QV4;

1
src/qml/jsruntime/qv4dataview.cpp
View File

@ -33,6 +33,7 @@
#include "qv4dataview_p.h"
#include "qv4arraybuffer_p.h"
#include "qv4string_p.h"
#include "qendian.h"

1
src/qml/jsruntime/qv4dateobject.cpp
View File

@ -36,6 +36,7 @@
#include "qv4objectproto_p.h"
#include "qv4scopedvalue_p.h"
#include "qv4runtime_p.h"
#include "qv4string_p.h"
#include <QtCore/QDebug>
#include <QtCore/QDateTime>

1
src/qml/jsruntime/qv4debugging.cpp
View File

@ -40,6 +40,7 @@
#include "qv4script_p.h"
#include "qv4objectiterator_p.h"
#include "qv4identifier_p.h"
#include "qv4string_p.h"
#include <iostream>
#include <algorithm>

2
src/qml/jsruntime/qv4engine.cpp
View File

@ -32,7 +32,7 @@
****************************************************************************/
#include <qv4engine_p.h>
#include <qv4context_p.h>
#include <qv4value_inl_p.h>
#include <qv4value_p.h>
#include <qv4object_p.h>
#include <qv4objectproto_p.h>
#include <qv4objectiterator_p.h>

3
src/qml/jsruntime/qv4engine_p.h
View File

@ -37,8 +37,7 @@
#include "private/qv4isel_p.h"
#include "qv4managed_p.h"
#include "qv4context_p.h"
#include "qv4string_p.h"
#include "qv4value_inl_p.h"
#include "qv4typedvalue_p.h"
#include "qv4internalclass_p.h"
#include <private/qintrusivelist_p.h>

1
src/qml/jsruntime/qv4errorobject.cpp
View File

@ -39,6 +39,7 @@
#include <QtCore/QStringList>
#include <QtCore/QDebug>
#include "qv4string_p.h"
#include <private/qv4mm_p.h>
#include <private/qqmljsengine_p.h>
#include <private/qqmljslexer_p.h>

2
src/qml/jsruntime/qv4function.cpp
View File

@ -34,7 +34,7 @@
#include "qv4function_p.h"
#include "qv4managed_p.h"
#include "qv4string_p.h"
#include "qv4value_inl_p.h"
#include "qv4value_p.h"
#include "qv4engine_p.h"
#include "qv4lookup_p.h"
#include <private/qv4mm_p.h>

3
src/qml/jsruntime/qv4globalobject.cpp
View File

@ -33,12 +33,13 @@
#include "qv4globalobject_p.h"
#include <private/qv4mm_p.h>
#include "qv4value_inl_p.h"
#include "qv4value_p.h"
#include "qv4context_p.h"
#include "qv4function_p.h"
#include "qv4debugging_p.h"
#include "qv4script_p.h"
#include "qv4scopedvalue_p.h"
#include "qv4string_p.h"
#include <private/qqmljsengine_p.h>
#include <private/qqmljslexer_p.h>

2
src/qml/jsruntime/qv4include_p.h
View File

@ -50,7 +50,7 @@
#include <private/qqmlcontext_p.h>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
#include <private/qv4context_p.h>
QT_BEGIN_NAMESPACE

1
src/qml/jsruntime/qv4jsonobject.cpp
View File

@ -38,6 +38,7 @@
#include <qv4objectiterator_p.h>
#include <qv4scopedvalue_p.h>
#include <qv4runtime_p.h>
#include "qv4string_p.h"
#include <qstack.h>
#include <qstringlist.h>

1
src/qml/jsruntime/qv4lookup.cpp
View File

@ -33,6 +33,7 @@
#include "qv4lookup_p.h"
#include "qv4functionobject_p.h"
#include "qv4scopedvalue_p.h"
#include "qv4string_p.h"
QT_BEGIN_NAMESPACE

2
src/qml/jsruntime/qv4memberdata.cpp
View File

@ -33,7 +33,7 @@
#include "qv4memberdata_p.h"
#include <private/qv4mm_p.h>
#include "qv4value_inl_p.h"
#include "qv4value_p.h"
using namespace QV4;

1
src/qml/jsruntime/qv4numberobject.cpp
View File

@ -33,6 +33,7 @@
#include "qv4numberobject_p.h"
#include "qv4runtime_p.h"
#include "qv4string_p.h"
#include <QtCore/qnumeric.h>
#include <QtCore/qmath.h>

1
src/qml/jsruntime/qv4object.cpp
View File

@ -43,6 +43,7 @@
#include "qv4memberdata_p.h"
#include "qv4objectiterator_p.h"
#include "qv4identifier_p.h"
#include "qv4string_p.h"
#include <stdint.h>

2
src/qml/jsruntime/qv4object_p.h
View File

@ -38,7 +38,7 @@
#include "qv4arraydata_p.h"
#include "qv4engine_p.h"
#include "qv4scopedvalue_p.h"
#include "qv4value_inl_p.h"
#include "qv4value_p.h"
QT_BEGIN_NAMESPACE

1
src/qml/jsruntime/qv4objectiterator.cpp
View File

@ -35,6 +35,7 @@
#include "qv4stringobject_p.h"
#include "qv4identifier_p.h"
#include "qv4argumentsobject_p.h"
#include "qv4string_p.h"
using namespace QV4;

1
src/qml/jsruntime/qv4objectproto.cpp
View File

@ -38,6 +38,7 @@
#include "qv4scopedvalue_p.h"
#include "qv4runtime_p.h"
#include "qv4objectiterator_p.h"
#include "qv4string_p.h"
#include <QtCore/QDateTime>
#include <QtCore/QStringList>

1
src/qml/jsruntime/qv4persistent_p.h
View File

@ -34,6 +34,7 @@
#define QV4PERSISTENT_H
#include "qv4value_p.h"
#include "qv4managed_p.h"
QT_BEGIN_NAMESPACE

1
src/qml/jsruntime/qv4profiling.cpp
View File

@ -33,6 +33,7 @@
#include "qv4profiling_p.h"
#include <private/qv4mm_p.h>
#include <private/qv4string_p.h>
QT_BEGIN_NAMESPACE

2
src/qml/jsruntime/qv4qobjectwrapper_p.h
View File

@ -54,7 +54,7 @@
#include <private/qqmlpropertycache_p.h>
#include <private/qintrusivelist_p.h>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
#include <private/qv4functionobject_p.h>
QT_BEGIN_NAMESPACE

2
src/qml/jsruntime/qv4runtime_p.h
View File

@ -34,7 +34,7 @@
#define QMLJS_RUNTIME_H
#include "qv4global_p.h"
#include "qv4value_inl_p.h"
#include "qv4value_p.h"
#include "qv4context_p.h"
#include "qv4engine_p.h"
#include "qv4math_p.h"

3
src/qml/jsruntime/qv4sequenceobject_p.h
View File

@ -48,9 +48,10 @@
#include <QtCore/qglobal.h>
#include <QtCore/qvariant.h>
#include "qv4value_inl_p.h"
#include "qv4value_p.h"
#include "qv4object_p.h"
#include "qv4context_p.h"
#include "qv4string_p.h"
QT_BEGIN_NAMESPACE

2
src/qml/jsruntime/qv4serialize.cpp
View File

@ -37,7 +37,7 @@
#include <private/qqmllistmodel_p.h>
#include <private/qqmllistmodelworkeragent_p.h>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
#include <private/qv4dateobject_p.h>
#include <private/qv4regexpobject_p.h>
#include <private/qv4sequenceobject_p.h>

2
src/qml/jsruntime/qv4serialize_p.h
View File

@ -46,7 +46,7 @@
//
#include <QtCore/qbytearray.h>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
QT_BEGIN_NAMESPACE

2
src/qml/jsruntime/qv4string.cpp
View File

@ -32,7 +32,7 @@
****************************************************************************/
#include "qv4string_p.h"
#include "qv4value_inl_p.h"
#include "qv4value_p.h"
#ifndef V4_BOOTSTRAP
#include "qv4identifiertable_p.h"
#include "qv4runtime_p.h"

9
src/qml/jsruntime/qv4string_p.h
View File

@ -189,6 +189,15 @@ inline const String *Value::as() const {
return isManaged() && m && m->vtable->isString ? static_cast<const String *>(this) : 0;
}
#ifndef V4_BOOTSTRAP
template<>
inline ReturnedValue value_convert<String>(ExecutionEngine *e, const Value &v)
{
return v.toString(e)->asReturnedValue();
}
#endif
}
QT_END_NAMESPACE

1
src/qml/jsruntime/qv4typedarray.cpp
View File

@ -32,6 +32,7 @@
****************************************************************************/
#include "qv4typedarray_p.h"
#include "qv4arraybuffer_p.h"
#include "qv4string_p.h"
#include <cmath>

79
src/qml/jsruntime/qv4value_inl_p.h → src/qml/jsruntime/qv4typedvalue_p.h
View File

@ -30,90 +30,15 @@
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef QV4VALUE_INL_H
#define QV4VALUE_INL_H
#include <cmath> // this HAS to come
#ifndef QV4TYPEDVALUE_H
#define QV4TYPEDVALUE_H
#include "qv4value_p.h"
#include <private/qv4heap_p.h>
#include "qv4string_p.h"
#include "qv4managed_p.h"
QT_BEGIN_NAMESPACE
namespace QV4 {
inline double Value::toNumber() const
{
if (isInteger())
return int_32;
if (isDouble())
return doubleValue();
return toNumberImpl();
}
inline int Value::toInt32() const
{
if (isInteger())
return int_32;
double d = isNumber() ? doubleValue() : toNumberImpl();
const double D32 = 4294967296.0;
const double D31 = D32 / 2.0;
if ((d >= -D31 && d < D31))
return static_cast<int>(d);
return Primitive::toInt32(d);
}
inline unsigned int Value::toUInt32() const
{
return (unsigned int)toInt32();
}
inline
ReturnedValue Heap::Base::asReturnedValue() const
{
return Value::fromHeapObject(const_cast<Heap::Base *>(this)).asReturnedValue();
}
#ifndef V4_BOOTSTRAP
inline uint Value::asArrayIndex() const
{
#if QT_POINTER_SIZE == 8
if (!isNumber())
return UINT_MAX;
if (isInteger())
return int_32 >= 0 ? (uint)int_32 : UINT_MAX;
#else
if (isInteger() && int_32 >= 0)
return (uint)int_32;
if (!isDouble())
return UINT_MAX;
#endif
double d = doubleValue();
uint idx = (uint)d;
if (idx != d)
return UINT_MAX;
return idx;
}
template<>
inline ReturnedValue value_convert<String>(ExecutionEngine *e, const Value &v)
{
return v.toString(e)->asReturnedValue();
}
#endif
template <typename T>
struct TypedValue : public Value
{

3
src/qml/jsruntime/qv4value.cpp
View File

@ -304,8 +304,6 @@ Heap::Object *Value::toObject(ExecutionEngine *e) const
return RuntimeHelpers::convertToObject(e, *this);
}
#endif // V4_BOOTSTRAP
uint Value::asArrayLength(bool *ok) const
{
*ok = true;
@ -337,3 +335,4 @@ uint Value::asArrayLength(bool *ok) const
}
return idx;
}
#endif // V4_BOOTSTRAP

62
src/qml/jsruntime/qv4value_p.h
View File

@ -334,7 +334,9 @@ struct Q_QML_PRIVATE_EXPORT Value
}
inline uint asArrayIndex() const;
#ifndef V4_BOOTSTRAP
uint asArrayLength(bool *ok) const;
#endif
ReturnedValue asReturnedValue() const { return val; }
static Value fromReturnedValue(ReturnedValue val) { Value v; v.val = val; return v; }
@ -389,6 +391,45 @@ inline bool Value::isPrimitive() const
return !isObject();
}
inline double Value::toNumber() const
{
if (isInteger())
return int_32;
if (isDouble())
return doubleValue();
return toNumberImpl();
}
#ifndef V4_BOOTSTRAP
inline uint Value::asArrayIndex() const
{
#if QT_POINTER_SIZE == 8
if (!isNumber())
return UINT_MAX;
if (isInteger())
return int_32 >= 0 ? (uint)int_32 : UINT_MAX;
#else
if (isInteger() && int_32 >= 0)
return (uint)int_32;
if (!isDouble())
return UINT_MAX;
#endif
double d = doubleValue();
uint idx = (uint)d;
if (idx != d)
return UINT_MAX;
return idx;
}
#endif
inline
ReturnedValue Heap::Base::asReturnedValue() const
{
return Value::fromHeapObject(const_cast<Heap::Base *>(this)).asReturnedValue();
}
struct Q_QML_PRIVATE_EXPORT Primitive : public Value
{
@ -523,6 +564,27 @@ private:
template<typename T>
ReturnedValue value_convert(ExecutionEngine *e, const Value &v);
inline int Value::toInt32() const
{
if (isInteger())
return int_32;
double d = isNumber() ? doubleValue() : toNumberImpl();
const double D32 = 4294967296.0;
const double D31 = D32 / 2.0;
if ((d >= -D31 && d < D31))
return static_cast<int>(d);
return Primitive::toInt32(d);
}
inline unsigned int Value::toUInt32() const
{
return (unsigned int)toInt32();
}
}
QT_END_NAMESPACE

2
src/qml/jsruntime/qv4variantobject_p.h
View File

@ -49,7 +49,7 @@
#include <QtQml/qqmllist.h>
#include <QtCore/qvariant.h>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
#include <private/qv4object_p.h>
QT_BEGIN_NAMESPACE

3
src/qml/jsruntime/qv4vme_moth.cpp
View File

@ -37,13 +37,14 @@
#include <QtCore/qjsondocument.h>
#include <QtCore/qjsonobject.h>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
#include <private/qv4debugging_p.h>
#include <private/qv4function_p.h>
#include <private/qv4functionobject_p.h>
#include <private/qv4math_p.h>
#include <private/qv4scopedvalue_p.h>
#include <private/qv4lookup_p.h>
#include <private/qv4string_p.h>
#include <iostream>
#include "qv4alloca_p.h"

2
src/qml/qml/qqmlboundsignal.cpp
View File

@ -47,7 +47,7 @@
#include <private/qqmlcompiler_p.h>
#include "qqmlinfo.h"
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
#include <QtCore/qstringbuilder.h>
#include <QtCore/qdebug.h>

2
src/qml/qml/qqmlcontextwrapper.cpp
View File

@ -38,7 +38,7 @@
#include <private/qqmlcontext_p.h>
#include <private/qv4engine_p.h>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
#include <private/qv4objectproto_p.h>
#include <private/qv4mm_p.h>
#include <private/qv4function_p.h>

2
src/qml/qml/qqmlcontextwrapper_p.h
View File

@ -48,7 +48,7 @@
#include <QtCore/qglobal.h>
#include <private/qtqmlglobal_p.h>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
#include <private/qv4object_p.h>
#include <private/qqmlcontext_p.h>
#include <private/qv4functionobject_p.h>

2
src/qml/qml/qqmldata_p.h
View File

@ -48,7 +48,7 @@
#include <private/qtqmlglobal_p.h>
#include <private/qobject_p.h>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
#include <private/qv4persistent_p.h>
#include <qjsengine.h>

2
src/qml/qml/qqmljavascriptexpression.cpp
View File

@ -35,7 +35,7 @@
#include <private/qqmlexpression_p.h>
#include <private/qqmlcontextwrapper_p.h>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
#include <private/qv4functionobject_p.h>
#include <private/qv4script_p.h>
#include <private/qv4errorobject_p.h>

2
src/qml/qml/qqmllistwrapper_p.h
View File

@ -50,7 +50,7 @@
#include <QtQml/qqmllist.h>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
#include <private/qv4object_p.h>
QT_BEGIN_NAMESPACE

3
src/qml/qml/qqmlproperty.cpp
View File

@ -55,6 +55,7 @@
#include <private/qmetaobject_p.h>
#include <private/qqmlvaluetypewrapper_p.h>
#include <QtCore/qdebug.h>
#include <cmath>
Q_DECLARE_METATYPE(QList<int>)
Q_DECLARE_METATYPE(QList<qreal>)
@ -1255,7 +1256,7 @@ bool QQmlPropertyPrivate::write(QObject *object,
// Enum values come through the script engine as doubles
if (value.userType() == QVariant::Double) {
double integral;
double fractional = modf(value.toDouble(), &integral);
double fractional = std::modf(value.toDouble(), &integral);
if (qFuzzyIsNull(fractional))
v.convert(QVariant::Int);
}

2
src/qml/qml/qqmlpropertycache.cpp
View File

@ -42,7 +42,7 @@
#include <private/qqmlaccessors_p.h>
#include <private/qmetaobjectbuilder_p.h>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
#include <QtCore/qdebug.h>

2
src/qml/qml/qqmlpropertycache_p.h
View File

@ -54,7 +54,7 @@
#include <QtCore/qvarlengtharray.h>
#include <QtCore/qvector.h>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
QT_BEGIN_NAMESPACE

2
src/qml/qml/qqmltypeloader_p.h
View File

@ -60,7 +60,7 @@
#include <private/qflagpointer_p.h>
#include <private/qqmlirbuilder_p.h>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
#include <private/qv4script_p.h>
QT_BEGIN_NAMESPACE

2
src/qml/qml/qqmltypewrapper_p.h
View File

@ -48,7 +48,7 @@
#include <QtCore/qglobal.h>
#include <QtCore/qpointer.h>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
#include <private/qv4object_p.h>
QT_BEGIN_NAMESPACE

2
src/qml/qml/qqmlvaluetypewrapper_p.h
View File

@ -48,7 +48,7 @@
#include <QtCore/qglobal.h>
#include <private/qtqmlglobal_p.h>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
#include <private/qv4object_p.h>
QT_BEGIN_NAMESPACE

2
src/qml/qml/qqmlvmemetaobject_p.h
View File

@ -63,7 +63,7 @@
#include <private/qv8engine_p.h>
#include <private/qflagpointer_p.h>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
QT_BEGIN_NAMESPACE

2
src/qml/qml/v8/qv8engine.cpp
View File

@ -61,7 +61,7 @@
#include <QtCore/qdatastream.h>
#include <private/qsimd_p.h>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
#include <private/qv4dateobject_p.h>
#include <private/qv4objectiterator_p.h>
#include <private/qv4mm_p.h>

2
src/qml/qml/v8/qv8engine_p.h
View File

@ -60,7 +60,7 @@
#include <private/qqmlpropertycache_p.h>
#include <private/qv4qobjectwrapper_p.h>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
#include <private/qv4object_p.h>
#include <private/qv4identifier_p.h>

2
src/qml/types/qqmldelegatemodel.cpp
View File

@ -44,7 +44,7 @@
#include <private/qqmlincubator_p.h>
#include <private/qqmlcompiler_p.h>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
#include <private/qv4functionobject_p.h>
#include <qv4objectiterator_p.h>

2
src/qml/types/qquickworkerscript.cpp
View File

@ -54,7 +54,7 @@
#include <private/qv8engine_p.h>
#include <private/qv4serialize_p.h>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
#include <private/qv4functionobject_p.h>
#include <private/qv4script_p.h>
#include <private/qv4scopedvalue_p.h>

2
src/qml/util/qqmladaptormodel.cpp
View File

@ -38,7 +38,7 @@
#include <private/qqmlproperty_p.h>
#include <private/qv8engine_p.h>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
#include <private/qv4functionobject_p.h>
QT_BEGIN_NAMESPACE

2
src/quick/items/context2d/qquickcanvasitem.cpp
View File

@ -46,7 +46,7 @@
#include <QtCore/QBuffer>
#include <QtCore/qdatetime.h>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
#include <private/qv4functionobject_p.h>
#include <private/qv4scopedvalue_p.h>

2
src/quick/items/context2d/qquickcontext2d.cpp
View File

@ -53,7 +53,7 @@
#include <private/qv4object_p.h>
#include <private/qquickwindow_p.h>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
#include <private/qv4functionobject_p.h>
#include <private/qv4objectproto_p.h>
#include <private/qv4scopedvalue_p.h>

2
src/quick/items/context2d/qquickcontext2d_p.h
View File

@ -48,7 +48,7 @@
#include <private/qv8engine_p.h>
#include <QtCore/QWaitCondition>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
//#define QQUICKCONTEXT2D_DEBUG //enable this for just DEBUG purpose!

2
src/quick/items/qquickloader_p_p.h
View File

@ -50,7 +50,7 @@
#include "qquickitemchangelistener_p.h"
#include <qqmlincubator.h>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
QT_BEGIN_NAMESPACE

2
tests/auto/qmldevtools/compile/tst_compile.cpp
View File

@ -37,7 +37,7 @@
#include <private/qqmljsastvisitor_p.h>
#include <private/qqmljsast_p.h>
#include <private/qqmlirbuilder_p.h>
#include <private/qv4value_inl_p.h>
#include <private/qv4typedvalue_p.h>
#include <private/qv4codegen_p.h>
int main()

2
tools/qmlimportscanner/main.cpp
View File

@ -35,7 +35,7 @@
#include <private/qqmljsparser_p.h>
#include <private/qqmljsast_p.h>
#include <private/qv4codegen_p.h>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
#include <private/qqmlpool_p.h>
#include <private/qqmlirbuilder_p.h>

1
tools/qmljs/qmljs.cpp
View File

@ -44,6 +44,7 @@
#include "private/qv4mm_p.h"
#include "private/qv4context_p.h"
#include "private/qv4script_p.h"
#include "private/qv4string_p.h"
#ifdef V4_ENABLE_JIT
# include "private/qv4isel_masm_p.h"

2
tools/qmllint/main.cpp
View File

@ -37,7 +37,7 @@
#include <QCommandLineParser>
#include <QCoreApplication>
#include <private/qv4value_inl_p.h>
#include <private/qv4value_p.h>
#include <private/qqmljslexer_p.h>
#include <private/qqmljsparser_p.h>
#include <private/qqmljsengine_p.h>