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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (61 commits)
  tst_qcompleter: Fix the QTBUG_14292_filesystem test on X11
  tst_qcompleter.cpp: fix test on mac.
  Fixed autotest that was missing focus on Windows
  QGraphicsLayoutItem - user set sizes should always override, even if there's a constraint
  QGridLayoutEngine - Rework height-for-width support so that row/col spanning works
  Revert "Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine""
  Fixed statement about const_iterator and some whitespace fixes.
  Adjust the parent index for the itemsMoved call.
  Correctly handle both 16bit and 32bit live pixmaps in meego graphics system.
  Correctly remove the egl alpha surface flags in meego graphics system.
  Proper dither & proper alpha checking.
  In meego graphics system, use always 16bit textures.
  QCompleter: do not auto complete when directory is changed.
  tst_qcompleter: Add a test for QFileSystemModel
  Doc: adjusting the search field width
  Doc - remove disclaimer
  Added the default format of QTime::toString().
  Moved the property documentation to its proper location.
  Added Q_INVOKABLE to ignore file.
  Made several QMenuBar functions visible to qdoc and added documentation.
  ...

1 files changed, 77 insertions, 0 deletions

diff --git a/doc/src/classes/phonon-api.qdoc b/doc/src/classes/phonon-api.qdoc
index 6fe0223..a429e5a 100644
--- a/doc/src/classes/phonon-api.qdoc
+++ b/doc/src/classes/phonon-api.qdoc
@@ -4114,6 +4114,13 @@
 */
 
 /*!
+    \fn Phonon::VideoWidget::snapshot()
+    \since 4.7
+
+    Returns a snapshot of the current frame shown in the widget.
+*/
+
+/*!
     \enum Phonon::VideoWidget::ScaleMode
 
     The ScaleMode enum describes how to treat aspect ratio during
@@ -4305,6 +4312,12 @@
 */
 
 /*!
+    \typedef Phonon::VideoWidgetInterfaceLatest
+    \inmodule Phonon
+    \since 4.7
+*/
+
+/*!
     \class Phonon::PlatformPlugin
     \inmodule Phonon
     \since 4.4
@@ -5021,3 +5034,67 @@
     \internal
 */
 
+/*!
+    \class Phonon::PulseSupport
+    \inmodule Phonon
+    \since 4.7
+    \internal
+*/
+
+/*!
+    \class Phonon::AudioDataOutput
+    \inmodule Phonon
+    \since 4.7
+
+    \brief The AudioDataOutput class provides access to audio data.
+
+    This class is used to obtain audio data, typically for the purpose of
+    visualizing it.
+
+    Although it is not designed for realtime performance, the latencies
+    associated with accessing the data should be low enough for applications
+    that provide visualizations of the data. This class can also be used to
+    save the audio data for further processing.
+*/
+
+/*!
+    \enum Phonon::AudioDataOutput::Channel
+
+    This enum describes the channel audio data belongs to.
+
+    \value LeftChannel
+    \value RightChannel
+    \value CenterChannel
+    \value LeftSurroundChannel
+    \value RightSurroundChannel
+    \value SubwooferChannel
+*/
+
+/*!
+    \property Phonon::AudioDataOutput::dataSize
+    \brief the number of samples passed via the dataReady() signal.
+*/
+
+/*!
+    \fn Phonon::AudioDataOutput::dataReady(const QMap<Phonon::AudioDataOutput::Channel, QVector<qint16> > &data)
+
+    This signal is emitted whenever there is data available to read. The
+    \a data sent by the signal is supplied in the form of a map that holds the
+    data for different output channels.
+*/
+
+/*!
+    \fn Phonon::AudioDataOutputInterface::~AudioDataOutputInterface()
+
+    Destroys the data interface.
+*/
+
+/*!
+    \fn Phonon::AudioDataOutputInterface::frontendObject()
+    \internal
+*/
+
+/*!
+    \fn Phonon::GlobalConfigPrivate::~GlobalConfigPrivate()
+    \internal
+*/