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

* '4.7-cutoff' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (82 commits)
  Revert 12b6987031be9faee3886d7623888feb4e1762af
  Changed TEST_COMPILER from CC to CXX in configure script.
  doc: Fixed several qdoc errors.
  Carbon: Native filedialog does not apply filters on app-bundles
  Cocoa: Native filedialog does not apply filters on app-bundles
  Improve performance of QTimer::singleShot
  Add a benchmark comparing single shot timer with invokeMethod
  use Qt's private mac functions, reduce code redundancy
  Assistant: Fix compile warning for empty header.
  Doc: mark QEasingCurve support functions as new in 4.7.
  Modify the XML test suite not to use non-characters.
  Autotest: Fix failing QTextCodec tests
  Doc: mark methods as internal (as they were in previous releases)
  Doc: add image for Qt Quick to "What's New" page.
  qdoc: Clear a static multimap after each qdocconf file.
  qdoc: Added some debug output to track down a crash
  Fixed mouse wheel handling in scrollareas.
  Added two missing keys for X11
  Carbon: usage of menu bars can cause exceptions to be thrown
  Mac: compile fix
  ...

1 files changed, 4 insertions, 2 deletions

diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp
index 8fe4c47..1fabf12 100644
--- a/src/gui/text/qstatictext.cpp
+++ b/src/gui/text/qstatictext.cpp
@@ -282,8 +282,10 @@ QString QStaticText::text() const
 }
 
 /*!
-  Sets the performance hint of the QStaticText. This hint can be used to customize how much
-  caching is done internally to improve performance.
+  Sets the performance hint of the QStaticText according to the \a
+  performanceHint provided. The \a performanceHint is used to
+  customize how much caching is done internally to improve
+  performance.
 
   The default is QStaticText::ModerateCaching.