diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-06 01:11:41 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-06 01:11:41 (GMT) |
| commit | f2526089d4b84b0b2c8a511ff2c22a22a6f2ee73 (patch) | |
| tree | 6626b9b43424c00041a4b210538a58f324430066 | |
| parent | f7cfc5e3ef17d0be0d4290f05428033055fb8731 (diff) | |
| parent | f4f1b712e1389987e045bb8f6ba654ea9e11d24e (diff) | |
| download | Qt-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
| -rw-r--r-- | doc/src/snippets/code/src_corelib_io_qsettings.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/io/qfilesystemengine_win.cpp | 1 | ||||
| -rw-r--r-- | tools/linguist/shared/numerus.cpp | 7 |
3 files changed, 1 insertions, 9 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] diff --git a/src/corelib/io/qfilesystemengine_win.cpp b/src/corelib/io/qfilesystemengine_win.cpp index 031d64b..98404a5 100644 --- a/src/corelib/io/qfilesystemengine_win.cpp +++ b/src/corelib/io/qfilesystemengine_win.cpp @@ -1094,7 +1094,6 @@ QFileSystemEntry QFileSystemEngine::currentPath() if (ret.length() >= 2 && ret[1] == QLatin1Char(':')) ret[0] = ret.at(0).toUpper(); // Force uppercase drive letters. #else - Q_UNUSED(fileName); //TODO - a race condition exists when using currentPath / setCurrentPath from multiple threads if (qfsPrivateCurrentDir.isEmpty()) qfsPrivateCurrentDir = QCoreApplication::applicationDirPath(); diff --git a/tools/linguist/shared/numerus.cpp b/tools/linguist/shared/numerus.cpp index ac519b5..87f3aee 100644 --- a/tools/linguist/shared/numerus.cpp +++ b/tools/linguist/shared/numerus.cpp @@ -361,13 +361,6 @@ static const NumerusTableEntry numerusTable[] = { static const int NumerusTableSize = sizeof(numerusTable) / sizeof(numerusTable[0]); -// magic number for the file -static const int MagicLength = 16; -static const uchar magic[MagicLength] = { - 0x3c, 0xb8, 0x64, 0x18, 0xca, 0xef, 0x9c, 0x95, - 0xcd, 0x21, 0x1c, 0xbf, 0x60, 0xa1, 0xbd, 0xdd -}; - bool getNumerusInfo(QLocale::Language language, QLocale::Country country, QByteArray *rules, QStringList *forms, const char **gettextRules) { |