Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵ | Qt Continuous Integration System | 2011-10-04 | 1 | -0/+1 |
|\ | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: QNetworkRequest autotest: adapt to new cookie parsing (re. commas) Remove support for multiple cookies in one Set-Cookie header to follow RFC6265. | ||||
| * | Merge branch '4.8' into earth-staging-master | Sinan Tanilkan | 2011-09-21 | 2 | -5/+428 |
| |\ | | | | | | | | | | | | | Conflicts: dist/changes-4.8.0 | ||||
| * | | Remove support for multiple cookies in one Set-Cookie header to follow RFC6265. | Jocelyn Turcotte | 2011-09-16 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | This also allows cookie values to contain commas to increase compatibility like most popular browsers do even though the RFC still reserves them for future uses. Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> Task-number: QTBUG-21456 | ||||
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵ | Qt Continuous Integration System | 2011-10-03 | 1 | -0/+10 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Added text about -random and -seed options in QTest to changelog Add another part of the source code to the snippet. Update changes-4.8.0 Update translation sources. Update the changelog for qdoc in 4.8 | ||||
| * | | | Added text about -random and -seed options in QTest to changelog | Magne Zachrisen | 2011-09-30 | 1 | -0/+5 |
| | | | | |||||
| * | | | Update changes-4.8.0 | Jens Georg | 2011-09-29 | 1 | -0/+1 |
| | | | | |||||
| * | | | Update the changelog for qdoc in 4.8 | Casper van Donderen | 2011-09-29 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | Reviewed-By: Trust Me | ||||
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵ | Qt Continuous Integration System | 2011-09-27 | 1 | -1/+3 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Update changes-4.8.0 file Only limit cursor position when line is wrapped Make sure cursor position doesn't exceed line end Allow shared EGL contexts for xcb and xlib platforms Allow generic EGL platform contexts to be shared 4.8 Changes: OpenGL Framebuffer Format stop tslib plugin having same file name as linux input plugin Avoid unnecessary detach of a QImage in QPixmapDropShadowFilter | ||||
| * | | | Update changes-4.8.0 file | aavit | 2011-09-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'qt-mainline/4.8' | aavit | 2011-09-22 | 1 | -5/+117 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: dist/changes-4.8.0 | ||||
| * | | | 4.8 Changes: OpenGL Framebuffer Format | Gerhard Roethlin | 2011-09-19 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added an entry for the OpenGL Framebuffer Format commit to the 4.8 changelog. Merge-request: 1387 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> | ||||
* | | | | Update changelog for Qt-4.8.0: add QtWebKit notes | Ademar de Souza Reis Jr | 2011-09-23 | 1 | -0/+5 |
| | | | | |||||
* | | | | Update changelog for Qt 4.8 | Sinan Tanilkan | 2011-09-23 | 1 | -0/+4 |
| |/ / |/| | | | | | | | | Change recieved from James Perrett | ||||
* | | | Update changelog for Qt 4.8 | Sinan Tanilkan | 2011-09-20 | 1 | -0/+1 |
| | | | | | | | | | | | | Change recieved from John Brooks | ||||
* | | | add 4.8 changes created/merged by me | Oswald Buddenhagen | 2011-09-19 | 1 | -13/+38 |
| | | | |||||
* | | | Update changelog for Qt 4.8.0 | Liang Qi | 2011-09-19 | 1 | -0/+8 |
| | | | | | | | | | | | | For QtConcurrent and QUuid. | ||||
* | | | Merge remote branch 'origin/4.8' into doc-staging-master | Rohan McGovern | 2011-09-19 | 1 | -0/+9 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: dist/changes-4.8.0 | ||||
| * | | Merge remote branch 'qt-mainline/4.8' | aavit | 2011-09-17 | 1 | -1/+2 |
| |\ \ | |||||
| | * | | Update changes file. | Christian Kandeler | 2011-09-14 | 1 | -1/+2 |
| | | | | |||||
| * | | | Updated Changelog | Lars Knoll | 2011-09-15 | 1 | -1/+7 |
| |/ / | |||||
* | | | Update changelog for Qt 4.8 | Sinan Tanilkan | 2011-09-16 | 1 | -0/+2 |
| | | | | | | | | | | | | Change recieved from David Faure. | ||||
* | | | Update changelog for Qt 4.8 | Sinan Tanilkan | 2011-09-16 | 1 | -0/+1 |
| | | | | | | | | | | | | Change recieved from Steffen Hansen. | ||||
* | | | Updated change-log for 4.8 | Christian Strømme | 2011-09-16 | 1 | -0/+1 |
| | | | |||||
* | | | Update changes file for 4.8.0 | Daniele E. Domenichelli | 2011-09-16 | 1 | -1/+5 |
| | | | |||||
* | | | Update changelog for Qt 4.8 | Sinan Tanilkan | 2011-09-16 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | Change recieved from Cédric OCHS. https://qt.gitorious.org/qt/qt/merge_requests/1157 | ||||
* | | | My changes for 4.8.0 | Joerg Bornemann | 2011-09-16 | 1 | -1/+17 |
| | | | |||||
* | | | My 4.8.0 changes. | Kim Motoyoshi Kalland | 2011-09-15 | 1 | -0/+7 |
| | | | |||||
* | | | My 4.8.0 changes | Sami Merila | 2011-09-15 | 1 | -1/+31 |
| | | | | | | | | | | | | Also contains changes from Miikka Heikkinen. | ||||
* | | | Mention Lighthouse in the changes file. | Paul Olav Tvete | 2011-09-15 | 1 | -0/+6 |
| | | | |||||
* | | | Changelog: add waylandwindowmanager integration changes | Lasse Holmstedt | 2011-09-15 | 1 | -0/+2 |
| | | | |||||
* | | | My 4.8.0 changes | Eskil Abrahamsen Blomfeldt | 2011-09-15 | 1 | -0/+4 |
|/ / | | | | | | | Add the rest of my changes to the change log. | ||||
* | | Merge branch 4.7 into qt-4.8-from-4.7 | Sergio Ahumada | 2011-08-23 | 1 | -0/+304 |
|\ \ | |/ |/| | | | | | Conflicts: doc/src/index.qdoc | ||||
| * | Update 4.7.4 changes | Timo Turunen | 2011-08-19 | 1 | -0/+304 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵ | Qt Continuous Integration System | 2011-07-19 | 1 | -0/+3 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add docs for QSqlRelationalTableModel::JoinMode Fixed behavior on NULL foreign keys update change file Forward port qt modifications for sqlite3.c Forward port the vxworks changes Update sqlite to 3.7.7.1 | ||||
| * | | update change file | Charles Yin | 2011-07-19 | 1 | -0/+3 |
| | | | | | | | | | | | | Change-Id: I3c7cecf1f099e2868653c041d88a4208b77c5748 | ||||
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵ | Qt Continuous Integration System | 2011-07-14 | 1 | -1/+2 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: Added Solaris build fix to the changes file. | ||||
| * | | Added Solaris build fix to the changes file. | Martin Pejcoch | 2011-07-14 | 1 | -1/+2 |
| | | | |||||
* | | | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-07-08 | 1 | -5/+22 |
|\ \ \ | |||||
| * \ \ | Merge remote branch 'mainline/4.8' into staging | Jiang Jiang | 2011-07-08 | 1 | -0/+18 |
| |\ \ \ | | |/ / | | | | | | | | | | | | | Conflicts: dist/changes-4.8.0 | ||||
| * | | | Add font related changes in 4.8 into changes | Jiang Jiang | 2011-07-04 | 1 | -3/+18 |
| | | | | | | | | | | | | | | | | Reviewed-by: Eskil | ||||
| * | | | update 4.8.0 changes file | aavit | 2011-07-01 | 1 | -1/+4 |
| | | | | |||||
* | | | | My changes for 4.8.0 | Jan-Arve Saether | 2011-07-05 | 1 | -0/+3 |
| |/ / |/| | | |||||
* | | | Update changelog with Accessibility fixes. | Frederik Gladhorn | 2011-07-04 | 1 | -0/+11 |
| | | | |||||
* | | | Changelog: Add mention of qmlplugindump. | Christian Kamm | 2011-07-04 | 1 | -0/+3 |
| | | | |||||
* | | | changelog | Harald Fernengel | 2011-07-01 | 1 | -0/+5 |
|/ / | |||||
* | | Update 4.8.0 changes file | Shane Kearns | 2011-06-30 | 1 | -1/+15 |
| | | |||||
* | | Merge remote-tracking branch 'origin/4.8' | Olivier Goffart | 2011-06-24 | 1 | -0/+2 |
|\ \ | |||||
| * | | changelog | Ritt Konstantin | 2011-06-21 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | Merge-request: 1259 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com> | ||||
* | | | my changelog for 4.8.0 | Peter Hartmann | 2011-06-23 | 1 | -0/+16 |
|/ / | |||||
* | | Added some of my Qt 4.8 changes to the changelog | Olivier Goffart | 2011-05-26 | 1 | -0/+22 |
| | | | | | | | | | | | | | | Change-Id: I8913c88e5bd68145e0587d51ee9896fd5d21054a Reviewed-on: http://codereview.qt.nokia.com/140 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> (cherry picked from commit bc7ea289ea84dcff22aeea78c01a5447ccf076f7) |