summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-10-06 01:11:41 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-10-06 01:11:41 (GMT)
commitf2526089d4b84b0b2c8a511ff2c22a22a6f2ee73 (patch)
tree6626b9b43424c00041a4b210538a58f324430066 /doc
parentf7cfc5e3ef17d0be0d4290f05428033055fb8731 (diff)
parentf4f1b712e1389987e045bb8f6ba654ea9e11d24e (diff)
downloadQt-f2526089d4b84b0b2c8a511ff2c22a22a6f2ee73.zip
Qt-f2526089d4b84b0b2c8a511ff2c22a22a6f2ee73.tar.gz
Qt-f2526089d4b84b0b2c8a511ff2c22a22a6f2ee73.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Build fix for WINCE to qfilesystemengine_win.cpp Fixed typo in QSettings documentation. remove dead code
Diffstat (limited to 'doc')
-rw-r--r--doc/src/snippets/code/src_corelib_io_qsettings.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/snippets/code/src_corelib_io_qsettings.cpp b/doc/src/snippets/code/src_corelib_io_qsettings.cpp
index 269aa44..91c5401 100644
--- a/doc/src/snippets/code/src_corelib_io_qsettings.cpp
+++ b/doc/src/snippets/code/src_corelib_io_qsettings.cpp
@@ -230,7 +230,7 @@ settings.setValue("sofa", true);
settings.setValue("tv", false);
QStringList groups = settings.childGroups();
-// group: ["fridge"]
+// groups: ["fridge"]
//! [21]