diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-08 11:53:28 +0100 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-08 11:53:28 +0100 |
| commit | 2e62227f950aac8205f2b67e4d7d046836b2c799 (patch) | |
| tree | 87e91115d86896949f69e8c8d993ba795422ef3b /tests/auto/uiloader | |
| parent | 9b0502aa6abf6bb9c07f205bccdf2d9c65027bde (diff) | |
| parent | 118e7a807d0764dee97612589fe5d7072d271e1e (diff) | |
| download | qt4-tools-2e62227f950aac8205f2b67e4d7d046836b2c799.tar.gz | |
Merge branch '4.6'
Conflicts:
src/corelib/io/qfsfileengine.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/opengl.pro
Diffstat (limited to 'tests/auto/uiloader')
| -rw-r--r-- | tests/auto/uiloader/baseline/css_qtbug6855.ui | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/tests/auto/uiloader/baseline/css_qtbug6855.ui b/tests/auto/uiloader/baseline/css_qtbug6855.ui deleted file mode 100644 index 0727f6ba99..0000000000 --- a/tests/auto/uiloader/baseline/css_qtbug6855.ui +++ /dev/null @@ -1,57 +0,0 @@ -<?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> |