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: (62 commits)
  Compile.
  Remove these friend declarations that aren't necessary in 4.7
  Added a new flag to fine-tune gesture propagation policy
  AIX has a #define for hz, so undef it
  Revert "remove -lz from OPENSSL_LIBS so as to respect qt-zlib"
  remove -lz from QT_LFLAGS_PSQL so as to respect qt-zlib
  remove -lz from OPENSSL_LIBS so as to respect qt-zlib
  Fix compilation with IBM xlC 7:
  Fix compilation of Qt Assistant when WebKit isn't built.
  Mac: QSystemTrayIcon::DoubleClick and midmouse not working
  add test for toDateTime() using QLocale::LongFormat
  remove debug info
  add test case for QTBUG-7898 that QLocale::toDateTime(QString, FormatType) cannot convert value correctly
  fix QTBUG-7898
  QNAM HTTP: More micro optimization in QHttpNetworkRequest
  QNAM HTTP: Some micro optimization in QHttpNetworkRequest
  QNAM HTTP: Trivial optimization
  Revert "Optimized QLocale to access system locale on demand."
  doc:	Added "\sa {QML Basic Types} to each QML basic type page.
  Incorrect mouse coordinates used when compressing WM_MOUSEMOVE messages.
  ...

1 files changed, 6 insertions, 2 deletions

diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index cdbe5f3..bb36035 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -383,6 +383,10 @@ QmlEngine::~QmlEngine()
         QmlEngineDebugServer::remEngine(this);
 }
 
+/*! \fn void QmlEngine::quit()
+  This signal is emitted when the QmlEngine quits.
+ */
+
 /*!
   Clears the engine's internal component cache.
 
@@ -999,7 +1003,7 @@ QScriptValue QmlEnginePrivate::consoleLog(QScriptContext *ctxt, QScriptEngine *e
 void QmlEnginePrivate::sendQuit ()
 {
     Q_Q(QmlEngine);
-    emit q->quit ();
+    emit q->quit();
 }
 
 QScriptValue QmlEnginePrivate::quit(QScriptContext * /*ctxt*/, QScriptEngine *e)