diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-25 14:00:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-25 14:00:05 (GMT) |
| commit | ce40a078caa4a09793128ca730cc5ca268aeee87 (patch) | |
| tree | e29aa8e561552721ad3f7ed42cdae99b23ec0960 /src/corelib/io | |
| parent | 022884db790a7592fa017add4ea9669d8b5598ca (diff) | |
| parent | 0ade09152067324f74678f2de4d447b6e0280600 (diff) | |
| download | Qt-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')
| -rw-r--r-- | src/corelib/io/qiodevice_p.h | 2 | ||||
| -rw-r--r-- | src/corelib/io/qsettings.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/io/qiodevice_p.h b/src/corelib/io/qiodevice_p.h index 1dd51ea..8b77da5 100644 --- a/src/corelib/io/qiodevice_p.h +++ b/src/corelib/io/qiodevice_p.h @@ -68,7 +68,7 @@ QT_BEGIN_NAMESPACE #define QIODEVICE_BUFFERSIZE Q_INT64_C(16384) #endif -// This is QIODevice's read buffer, optimised for read(), isEmpty() and getChar() +// This is QIODevice's read buffer, optimized for read(), isEmpty() and getChar() class QIODevicePrivateLinearBuffer { public: 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 |