diff options
Diffstat (limited to 'src/qml/jsruntime/qv4global_p.h')
-rw-r--r-- | src/qml/jsruntime/qv4global_p.h | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h index 5cddf2eaa6..7f82a02ae0 100644 --- a/src/qml/jsruntime/qv4global_p.h +++ b/src/qml/jsruntime/qv4global_p.h @@ -76,9 +76,6 @@ namespace std { inline bool isinf(double d) { return !_finite(d) && !_isnan(d); } inline bool isnan(double d) { return !!_isnan(d); } inline bool isfinite(double d) { return _finite(d); } -#if _MSC_VER < 1800 -inline bool signbit(double d) { return _copysign(1.0, d) < 0; } -#endif } // namespace std @@ -107,8 +104,8 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); } # if defined(Q_OS_LINUX) || defined(Q_OS_QNX) # define V4_ENABLE_JIT # endif -#elif defined(Q_PROCESSOR_MIPS_32) && defined(Q_OS_LINUX) -# define V4_ENABLE_JIT +//#elif defined(Q_PROCESSOR_MIPS_32) && defined(Q_OS_LINUX) +//# define V4_ENABLE_JIT #endif // Black list some platforms @@ -147,6 +144,12 @@ QT_BEGIN_NAMESPACE namespace QV4 { +namespace Compiler { + struct Module; + struct Context; + struct JSUnitGenerator; +} + namespace Heap { struct Base; struct MemberData; @@ -157,7 +160,6 @@ namespace Heap { struct ObjectPrototype; struct ExecutionContext; - struct GlobalContext; struct CallContext; struct ScriptFunction; @@ -182,12 +184,12 @@ namespace Heap { } class MemoryManager; +class ExecutableAllocator; struct String; struct Object; struct ObjectPrototype; struct ObjectIterator; struct ExecutionContext; -struct GlobalContext; struct CallContext; struct ScriptFunction; struct InternalClass; @@ -206,7 +208,6 @@ struct StringObject; struct ArrayObject; struct DateObject; struct FunctionObject; -struct BuiltinFunction; struct ErrorObject; struct ArgumentsObject; struct Managed; @@ -243,12 +244,6 @@ struct IdentifierTable; class RegExpCache; class MultiplyWrappedQObjectMap; -namespace Global { - enum { - ReservedArgumentCount = 6 - }; -} - enum PropertyFlag { Attr_Data = 0, Attr_Accessor = 0x1, @@ -349,11 +344,11 @@ struct PropertyAttributes } }; -struct StackFrame { +struct Q_QML_EXPORT StackFrame { QString source; QString function; - int line; - int column; + int line = -1; + int column = -1; }; typedef QVector<StackFrame> StackTrace; |