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:
  Improve docs for QTEST_MAIN macro.
  Work around an apparent GCC optimiser bug accessing arrays beyond end
  Do not crash in case a future version of libdbus has a new kind of message.
  Docs: QTBUG-9150 Incorrect snippet in class doc.
  tst_headers: make failure more detailed when failing to open a file
  Fix number of chapters in qtestlib tutorial.
  Fixed QStatusBar not to repaint itself too early
  QNAM HTTP: Fix missing error() signal
  Make it clear which security updates are needed for Visual Studio 2005.

1 files changed, 5 insertions, 1 deletions

diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index e3a8726..207873e 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -298,10 +298,14 @@ QT_BEGIN_NAMESPACE
 
     \relates QTest
 
-    Implements a main() function that instantiates a QApplication object and
+    Implements a main() function that instantiates an application object and
     the \a TestClass, and executes all tests in the order they were defined.
     Use this macro to build stand-alone executables.
 
+    If \c QT_GUI_LIB is defined, the application object will be a QApplication,
+    otherwise it will be a QCoreApplication.  If qmake is used and the configuration
+    includes \c{QT += gui}, then \c QT_GUI_LIB will be defined automatically.
+
     \bold {Note:} On platforms that have keypad navigation enabled by default (eg: Symbian),
     this macro will forcfully disable it to simplify the usage of key events when writing
     autotests. If you wish to write a test case that uses keypad navigation, you should