diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-05-21 22:04:36 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-22 06:23:34 +0200 |
| commit | 6aa14b5d01d86894f620be2adce75e069b1a1e48 (patch) | |
| tree | 5ef733351bcb24c859af9b727d513c9391011032 /src/qml/qml/qqmlpropertycache.cpp | |
| parent | 70f8279338ee9f4df39e45403f9357359113ec0d (diff) | |
Remove v8 dependencies in qhashedstring
Also remove now unused API in v8::String
Change-Id: I2570aedf407c89ad85da01cf0e2153a52b4e562d
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlpropertycache.cpp')
| -rw-r--r-- | src/qml/qml/qqmlpropertycache.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlpropertycache.cpp b/src/qml/qml/qqmlpropertycache.cpp index 55ecdff14e..4adb268fb4 100644 --- a/src/qml/qml/qqmlpropertycache.cpp +++ b/src/qml/qml/qqmlpropertycache.cpp @@ -1366,9 +1366,9 @@ inline const QString &qQmlPropertyCacheToString(const QString &string) return string; } -inline QString qQmlPropertyCacheToString(const QHashedV8String &string) +inline QString qQmlPropertyCacheToString(const QHashedV4String &string) { - return string.string()->v4Value().toQString(); + return string.toString(); } template<typename T> @@ -1406,10 +1406,10 @@ qQmlPropertyCacheProperty(QQmlEngine *engine, QObject *obj, const T &name, } QQmlPropertyData * -QQmlPropertyCache::property(QQmlEngine *engine, QObject *obj, const QHashedV8String &name, +QQmlPropertyCache::property(QQmlEngine *engine, QObject *obj, const QHashedV4String &name, QQmlContextData *context, QQmlPropertyData &local) { - return qQmlPropertyCacheProperty<QHashedV8String>(engine, obj, name, context, local); + return qQmlPropertyCacheProperty<QHashedV4String>(engine, obj, name, context, local); } QQmlPropertyData * |