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:
  Added my changes to the changelog.
  Clarified documentation of loadFinished() signal.
  Added a condition to skip obsolete functions during the threadness check.
  Doc: call qApp->precessEvents after QSplashScreen::showMessage
  Doc: Said that QApplication exits when not able to open X11 display
  Doc: maintainance - fixing grammar and spelling
  Doc: Added a note to qmake INSTALLS docs
  Doc: Fixing overlapping text problem in columns
  Doc: Added info on QWidget::render to printing docs
  Added default value documentation for two variables.

4 files changed, 24 insertions, 8 deletions

diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
index d0c047d..9b97c8b 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
@@ -1890,9 +1890,10 @@ InspectorController* QWebPagePrivate::inspectorController()
     The loadStarted() signal is emitted when the page begins to load.The
     loadProgress() signal, on the other hand, is emitted whenever an element
     of the web page completes loading, such as an embedded image, a script,
-    etc. Finally, the loadFinished() signal is emitted when the page has
-    loaded completely. Its argument, either true or false, indicates whether
-    or not the load operation succeeded.
+    etc. Finally, the loadFinished() signal is emitted when the page contents
+    are loaded completely, independent of script execution or page rendering.
+    Its argument, either true or false, indicates whether or not the load
+    operation succeeded.
 
     \section1 Using QWebPage in a Widget-less Environment
 
@@ -3729,7 +3730,7 @@ quint64 QWebPage::bytesReceived() const
 /*!
     \fn void QWebPage::loadStarted()
 
-    This signal is emitted when a new load of the page is started.
+    This signal is emitted when a page starts loading content.
 
     \sa loadFinished()
 */
@@ -3748,7 +3749,8 @@ quint64 QWebPage::bytesReceived() const
 /*!
     \fn void QWebPage::loadFinished(bool ok)
 
-    This signal is emitted when a load of the page is finished.
+    This signal is emitted when the page finishes loading content. This signal
+    is independant of script execution or page rendering.
     \a ok will indicate whether the load was successful or any error occurred.
 
     \sa loadStarted(), ErrorPageExtension
diff --git a/src/corelib/io/qtextstream.cpp b/src/corelib/io/qtextstream.cpp
index eab0662..6091ec0 100644
--- a/src/corelib/io/qtextstream.cpp
+++ b/src/corelib/io/qtextstream.cpp
@@ -3019,8 +3019,8 @@ void QTextStream::setAutoDetectUnicode(bool enabled)
 }
 
 /*!
-    Returns true if automatic Unicode detection is enabled; otherwise
-    returns false.
+    Returns true if automatic Unicode detection is enabled, otherwise
+    returns false. Automatic Unicode detection is enabled by default.
 
     \sa setAutoDetectUnicode(), setCodec()
 */
@@ -3051,7 +3051,8 @@ void QTextStream::setGenerateByteOrderMark(bool generate)
 
 /*!
     Returns true if QTextStream is set to generate the UTF BOM (Byte Order
-    Mark) when using a UTF codec; otherwise returns false.
+    Mark) when using a UTF codec; otherwise returns false. UTF BOM generation is
+    set to false by default.
 
     \sa setGenerateByteOrderMark()
 */
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 185af9a..fdacefc 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -711,6 +711,12 @@ void QApplicationPrivate::process_cmdline()
             done.
     \endlist
 
+    \section1 X11 Notes
+
+    If QApplication fails to open the X11 display, it will terminate
+    the process. This behavior is consistent with most X11
+    applications.
+
     \sa arguments()
 */
 
diff --git a/src/gui/widgets/qsplashscreen.cpp b/src/gui/widgets/qsplashscreen.cpp
index 8be0cf8..d1fb686 100644
--- a/src/gui/widgets/qsplashscreen.cpp
+++ b/src/gui/widgets/qsplashscreen.cpp
@@ -186,6 +186,13 @@ void QSplashScreen::repaint()
     Draws the \a message text onto the splash screen with color \a
     color and aligns the text according to the flags in \a alignment.
 
+    To make sure the splash screen is repainted immediately, you can
+    call \l{QCoreApplication}'s
+    \l{QCoreApplication::}{processEvents()} after the call to
+    showMessage(). You usually want this to make sure that the message
+    is kept up to date with what your application is doing (e.g.,
+    loading files).
+
     \sa Qt::Alignment, clearMessage()
 */
 void QSplashScreen::showMessage(const QString &message, int alignment,