diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-07 10:35:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-07 10:35:28 (GMT) |
| commit | b533711996a7724afb1fc3e9e094b197066fb751 (patch) | |
| tree | dba7f793d833a36fe4ac0523274ff38eaf1b15c7 /demos/composition/composition.cpp | |
| parent | 00fd05900114b44ac209351085814caea227c588 (diff) | |
| parent | 776a00b3e8a29552a5db65fb539c0802654bfdff (diff) | |
| download | Qt-b533711996a7724afb1fc3e9e094b197066fb751.zip Qt-b533711996a7724afb1fc3e9e094b197066fb751.tar.gz Qt-b533711996a7724afb1fc3e9e094b197066fb751.tar.bz2 | |
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (207 commits)
Doc: Adding documentation on configure options for Qt configure
Ensured that trailing newlines are quoted and correct atoms are used.
Fixed build breakage.
Fixed C++ and plain markup found in \c commands.
Doc: Document display-orientation-related widget attributes.
Added a configuration variable for the QML documentation file prefix.
Fixed wrong casing of a Symbian library.
Fixed wrong static library extension on Symbian.
Fixed library casing.
Remove dependencies to pre-Symbian3 platforms from Symbian3 packages
My changes 4.7.2
Don't accept input methods when a TextEdit or TextInput is read only.
Correct error message
On windows xp using a higher port makes the declarativedebug* tests work
Correct assert
Fix for QTBUG-17035
Fix qt.sis platform dependencies for Symbian^3 builds.
Fix QMutex can deadlock when calling tryLock
Carefull free the data from XGetWindowProperty on X11.
Fixes memory leaks in QX11Embed
...
Diffstat (limited to 'demos/composition/composition.cpp')
0 files changed, 0 insertions, 0 deletions