diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-22 08:29:37 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-22 08:29:37 (GMT) |
| commit | 27f566fb608d9465110dc67d16fe8f88ee9d4a0a (patch) | |
| tree | c8925b7aa4effc946ba8330648c95a288f923d4d /examples | |
| parent | 79a093b7f4c78994504a0a9e306169df1eb4c7a3 (diff) | |
| parent | 144f3bade4d5f48ebc268dae0df26ddf7dfe1228 (diff) | |
| download | Qt-27f566fb608d9465110dc67d16fe8f88ee9d4a0a.zip Qt-27f566fb608d9465110dc67d16fe8f88ee9d4a0a.tar.gz Qt-27f566fb608d9465110dc67d16fe8f88ee9d4a0a.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
src/openvg/qpaintengine_vg.cpp
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/widgets/stylesheet/mainwindow.ui | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/widgets/stylesheet/mainwindow.ui b/examples/widgets/stylesheet/mainwindow.ui index 2b232df..cc29257 100644 --- a/examples/widgets/stylesheet/mainwindow.ui +++ b/examples/widgets/stylesheet/mainwindow.ui @@ -196,7 +196,7 @@ </item> <item row="1" column="2" colspan="2" > <widget class="QRadioButton" name="femaleRadioButton" > - <property name="styleSheet" > + <property name="toolTip"> <string>Check this if you are female</string> </property> <property name="text" > |