Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master... | Qt Continuous Integration System | 2011-03-02 | 4 | -6/+27 |
|\ | |||||
| * | Don't allow non-Object values to be set as prototype | Kent Hansen | 2011-03-02 | 1 | -2/+6 |
| * | Enable QtScript/JavaScriptCore ASSERTs in debug mode | Kent Hansen | 2011-03-01 | 1 | -1/+1 |
| * | Don't assert in abortEvaluation() autotest | Kent Hansen | 2011-03-01 | 1 | -2/+11 |
| * | Avoid asserting when computing line number for backtrace | Kent Hansen | 2011-03-01 | 1 | -1/+9 |
* | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-03-01 | 24 | -138/+272 |
|\ \ | |||||
| * \ | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-01 | 24 | -138/+272 |
| |\ \ | |||||
| | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-02-28 | 15 | -110/+225 |
| | |\ \ | |||||
| | | * | | Drag over bounds errors when ListView has variable height content | Martin Jones | 2011-02-28 | 4 | -43/+84 |
| | | * | | FolderListModel emitted incorrect rowsRemoved range causing crash. | Martin Jones | 2011-02-28 | 1 | -1/+1 |
| | | * | | fix/improve docs for new QtQuick 1.1 attributes | Bea Lam | 2011-02-28 | 9 | -15/+52 |
| | | * | | Document BorderImage::asynchronous | Alan Alpert | 2011-02-27 | 1 | -0/+14 |
| | | * | | Ensure layout is updated when section property changes. | Martin Jones | 2011-02-25 | 1 | -1/+4 |
| | | * | | QDeclarativeDebug: Export needed symbols on Symbian | Kai Koehne | 2011-02-24 | 3 | -47/+47 |
| | | * | | Add a 'CursorPosition' parameter to TextInput.positionAt(). | Andrew den Exter | 2011-02-24 | 2 | -3/+23 |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-02-28 | 2 | -7/+13 |
| | |\ \ \ | |||||
| | | * | | | Fix Mac synthesized italic fonts clipping issue for QGLWidget | Jiang Jiang | 2011-02-28 | 1 | -5/+10 |
| | | * | | | Merge branch 'graphics-team-text-4.7' into 4.7 | Eskil Abrahamsen Blomfeldt | 2011-02-28 | 1 | -2/+3 |
| | | |\ \ \ | |||||
| | | | * | | | Fix cursor position adjustment when removing strings | Jiang Jiang | 2011-01-25 | 1 | -1/+3 |
| | | | * | | | Fix out of bounds handling in Mac shaper | Jiang Jiang | 2011-01-14 | 1 | -2/+3 |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-02-28 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Fix openvg compilation on win32. | Laszlo Agocs | 2011-02-28 | 1 | -1/+1 |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-02-26 | 3 | -13/+33 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Make QtScript support COLLECT_ON_EVERY_ALLOCATION define | Kent Hansen | 2011-02-25 | 1 | -11/+12 |
| | | * | | | | | | Add missing API shims to QScriptValue constructors | Kent Hansen | 2011-02-25 | 1 | -0/+5 |
| | | * | | | | | | Don't crash when marking arguments object of native context | Kent Hansen | 2011-02-25 | 2 | -2/+16 |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-02-26 | 6 | -70/+281 |
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | |||||
| | | * | | | | | | Update QtOpenGL def files | Jani Hautakangas | 2011-02-25 | 2 | -0/+15 |
| | | * | | | | | | Fix extern usage in qpixmapdata_gl.cpp | Jani Hautakangas | 2011-02-25 | 1 | -1/+1 |
| | | * | | | | | | Fix for loading QPixmaps from file in GL graphics system | Jani Hautakangas | 2011-02-25 | 1 | -22/+22 |
| | | * | | | | | | Fix code style in qgl_symbian.cpp | Jani Hautakangas | 2011-02-25 | 1 | -4/+4 |
| | | * | | | | | | QPixmap::to/fromSymbianCFbsBitmap() in OpenGL graphics system. | Jani Hautakangas | 2011-02-25 | 2 | -0/+119 |
| | | * | | | | | | Use the 'convertInPlace' versions of QImage in QGLPixmapData load. | Jani Hautakangas | 2011-02-25 | 2 | -34/+83 |
| | | * | | | | | | Recreate GL surface when native window is resized on Symbian | Jani Hautakangas | 2011-02-25 | 1 | -13/+41 |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-02-25 | 2 | -7/+9 |
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | / / / / | | | | |/ / / / | | | |/| | | | | |||||
| | | * | | | | | QSortFilterProxyModel::reset() should invalidate. | Olivier Goffart | 2011-02-25 | 2 | -7/+9 |
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-03-01 | 4 | -0/+32 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team | aavit | 2011-02-28 | 4 | -0/+32 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | Resolve font alias before testing for exact matching | Jiang Jiang | 2011-02-28 | 4 | -0/+32 |
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-02-28 | 50 | -92/+1678 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Ammend INTEGRITY fixes | Harald Fernengel | 2011-02-23 | 1 | -3/+4 |
| * | | | | | | | add gsm to connectable bearer for networkmanager. | Lorn Potter | 2011-02-22 | 1 | -0/+5 |
| * | | | | | | | Fix license headers | Harald Fernengel | 2011-02-22 | 7 | -137/+190 |
| * | | | | | | | add missing include | Rolland Dudemaine | 2011-02-22 | 1 | -0/+1 |
| * | | | | | | | Silence GHS compiler | Rolland Dudemaine | 2011-02-22 | 1 | -0/+4 |
| * | | | | | | | Run on INTEGRITY | Rolland Dudemaine | 2011-02-22 | 1 | -1/+10 |
| * | | | | | | | Fix compilation on INTEGRITY | Rolland Dudemaine | 2011-02-22 | 4 | -35/+35 |
| * | | | | | | | Add a "-nn" option to moc | Rolland Dudemaine | 2011-02-22 | 3 | -4/+16 |
| * | | | | | | | Use TCP_LOCALSOCKET on INTEGRITY | Rolland Dudemaine | 2011-02-22 | 4 | -2/+13 |
| * | | | | | | | Compile for systems without mmap | Rolland Dudemaine | 2011-02-22 | 1 | -10/+40 |