Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Liang Qi | 2011-07-20 | 2 | -3/+77 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-07-19 | 2 | -3/+77 |
| |\ | |||||
| | * | Delay masking the last character in Password echo mode. | Andrew den Exter | 2011-07-19 | 2 | -3/+77 |
* | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-07-18 | 1 | -0/+6 |
|\ \ \ | |||||
| * \ \ | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-07-18 | 1 | -0/+6 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-07-18 | 1 | -0/+6 |
| | |\ \ | |||||
| | | * | | Fixes leaking X11 SyncCounter when widgets get open/destroyed | Aleksandar Stojiljkovic | 2011-07-18 | 1 | -0/+6 |
* | | | | | namespace fix | Joerg Bornemann | 2011-07-14 | 1 | -1/+2 |
|/ / / / | |||||
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Liang Qi | 2011-07-14 | 2 | -2/+9 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-07-13 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Fix potential crash when clicking in a text edit | Eskil Abrahamsen Blomfeldt | 2011-07-13 | 1 | -0/+1 |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-07-12 | 1 | -2/+8 |
| |\ \ \ | | |/ / | |||||
| | * | | Compensate for different rounding rule in CG engine | Jiang Jiang | 2011-07-12 | 1 | -2/+8 |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-07-12 | 3 | -44/+117 |
| |\ \ \ | | |/ / | |||||
| | * | | Check engine existence before increasing reference count | Jiang Jiang | 2011-07-12 | 1 | -3/+6 |
| | * | | Keep reference count for cached font engines in QTextEngine | Jiang Jiang | 2011-07-11 | 1 | -0/+15 |
| | * | | Optimize text layout. | Michael Brasser | 2011-07-11 | 3 | -25/+71 |
| | * | | Fix crash when app font is added | Jiang Jiang | 2011-07-11 | 3 | -19/+28 |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-07-11 | 3 | -2/+11 |
| |\ \ \ | |||||
| | * | | | Backporting fix for QTBUG-18716 | Tomi Vihria | 2011-07-11 | 3 | -2/+11 |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-07-12 | 8 | -50/+58 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge remote branch 'review/master' into staging | Jiang Jiang | 2011-07-12 | 8 | -50/+58 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix compiler warning in qtextdocument.cpp | Eskil Abrahamsen Blomfeldt | 2011-07-11 | 1 | -1/+1 |
| | * | | | | | Fix crash when app font is added | Jiang Jiang | 2011-07-11 | 3 | -19/+28 |
| | * | | | | | Use truncate only for subpixel boundingBox x position | Jiang Jiang | 2011-07-08 | 2 | -2/+2 |
| | * | | | | | Use more numerically robust algorithm to compute QBezier::pointAt(). | Samuel Rødal | 2011-07-08 | 1 | -18/+18 |
| | * | | | | | Fix editable combobox style on Mac | Jiang Jiang | 2011-07-07 | 1 | -5/+5 |
| | * | | | | | Revert 344a4dcfe and part of 93bce787 | Jiang Jiang | 2011-07-07 | 2 | -6/+5 |
| | * | | | | | Fix raster subpixel positioning in Lion | Jiang Jiang | 2011-07-07 | 1 | -1/+1 |
| | * | | | | | Merge remote branch 'mainline/4.8' | Jiang Jiang | 2011-07-07 | 15 | -206/+817 |
| | |\ \ \ \ \ | |||||
* | | \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma... | Qt Continuous Integration System | 2011-07-12 | 6 | -91/+568 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix license header in qs60keycapture_p.h and qs60keycapture.cpp | Honglei Zhang | 2011-07-08 | 2 | -36/+36 |
| * | | | | | | | | Merge remote-tracking branch 'qt/4.8' | Sami Lempinen | 2011-07-05 | 26 | -281/+1181 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'newmmkey_sym' | Honglei Zhang | 2011-07-04 | 6 | -91/+568 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Enable key capture and RemCon interfaces for Qt apps on Symbian | Honglei Zhang | 2011-07-03 | 6 | -91/+568 |
* | | | | | | | | | | | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-07-09 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-07-08 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-07-08 | 1 | -1/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-07-07 | 1 | -1/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / | | | | |/| | | | | | | | | |||||
| | | | * | | | | | | | | | Regression: Some QMenus are shown completely transparent in Symbian | Sami Merila | 2011-07-07 | 1 | -1/+3 |
* | | | | | | | | | | | | | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-07-08 | 32 | -122/+269 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master... | Qt Continuous Integration System | 2011-07-08 | 19 | -8/+62 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge remote branch 'upstream/4.8' | Jerome Pasion | 2011-07-08 | 17 | -212/+853 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | | Doc: Fixed \since declarations. | David Boddie | 2011-07-01 | 1 | -2/+2 |
| | * | | | | | | | | | | | Doc: Added more appropriate links to help reduce confusion. | David Boddie | 2011-07-01 | 1 | -0/+2 |
| | * | | | | | | | | | | | Doc: Updated documentation with \since 4.8 declarations. | David Boddie | 2011-06-30 | 17 | -6/+58 |
| * | | | | | | | | | | | | Merge remote branch 'mainline/4.8' into staging | Jiang Jiang | 2011-07-08 | 17 | -212/+853 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | / / / / | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-07-07 | 2 | -2/+19 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | |||||
| | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-07-06 | 1 | -1/+13 |
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / | | | | |/| | | | | | | | |||||
| | | | * | | | | | | | | Fix bidi reordering when part of text is rendered by fallback font | Eskil Abrahamsen Blomfeldt | 2011-07-06 | 1 | -1/+13 |