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, 2 insertions, 0 deletions

diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index 07c9e53..f5d7c0d 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -1511,6 +1511,7 @@ QVariant::QVariant(const char *val)
 */
 
 /*!
+    \since 4.7
   \fn QVariant::QVariant(const QEasingCurve &val)
 
     Constructs a new variant with an easing curve value, \a val.
@@ -2204,6 +2205,7 @@ QDateTime QVariant::toDateTime() const
 }
 
 /*!
+    \since 4.7
     \fn QEasingCurve QVariant::toEasingCurve() const
 
     Returns the variant as a QEasingCurve if the variant has type() \l