Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (22 commits)
  Fix compilation on HP-UXi: m_volume is a #define
  WinCE doesn't have sys/types.h
  Fix compilation: qmlviewer cannot use symbols exported with Q_AUTOTEST_EXPORT in production builds
  Fix compilation on recent Linux systems: getpid(2) is in unistd.h.
  Cocoa: calling QEventLoop::exec from mouse up causes problem
  Fix compilation on GNU/Hurd (SA_SIGINFO isn't defined)
  Doc: Collected the Declarative UI tutorials together and renamed them.
  Doc: Simplified Commercial Editions for Qt 4.7.
  Work around MSVC2008 compiler crash
  doc:	Added "\since 4.7" to a bunch of declarative stuff.
  Cocoa: event dispatcher eats mouse events
  Fix an issue about double-click on Mac OS X.
  qdoc:	Finished "Inherited by" list for QML elements.
  Avoid calling out to public API in the QtScript implementation
  Move property helper functions to QScriptEnginePrivate
  Move more script value conversion code to helper functions
  Cleanup: Move value conversion code to helper functions
  Move implementation of QScriptValue construction functions to private class
  Cleanup: Move number conversion functions to QScriptEnginePrivate
  Move some helper function declarations outside QT_NO_QOBJECT guard
  ...

9 files changed, 11 insertions, 0 deletions

diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp
index 87ecb8a..1bdc883 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 303af42..1cd550d 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 cf26f58..5bde75c 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -116,6 +116,7 @@ DEFINE_BOOL_CONFIG_OPTION(qmlImportTrace, QML_IMPORT_TRACE)
 QML_DEFINE_TYPE(Qt,4,6,QtObject,QObject)
 /*!
     \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
@@ -343,6 +344,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 d428377..89870f9 100644
--- a/src/declarative/qml/qmlexpression.cpp
+++ b/src/declarative/qml/qmlexpression.cpp
@@ -189,6 +189,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/qmlmoduleplugin.cpp b/src/declarative/qml/qmlmoduleplugin.cpp
index 8019805..342074a 100644
--- a/src/declarative/qml/qmlmoduleplugin.cpp
+++ b/src/declarative/qml/qmlmoduleplugin.cpp
@@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QmlModulePlugin
+  \since 4.7
     \brief The QmlModulePlugin class provides an abstract base for custom QML module plugins.
     \reentrant
     \ingroup plugins
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.