diff options
author | Pulse Build System <qt-info@nokia.com> | 2010-01-22 00:53:04 (GMT) |
---|---|---|
committer | Pulse Build System <qt-info@nokia.com> | 2010-01-22 00:53:04 (GMT) |
commit | 0e12da85f8f8ee8b5ddb32e518a25ef168cea9e7 (patch) | |
tree | cdc404155a92000c1a0b6ebe1fbda74b22457ec0 /tests/auto | |
parent | 8e65adce9ced8f3b1d42b938e4d65e1af4768c33 (diff) | |
parent | 5c8c51284b1119f90520b6dbad0ac23fe0487bcf (diff) | |
download | Qt-0e12da85f8f8ee8b5ddb32e518a25ef168cea9e7.zip Qt-0e12da85f8f8ee8b5ddb32e518a25ef168cea9e7.tar.gz Qt-0e12da85f8f8ee8b5ddb32e518a25ef168cea9e7.tar.bz2 |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2:
build fix for mingw
Build fix for MSVC2005 and older SDK
QStyleSheetStyle: Fixed some text croped when having padding with native border.
Remove obsolete code for unsupported platforms
Character spacing when drawing a QPicture to a high DPI device.
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/uiloader/baseline/css_qtbug6855.ui | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/tests/auto/uiloader/baseline/css_qtbug6855.ui b/tests/auto/uiloader/baseline/css_qtbug6855.ui new file mode 100644 index 0000000..0727f6b --- /dev/null +++ b/tests/auto/uiloader/baseline/css_qtbug6855.ui @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>Form</class> + <widget class="QWidget" name="Form"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>212</width> + <height>108</height> + </rect> + </property> + <property name="windowTitle"> + <string>Form</string> + </property> + <property name="styleSheet"> + <string notr="true">QPushButton { padding: 20px; }</string> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QPushButton" name="pushButton"> + <property name="text"> + <string>Text not cropped</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>258</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="0"> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>218</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <resources/> + <connections/> +</ui> |