diff options
author | Liang Qi <liang.qi@qt.io> | 2018-04-11 09:34:23 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-04-11 09:34:23 +0200 |
commit | 093290a662c17cdbedee7e820ec51c3e5ba82aef (patch) | |
tree | 9523faf19abf5f3d411a16e7758367a05efe8a76 /tests/auto/widgets/dialogs | |
parent | c7cbf216999cd833cae667b8c6fbfa65d33e8efd (diff) | |
parent | 95c8f24b71445956651a5d1eade9475dceb16675 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/platforms/ios/quiview.mm
Change-Id: I0fd0adeca1590fffddd577873172f6d987a60412
Diffstat (limited to 'tests/auto/widgets/dialogs')
-rw-r--r-- | tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp index e26da6b93e..e39110bb50 100644 --- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp @@ -471,6 +471,9 @@ void tst_QFiledialog::completer() for (int i = 0; i < 10; ++i) { TemporaryFilePtr file(new QTemporaryFile(startPath + QStringLiteral("/rXXXXXX"))); QVERIFY2(file->open(), qPrintable(file->errorString())); + // Force the temporary file to materialize with the requested name + (void) file->fileName(); + QVERIFY(file->exists()); files.append(file); } } |