summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-0355-229/+625
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-03-021-1/+3
| |\
| | * Add qscriptobject and context2d to "trusted" benchmarksKent Hansen2011-03-021-1/+3
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-03-028-25/+17
| |\ \
| | * | qdoc3: Fix compilation with -no-stlhjk2011-03-021-0/+2
| | * | don't add extraneous empty command linesOswald Buddenhagen2011-03-013-3/+3
| | * | make the $$quote() function less prominentOswald Buddenhagen2011-03-012-19/+9
| | * | minor cleanup of the QMAKE_POST_LINK command line constructionOswald Buddenhagen2011-03-011-2/+2
| | * | silence qmake warning about unbalanced parenthesesOswald Buddenhagen2011-03-011-1/+1
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-03-027-21/+80
| |\ \ \ | | | |/ | | |/|
| | * | Don't allow non-Object values to be set as prototypeKent Hansen2011-03-022-6/+7
| | * | Enable QtScript/JavaScriptCore ASSERTs in debug modeKent Hansen2011-03-011-1/+1
| | * | Don't assert in abortEvaluation() autotestKent Hansen2011-03-012-5/+59
| | * | Avoid asserting when computing line number for backtraceKent Hansen2011-03-012-5/+11
| | * | Make missing line number info an expected failureKent Hansen2011-02-281-8/+6
| * | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-0136-182/+486
| |\ \ \
| | * \ \ 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
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | |