diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-04-10 08:16:20 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-04-10 08:16:20 +0200 |
| commit | a20da2353cc308aab15e3efa05ab7d899e9c6ca7 (patch) | |
| tree | 63881eb44f19384ebfb0e0443291b8f9ab82f149 /tests/manual/dialogs/filedialogpanel.cpp | |
| parent | 95f787bfdc890c259e8b347bdad9123d534efe0f (diff) | |
| parent | eaf20420f8a4d72c804a9d3725c3e294b34c78c8 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
mkspecs/win32-clang-msvc/qmake.conf
src/gui/image/qpnghandler.cpp
Change-Id: Ied79d02912ffb3a307a99483df7db08c7f9d0cd8
Diffstat (limited to 'tests/manual/dialogs/filedialogpanel.cpp')
| -rw-r--r-- | tests/manual/dialogs/filedialogpanel.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/manual/dialogs/filedialogpanel.cpp b/tests/manual/dialogs/filedialogpanel.cpp index 800baae45e..25c1e44b8c 100644 --- a/tests/manual/dialogs/filedialogpanel.cpp +++ b/tests/manual/dialogs/filedialogpanel.cpp @@ -505,8 +505,15 @@ void FileDialogPanel::accepted() Q_ASSERT(d); m_result.clear(); QDebug(&m_result).nospace() +#if QT_VERSION >= 0x050000 + << "URLs: " << d->selectedUrls() << '\n' +#endif << "Files: " << d->selectedFiles() - << "\nDirectory: " << d->directory().absolutePath() + << "\nDirectory: " +#if QT_VERSION >= 0x050000 + << d->directoryUrl() << ", " +#endif + << d->directory().absolutePath() << "\nName filter: " << d->selectedNameFilter(); QTimer::singleShot(0, this, SLOT(showAcceptedResult())); // Avoid problems with the closing (modal) dialog as parent. } |