diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-10-07 01:00:12 +0200 |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-10-07 01:00:12 +0200 |
| commit | 6425f239d1e01e1b55cfadde8f95ab884f4dd76c (patch) | |
| tree | 902c253b8de7c99b322a13fda6cf3f8389f0448a /src | |
| parent | 4fb24cb0d36a421ccd81d34ee1488705bf1b9a33 (diff) | |
| parent | 109ece623d8a973a2d97263309aa32bceab7e210 (diff) | |
Merge branch '4.8-upstream' into master-water
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/io/qfilesystemengine_win.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/corelib/io/qfilesystemengine_win.cpp b/src/corelib/io/qfilesystemengine_win.cpp index 031d64ba80..98404a53b7 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(); |