Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt

Conflicts:
	doc/src/declarative/advtutorial1.qdoc
	src/declarative/qml/qmlmoduleplugin.cpp
	src/declarative/util/qmlxmllistmodel.cpp

1 files changed, 10 insertions, 14 deletions

diff --git a/src/script/api/qscriptvalue_p.h b/src/script/api/qscriptvalue_p.h
index 7440d21..77b7330 100644
--- a/src/script/api/qscriptvalue_p.h
+++ b/src/script/api/qscriptvalue_p.h
@@ -69,9 +69,6 @@ public:
     inline bool isJSC() const;
     inline bool isObject() const;
 
-    QVariant &variantValue() const;
-    void setVariantValue(const QVariant &value);
-
     static inline QScriptValuePrivate *get(const QScriptValue &q)
     {
         return q.d_ptr.data();
@@ -89,14 +86,16 @@ public:
         return q.d_ptr->engine;
     }
 
-    inline QScriptValue property(const JSC::Identifier &id, int resolveMode) const;
-    QScriptValue propertyHelper(const JSC::Identifier &id, int resolveMode) const;
-    inline QScriptValue property(quint32 index, int resolveMode) const;
-    QScriptValue propertyHelper(quint32, int resolveMode) const;
-    inline QScriptValue property(const QString &, int resolveMode) const;
-    void setProperty(const JSC::Identifier &id, const QScriptValue &value,
-                     const QScriptValue::PropertyFlags &flags);
-    QScriptValue::PropertyFlags propertyFlags(
+    inline JSC::JSValue property(const JSC::Identifier &id, int resolveMode) const;
+    inline JSC::JSValue property(quint32 index, int resolveMode) const;
+    inline JSC::JSValue property(const QString &, int resolveMode) const;
+    inline void setProperty(const QString &name, const JSC::JSValue &value,
+                            const QScriptValue::PropertyFlags &flags);
+    inline void setProperty(const JSC::Identifier &id, const JSC::JSValue &value,
+                            const QScriptValue::PropertyFlags &flags);
+    inline void setProperty(quint32 index, const JSC::JSValue &value,
+                            const QScriptValue::PropertyFlags &flags);
+    inline QScriptValue::PropertyFlags propertyFlags(
         const JSC::Identifier &id, const QScriptValue::ResolveFlags &mode) const;
 
     void detachFromEngine();
@@ -109,9 +108,6 @@ public:
             return -1;
     }
 
-    static inline void saveException(JSC::ExecState*, JSC::JSValue*);
-    static inline void restoreException(JSC::ExecState*, JSC::JSValue);
-
     QScriptEnginePrivate *engine;
     Type type;
     JSC::JSValue jscValue;