summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-08-22 12:47:35 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-08-22 12:47:35 (GMT)
commita3a86e6162e18cf8c7506473e1bd746426f26d19 (patch)
treed5a7b1b3edecffee39f8369ff331379474197e8a
parent7efd63b1ad26090ec15e1ab7bd9c60fa1c12e98a (diff)
parenta51f33f0d847a73c68f69f3a0577bc8facc9f5be (diff)
downloadQt-a3a86e6162e18cf8c7506473e1bd746426f26d19.zip
Qt-a3a86e6162e18cf8c7506473e1bd746426f26d19.tar.gz
Qt-a3a86e6162e18cf8c7506473e1bd746426f26d19.tar.bz2
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Doc: Removed internal Phonon classes from doce
-rw-r--r--doc/src/classes/phonon-api.qdoc24
1 files changed, 24 insertions, 0 deletions
diff --git a/doc/src/classes/phonon-api.qdoc b/doc/src/classes/phonon-api.qdoc
index 95e20dd..d1b26f6 100644
--- a/doc/src/classes/phonon-api.qdoc
+++ b/doc/src/classes/phonon-api.qdoc
@@ -5131,6 +5131,30 @@
*/
/*!
+ \class Phonon::GlobalConfigPrivate
+ \inmodule Phonon
+ \internal
+*/
+
+/*!
+ \class Phonon::AudioDataOutputPrivate
+ \inmodule Phonon
+ \internal
+*/
+
+/*!
+ \class Phonon::AudioDataOutputInterface
+ \inmodule Phonon
+ \internal
+*/
+
+/*!
+ \class Phonon::SwiftSlider
+ \inmodule Phonon
+ \internal
+*/
+
+/*!
\fn Phonon::GlobalConfigPrivate::GlobalConfigPrivate()
\internal
*/