summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-02-08 12:46:20 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-02-08 12:46:20 (GMT)
commit3d852b4b4b6834688519e8a992ecaef391f8bde9 (patch)
treeca21946e6461dba53b43fa3b761e9d782b1dc975 /src/3rdparty/phonon
parentb54d20070f6a483e0d6e4a06317de7cd8c817806 (diff)
parent4e5c366afd6d6f8ccb3fc44cd2f6c522a3192b2d (diff)
downloadQt-3d852b4b4b6834688519e8a992ecaef391f8bde9.zip
Qt-3d852b4b4b6834688519e8a992ecaef391f8bde9.tar.gz
Qt-3d852b4b4b6834688519e8a992ecaef391f8bde9.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Doc: Fixed warnings and other problems found while fixing markup. Doc: Adding documentation on configure options for Qt configure Ensured that trailing newlines are quoted and correct atoms are used. Fixed build breakage. Fixed C++ and plain markup found in \c commands. Doc: Document display-orientation-related widget attributes. Added a configuration variable for the QML documentation file prefix. Doc: Renamed a tutorial image to avoid a clash with another image.
Diffstat (limited to 'src/3rdparty/phonon')
0 files changed, 0 insertions, 0 deletions