diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-17 00:44:36 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-17 00:44:36 (GMT) |
| commit | 364929585a1fa0243acf3a3926626bdd19143447 (patch) | |
| tree | 439b890ef77537b2274d633dbfb4110f5901aa02 /tests/auto/auto.pro | |
| parent | fd3f9dd0f31efeea3aa0ec28b54c70d85712c7ba (diff) | |
| parent | d25b67df588254f6142f73e7f2d13c2e90fc155a (diff) | |
| download | Qt-364929585a1fa0243acf3a3926626bdd19143447.zip Qt-364929585a1fa0243acf3a3926626bdd19143447.tar.gz Qt-364929585a1fa0243acf3a3926626bdd19143447.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (105 commits)
Fixed compile on Mac.
Changelog update for 4.7.
Fix license headers.
Rename QStaticText::setUseBackendOptimizations to setPerformanceHint()
doc: Update documentation for QStaticText
Fixed a compile error on Mac/Leopard.
Fix alpha check for OpenGL/ES in GL2 paint engine
Compile fix for QStaticText - include declaration of QColor
Support Qt::AutoTest in QStaticText::setTextFormat()
Improved performance of path vs path intersection where one is a rect.
Separate out textFormat property from setText() function and remove
Update license doc and .pri file for libpng 1.4.0
Our modifications to libpng
Add libpng 1.4.0
Delete libpng 1.2.40
Fixes a behaviour for QDockWidget used without QMainWindow
Replaced the numCopies()/setNumCopies() and actualNumCopies() API.
Add API for rich text and getting actual size of QStaticText
Remove fluxuating tests for QStaticText
Make QStaticText public API again
...
Diffstat (limited to 'tests/auto/auto.pro')
0 files changed, 0 insertions, 0 deletions