diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-09-07 09:55:37 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-09-07 09:55:37 (GMT) |
| commit | f27ed1a26d0b68594f13f79be4806b40e489ce14 (patch) | |
| tree | 1c58a8a813c9f398a36098b6517eadbe2f47498c /src/3rdparty/webkit/JavaScriptCore/runtime/Protect.h | |
| parent | 1cac9a68bab207cab3fd3790baec4569a0acd385 (diff) | |
| parent | 6b7330ee075a62138f005492a6448059106554af (diff) | |
| download | Qt-f27ed1a26d0b68594f13f79be4806b40e489ce14.zip Qt-f27ed1a26d0b68594f13f79be4806b40e489ce14.tar.gz Qt-f27ed1a26d0b68594f13f79be4806b40e489ce14.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/Protect.h')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/Protect.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/Protect.h b/src/3rdparty/webkit/JavaScriptCore/runtime/Protect.h index 224164d..6e7984c 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/Protect.h +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/Protect.h @@ -98,7 +98,7 @@ namespace JSC { JSValue get() const { return m_value; } operator JSValue() const { return m_value; } - JSValue operator->() const { return m_value; } + //JSValue operator->() const { return m_value; } operator bool() const { return m_value; } bool operator!() const { return !m_value; } |