diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2012-08-21 10:26:05 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-21 17:30:09 +0200 |
| commit | bc6456d722e7a23f145baf13b8d1c15f81513aad (patch) | |
| tree | 4f6f721357507273a52abecda9bcd2977620e6f5 | |
| parent | 4fdf98a11f6919c04c5ef3fb78ecd39dd5f4b1fa (diff) | |
Fix compilation on Linux with gcc-4.6
Also make use of the seed.
Change-Id: I03bd961489d95504bf973c02d51979904fbd9b1c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| -rw-r--r-- | src/qml/qml/v8/qv8engine_p.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/qml/qml/v8/qv8engine_p.h b/src/qml/qml/v8/qv8engine_p.h index 9abdb842f9..28acd15ff8 100644 --- a/src/qml/qml/v8/qv8engine_p.h +++ b/src/qml/qml/v8/qv8engine_p.h @@ -83,6 +83,16 @@ #include "qv8sequencewrapper_p.h" #include "qv8jsonwrapper_p.h" +namespace v8 { + +// Needed for V8ObjectSet +inline uint qHash(const v8::Handle<v8::Object> &object, uint seed) +{ + return (object->GetIdentityHash() ^ seed); +} + +} + QT_BEGIN_NAMESPACE @@ -616,13 +626,6 @@ QV8Engine::Deletable *QV8Engine::extensionData(int index) const return 0; } -// Needed for V8ObjectSet -template<> -inline uint qHash<v8::Handle<v8::Object> >(const v8::Handle<v8::Object> &object, uint /*seed*/) -{ - return object->GetIdentityHash(); -} - QT_END_NAMESPACE #endif // QQMLV8ENGINE_P_H |