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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix some #ifdefs to compile for a specific combination of featuress that was previously unsupported
  update Russian translations for Qt and tools
  Updated Slovenian translations for Qt 4.7
  doc: The QML Qt element was missing from the documentation.
  64-bit versions of PREMUL, BYTE_MUL and INTERPOLATE_PIXEL_256
  QXmlStreamReader: avoid unnecessary detaching
  QSslCertificate: support expiration dates > 2049
  Doc: Fixing typo
  Doc: Fixing bug involving header misplacement in Creator style
  qdoc: Added list of all members (including inherited) page to QML elements.
  qdoc: Ensured that text is encoded correctly.
  qdoc: Fixed non-well-formed markup.
  Doc: Fixed typo in a shortcut string.
  Remove useless QString::clear() from QSharedData example snippet.
  Move note on connectToBus() not actually being able to reconnect to
  Doc: Added more license information.

1 files changed, 4 insertions, 3 deletions

diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 3822373..de79e4d 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -184,11 +184,12 @@ void QDeclarativeEnginePrivate::defineModule()
 }
 
 /*!
-\keyword QmlGlobalQtObject
-\qmlclass Qt QDeclarativeEnginePrivate
+\qmlclass QML:Qt QDeclarativeEnginePrivate
 \brief The QML global Qt object provides useful enums and functions from Qt.
 
-The \c Qt object provides useful enums and functions from Qt, for use in all QML files. 
+\keyword QmlGlobalQtObject
+
+\brief The \c Qt object provides useful enums and functions from Qt, for use in all QML files. 
 
 The \c Qt object is not a QML element; it cannot be instantiated. It is a global object 
 with enums and functions.  To use it, call the members of the global \c Qt object directly.