diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-25 00:24:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-25 00:24:13 (GMT) |
| commit | 2a1fe68f34c959d6f61aa9944cdf31a2be79c82c (patch) | |
| tree | 6d6629ac10d9fb3403babef3edcbca0502ef4e1f /examples | |
| parent | 69b88e97a02b41f3ffb88cbac09a5096da6c520d (diff) | |
| parent | b936a29a640d6adb1680624c21552f55a3b78f6f (diff) | |
| download | Qt-2a1fe68f34c959d6f61aa9944cdf31a2be79c82c.zip Qt-2a1fe68f34c959d6f61aa9944cdf31a2be79c82c.tar.gz Qt-2a1fe68f34c959d6f61aa9944cdf31a2be79c82c.tar.bz2 | |
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (71 commits)
Revert "Attempt at fixing compile failure introduced by 4.6 merge in qpaintengine_vg.cpp"
Attempt at fixing compile failure introduced by 4.6 merge in qpaintengine_vg.cpp
Fixing the wrong QUrl usage
When on Symbian use smaller files.
correctly position glyphs for complex languages
Removed inneccessary QGlyphLayout::offsets initialization.
Fix mirrored characters for RTL text in Symbian
QNAM: Add a code comment related to the cache
tst_QSystemSemaphore::processes fixed for WinCE
tst_qsystemsemaphore: fix deployment of lackey.exe for WinCE
tst_qsharedmemory: create multiple instances of lackey.exe on WinCE
tst_qsharedmemory: fix deployment of lackey.exe for WinCE
fix compilation of tst_sharedmemory on Windows CE
QtScript: regression with instanceof operator for QMetaObject wrappers
examples/widgets/stylesheet fix mainwindow.ui
QStyleSheetStyle: fix memory leak on base style change
QNAM HTTP: Fixed a bug when getting empty files with pipelining
Fix window transparency on Symbian.
Tweak the 'normalGeometry' of the widget before setting it.
Use QDesktopWidget as a status pane observer on Symbian.
...
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" > |