diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2021-09-17 16:07:10 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2021-09-23 16:57:03 +0200 |
commit | 298e41b830f60c0f2f078996ace77a4254a9f335 (patch) | |
tree | 4bf6029da36fb143aeeb11c04a2bdf442ef56b42 /tests/manual/dialogs/printdialogpanel.h | |
parent | e5d65996a93bbf4cbc8a155887def6efa3ad73de (diff) |
Remove fatuously true or false QT_VERSION checks
QT_VERSION is now at least QT_VERSION_CHECK(6, 3, 0), so remove all
checks against Qt 6.0.0 or earlier. They are superfluous. Tidied up in
some places in the process, particularly #include order.
Change-Id: I2636b2fd13be5b976f5b043ef2f8cddc038a72a4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/manual/dialogs/printdialogpanel.h')
-rw-r--r-- | tests/manual/dialogs/printdialogpanel.h | 34 |
1 files changed, 1 insertions, 33 deletions
diff --git a/tests/manual/dialogs/printdialogpanel.h b/tests/manual/dialogs/printdialogpanel.h index 618e34d596..0f34d01033 100644 --- a/tests/manual/dialogs/printdialogpanel.h +++ b/tests/manual/dialogs/printdialogpanel.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. @@ -33,9 +33,7 @@ #include "ui_printdialogpanel.h" -#if QT_VERSION >= 0x050300 #include <QPageLayout> -#endif #include <QPrinter> #include <QWidget> @@ -50,31 +48,6 @@ QT_END_NAMESPACE class PageSizeControl; class OptionsControl; -#if QT_VERSION < 0x050300 -// Copied from class QPageLayout introduced in Qt 5.3 -namespace QPageLayout -{ - enum Unit { - Millimeter, - Point, - Inch, - Pica, - Didot, - Cicero - }; - - enum Orientation { - Portrait, - Landscape - }; - - enum Mode { - StandardMode, // Paint Rect includes margins - FullPageMode // Paint Rect excludes margins - }; -} -#endif - class PrintDialogPanel : public QWidget { Q_OBJECT @@ -107,12 +80,7 @@ private: bool m_blockSignals; Ui::PrintDialogPanel m_panel; -#if QT_VERSION >= 0x050300 QPageLayout m_pageLayout; -#else - QPrinter m_printerLayout; - QPrinter::Unit m_units; -#endif QScopedPointer<QPrinter> m_printer; }; |