3 files changed, 35 insertions, 9 deletions
diff --git a/tests/manual/dialogs/filedialogpanel.cpp b/tests/manual/dialogs/filedialogpanel.cpp
index 9e3c761cff..25c1e44b8c 100644
--- a/tests/manual/dialogs/filedialogpanel.cpp
+++ b/tests/manual/dialogs/filedialogpanel.cpp
@@ -438,9 +438,9 @@ void FileDialogPanel::restoreDefaults()
     setComboBoxValue(m_viewMode, d.viewMode());
     m_showDirsOnly->setChecked(d.testOption(QFileDialog::ShowDirsOnly));
     m_allowedSchemes->setText(QString());
-    m_confirmOverWrite->setChecked(d.confirmOverwrite());
-    m_nameFilterDetailsVisible->setChecked(d.isNameFilterDetailsVisible());
-    m_resolveSymLinks->setChecked(d.resolveSymlinks());
+    m_confirmOverWrite->setChecked(!d.testOption(QFileDialog::DontConfirmOverwrite));
+    m_nameFilterDetailsVisible->setChecked(!d.testOption(QFileDialog::HideNameFilterDetails));
+    m_resolveSymLinks->setChecked(!d.testOption(QFileDialog::DontResolveSymlinks));
     m_readOnly->setChecked(d.isReadOnly());
     m_native->setChecked(true);
     m_customDirIcons->setChecked(d.testOption(QFileDialog::DontUseCustomDirectoryIcons));
@@ -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.
 }
diff --git a/tests/manual/dialogs/main.cpp b/tests/manual/dialogs/main.cpp
index 83089e684c..07df8f5cf4 100644
--- a/tests/manual/dialogs/main.cpp
+++ b/tests/manual/dialogs/main.cpp
@@ -44,6 +44,8 @@
 #include <QAction>
 #include <QKeySequence>
 
+static bool optNoPrinter = false;
+
 // Test for dialogs, allowing to play with all dialog options for implementing native dialogs.
 // Compiles with Qt 4.8 and Qt 5.
 
@@ -92,7 +94,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
     QMenu *editMenu = menuBar()->addMenu(tr("&Edit"));
     QAction *action = editMenu->addAction(tr("Cut"));
-    action->setShortcut(QKeySequence(QKeySequence::Quit));
+    action->setShortcut(QKeySequence(QKeySequence::Cut));
     action = editMenu->addAction(tr("Copy"));
     action->setShortcut(QKeySequence(QKeySequence::Copy));
     action = editMenu->addAction(tr("Paste"));
@@ -109,7 +111,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     tabWidget->addTab(new WizardPanel, tr("QWizard"));
     tabWidget->addTab(new MessageBoxPanel, tr("QMessageBox"));
 #ifndef QT_NO_PRINTER
-    tabWidget->addTab(new PrintDialogPanel, tr("QPrintDialog"));
+    if (!optNoPrinter)
+        tabWidget->addTab(new PrintDialogPanel, tr("QPrintDialog"));
 #endif
     setCentralWidget(tabWidget);
 }
@@ -123,14 +126,20 @@ void MainWindow::aboutDialog()
 
 int main(int argc, char *argv[])
 {
-#if QT_VERSION >= 0x050700
+#if QT_VERSION >= 0x050600
+    QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
+#endif
+
     for (int a = 1; a < argc; ++a) {
         if (!qstrcmp(argv[a], "-n")) {
             qDebug("AA_DontUseNativeDialogs");
+#if QT_VERSION >= 0x050700
             QCoreApplication::setAttribute(Qt::AA_DontUseNativeDialogs);
+#endif
+        } else if (!qstrcmp(argv[a], "-p")) {
+            optNoPrinter = true; // Avoid startup slowdown by printer code
         }
     }
-#endif // Qt 5
 
     QApplication a(argc, argv);
     MainWindow w;
diff --git a/tests/manual/dialogs/printdialogpanel.cpp b/tests/manual/dialogs/printdialogpanel.cpp
index d999dbc30c..8d64d2f6a6 100644
--- a/tests/manual/dialogs/printdialogpanel.cpp
+++ b/tests/manual/dialogs/printdialogpanel.cpp
@@ -55,6 +55,10 @@
 #include <QTextStream>
 #include <QDir>
 
+#if QT_VERSION >= 0x050000
+#  include <QScreen>
+#endif
+
 const FlagData printerModeComboData[] =
 {
     {"ScreenResolution", QPrinter::ScreenResolution},
@@ -705,7 +709,13 @@ void PrintDialogPanel::showPreviewDialog()
 {
     applySettings(m_printer.data());
     PrintPreviewDialog dialog(m_printer.data(), this);
-    dialog.resize(QApplication::desktop()->availableGeometry().size() * 4/ 5);
+#if QT_VERSION >= 0x050000
+    const int screenNumber = QApplication::desktop()->screenNumber(this);
+    const QSize availableSize = QGuiApplication::screens().at(screenNumber)->availableSize();
+#else
+    const QSize availableSize = QApplication::desktop()->availableGeometry().size();
+#endif
+    dialog.resize(availableSize * 4/ 5);
     if (dialog.exec() == QDialog::Accepted)
         retrieveSettings(m_printer.data());
 }