summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qsettings.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-25 14:00:05 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-25 14:00:05 (GMT)
commitce40a078caa4a09793128ca730cc5ca268aeee87 (patch)
treee29aa8e561552721ad3f7ed42cdae99b23ec0960 /src/corelib/io/qsettings.cpp
parent022884db790a7592fa017add4ea9669d8b5598ca (diff)
parent0ade09152067324f74678f2de4d447b6e0280600 (diff)
downloadQt-ce40a078caa4a09793128ca730cc5ca268aeee87.zip
Qt-ce40a078caa4a09793128ca730cc5ca268aeee87.tar.gz
Qt-ce40a078caa4a09793128ca730cc5ca268aeee87.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fixed many spelling errors.
Diffstat (limited to 'src/corelib/io/qsettings.cpp')
-rw-r--r--src/corelib/io/qsettings.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index edd6d2b..53af822 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -3506,7 +3506,7 @@ void QSettings::setPath(Format format, Scope scope, const QString &path)
\threadsafe
Registers a custom storage format. On success, returns a special
- Format value that can then be passed to the QSettings constuctor.
+ Format value that can then be passed to the QSettings constructor.
On failure, returns InvalidFormat.
The \a extension is the file