Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-03-04 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-03-04 | 1 | -1/+1 |
| |\ | |||||
| | * | Added image conversion flag to prevent conversions. | Samuel Rødal | 2011-03-04 | 1 | -1/+1 |
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-03 | 2 | -0/+8 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Laszlo Agocs | 2011-03-01 | 15 | -143/+391 |
| |\ \ | |||||
| * | | | Add internal function for releasing cached GPU resources. | Jani Hautakangas | 2011-03-01 | 2 | -0/+8 |
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-23 | 6 | -20/+41 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-02-23 | 1 | -0/+5 |
| |\ \ \ | |||||
| | * | | | add gsm to connectable bearer for networkmanager. | Lorn Potter | 2011-02-23 | 1 | -0/+5 |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-02-20 | 5 | -20/+36 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Prevents crashing when ICO file has bad color table value | Mauri Vehniäinen | 2011-02-18 | 1 | -0/+2 |
| | * | | | directfb: fix crash in client/server mode of qws | Denis Oliver Kropp | 2011-02-17 | 2 | -16/+31 |
| | * | | | Make Qt/DirectFB less verbose about failing to load pixmaps. | Anders Bakken | 2011-02-17 | 1 | -3/+2 |
| | * | | | fix-layer-getsurface-result-check-for-screen-size-determination | Denis Oliver Kropp | 2011-02-17 | 1 | -1/+1 |
* | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-02-18 | 1 | -95/+52 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-02-17 | 1 | -95/+52 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | RGBA32 -> RGB565 dithering in Meego Graphicssystem, | Tero Tiittanen | 2011-02-17 | 1 | -95/+52 |
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-17 | 5 | -3/+3 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-02-14 | 5 | -3/+3 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Rename 'plugins\qmldebugging' (work around qmake issues) | Kai Koehne | 2011-02-11 | 5 | -3/+3 |
* | | | | | Merge branch earth-team/master into earth-staging | João Abecasis | 2011-02-16 | 1 | -0/+6 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-master | axis | 2011-01-31 | 249 | -2235/+7546 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'windowsMakefileBuildSupport' into earth-master | axis | 2011-01-28 | 1 | -0/+6 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fixed a build library deployment issue in sqlite. | axis | 2011-01-28 | 1 | -0/+6 |
* | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-10 | 3 | -24/+10 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-02-08 | 2 | -19/+5 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Use the thread-default glib context for the DBus connection in the ICD bearer... | Jocelyn Turcotte | 2011-02-08 | 1 | -1/+1 |
| | * | | | | | | | directfb: Pixmap creation always premultiplied the alpha even when it is alre... | Denis Oliver Kropp | 2011-02-04 | 1 | -18/+4 |
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-02-08 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | * | | | | | | | Fix random crashes when bearer suddenly goes down | Shane Kearns | 2011-02-04 | 1 | -3/+3 |
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ... | Qt Continuous Integration System | 2011-02-04 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Doc: Fixed qdoc warning. | David Boddie | 2011-01-25 | 1 | -3/+3 |
* | | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-02-10 | 6 | -2/+281 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-04 | 6 | -2/+281 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-02-04 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | |||||
| | | * | | | | | | | | Fixed library casing. | axis | 2011-02-03 | 1 | -1/+1 |
| | | |/ / / / / / / | |||||
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-02-03 | 5 | -2/+280 |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | | | |||||
| | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11 | Martin Jones | 2011-01-19 | 196 | -935/+216 |
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | |||||
| | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11 | Martin Jones | 2011-01-07 | 3 | -8/+9 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11 | Joona Petrell | 2010-12-20 | 4 | -16/+95 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | QDeclarativeDebug: Move Tcp server to separate plugin | Kai Koehne | 2010-12-17 | 5 | -2/+280 |
* | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-02-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Use the thread-default glib context for the DBus connection in the ICD bearer... | Jocelyn Turcotte | 2011-02-09 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-03 | 2 | -4/+10 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| / / / / / / / / / | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-02-03 | 1 | -1/+7 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | * | | | | | | | Prevent recursion when creating window surface. | Samuel Rødal | 2011-02-02 | 1 | -1/+7 |
| | | |_|_|/ / / | | |/| | | | | | |||||
| * | | | | | | | Fix for QTBUG-17035 | kranthi | 2011-02-02 | 1 | -3/+3 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'master' into lighthouse-master | Jørgen Lind | 2011-01-26 | 198 | -959/+225 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-01-17 | 198 | -937/+217 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Allow IAP to be selected in Phonon MMF backend | Ruth Sadler | 2011-01-11 | 1 | -0/+3 |