Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml

Conflicts:
	src/declarative/qml/qml.h

11 files changed, 16 insertions, 6 deletions

diff --git a/src/declarative/qml/qml.h b/src/declarative/qml/qml.h
index 34873a2..7cde731 100644
--- a/src/declarative/qml/qml.h
+++ b/src/declarative/qml/qml.h
@@ -55,8 +55,6 @@
 
 QT_BEGIN_HEADER
 
-QT_MODULE(Declarative)
-
 #define QML_DECLARE_TYPE(TYPE) \
     Q_DECLARE_METATYPE(TYPE *) \
     Q_DECLARE_METATYPE(QmlListProperty<TYPE>) 
@@ -88,6 +86,8 @@ QT_END_NAMESPACE
 
 QT_BEGIN_NAMESPACE
 
+QT_MODULE(Declarative)
+
 #define QML_REGISTER_INTERFACE(INTERFACE) \
     qmlRegisterInterface<INTERFACE>(#INTERFACE)
 
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index 4365b17..3702d0b 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -123,10 +123,9 @@ bool QmlCompiler::isValidId(const QString &val)
     if (val.isEmpty())
         return false;
 
-    // TODO this will be enforced and return false
     if (val.at(0).isLetter() && !val.at(0).isLower()) {
-        //return false;
-        qWarning().nospace() << "id '" << val << "' is invalid: ids cannot start with uppercase letters. This will be enforced in an upcoming version of QML.";
+        qWarning().nospace() << "id " << val << " is invalid: ids cannot start with uppercase letters";
+        return false;
     }
 
     QChar u(QLatin1Char('_'));
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp
index 1e1289e..cda281f 100644
--- a/src/declarative/qml/qmlcomponent.cpp
+++ b/src/declarative/qml/qmlcomponent.cpp
@@ -69,12 +69,14 @@ int statusId = qRegisterMetaType<QmlComponent::Status>("QmlComponent::Status");
 
 /*!
     \class QmlComponent
+  \since 4.7
     \brief The QmlComponent class encapsulates a QML component description.
     \mainclass
 */
 
 /*!
     \qmlclass Component QmlComponent
+  \since 4.7
     \brief The Component element encapsulates a QML component description.
 
     Components are reusable, encapsulated Qml element with a well-defined interface.
diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp
index 56038cf..1718387 100644
--- a/src/declarative/qml/qmlcontext.cpp
+++ b/src/declarative/qml/qmlcontext.cpp
@@ -130,6 +130,7 @@ void QmlContextPrivate::init()
 
 /*!
     \class QmlContext
+  \since 4.7
     \brief The QmlContext class defines a context within a QML engine.
     \mainclass
 
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 1c40ac7..2d904d1 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -117,6 +117,7 @@ DEFINE_BOOL_CONFIG_OPTION(qmlImportTrace, QML_IMPORT_TRACE)
 
 /*!
     \qmlclass QtObject QObject
+  \since 4.7
     \brief The QtObject element is the most basic element in QML
 
     The QtObject element is a non-visual element which contains only
@@ -371,6 +372,7 @@ QmlWorkerScriptEngine *QmlEnginePrivate::getWorkerScriptEngine()
 
 /*!
     \class QmlEngine
+  \since 4.7
     \brief The QmlEngine class provides an environment for instantiating QML components.
     \mainclass
 
diff --git a/src/declarative/qml/qmlerror.cpp b/src/declarative/qml/qmlerror.cpp
index 5ba7719..fc4bcd5 100644
--- a/src/declarative/qml/qmlerror.cpp
+++ b/src/declarative/qml/qmlerror.cpp
@@ -49,6 +49,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QmlError
+  \since 4.7
     \brief The QmlError class encapsulates a QML error
 */
 class QmlErrorPrivate
diff --git a/src/declarative/qml/qmlexpression.cpp b/src/declarative/qml/qmlexpression.cpp
index 64b2d7f..217f002 100644
--- a/src/declarative/qml/qmlexpression.cpp
+++ b/src/declarative/qml/qmlexpression.cpp
@@ -187,6 +187,7 @@ QScriptValue QmlExpressionPrivate::evalInObjectScope(QmlContext *context, QObjec
 
 /*!
     \class QmlExpression
+  \since 4.7
     \brief The QmlExpression class evaluates JavaScript in a QML context.
 */
 
diff --git a/src/declarative/qml/qmllist.h b/src/declarative/qml/qmllist.h
index cedc35b..5528d8d 100644
--- a/src/declarative/qml/qmllist.h
+++ b/src/declarative/qml/qmllist.h
@@ -133,10 +133,11 @@ private:
     friend class QmlListReferencePrivate;
     QmlListReferencePrivate* d;
 };
-Q_DECLARE_METATYPE(QmlListReference);
 
 QT_END_NAMESPACE
 
+Q_DECLARE_METATYPE(QmlListReference);
+
 QT_END_HEADER
 
 #endif // QMLLIST_H
diff --git a/src/declarative/qml/qmlnetworkaccessmanagerfactory.cpp b/src/declarative/qml/qmlnetworkaccessmanagerfactory.cpp
index 1ba0694..455d09e 100644
--- a/src/declarative/qml/qmlnetworkaccessmanagerfactory.cpp
+++ b/src/declarative/qml/qmlnetworkaccessmanagerfactory.cpp
@@ -45,6 +45,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QmlNetworkAccessManagerFactory
+  \since 4.7
     \brief The QmlNetworkAccessManagerFactory class provides a factory for QNetworkAccessManager
 
     QNetworkAccessManager is used for all network access by QML.
diff --git a/src/declarative/qml/qmlparserstatus.cpp b/src/declarative/qml/qmlparserstatus.cpp
index 435d620..315bc75 100644
--- a/src/declarative/qml/qmlparserstatus.cpp
+++ b/src/declarative/qml/qmlparserstatus.cpp
@@ -45,6 +45,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QmlParserStatus
+  \since 4.7
     \brief The QmlParserStatus class provides updates on the parser state.
 */
 
diff --git a/src/declarative/qml/qmlscriptstring.cpp b/src/declarative/qml/qmlscriptstring.cpp
index 29118e6..a80f66b 100644
--- a/src/declarative/qml/qmlscriptstring.cpp
+++ b/src/declarative/qml/qmlscriptstring.cpp
@@ -55,6 +55,7 @@ public:
 
 /*!
 \class QmlScriptString
+  \since 4.7
 \brief The QmlScriptString class encapsulates a script and its context.
 
 The QmlScriptString is used by properties that want to accept a script "assignment" from QML.