diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2011-09-06 16:43:29 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-06 17:32:57 +0200 |
| commit | 0b67ad9db2647a69a56bd4ebb4609bb259932cb0 (patch) | |
| tree | 6e22b595ae1fe26a1d12cc277a2bf4c53310872f /tests/auto/sql/kernel/qsqldatabase/tst_databases.h | |
| parent | 1189ebff320b8dd03637947c92df6e3ef84a3c06 (diff) | |
Merge fixes for QDir::operator==
There were two fixes in 4.8 which each fixed a part of the problem.
Comparing canonical paths is more correct, but is only possible where
both directories exist. If neither directory exists, then compare
absolute paths instead.
Changed a regression test, because /tmp is a symbolic link on MacOS.
I.E. "/tmp/.." is canonically "/private" and not "/" as expected.
Task-Number: QTBUG-20495
Reviewed-By: joao
(cherry-picked from ad35d25e78c8252a72108a4ba931934047c4707e)
Change-Id: Ia4986e8337f0e512e1a3398a5a4dd36e62680b9c
Reviewed-on: http://codereview.qt-project.org/5813
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Diffstat (limited to 'tests/auto/sql/kernel/qsqldatabase/tst_databases.h')
0 files changed, 0 insertions, 0 deletions