diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-06-04 16:02:06 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-06-24 15:43:58 +0000 |
| commit | ec8c1dcf147ac71ea3c0105d67c2575ab733d348 (patch) | |
| tree | c7e9f264ee899779d154e3bb0afc3871f61c60d4 /tests/auto/tools/qmakelib | |
| parent | 0e41a58fb8f15a9a0790db2f33efe32d3c227bc2 (diff) | |
Make QDir::relativeFilePath() return "." for a path to itself.
The rationale being that the empty string is not a valid path component.
[ChangeLog][QtCore][QDir] QDir::relativeFilePath() now returns "."
instead of an empty string if the given path is the same as the
directory.
Change-Id: Ibcf31904b2ae5edf5639d4c2e5ba234365d347fd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'tests/auto/tools/qmakelib')
| -rw-r--r-- | tests/auto/tools/qmakelib/evaltest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/tools/qmakelib/evaltest.cpp b/tests/auto/tools/qmakelib/evaltest.cpp index fab2cdce17..bed4c792a1 100644 --- a/tests/auto/tools/qmakelib/evaltest.cpp +++ b/tests/auto/tools/qmakelib/evaltest.cpp @@ -1356,7 +1356,7 @@ void tst_qmakelib::addReplaceFunctions(const QString &qindir) QTest::newRow("$$relative_path(): relative file to empty") << "VAR = $$relative_path(dir/..)" - << "VAR =" + << "VAR = ." << "" << true; @@ -1368,7 +1368,7 @@ void tst_qmakelib::addReplaceFunctions(const QString &qindir) QTest::newRow("$$relative_path(): empty file & path") << "VAR = $$relative_path('', /root/sub)" - << "VAR =" + << "VAR = ." << "" << true; |