summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-0136-182/+486
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-2823-150/+356
| |\
| | * Fix FolderListModel test - set folder to one containing files.Martin Jones2011-02-281-0/+3
| | * Drag over bounds errors when ListView has variable height contentMartin Jones2011-02-285-45/+108
| | * FolderListModel emitted incorrect rowsRemoved range causing crash.Martin Jones2011-02-282-2/+31
| | * fix/improve docs for new QtQuick 1.1 attributesBea Lam2011-02-2812-52/+91
| | * Fix test instability.Martin Jones2011-02-281-0/+2
| | * Document BorderImage::asynchronousAlan Alpert2011-02-271-0/+14
| | * Ensure layout is updated when section property changes.Martin Jones2011-02-253-2/+28
| | * QDeclarativeDebug: Export needed symbols on SymbianKai Koehne2011-02-243-47/+47
| | * Add a 'CursorPosition' parameter to TextInput.positionAt().Andrew den Exter2011-02-243-3/+31
| | * Fix qmlviewer compilation on old Symbian platformsJoona Petrell2011-02-241-0/+2
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-02-283-8/+24
| |\ \
| | * | 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-282-3/+14
| | |\ \
| | | * | Fix cursor position adjustment when removing stringsJiang Jiang2011-01-252-1/+31
| | | * | Fix out of bounds handling in Mac shaperJiang Jiang2011-01-142-3/+14
| * | | | 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-264-13/+44
| |\ \ \ \ \
| | * | | | | 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-253-2/+27
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-267-75/+287
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | 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-253-5/+125
| | * | | | | 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-253-7/+66
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | QSortFilterProxyModel::reset() should invalidate.Olivier Goffart2011-02-253-7/+66
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-251-3/+3
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | spelling fixes in extending.qdocDavid Fries2011-02-251-3/+3
| |/ / / / /
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-02-2875-118/+2986
|\ \ \ \ \ \
| * | | | | | fix autotest on windows (again)Harald Fernengel2011-02-281-1/+1
| * | | | | | fix autotest on windowsHarald Fernengel2011-02-271-0/+7
| * | | | | | Ammend last INTEGRITY fixHarald Fernengel2011-02-243-3/+14
| * | | | | | Fix qmake build on WindowsHarald Fernengel2011-02-243-3/+3
| * | | | | | fix test for QtLighthouseHarald Fernengel2011-02-231-1/+1
| * | | | | | add test for suppressing warnings in mocHarald Fernengel2011-02-231-2/+117
| * | | | | | Ammend INTEGRITY fixesHarald Fernengel2011-02-231-3/+4
| * | | | | | Store property editor's column positions in settingsJarek Kobus2011-02-231-0/+4
| * | | | | | add gsm to connectable bearer for networkmanager.Lorn Potter2011-02-221-0/+5
| * | | | | | Fix license headersHarald Fernengel2011-02-2210-188/+279
| * | | | | | 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