Fix compiler error and warning.

Change-Id: Ifc458df6f2804cbc4a78b0d0b3b582edd974a61d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

diff --git a/src/qml/qml/v4/qv4isel_llvm.cpp b/src/qml/qml/v4/qv4isel_llvm.cpp
index 7e4b809..f40eb56 100644 (file)
--- a/src/qml/qml/v4/qv4isel_llvm.cpp
+++ b/src/qml/qml/v4/qv4isel_llvm.cpp
@@ -498,6 +498,13 @@ void InstructionSelection::callBuiltinDefineArray(V4IR::Temp *result, V4IR::Expr
     Q_UNREACHABLE();
 }
 
+void InstructionSelection::callBuiltinDefineObjectLiteral(V4IR::Temp *result, V4IR::ExprList *args)
+{
+    // TODO
+    assert(!"TODO!");
+    Q_UNREACHABLE();
+}
+
 void InstructionSelection::callValue(V4IR::Temp *value, V4IR::ExprList *args, V4IR::Temp *result)
 {
     // TODO

diff --git a/src/qml/qml/v4/qv4isel_llvm_p.h b/src/qml/qml/v4/qv4isel_llvm_p.h
index bdda28c..e96d0b9 100644 (file)
--- a/src/qml/qml/v4/qv4isel_llvm_p.h
+++ b/src/qml/qml/v4/qv4isel_llvm_p.h
@@ -98,6 +98,7 @@ public: // methods from InstructionSelection:
     virtual void callBuiltinDefineGetterSetter(V4IR::Temp *object, const QString &name, V4IR::Temp *getter, V4IR::Temp *setter);
     virtual void callBuiltinDefineProperty(V4IR::Temp *object, const QString &name, V4IR::Temp *value);
     virtual void callBuiltinDefineArray(V4IR::Temp *result, V4IR::ExprList *args);
+    virtual void callBuiltinDefineObjectLiteral(V4IR::Temp *result, V4IR::ExprList *args);
     virtual void callValue(V4IR::Temp *value, V4IR::ExprList *args, V4IR::Temp *result);
     virtual void callProperty(V4IR::Temp *base, const QString &name, V4IR::ExprList *args, V4IR::Temp *result);
     virtual void callSubscript(V4IR::Temp *base, V4IR::Temp *index, V4IR::ExprList *args, V4IR::Temp *result);

diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp
index 31b23fb..f018075 100644 (file)
--- a/src/quick/util/qquickglobal.cpp
+++ b/src/quick/util/qquickglobal.cpp
@@ -311,6 +311,8 @@ public:
 
     static QFont fontFromObject(QQmlV4Handle object, QV8Engine *e, bool *ok)
     {
+        Q_UNUSED(e);
+
         if (ok) *ok = false;
         QFont retn;
         v8::Handle<v8::Object> obj = object.toV8Handle()->ToObject();