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: (135 commits)
  Do not treat images in qml examples differently.
  Replace Flickable overshoot property with boundsBehavior
  Autotests and doc
  Give error on attempt to import types from too-early version number.
  Remove (undocumented) QML bindings for effects.
  De-straighten them lines.
  Doc: fix QStringList model doc (really).
  Doc: fix QStringList model docs
  Change return type to match value().
  Add duration and easing properties to AnchorAnimation.
  Autotest
  Remove dead code
  Compile on Windows (export decl fix).
  Fix versioning of Qt Declarative's in-built types
  Fixed declarative/parserstress autotest.
  Fix parsing of regular expression literals.
  Fill out QGraphicsLayout bindings
  Update test files to new syntax
  Compile without Qt3 support.
  Ensure workerscript.qml works (autotested).
  ...

1 files changed, 17 insertions, 129 deletions

diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp
index 065009a..1727687 100644
--- a/src/declarative/qml/qdeclarativecompiler.cpp
+++ b/src/declarative/qml/qdeclarativecompiler.cpp
@@ -571,8 +571,12 @@ bool QDeclarativeCompiler::compile(QDeclarativeEngine *engine,
         QDeclarativeScriptParser::TypeReference *parserRef = unit->data.referencedTypes().at(ii);
         if (tref.type) {
             ref.type = tref.type;
-            if (!ref.type->isCreatable()) 
-                COMPILE_EXCEPTION(parserRef->refObjects.first(), tr( "Element is not creatable."));
+            if (!ref.type->isCreatable()) {
+                QString err = ref.type->noCreationReason();
+                if (err.isEmpty())
+                    err = tr( "Element is not creatable.");
+                COMPILE_EXCEPTION(parserRef->refObjects.first(), err);
+            }
         } else if (tref.unit) {
             ref.component = tref.unit->toComponent(engine);
 
@@ -733,10 +737,6 @@ bool QDeclarativeCompiler::buildObject(Object *obj, const BindingContext &ctxt)
         return true;
     } 
 
-    // Build any script blocks for this type
-    for (int ii = 0; ii < obj->scriptBlockObjects.count(); ++ii)
-        COMPILE_CHECK(buildScript(obj, obj->scriptBlockObjects.at(ii)));
-
     // Object instantiations reset the binding context
     BindingContext objCtxt(obj);
 
@@ -868,12 +868,14 @@ bool QDeclarativeCompiler::buildObject(Object *obj, const BindingContext &ctxt)
         defaultProperty->release();
 
     // Compile custom parser parts
-    if (isCustomParser && !customProps.isEmpty()) {
+    if (isCustomParser/* && !customProps.isEmpty()*/) {
         QDeclarativeCustomParser *cp = output->types.at(obj->type).type->customParser();
         cp->clearErrors();
         cp->compiler = this;
+        cp->object = obj;
         obj->custom = cp->compile(customProps);
         cp->compiler = 0;
+        cp->object = 0;
         foreach (QDeclarativeError err, cp->errors()) {
             err.setUrl(output->url);
             exceptions << err;
@@ -961,17 +963,6 @@ void QDeclarativeCompiler::genObject(QDeclarativeParser::Object *obj)
         output->bytecode << id;
     }
 
-    // Set any script blocks
-    for (int ii = 0; ii < obj->scripts.count(); ++ii) {
-        QDeclarativeInstruction script;
-        script.type = QDeclarativeInstruction::StoreScript;
-        script.line = 0; // ###
-        int idx = output->scripts.count();
-        output->scripts << obj->scripts.at(ii);
-        script.storeScript.value = idx;
-        output->bytecode << script;
-    }
-
     // Begin the class
     if (obj->parserStatusCast != -1) {
         QDeclarativeInstruction begin;
@@ -1177,9 +1168,6 @@ bool QDeclarativeCompiler::buildComponent(QDeclarativeParser::Object *obj,
        (obj->properties.count() == 1 && obj->properties.begin().key() != "id"))
         COMPILE_EXCEPTION(*obj->properties.begin(), tr("Component elements may not contain properties other than id"));
        
-    if (!obj->scriptBlockObjects.isEmpty())
-        COMPILE_EXCEPTION(obj->scriptBlockObjects.first(), tr("Component elements may not contain script blocks"));
-
     if (obj->properties.count())
         idProp = *obj->properties.begin();
 
@@ -1203,6 +1191,13 @@ bool QDeclarativeCompiler::buildComponent(QDeclarativeParser::Object *obj,
         (obj->defaultProperty->values.count() == 1 && !obj->defaultProperty->values.first()->object)))
         COMPILE_EXCEPTION(obj, tr("Invalid component body specification"));
 
+    if (!obj->dynamicProperties.isEmpty())
+        COMPILE_EXCEPTION(obj, tr("Component objects cannot declare new properties."));
+    if (!obj->dynamicSignals.isEmpty())
+        COMPILE_EXCEPTION(obj, tr("Component objects cannot declare new signals."));
+    if (!obj->dynamicSlots.isEmpty())
+        COMPILE_EXCEPTION(obj, tr("Component objects cannot declare new functions."));
+
     Object *root = 0;
     if (obj->defaultProperty && obj->defaultProperty->values.count())
         root = obj->defaultProperty->values.first()->object;
@@ -1216,94 +1211,6 @@ bool QDeclarativeCompiler::buildComponent(QDeclarativeParser::Object *obj,
     return true;
 }
 
-bool QDeclarativeCompiler::buildScript(QDeclarativeParser::Object *obj, QDeclarativeParser::Object *script)
-{
-    qWarning().nospace() << qPrintable(output->url.toString()) << ":" << obj->location.start.line << ":" << obj->location.start.column << ": Script blocks have been deprecated.  Support will be removed entirely shortly.";
-
-    Object::ScriptBlock scriptBlock;
-
-    if (script->properties.count() == 1 && 
-        script->properties.begin().key() == QByteArray("source")) {
-
-        Property *source = *script->properties.begin();
-        if (script->defaultProperty)
-            COMPILE_EXCEPTION(source, tr("Invalid Script block.  Specify either the source property or inline script"));
-
-        if (source->value || source->values.count() != 1 ||
-            source->values.at(0)->object || !source->values.at(0)->value.isStringList())
-            COMPILE_EXCEPTION(source, tr("Invalid Script source value"));
-
-        QStringList sources = source->values.at(0)->value.asStringList();
-
-        for (int jj = 0; jj < sources.count(); ++jj) {
-            QString sourceUrl = output->url.resolved(QUrl(sources.at(jj))).toString();
-            QString scriptCode;
-            int lineNumber = 1;
-
-            for (int ii = 0; ii < unit->resources.count(); ++ii) {
-                if (unit->resources.at(ii)->url == sourceUrl) {
-                    scriptCode = QString::fromUtf8(unit->resources.at(ii)->data);
-                    break;
-                }
-            }
-
-            if (!scriptCode.isEmpty()) {
-                scriptBlock.codes.append(scriptCode);
-                scriptBlock.files.append(sourceUrl);
-                scriptBlock.lineNumbers.append(lineNumber);
-                scriptBlock.pragmas.append(Object::ScriptBlock::None);
-            }
-        }
-
-    } else if (!script->properties.isEmpty()) {
-        COMPILE_EXCEPTION(*script->properties.begin(), tr("Properties cannot be set on Script block"));
-    } else if (script->defaultProperty) {
-
-        QString scriptCode;
-        int lineNumber = 1;
-        QString sourceUrl = output->url.toString();
-
-        QDeclarativeParser::Location currentLocation;
-
-        for (int ii = 0; ii < script->defaultProperty->values.count(); ++ii) {
-            Value *v = script->defaultProperty->values.at(ii);
-            if (lineNumber == 1)
-                lineNumber = v->location.start.line;
-            if (v->object || !v->value.isString())
-                COMPILE_EXCEPTION(v, tr("Invalid Script block"));
-
-            if (ii == 0) {
-                currentLocation = v->location.start;
-                scriptCode.append(QString(currentLocation.column, QLatin1Char(' ')));
-            }
-
-            while (currentLocation.line < v->location.start.line) {
-                scriptCode.append(QLatin1Char('\n'));
-                currentLocation.line++;
-                currentLocation.column = 0;
-            }
-
-            scriptCode.append(QString(v->location.start.column - currentLocation.column, QLatin1Char(' ')));
-
-            scriptCode += v->value.asString();
-            currentLocation = v->location.end;
-            currentLocation.column++;
-        }
-
-        if (!scriptCode.isEmpty()) {
-            scriptBlock.codes.append(scriptCode);
-            scriptBlock.files.append(sourceUrl);
-            scriptBlock.lineNumbers.append(lineNumber);
-            scriptBlock.pragmas.append(Object::ScriptBlock::None);
-        }
-    }
-
-    if (!scriptBlock.codes.isEmpty())
-        obj->scripts << scriptBlock;
-
-    return true;
-}
-
 bool QDeclarativeCompiler::buildComponentFromRoot(QDeclarativeParser::Object *obj,
                                          const BindingContext &ctxt)
 {
@@ -1351,7 +1258,7 @@ bool QDeclarativeCompiler::buildSubObject(Object *obj, const BindingContext &ctx
 
 int QDeclarativeCompiler::componentTypeRef()
 {
-    QDeclarativeType *t = QDeclarativeMetaType::qmlType("Qt/Component",4,6);
+    QDeclarativeType *t = QDeclarativeMetaType::qmlType("Qt/Component",4,7);
     for (int ii = output->types.count() - 1; ii >= 0; --ii) {
         if (output->types.at(ii).type == t)
             return ii;
@@ -2902,25 +2809,6 @@ bool QDeclarativeCompiler::canCoerce(int to, QDeclarativeParser::Object *from)
     return false;
 }
 
-/*!
-    Returns true if from can be assigned to a (QObject) property of type
-    to.
-*/
-bool QDeclarativeCompiler::canCoerce(int to, int from)
-{
-    const QMetaObject *toMo = 
-        QDeclarativeEnginePrivate::get(engine)->rawMetaObjectForType(to);
-    const QMetaObject *fromMo = 
-        QDeclarativeEnginePrivate::get(engine)->rawMetaObjectForType(from);
-
-    while (fromMo) {
-        if (QDeclarativePropertyPrivate::equal(fromMo, toMo))
-            return true;
-        fromMo = fromMo->superClass();
-    }
-    return false;
-}
-
 QDeclarativeType *QDeclarativeCompiler::toQmlType(QDeclarativeParser::Object *from)
 {
     // ### Optimize