From c4314f7aeb35568cc7f88fe94420c01f74f670a5 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 15 Feb 2013 09:42:13 +0100 Subject: [PATCH] Filedialog test: Do not set directory if empty. Make it possible to test the saving/restoring of directories which is done by default. Task-number: QTBUG-28855 Change-Id: Id16010b6aea9cd78b9bebdbe1b148eb7f5141f8b Reviewed-by: J-P Nurmi --- tests/manual/dialogs/filedialogpanel.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/manual/dialogs/filedialogpanel.cpp b/tests/manual/dialogs/filedialogpanel.cpp index 56bd2c1da83..636e65b6845 100644 --- a/tests/manual/dialogs/filedialogpanel.cpp +++ b/tests/manual/dialogs/filedialogpanel.cpp @@ -400,7 +400,9 @@ void FileDialogPanel::applySettings(QFileDialog *d) const d->setFileMode(comboBoxValue(m_fileMode)); d->setOptions(options()); d->setDefaultSuffix(m_defaultSuffix->text().trimmed()); - d->setDirectory(m_directory->text().trimmed()); + const QString directory = m_directory->text().trimmed(); + if (!directory.isEmpty()) + d->setDirectory(directory); const QString file = m_selectedFileName->text().trimmed(); if (!file.isEmpty()) d->selectFile(file);