diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-05 16:41:26 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-05 16:41:26 (GMT) |
commit | b2a42f084b6047043bc91897e73421a9d71a6ddd (patch) | |
tree | a28e8c4b6875e0629dd2597eb170aa8b72820b02 /tests/auto/qexplicitlyshareddatapointer | |
parent | 717e96cc790c173a4555077741d37f42a3dd6cba (diff) | |
parent | e132e88cfe3eaa0155f7c951168954b67280b374 (diff) | |
download | Qt-b2a42f084b6047043bc91897e73421a9d71a6ddd.zip Qt-b2a42f084b6047043bc91897e73421a9d71a6ddd.tar.gz Qt-b2a42f084b6047043bc91897e73421a9d71a6ddd.tar.bz2 |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (49 commits)
Updated WebKit to 3f0f51f4c87e65bfe04165c6af4c00934b0ca1e2
Fixed a QBuffer warning caused by a regression in qjpeg
QGraphicsView drawing artifacts due to rounding errors.
Fixed OpenGL version flags for versions > 3.2.
Do not link QtGui in benchmarks which don't need it
Fix a small typo: therfore -> therefore
Fix a small typo in setColor description (brush -> color)
only add phonon and scripttools dependencies if they're available, otherwise linking will fail
s/INCPATH/INCLUDEPATH/
qdoc: Added breadcrumbs for most other pages.
Revert "Revert "Revert "Implement heightForWidth support for QTabWidget and QStackedLayout."""
Updated WebKit to 8941bee5706ef2171ed5def63834deefc7440d11
Fix bold text rendering of Thai and Vietnamese on Symbian
Event dispatcher slow down using delays rather than thread priority
Fix project file generation for MSVC 2010
Fixed incorrect runtime platform version check in Phonon MMF backend
Fix wrong translation and clip for the raster paint-engine on Mac
Updated WebKit to 540ae4ccd25609e1bfe1673195ce126255e36774
Removing unused code.
Return the correct library name in qt_gl_library_name for GLES*
...
Diffstat (limited to 'tests/auto/qexplicitlyshareddatapointer')
0 files changed, 0 insertions, 0 deletions