diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-04-22 23:18:24 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-04-22 23:18:24 (GMT) |
| commit | 5d695c4442107fb5a3fbd37acdaa1f5d1d3ca06f (patch) | |
| tree | 6d6720837e14be7e65da4d8a08d44e6fea5a55cc /doc/src | |
| parent | 7fa8e95d1b87403aab14dd326520600bc028a195 (diff) | |
| parent | d64d13102d3d53d0aa43597408d7abf3fecb57a3 (diff) | |
| download | Qt-5d695c4442107fb5a3fbd37acdaa1f5d1d3ca06f.zip Qt-5d695c4442107fb5a3fbd37acdaa1f5d1d3ca06f.tar.gz Qt-5d695c4442107fb5a3fbd37acdaa1f5d1d3ca06f.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/phonon-api.qdoc | 4 | ||||
| -rw-r--r-- | doc/src/snippets/code/doc_src_qtestlib.qdoc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/phonon-api.qdoc b/doc/src/phonon-api.qdoc index 3d04c68..501b5a5 100644 --- a/doc/src/phonon-api.qdoc +++ b/doc/src/phonon-api.qdoc @@ -4457,12 +4457,12 @@ */ /*! - \fn QList<int> Phonon::GlobalConfig::audioOutputDeviceListFor(Phonon::Category category, HideAdvancedDevicesOverride override = FromSettings) const + \fn QList<int> Phonon::GlobalConfig::audioOutputDeviceListFor(Phonon::Category category, int override = AdvancedDevicesFromSettings) const \internal */ /*! - \fn int Phonon::GlobalConfig::audioOutputDeviceFor(Phonon::Category category) const + \fn int Phonon::GlobalConfig::audioOutputDeviceFor(Phonon::Category category, int override = AdvancedDevicesFromSettings) const \internal */ diff --git a/doc/src/snippets/code/doc_src_qtestlib.qdoc b/doc/src/snippets/code/doc_src_qtestlib.qdoc index ff52b2f..a0e4944 100644 --- a/doc/src/snippets/code/doc_src_qtestlib.qdoc +++ b/doc/src/snippets/code/doc_src_qtestlib.qdoc @@ -61,7 +61,7 @@ void TestQString::toUpper() //! [9] -/myTestDirectory$ qmake -project "QT += testlib" +/myTestDirectory$ qmake -project "CONFIG += qtestlib" /myTestDirectory$ qmake /myTestDirectory$ make //! [9] |