summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorPulse Build System <qt-info@nokia.com>2010-01-27 08:15:31 (GMT)
committerPulse Build System <qt-info@nokia.com>2010-01-27 08:15:31 (GMT)
commitc9691c62b62c656a9a153b8879f13a5ce71a6d2d (patch)
treeac67ae8366a0dfa869a180af354b834aa93765e0 /tests
parent8cb85d5cb47f06f01f70781e9762a716cabdc73a (diff)
parentc06c254cf208840f14c9e562cae976f1a61f0879 (diff)
downloadQt-c9691c62b62c656a9a153b8879f13a5ce71a6d2d.zip
Qt-c9691c62b62c656a9a153b8879f13a5ce71a6d2d.tar.gz
Qt-c9691c62b62c656a9a153b8879f13a5ce71a6d2d.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: Fixed compile of QTriangulator on Solaris. Fix compile on MSVC 2003. ARRAYSIZE macro doesn't exit. Fixed compile for wincewm60standard-msvc2008 (attempt 2) Fixed compile for wincewm60standard-msvc2008. Fixed compile. Fixed compile for wincewm60standard-msvc2008. Fixed compile when Qt is configured with -no-webkit 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')
-rw-r--r--tests/auto/uiloader/baseline/css_qtbug6855.ui57
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>