diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-14 22:02:58 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-14 22:02:58 (GMT) |
| commit | e3fcf351dee44b4f9457a6abbed76d37fc0fbe67 (patch) | |
| tree | 2c5e0a4eaedbfa1aa8145b6aef6bdd93a38f92fb /src/gui/dialogs | |
| parent | f36d2e5cd0655cee2a1bfb84a66400a4b7a4c454 (diff) | |
| parent | ae3f20e9ce7f592c22c23e8dea6bb9feb52c8b90 (diff) | |
| download | Qt-e3fcf351dee44b4f9457a6abbed76d37fc0fbe67.zip Qt-e3fcf351dee44b4f9457a6abbed76d37fc0fbe67.tar.gz Qt-e3fcf351dee44b4f9457a6abbed76d37fc0fbe67.tar.bz2 | |
Merge branch '4.5'
Conflicts:
tools/macdeployqt/shared/shared.cpp
Diffstat (limited to 'src/gui/dialogs')
| -rw-r--r-- | src/gui/dialogs/qsidebar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/dialogs/qsidebar.cpp b/src/gui/dialogs/qsidebar.cpp index 26108d7..000a06b 100644 --- a/src/gui/dialogs/qsidebar.cpp +++ b/src/gui/dialogs/qsidebar.cpp @@ -249,9 +249,9 @@ void QUrlModel::addUrls(const QList<QUrl> &list, int row, bool move) continue; for (int j = 0; move && j < rowCount(); ++j) { #if defined(Q_OS_WIN) - if (index(j, 0).data(UrlRole).toUrl().toLocalFile().toLower() == url.toLocalFile().toLower()) { + if (QDir::cleanPath(index(j, 0).data(UrlRole).toUrl().toLocalFile()).toLower() == QDir::cleanPath(url.toLocalFile()).toLower()) { #else - if (index(j, 0).data(UrlRole) == url) { + if (QDir::cleanPath(index(j, 0).data(UrlRole).toUrl().toLocalFile()) == QDir::cleanPath(url.toLocalFile())) { #endif removeRow(j); if (j <= row) |