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: (22 commits)
  Regression fix for Loader anchors not working
  Make Qt.include() work for js files that have '.pragma library'
  doc fix
  Improve docs for Qt.quit()
  Prevent assignment of values (string, number, bool)  to signal handlers.
  Make sure strings are escaped when returned via asScript.
  Documentation
  git ignore stuff
  Test Qt.labs.folderlistmodel plugin
  Fix naming.
  Sometimes you own QNetworkReply, sometimes you don't.
  Rename files; fix test.
  Add parent parameter to QDeclarativeExpression constructor.
  Round correctly in binding optimizer
  Don't disable SmoothPixmapTransform in qDrawBorderPixmap()
  Photoviewer example fixes.
  Port from QListModelInterface to QAbstractListModel.
  Use QDeclarativeScriptString for ParentChange.
  Set raster + gl viewport as the default for OS X.
  Move stuff from QML viewer to plugins.
  ...

14 files changed, 100 insertions, 47 deletions

diff --git a/src/declarative/qml/qdeclarativebinding.cpp b/src/declarative/qml/qdeclarativebinding.cpp
index 2e905b9..8230941 100644
--- a/src/declarative/qml/qdeclarativebinding.cpp
+++ b/src/declarative/qml/qdeclarativebinding.cpp
@@ -88,7 +88,7 @@ QDeclarativeBinding::QDeclarativeBinding(void *data, QDeclarativeRefCount *rc, Q
 
 QDeclarativeBinding::QDeclarativeBinding(const QString &str, QObject *obj, QDeclarativeContext *ctxt, 
                                          QObject *parent)
-: QDeclarativeExpression(QDeclarativeContextData::get(ctxt), str, obj, *new QDeclarativeBindingPrivate)
+: QDeclarativeExpression(QDeclarativeContextData::get(ctxt), obj, str, *new QDeclarativeBindingPrivate)
 {
     setParent(parent);
     setNotifyOnValueChanged(true);
@@ -96,7 +96,7 @@ QDeclarativeBinding::QDeclarativeBinding(const QString &str, QObject *obj, QDecl
 
 QDeclarativeBinding::QDeclarativeBinding(const QString &str, QObject *obj, QDeclarativeContextData *ctxt, 
                                          QObject *parent)
-: QDeclarativeExpression(ctxt, str, obj, *new QDeclarativeBindingPrivate)
+: QDeclarativeExpression(ctxt, obj, str, *new QDeclarativeBindingPrivate)
 {
     setParent(parent);
     setNotifyOnValueChanged(true);
diff --git a/src/declarative/qml/qdeclarativeboundsignal.cpp b/src/declarative/qml/qdeclarativeboundsignal.cpp
index 89f1256..8769122 100644
--- a/src/declarative/qml/qdeclarativeboundsignal.cpp
+++ b/src/declarative/qml/qdeclarativeboundsignal.cpp
@@ -119,7 +119,7 @@ QDeclarativeBoundSignal::QDeclarativeBoundSignal(QDeclarativeContext *ctxt, cons
     QDeclarative_setParent_noEvent(this, parent);
     QMetaObject::connect(scope, m_signal.methodIndex(), this, evaluateIdx);
 
-    m_expression = new QDeclarativeExpression(ctxt, val, scope);
+    m_expression = new QDeclarativeExpression(ctxt, scope, val);
 }
 
 QDeclarativeBoundSignal::~QDeclarativeBoundSignal()
diff --git a/src/declarative/qml/qdeclarativecompiledbindings.cpp b/src/declarative/qml/qdeclarativecompiledbindings.cpp
index f55d330..7ddc735 100644
--- a/src/declarative/qml/qdeclarativecompiledbindings.cpp
+++ b/src/declarative/qml/qdeclarativecompiledbindings.cpp
@@ -1200,7 +1200,7 @@ void QDeclarativeCompiledBindingsPrivate::run(int instrIndex,
         const Register &input = registers[instr->unaryop.src];
         Register &output = registers[instr->unaryop.output];
         if (input.isUndefined()) output.setUndefined();
-        else output.setint(int(input.getqreal()));
+        else output.setint(qRound(input.getqreal()));
     }
         break;
 
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);
diff --git a/src/declarative/qml/qdeclarativeenginedebug.cpp b/src/declarative/qml/qdeclarativeenginedebug.cpp
index 69e42f8..7ae0050 100644
--- a/src/declarative/qml/qdeclarativeenginedebug.cpp
+++ b/src/declarative/qml/qdeclarativeenginedebug.cpp
@@ -414,7 +414,7 @@ void QDeclarativeEngineDebugServer::messageReceived(const QByteArray &message)
         QDeclarativeContext *context = qmlContext(object);
         QVariant result;
         if (object && context) {
-            QDeclarativeExpression exprObj(context, expr, object);
+            QDeclarativeExpression exprObj(context, object, expr);
             bool undefined = false;
             QVariant value = exprObj.evaluate(&undefined);
             if (undefined)
diff --git a/src/declarative/qml/qdeclarativeexpression.cpp b/src/declarative/qml/qdeclarativeexpression.cpp
index 5ceb918..b1aecfa 100644
--- a/src/declarative/qml/qdeclarativeexpression.cpp
+++ b/src/declarative/qml/qdeclarativeexpression.cpp
@@ -241,15 +241,17 @@ QDeclarativeExpression::QDeclarativeExpression(QDeclarativeContextData *ctxt, vo
 }
 
 /*!
-    Create a QDeclarativeExpression object.
+    Create a QDeclarativeExpression object that is a child of \a parent.
 
     The \a expression JavaScript will be executed in the \a ctxt QDeclarativeContext.
     If specified, the \a scope object's properties will also be in scope during
     the expression's execution.
 */
-QDeclarativeExpression::QDeclarativeExpression(QDeclarativeContext *ctxt, const QString &expression,
-                                               QObject *scope)
-: QObject(*new QDeclarativeExpressionPrivate, 0)
+QDeclarativeExpression::QDeclarativeExpression(QDeclarativeContext *ctxt,
+                                               QObject *scope,
+                                               const QString &expression,
+                                               QObject *parent)
+: QObject(*new QDeclarativeExpressionPrivate, parent)
 {
     Q_D(QDeclarativeExpression);
     d->init(QDeclarativeContextData::get(ctxt), expression, scope);
@@ -258,8 +260,8 @@ QDeclarativeExpression::QDeclarativeExpression(QDeclarativeContext *ctxt, const
 /*! 
     \internal
 */
-QDeclarativeExpression::QDeclarativeExpression(QDeclarativeContextData *ctxt, const QString &expression,
-                                               QObject *scope)
+QDeclarativeExpression::QDeclarativeExpression(QDeclarativeContextData *ctxt, QObject *scope,
+                                               const QString &expression)
 : QObject(*new QDeclarativeExpressionPrivate, 0)
 {
     Q_D(QDeclarativeExpression);
@@ -267,8 +269,8 @@ QDeclarativeExpression::QDeclarativeExpression(QDeclarativeContextData *ctxt, co
 }
 
 /*!  \internal */
-QDeclarativeExpression::QDeclarativeExpression(QDeclarativeContextData *ctxt, const QString &expression,
-                                               QObject *scope, QDeclarativeExpressionPrivate &dd)
+QDeclarativeExpression::QDeclarativeExpression(QDeclarativeContextData *ctxt, QObject *scope,
+                                               const QString &expression, QDeclarativeExpressionPrivate &dd)
 : QObject(dd, 0)
 {
     Q_D(QDeclarativeExpression);
diff --git a/src/declarative/qml/qdeclarativeexpression.h b/src/declarative/qml/qdeclarativeexpression.h
index 6c72e4d..a8c86da 100644
--- a/src/declarative/qml/qdeclarativeexpression.h
+++ b/src/declarative/qml/qdeclarativeexpression.h
@@ -64,7 +64,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeExpression : public QObject
     Q_OBJECT
 public:
     QDeclarativeExpression();
-    QDeclarativeExpression(QDeclarativeContext *, const QString &, QObject *);
+    QDeclarativeExpression(QDeclarativeContext *, QObject *, const QString &, QObject * = 0);
     virtual ~QDeclarativeExpression();
 
     QDeclarativeEngine *engine() const;
@@ -92,13 +92,13 @@ Q_SIGNALS:
     void valueChanged();
 
 protected:
-    QDeclarativeExpression(QDeclarativeContextData *, const QString &, QObject *, 
+    QDeclarativeExpression(QDeclarativeContextData *, QObject *, const QString &,
                            QDeclarativeExpressionPrivate &dd);
     QDeclarativeExpression(QDeclarativeContextData *, void *, QDeclarativeRefCount *rc, 
                            QObject *me, const QString &, int, QDeclarativeExpressionPrivate &dd);
 
 private:
-    QDeclarativeExpression(QDeclarativeContextData *, const QString &, QObject *);
+    QDeclarativeExpression(QDeclarativeContextData *, QObject *, const QString &);
 
     Q_DISABLE_COPY(QDeclarativeExpression)
     Q_DECLARE_PRIVATE(QDeclarativeExpression)
diff --git a/src/declarative/qml/qdeclarativeinclude.cpp b/src/declarative/qml/qdeclarativeinclude.cpp
index 619264a..e37b68b 100644
--- a/src/declarative/qml/qdeclarativeinclude.cpp
+++ b/src/declarative/qml/qdeclarativeinclude.cpp
@@ -140,6 +140,7 @@ void QDeclarativeInclude::finished()
 
         scriptContext->pushScope(m_scope[1]);
         scriptContext->setActivationObject(m_scope[1]);
+        QDeclarativeScriptParser::extractPragmas(code);
 
         m_scriptEngine->evaluate(code, urlString, 1);
 
@@ -230,6 +231,7 @@ QScriptValue QDeclarativeInclude::include(QScriptContext *ctxt, QScriptEngine *e
             QScriptValue scope = QScriptDeclarativeClass::scopeChainValue(ctxt, -5);
             scriptContext->pushScope(scope);
             scriptContext->setActivationObject(scope);
+            QDeclarativeScriptParser::extractPragmas(code);
 
             engine->evaluate(code, urlString, 1);
 
@@ -291,6 +293,7 @@ QScriptValue QDeclarativeInclude::worker_include(QScriptContext *ctxt, QScriptEn
             QScriptValue scope = QScriptDeclarativeClass::scopeChainValue(ctxt, -4);
             scriptContext->pushScope(scope);
             scriptContext->setActivationObject(scope);
+            QDeclarativeScriptParser::extractPragmas(code);
 
             engine->evaluate(code, urlString, 1);
 
diff --git a/src/declarative/qml/qdeclarativeparser.cpp b/src/declarative/qml/qdeclarativeparser.cpp
index b38bd76..8d00ef8 100644
--- a/src/declarative/qml/qdeclarativeparser.cpp
+++ b/src/declarative/qml/qdeclarativeparser.cpp
@@ -57,6 +57,7 @@
 #include <QPointF>
 #include <QSizeF>
 #include <QRectF>
+#include <QStringBuilder>
 #include <QtDebug>
 
 QT_BEGIN_NAMESPACE
@@ -310,6 +311,49 @@ double QDeclarativeParser::Variant::asNumber() const
     return d;
 }
 
+//reverse of Lexer::singleEscape()
+QString escapedString(const QString &string)
+{
+    QString tmp = QLatin1String("\"");
+    for (int i = 0; i < string.length(); ++i) {
+        const QChar &c = string.at(i);
+        switch(c.unicode()) {
+        case 0x08:
+            tmp += QLatin1String("\\b");
+            break;
+        case 0x09:
+            tmp += QLatin1String("\\t");
+            break;
+        case 0x0A:
+            tmp += QLatin1String("\\n");
+            break;
+        case 0x0B:
+            tmp += QLatin1String("\\v");
+            break;
+        case 0x0C:
+            tmp += QLatin1String("\\f");
+            break;
+        case 0x0D:
+            tmp += QLatin1String("\\r");
+            break;
+        case 0x22:
+            tmp += QLatin1String("\\\"");
+            break;
+        case 0x27:
+            tmp += QLatin1String("\\\'");
+            break;
+        case 0x5C:
+            tmp += QLatin1String("\\\\");
+            break;
+        default:
+            tmp += c;
+            break;
+        }
+    }
+    tmp += QLatin1Char('\"');
+    return tmp;
+}
+
 QString QDeclarativeParser::Variant::asScript() const
 {
     switch(type()) { 
@@ -324,6 +368,7 @@ QString QDeclarativeParser::Variant::asScript() const
         else
             return s;
     case String:
+        return escapedString(s);
     case Script:
         return s;
     }
diff --git a/src/declarative/qml/qdeclarativeparser_p.h b/src/declarative/qml/qdeclarativeparser_p.h
index 25777f5..d192f3a 100644
--- a/src/declarative/qml/qdeclarativeparser_p.h
+++ b/src/declarative/qml/qdeclarativeparser_p.h
@@ -307,8 +307,8 @@ namespace QDeclarativeParser
         };
         Type type;
 
-        // ### Temporary
-        QString primitive() const { return value.asScript(); }
+        // ### Temporary (for id only)
+        QString primitive() const { return value.isString() ? value.asString() : value.asScript(); }
 
         // Primitive value
         Variant value;
diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp
index 8ba79a6..3247f85 100644
--- a/src/declarative/qml/qdeclarativevme.cpp
+++ b/src/declarative/qml/qdeclarativevme.cpp
@@ -627,7 +627,7 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
 
                 QDeclarativeBoundSignal *bs = new QDeclarativeBoundSignal(target, signal, target);
                 QDeclarativeExpression *expr = 
-                    new QDeclarativeExpression(ctxt, primitives.at(instr.storeSignal.value), context);
+                    new QDeclarativeExpression(ctxt, context, primitives.at(instr.storeSignal.value));
                 expr->setSourceLocation(comp->name, instr.line);
                 bs->setExpression(expr);
             }
diff --git a/src/declarative/qml/qdeclarativewatcher.cpp b/src/declarative/qml/qdeclarativewatcher.cpp
index 842b3c4..da1419f 100644
--- a/src/declarative/qml/qdeclarativewatcher.cpp
+++ b/src/declarative/qml/qdeclarativewatcher.cpp
@@ -153,7 +153,7 @@ bool QDeclarativeWatcher::addWatch(int id, quint32 objectId, const QString &expr
     QObject *object = QDeclarativeDebugService::objectForId(objectId);
     QDeclarativeContext *context = qmlContext(object);
     if (context) {
-        QDeclarativeExpression *exprObj = new QDeclarativeExpression(context, expr, object);
+        QDeclarativeExpression *exprObj = new QDeclarativeExpression(context, object, expr);
         exprObj->setNotifyOnValueChanged(true);
         QDeclarativeWatchProxy *proxy = new QDeclarativeWatchProxy(id, exprObj, objectId, this);
         exprObj->setParent(proxy);
diff --git a/src/declarative/qml/qdeclarativeworkerscript.cpp b/src/declarative/qml/qdeclarativeworkerscript.cpp
index 4b687a9..8182998 100644
--- a/src/declarative/qml/qdeclarativeworkerscript.cpp
+++ b/src/declarative/qml/qdeclarativeworkerscript.cpp
@@ -527,7 +527,7 @@ void QDeclarativeWorkerScriptEngine::run()
     \snippet doc/src/snippets/declarative/workerscript.qml 0
 
     The above worker script specifies a javascript file, "script.js", that handles
-    the operations to be performed in the new thread:
+    the operations to be performed in the new thread. Here is \c script.js:
 
     \qml
     WorkerScript.onMessage = function(message) {
@@ -538,7 +538,7 @@ void QDeclarativeWorkerScriptEngine::run()
 
     When the user clicks anywhere within the rectangle, \c sendMessage() is
     called, triggering the \tt WorkerScript.onMessage() handler in
-    \tt source.js. This in turn sends a reply message that is then received
+    \tt script.js. This in turn sends a reply message that is then received
     by the \tt onMessage() handler of \tt myWorker.
 */
 QDeclarativeWorkerScript::QDeclarativeWorkerScript(QObject *parent)
diff --git a/src/declarative/qml/qdeclarativexmlhttprequest.cpp b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
index 80510f8..acd1f51 100644
--- a/src/declarative/qml/qdeclarativexmlhttprequest.cpp
+++ b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
@@ -995,7 +995,7 @@ private:
     int m_status;
     QString m_statusText;
     QNetworkRequest m_request;
-    QNetworkReply *m_network;
+    QDeclarativeGuard<QNetworkReply> m_network;
     void destroyNetwork();
 
     QNetworkAccessManager *m_nam;