Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (53 commits)
  Be consistent in conversion from string (eg. color, int rounding).
  Simplify code to make next change clearer.
  Stop warnings.
  Improve error messages when tests fail.
  Stop highlight animators for highlightFollowsCurrentItem: false
  Ensure valuetype enums can be assigned from JS
  Improve testcase
  Rename Component::errorsString() -> errorString() (and also for
  Fixes for docs, example code
  Make test more stable
  Autotest (XFAIL) for QTBUG-10822
  Add return value for resolveTypeInNamespace
  Fix test
  Fix test. Missed files.
  Missing break
  Create overview page for examples for Extending QML in C++
  Search for QML import libraries also in application directory
  Doc improvements
  Disable mouse-based selection in TextInput/TextEdit
  Rename qml executable to qmlviewer
  ...

1 files changed, 27 insertions, 24 deletions

diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp
index a43b9ac..b5bf972 100644
--- a/src/declarative/qml/qdeclarativecompiler.cpp
+++ b/src/declarative/qml/qdeclarativecompiler.cpp
@@ -180,7 +180,7 @@ bool QDeclarativeCompiler::isSignalPropertyName(const QByteArray &name)
 bool QDeclarativeCompiler::testLiteralAssignment(const QMetaProperty &prop,
                                         QDeclarativeParser::Value *v)
 {
-    QString string = v->value.asScript();
+    QString string = v->value.asString();
 
     if (!prop.isWritable())
         COMPILE_EXCEPTION(v, tr("Invalid property assignment: \"%1\" is a read-only property").arg(QString::fromUtf8(prop.name())));
@@ -207,31 +207,31 @@ bool QDeclarativeCompiler::testLiteralAssignment(const QMetaProperty &prop,
             break;
         case QVariant::UInt:
             {
-            bool ok;
-            string.toUInt(&ok);
-            if (!v->value.isNumber() || !ok) COMPILE_EXCEPTION(v, tr("Invalid property assignment: unsigned int expected"));
+            bool ok = v->value.isNumber();
+            if (ok) {
+                double n = v->value.asNumber();
+                if (double(uint(n)) != n)
+                    ok = false;
+            }
+            if (!ok) COMPILE_EXCEPTION(v, tr("Invalid property assignment: unsigned int expected"));
             }
             break;
         case QVariant::Int:
             {
-            bool ok;
-            string.toInt(&ok);
-            if (!v->value.isNumber() || !ok) COMPILE_EXCEPTION(v, tr("Invalid property assignment: int expected"));
+            bool ok = v->value.isNumber();
+            if (ok) {
+                double n = v->value.asNumber();
+                if (double(int(n)) != n)
+                    ok = false;
+            }
+            if (!ok) COMPILE_EXCEPTION(v, tr("Invalid property assignment: int expected"));
             }
             break;
         case QMetaType::Float:
-            {
-            bool ok;
-            string.toFloat(&ok);
-            if (!v->value.isNumber() || !ok) COMPILE_EXCEPTION(v, tr("Invalid property assignment: float expected"));
-            }
+            if (!v->value.isNumber()) COMPILE_EXCEPTION(v, tr("Invalid property assignment: float expected"));
             break;
         case QVariant::Double:
-            {
-            bool ok;
-            string.toDouble(&ok);
-            if (!v->value.isNumber() || !ok) COMPILE_EXCEPTION(v, tr("Invalid property assignment: double expected"));
-            }
+            if (!v->value.isNumber()) COMPILE_EXCEPTION(v, tr("Invalid property assignment: double expected"));
             break;
         case QVariant::Color:
             {
@@ -319,7 +319,7 @@ bool QDeclarativeCompiler::testLiteralAssignment(const QMetaProperty &prop,
 void QDeclarativeCompiler::genLiteralAssignment(const QMetaProperty &prop,
                                        QDeclarativeParser::Value *v)
 {
-    QString string = v->value.asScript();
+    QString string = v->value.asString();
 
     QDeclarativeInstruction instr;
     instr.line = v->location.start.line;
@@ -382,28 +382,28 @@ void QDeclarativeCompiler::genLiteralAssignment(const QMetaProperty &prop,
             {
             instr.type = QDeclarativeInstruction::StoreInteger;
             instr.storeInteger.propertyIndex = prop.propertyIndex();
-            instr.storeInteger.value = string.toUInt();
+            instr.storeInteger.value = uint(v->value.asNumber());
             }
             break;
         case QVariant::Int:
             {
             instr.type = QDeclarativeInstruction::StoreInteger;
             instr.storeInteger.propertyIndex = prop.propertyIndex();
-            instr.storeInteger.value = string.toInt();
+            instr.storeInteger.value = int(v->value.asNumber());
             }
             break;
         case QMetaType::Float:
             {
             instr.type = QDeclarativeInstruction::StoreFloat;
             instr.storeFloat.propertyIndex = prop.propertyIndex();
-            instr.storeFloat.value = string.toFloat();
+            instr.storeFloat.value = float(v->value.asNumber());
             }
             break;
         case QVariant::Double:
             {
             instr.type = QDeclarativeInstruction::StoreDouble;
             instr.storeDouble.propertyIndex = prop.propertyIndex();
-            instr.storeDouble.value = string.toDouble();
+            instr.storeDouble.value = v->value.asNumber();
             }
             break;
         case QVariant::Color:
@@ -1187,7 +1187,7 @@ bool QDeclarativeCompiler::buildComponent(QDeclarativeParser::Object *obj,
     if (idProp) {
        if (idProp->value || idProp->values.count() > 1 || idProp->values.at(0)->object) 
            COMPILE_EXCEPTION(idProp, tr("Invalid component id specification"));
-       COMPILE_CHECK(checkValidId(idProp->values.first(), idProp->values.first()->primitive()));
+       COMPILE_CHECK(checkValidId(idProp->values.first(), idProp->values.first()->primitive()))
 
         QString idVal = idProp->values.first()->primitive();
 
@@ -1316,6 +1316,9 @@ bool QDeclarativeCompiler::buildSignal(QDeclarativeParser::Property *prop, QDecl
         } else {
             prop->values.at(0)->type = Value::SignalExpression;
 
+            if (!prop->values.at(0)->value.isScript())
+                COMPILE_EXCEPTION(prop, tr("Cannot assign a value to a signal (expecting a script to be run)"));
+
             QString script = prop->values.at(0)->value.asScript().trimmed();
             if (script.isEmpty())
                 COMPILE_EXCEPTION(prop, tr("Empty signal assignment"));
@@ -1893,7 +1896,7 @@ bool QDeclarativeCompiler::buildScriptStringProperty(QDeclarativeParser::Propert
     if (prop->values.count() > 1) 
         COMPILE_EXCEPTION(prop->values.at(1), tr( "Cannot assign multiple values to a script property"));
 
-    if (prop->values.at(0)->object || !prop->values.at(0)->value.isScript())
+    if (prop->values.at(0)->object)
         COMPILE_EXCEPTION(prop->values.at(0), tr( "Invalid property assignment: script expected"));
 
     obj->addScriptStringProperty(prop, ctxt.stack);