summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-0327-168/+1407
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-031-3/+3
| |\
| | * Use the generic QVoltileImage implementation on S60 3.1 and 3.2.Laszlo Agocs2011-03-031-3/+3
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-031-1/+1
| |\ \
| | * | Position the TextInput cursor correctly after IM text is commited.Andrew den Exter2011-03-031-1/+1
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-026-19/+105
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Make the TextInput cursorRectangle relative to the item.Andrew den Exter2011-03-021-0/+1
| | * Don't assert if font engine creates new glyphsAaron Kennedy2011-03-021-5/+6
| | * Doc: remove experimental GestureArea from contents and add PinchAreaMartin Jones2011-03-021-0/+4
| | * Don't return positions within preedit text from positionAt().Andrew den Exter2011-03-013-6/+31
| | * Add an is input method composing property to TextEdit and TextInput.Andrew den Exter2011-03-014-8/+63
| * | Have QVolatileImage backed by a bitmap in all cases.Laszlo Agocs2011-03-011-5/+3
| * | Removing extra tabs from def file.Laszlo Agocs2011-03-011-1/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-03-01273-2557/+9088
| |\ \
| * | | Fix style issue in qvgimagepool.cppJani Hautakangas2011-03-011-1/+1
| * | | Add internal function for releasing cached GPU resources.Jani Hautakangas2011-03-017-3/+31
| * | | Changed QPixmap VG backend to use CFbsBitmap on Symbian.Laszlo Agocs2011-02-2817-144/+1335
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-03-024-6/+27
|\ \ \ \
| * | | | Don't allow non-Object values to be set as prototypeKent Hansen2011-03-021-2/+6
| * | | | Enable QtScript/JavaScriptCore ASSERTs in debug modeKent Hansen2011-03-011-1/+1
| * | | | Don't assert in abortEvaluation() autotestKent Hansen2011-03-011-2/+11
| * | | | 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