summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | Avoid asserting when computing line number for backtraceKent Hansen2011-03-011-1/+9
* | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-0124-138/+272
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-0124-138/+272
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-2815-110/+225
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | Drag over bounds errors when ListView has variable height contentMartin Jones2011-02-284-43/+84
| | | * | | | | | FolderListModel emitted incorrect rowsRemoved range causing crash.Martin Jones2011-02-281-1/+1
| | | * | | | | | fix/improve docs for new QtQuick 1.1 attributesBea Lam2011-02-289-15/+52
| | | * | | | | | Document BorderImage::asynchronousAlan Alpert2011-02-271-0/+14
| | | * | | | | | Ensure layout is updated when section property changes.Martin Jones2011-02-251-1/+4
| | | * | | | | | QDeclarativeDebug: Export needed symbols on SymbianKai Koehne2011-02-243-47/+47
| | | * | | | | | Add a 'CursorPosition' parameter to TextInput.positionAt().Andrew den Exter2011-02-242-3/+23
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-02-282-7/+13
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix Mac synthesized italic fonts clipping issue for QGLWidgetJiang Jiang2011-02-281-5/+10
| | | * | | | | | | Merge branch 'graphics-team-text-4.7' into 4.7Eskil Abrahamsen Blomfeldt2011-02-281-2/+3
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Fix cursor position adjustment when removing stringsJiang Jiang2011-01-251-1/+3
| | | | * | | | | | | Fix out of bounds handling in Mac shaperJiang Jiang2011-01-141-2/+3
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-281-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | |
| | | * | | | | | | | Fix openvg compilation on win32.Laszlo Agocs2011-02-281-1/+1
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-263-13/+33
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Make QtScript support COLLECT_ON_EVERY_ALLOCATION defineKent Hansen2011-02-251-11/+12
| | | * | | | | | | | | Add missing API shims to QScriptValue constructorsKent Hansen2011-02-251-0/+5
| | | * | | | | | | | | Don't crash when marking arguments object of native contextKent Hansen2011-02-252-2/+16
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-266-70/+281
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Update QtOpenGL def filesJani Hautakangas2011-02-252-0/+15
| | | * | | | | | | | | Fix extern usage in qpixmapdata_gl.cppJani Hautakangas2011-02-251-1/+1
| | | * | | | | | | | | Fix for loading QPixmaps from file in GL graphics systemJani Hautakangas2011-02-251-22/+22
| | | * | | | | | | | | Fix code style in qgl_symbian.cppJani Hautakangas2011-02-251-4/+4
| | | * | | | | | | | | QPixmap::to/fromSymbianCFbsBitmap() in OpenGL graphics system.Jani Hautakangas2011-02-252-0/+119
| | | * | | | | | | | | Use the 'convertInPlace' versions of QImage in QGLPixmapData load.Jani Hautakangas2011-02-252-34/+83
| | | * | | | | | | | | Recreate GL surface when native window is resized on SymbianJani Hautakangas2011-02-251-13/+41
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-02-252-7/+9
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | / / / / / / / | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | QSortFilterProxyModel::reset() should invalidate.Olivier Goffart2011-02-252-7/+9
* | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-03-014-0/+32
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-02-284-0/+32
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| | * | | | | | | | | Resolve font alias before testing for exact matchingJiang Jiang2011-02-284-0/+32
* | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-02-2850-92/+1678
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Ammend INTEGRITY fixesHarald Fernengel2011-02-231-3/+4
| * | | | | | | | | | add gsm to connectable bearer for networkmanager.Lorn Potter2011-02-221-0/+5
| * | | | | | | | | | Fix license headersHarald Fernengel2011-02-227-137/+190
| * | | | | | | | | | add missing includeRolland Dudemaine2011-02-221-0/+1
| * | | | | | | | | | Silence GHS compilerRolland Dudemaine2011-02-221-0/+4
| * | | | | | | | | | Run on INTEGRITYRolland Dudemaine2011-02-221-1/+10
| * | | | | | | | | | Fix compilation on INTEGRITYRolland Dudemaine2011-02-224-35/+35
| * | | | | | | | | | Add a "-nn" option to mocRolland Dudemaine2011-02-223-4/+16
| * | | | | | | | | | Use TCP_LOCALSOCKET on INTEGRITYRolland Dudemaine2011-02-224-2/+13
| * | | | | | | | | | Compile for systems without mmapRolland Dudemaine2011-02-221-10/+40
| * | | | | | | | | | Various INTEGRITY fixesRolland Dudemaine2011-02-227-28/+37
| * | | | | | | | | | INTEGRITY screen, mouse and kbd driversRolland Dudemaine2011-02-2211-1/+1113
| * | | | | | | | | | Various INTEGRITY fixesRolland Dudemaine2011-02-2212-9/+62
| * | | | | | | | | | Atomic operations support for INTEGRITY RTOSRolland Dudemaine2011-02-224-1/+292