From 9a2dbcab7e820c63aac55ba08dc120a56986efac Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Tue, 13 May 2014 14:08:05 +0200
Subject: 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>
---
 tests/manual/dialogs/printdialogpanel.ui | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'tests/manual/dialogs/printdialogpanel.ui')

diff --git a/tests/manual/dialogs/printdialogpanel.ui b/tests/manual/dialogs/printdialogpanel.ui
index 2f0fe606a3..f4bab6fd9a 100644
--- a/tests/manual/dialogs/printdialogpanel.ui
+++ b/tests/manual/dialogs/printdialogpanel.ui
@@ -527,24 +527,24 @@
         <item row="7" column="1">
          <widget class="QComboBox" name="m_paperSourceCombo"/>
         </item>
-        <item row="8" column="0">
+        <item row="9" column="0">
          <widget class="QLabel" name="label_23">
           <property name="text">
            <string>Color Mode:</string>
           </property>
          </widget>
         </item>
-        <item row="8" column="1">
+        <item row="9" column="1">
          <widget class="QComboBox" name="m_colorModeCombo"/>
         </item>
-        <item row="9" column="0">
+        <item row="10" column="0">
          <widget class="QLabel" name="label_28">
           <property name="text">
            <string>Resolution:</string>
           </property>
          </widget>
         </item>
-        <item row="9" column="1">
+        <item row="10" column="1">
          <layout class="QHBoxLayout" name="horizontalLayout_7">
           <item>
            <widget class="QSpinBox" name="m_resolution">
@@ -584,6 +584,16 @@
         <item row="4" column="1">
          <widget class="QComboBox" name="m_pageOrderCombo"/>
         </item>
+        <item row="8" column="0">
+         <widget class="QLabel" name="availPaperSourceDescLabel">
+          <property name="text">
+           <string>Available Paper Sources:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="8" column="1">
+         <widget class="QLabel" name="availPaperSourceLabel"/>
+        </item>
        </layout>
       </widget>
      </item>
-- 
cgit v1.2.3