diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-06-05 22:26:44 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2014-06-05 22:26:44 +0200 |
| commit | 0fcce50af009f97efa2a5c5f2c74415c92830962 (patch) | |
| tree | f8abf0e4f445fed9480b426b2f856b50911f1210 /tests/manual/dialogs/printdialogpanel.ui | |
| parent | 74d46a669badc5bf32187686102ca4e644a3c0af (diff) | |
| parent | c54f7720d09e7d00f3309736bbeaaa6a81967ec1 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
mkspecs/features/qt.prf
src/plugins/platforms/xcb/qxcbwindow.h
src/tools/qdoc/qdocindexfiles.cpp
src/widgets/kernel/qwidget_qpa.cpp
Change-Id: I214f57b03bc2ff86cf3b7dfe2966168af93a5a67
Diffstat (limited to 'tests/manual/dialogs/printdialogpanel.ui')
| -rw-r--r-- | tests/manual/dialogs/printdialogpanel.ui | 18 |
1 files changed, 14 insertions, 4 deletions
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> |