diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-01 13:44:39 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-01 13:44:39 (GMT) |
| commit | 3a19d617593e324773feae87663d0cfa0d65569a (patch) | |
| tree | 86b348e53dfcd55a99285ed566461b0bc492dbc6 /doc/src/snippets/code/doc_src_qnamespace.cpp | |
| parent | 9b08c9f72f5308a918b3bf1702cb6292d903c651 (diff) | |
| parent | ee767e8c16742316068e83323374ea54f2b939cb (diff) | |
| download | Qt-3a19d617593e324773feae87663d0cfa0d65569a.zip Qt-3a19d617593e324773feae87663d0cfa0d65569a.tar.gz Qt-3a19d617593e324773feae87663d0cfa0d65569a.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: (26 commits)
Fix FolderListModel test - set folder to one containing files.
Fix Mac synthesized italic fonts clipping issue for QGLWidget
Fix openvg compilation on win32.
Drag over bounds errors when ListView has variable height content
FolderListModel emitted incorrect rowsRemoved range causing crash.
fix/improve docs for new QtQuick 1.1 attributes
Fix test instability.
Document BorderImage::asynchronous
Make QtScript support COLLECT_ON_EVERY_ALLOCATION define
QSortFilterProxyModel::reset() should invalidate.
Add missing API shims to QScriptValue constructors
Don't crash when marking arguments object of native context
Update QtOpenGL def files
Fix extern usage in qpixmapdata_gl.cpp
Fix for loading QPixmaps from file in GL graphics system
Fix code style in qgl_symbian.cpp
QPixmap::to/fromSymbianCFbsBitmap() in OpenGL graphics system.
Use the 'convertInPlace' versions of QImage in QGLPixmapData load.
Recreate GL surface when native window is resized on Symbian
spelling fixes in extending.qdoc
...
Diffstat (limited to 'doc/src/snippets/code/doc_src_qnamespace.cpp')
0 files changed, 0 insertions, 0 deletions