diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-05-19 15:54:46 (GMT) |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-05-19 15:54:46 (GMT) |
commit | e9dec649afc2e513354c79f6e38ca53b6943cccc (patch) | |
tree | c3947491e089a1d1d82148481c80ab4e46a49741 /src/corelib/io/qdiriterator.cpp | |
parent | 92b47ba61809de30eed205e7d1eafb1cde1087e1 (diff) | |
parent | 90b4f0ca7b9fe21f6c4b39a80f8f9cf98626690a (diff) | |
download | Qt-e9dec649afc2e513354c79f6e38ca53b6943cccc.zip Qt-e9dec649afc2e513354c79f6e38ca53b6943cccc.tar.gz Qt-e9dec649afc2e513354c79f6e38ca53b6943cccc.tar.bz2 |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/corelib/io/qdiriterator.cpp')
-rw-r--r-- | src/corelib/io/qdiriterator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index b14f436..81bfb27 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -201,8 +201,8 @@ void QDirIteratorPrivate::advance() QString subDir = it->currentFilePath(); #ifdef Q_OS_WIN - if (currentFileInfo.isSymLink()) - subDir = currentFileInfo.canonicalFilePath(); + if (nextFileInfo.isSymLink()) + subDir = nextFileInfo.canonicalFilePath(); #endif pushSubDirectory(subDir, it->nameFilters(), it->filters()); } |