diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-23 05:41:06 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-23 05:41:06 (GMT) |
| commit | e793809aff8e2c7c14e54b7062a8cc3c05cc0b81 (patch) | |
| tree | 629ca768bf035a8950f24f4ad05c2fa69575963a /examples | |
| parent | 6c4a1d0664f74fc9fe0533ca245d75355695e5be (diff) | |
| parent | 152c2e47eba67d7f9f1aefe4ab45c40592716c90 (diff) | |
| download | Qt-e793809aff8e2c7c14e54b7062a8cc3c05cc0b81.zip Qt-e793809aff8e2c7c14e54b7062a8cc3c05cc0b81.tar.gz Qt-e793809aff8e2c7c14e54b7062a8cc3c05cc0b81.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" > |