From 18bd22656418e269ee57024a966bbc2fef70db36 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Fri, 25 Sep 2020 09:49:47 +0200
Subject: Fix compilation of some manual tests

- qtabletevent/device_information
- dialogs
- windowflags

Change-Id: Id3e4b2aec2a873b00dcda39fb1227b24832181ca
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
---
 tests/manual/dialogs/filedialogpanel.cpp  |  2 +-
 tests/manual/dialogs/printdialogpanel.cpp | 20 +++++++++++---------
 tests/manual/dialogs/wizardpanel.cpp      |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'tests/manual/dialogs')

diff --git a/tests/manual/dialogs/filedialogpanel.cpp b/tests/manual/dialogs/filedialogpanel.cpp
index 0fa1bc9dc2..56a1502313 100644
--- a/tests/manual/dialogs/filedialogpanel.cpp
+++ b/tests/manual/dialogs/filedialogpanel.cpp
@@ -440,7 +440,7 @@ void FileDialogPanel::restoreDefaults()
     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_readOnly->setChecked(d.testOption(QFileDialog::ReadOnly));
     m_native->setChecked(true);
     m_customDirIcons->setChecked(d.testOption(QFileDialog::DontUseCustomDirectoryIcons));
     m_directory->setText(QDir::homePath());
diff --git a/tests/manual/dialogs/printdialogpanel.cpp b/tests/manual/dialogs/printdialogpanel.cpp
index 29dc33285b..338064e9be 100644
--- a/tests/manual/dialogs/printdialogpanel.cpp
+++ b/tests/manual/dialogs/printdialogpanel.cpp
@@ -157,17 +157,19 @@ QTextStream &operator<<(QTextStream &s, const QRectF &rect)
 
 QTextStream &operator<<(QTextStream &s, const QPrinter &printer)
 {
-    s << '"' << printer.printerName() << "\"\nPaper #" <<printer.paperSize()
-        << " \"" << printer.paperName() << '"'
-      << (printer.orientation() == QPrinter::Portrait ? ", Portrait" : ", Landscape");
+    const auto pageLayout = printer.pageLayout();
+    const auto pageSize = pageLayout.pageSize();
+    s << '"' << printer.printerName() << "\"\nPaper #" << pageSize.id()
+        << " \"" << pageSize.name() << '"'
+      << (pageLayout.orientation() == QPageLayout::Portrait ? ", Portrait" : ", Landscape");
     if (printer.fullPage())
         s << ", full page";
     s << "\nPaper size: "
-        << printer.paperSize(QPrinter::Point) << "pt "
-        << printer.paperSize(QPrinter::Millimeter) << "mm "
-      << "\n            " << printer.paperSize(QPrinter::DevicePixel) << "device pt "
-        << printer.paperSize(QPrinter::Inch) << "inch "
-      << "\nPagedPaintDevSize: " <<   printer.pageSizeMM() << "mm"
+        << pageSize.sizePoints() << "pt "
+        << pageSize.size(QPageSize::Millimeter) << "mm "
+      << "\n            " << pageSize.sizePixels(printer.resolution()) << " device pt "
+        <<  pageSize.size(QPageSize::Inch) << "inch "
+      << "\n            " <<   pageSize.size(QPageSize::Millimeter) << "mm"
       << "\nLogical resolution : " << printer.logicalDpiX() << ',' << printer.logicalDpiY() << "DPI"
       << "\nPhysical resolution: " << printer.physicalDpiX() << ',' << printer.physicalDpiY() << "DPI"
       << "\nPaperRect: " << printer.paperRect(QPrinter::Point) << "pt "
@@ -236,7 +238,7 @@ static bool print(QPrinter *printer, QString *errorMessage)
         return false;
     }
 
-    const QRectF pageF = printer->pageRect();
+    const QRectF pageF = printer->pageRect(QPrinter::DevicePixel);
 
     QFont font = painter.font();
     font.setFamily("Courier");
diff --git a/tests/manual/dialogs/wizardpanel.cpp b/tests/manual/dialogs/wizardpanel.cpp
index 8e8af5f556..e5624e6248 100644
--- a/tests/manual/dialogs/wizardpanel.cpp
+++ b/tests/manual/dialogs/wizardpanel.cpp
@@ -90,7 +90,7 @@ WizardStyleControl::WizardStyleControl(QWidget *parent)
     , m_group(new QButtonGroup(this))
 {
     m_group->setExclusive(true);
-    connect(m_group, SIGNAL(buttonClicked(int)), this, SIGNAL(wizardStyleChanged(int)));
+    connect(m_group, &QButtonGroup::idClicked, this, &WizardStyleControl::wizardStyleChanged);
     QVBoxLayout *vLayout = new QVBoxLayout(this);
     QRadioButton *radioButton = new QRadioButton(tr("None/OS Default"), this);
     m_group->addButton(radioButton, QWizard::NStyles);
-- 
cgit v1.2.3