summaryrefslogtreecommitdiffstats
path: root/tests/manual/dialogs/printdialogpanel.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2014-05-13 14:08:05 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-05-23 22:18:41 +0200
commit9a2dbcab7e820c63aac55ba08dc120a56986efac (patch)
treee99a450b0fbb7282fc6ec8c8d1d1a186a515a6bd /tests/manual/dialogs/printdialogpanel.cpp
parentd3d8ade87b74c541cc3baa67b9972d6471864c25 (diff)
QPrinter/Windows: Fix handling of native paper source ids.
On Windows, it is possible to pass native Windows paper source ids >= DMBIN_USER to QPrinter::setPaperSource() and they are listed by supportedPaperSources(). Task-number: QTBUG-38897 Task-number: QTBUG-38888 Change-Id: I8f1264e80ce5bdddd3873602200b24eabee00502 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Diffstat (limited to 'tests/manual/dialogs/printdialogpanel.cpp')
-rw-r--r--tests/manual/dialogs/printdialogpanel.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/tests/manual/dialogs/printdialogpanel.cpp b/tests/manual/dialogs/printdialogpanel.cpp
index 1a18f94406..e316486fcf 100644
--- a/tests/manual/dialogs/printdialogpanel.cpp
+++ b/tests/manual/dialogs/printdialogpanel.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the test suite of the Qt Toolkit.
@@ -474,6 +474,15 @@ void PrintDialogPanel::retrieveSettings(const QPrinter *printer)
setComboBoxValue(m_panel.m_colorModeCombo, printer->colorMode());
m_panel.m_resolution->setValue(printer->resolution());
+#ifdef Q_OS_WIN
+ QString availPaperSources;
+ foreach (QPrinter::PaperSource ps, printer->supportedPaperSources())
+ availPaperSources += QString::number(int(ps)) + QLatin1Char(' ');
+ m_panel.availPaperSourceLabel->setText(availPaperSources);
+#else
+ m_panel.availPaperSourceLabel->setText(QLatin1String("N/A"));
+#endif
+
#if QT_VERSION >= 0x050300
m_pageLayout = printer->pageLayout();
#else