diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-23 08:46:26 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-23 08:46:26 (GMT) |
| commit | be3916b7e4e8007394cbed40484ef6b696e90f2b (patch) | |
| tree | a66dc85f3900e08a040f0d80eb0e56f43a163efc /doc | |
| parent | ed24cd82444faeeda0a171a9082808ebb667e092 (diff) | |
| parent | 389c4fdebe681eb3af5a2431c390323f52a03c17 (diff) | |
| download | Qt-be3916b7e4e8007394cbed40484ef6b696e90f2b.zip Qt-be3916b7e4e8007394cbed40484ef6b696e90f2b.tar.gz Qt-be3916b7e4e8007394cbed40484ef6b696e90f2b.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/corelib/global/qfeatures.h
src/gui/painting/qtransform.cpp
util/scripts/make_qfeatures_dot_h
Diffstat (limited to 'doc')
| -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] |