summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@qt.io>2023-10-30 08:59:43 +0100
committerRobert Griebl <robert.griebl@qt.io>2023-10-30 09:50:12 +0100
commit8cb8d4c547891b6af1134573df05cbc21e52a656 (patch)
treecb1f276285e79513630a1a3c2349092034d128d3 /tests
parentf2666b6c726ad01ac408f78e7d4a64d5fb3ac0ca (diff)
Adapt to behavior change in QTemporaryFile
935562a77ba5f4dc90960ae5685c461efc83c0ee in qtbase changed how QTemporaryFile::fileName works. Since we rely on the exact path for the test, we have to adapt. Change-Id: Ibc5c53de78ff94c576f022c2260313ae4c32d76a Fixes: QTBUG-118603 Reviewed-by: Bernd Weimer <bernd.weimer@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/yaml/tst_yaml.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/yaml/tst_yaml.cpp b/tests/auto/yaml/tst_yaml.cpp
index 3e7825e6..68bf7475 100644
--- a/tests/auto/yaml/tst_yaml.cpp
+++ b/tests/auto/yaml/tst_yaml.cpp
@@ -329,7 +329,8 @@ void tst_Yaml::mergedCache()
QVERIFY(cache2File.write(cache2Resource.readAll()) > 0);
QVERIFY(cache2File.flush());
- QStringList files = { qSL(":/data/cache1.yaml"), cache2File.fileName() };
+ const QString cache2FileName = QFileInfo(cache2File).absoluteFilePath();
+ QStringList files = { qSL(":/data/cache1.yaml"), cache2FileName };
for (int step = 0; step < 4; ++step) {
AbstractConfigCache::Options options = AbstractConfigCache::MergedResult;