Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

5 files changed, 11 insertions, 28 deletions

diff --git a/src/declarative/qml/qmldom.cpp b/src/declarative/qml/qmldom.cpp
index 9015e5c..648eb36 100644
--- a/src/declarative/qml/qmldom.cpp
+++ b/src/declarative/qml/qmldom.cpp
@@ -194,8 +194,6 @@ bool QmlDomDocument::load(QmlEngine *engine, const QByteArray &data, const QUrl
         d->imports += QUrl(td->data.imports().at(i).uri);
     }
 
-    d->automaticSemicolonOffsets = td->data.automaticSemicolonOffsets();
-
     if (td->data.tree()) {
         if (compilerDump()) {
             qWarning() << "-AST------------------------------------------------------------------------------";
@@ -253,14 +251,6 @@ QmlDomObject QmlDomDocument::rootObject() const
     return rv;
 }
 
-QList<int> QmlDomDocument::automaticSemicolonOffsets() const
-{
-    if (d)
-        return d->automaticSemicolonOffsets;
-    else
-        return QList<int>();
-}
-
 QmlDomPropertyPrivate::QmlDomPropertyPrivate()
 : property(0)
 {
diff --git a/src/declarative/qml/qmldom.h b/src/declarative/qml/qmldom.h
index 170ef56..ef9fe25 100644
--- a/src/declarative/qml/qmldom.h
+++ b/src/declarative/qml/qmldom.h
@@ -79,8 +79,6 @@ public:
 
     QmlDomObject rootObject() const;
 
-    QList<int> automaticSemicolonOffsets() const;
-
 private:
     QSharedDataPointer<QmlDomDocumentPrivate> d;
 };
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 14dbf84..2d98063 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -842,7 +842,9 @@ QScriptValue QmlEngine::qmlScriptObject(QObject* object, QmlEngine* engine)
         }
     \endcode
 
-    \sa QmlComponent::createObject()
+    If you want to just create an arbitrary string of QML, instead of an
+    existing qml component or qml file, consider the evalQML() function.
+    \sa QmlComponent::createObject(), QmlEngine::createQMLObject()
 */
 QScriptValue QmlEngine::createComponent(QScriptContext *ctxt, QScriptEngine *engine)
 {
@@ -868,6 +870,14 @@ QScriptValue QmlEngine::createComponent(QScriptContext *ctxt, QScriptEngine *eng
 
     Returns the created object, or null if there is an error. In the case of an
     error, details of the error are output using qWarning().
+
+    Note that this function returns immediately, and therefore may not work if
+    the QML loads new components. If you are trying to load a new component,
+    for example from a QML file, consider the createComponent() function
+    instead. 'New components' refers to external QML files that have not yet
+    been loaded, and so it is safe to use evalQml to load built-in components.
+
+    \sa QmlEngine::createComponent()
 */
 QScriptValue QmlEngine::createQMLObject(QScriptContext *ctxt, QScriptEngine *engine)
 {
diff --git a/src/declarative/qml/qmlscriptparser.cpp b/src/declarative/qml/qmlscriptparser.cpp
index 880b64b..7475943 100644
--- a/src/declarative/qml/qmlscriptparser.cpp
+++ b/src/declarative/qml/qmlscriptparser.cpp
@@ -178,8 +178,6 @@ protected:
     virtual bool visit(AST::UiArrayBinding *node);
     virtual bool visit(AST::UiSourceElement *node);
 
-    virtual bool visit(AST::ExpressionStatement *node);
-
     void accept(AST::Node *node);
 
     QString asString(AST::UiQualifiedId *node) const;
@@ -669,14 +667,6 @@ bool ProcessAST::visit(AST::UiScriptBinding *node)
     return true;
 }
 
-bool ProcessAST::visit(AST::ExpressionStatement *node)
-{
-    if (!node->semicolonToken.isValid())
-        _parser->addAutomaticSemicolonOffset(node->semicolonToken.offset);
-
-    return true;
-}
-
 static QList<int> collectCommas(AST::UiArrayMemberList *members)
 {
     QList<int> commas;
@@ -880,7 +870,6 @@ void QmlScriptParser::clear()
     _nameSpacePaths.clear();
     _typeNames.clear();
     _errors.clear();
-    _automaticSemicolonOffsets.clear();
 
     if (data) {
         delete data;
diff --git a/src/declarative/qml/qmlscriptparser_p.h b/src/declarative/qml/qmlscriptparser_p.h
index 15f165c..a4cbd82 100644
--- a/src/declarative/qml/qmlscriptparser_p.h
+++ b/src/declarative/qml/qmlscriptparser_p.h
@@ -93,9 +93,6 @@ public:
 
     QList<QmlError> errors() const;
 
-    QList<int> automaticSemicolonOffsets() const { return _automaticSemicolonOffsets; }
-    void addAutomaticSemicolonOffset(int offset) { _automaticSemicolonOffsets.append(offset); }
-
 // ### private:
     int findOrCreateTypeId(const QString &name);
     void setTree(QmlParser::Object *tree);
@@ -114,7 +111,6 @@ public:
     QStringList _typeNames;
     QString _scriptFile;
     QmlScriptParserJsASTData *data;
-    QList<int> _automaticSemicolonOffsets;
 };
 
 QT_END_NAMESPACE