Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-05-06 | 3 | -5/+8 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-05-06 | 3 | -5/+8 |
| |\ | |||||
| | * | fix random miscompilation with msvc | Oswald Buddenhagen | 2011-05-06 | 1 | -0/+1 |
| | * | don't ignore create_prl for static plugins | Oswald Buddenhagen | 2011-05-06 | 1 | -1/+1 |
| | * | make QLibraryInfo return clean paths | Oswald Buddenhagen | 2011-05-06 | 1 | -4/+6 |
| | * | make relative paths in qt.conf work inside qmake | Oswald Buddenhagen | 2011-05-06 | 1 | -1/+1 |
* | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-06 | 29 | -28/+199 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-05-05 | 1 | -4/+4 |
| |\ \ | | |/ | |||||
| | * | QNAM: Re-order checks in migrateBackend() | Markus Goetz | 2011-05-05 | 1 | -4/+4 |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-05-05 | 11 | -18/+129 |
| |\ \ | |||||
| | * | | Skip test on MacOS due to problems with corewlan plugin | Shane Kearns | 2011-05-05 | 1 | -1/+5 |
| | * | | Send User-Agent from the network request in http proxy CONNECT command | Shane Kearns | 2011-05-05 | 5 | -2/+28 |
| | * | | Fix initial main window dimensions for "fullscreen with softkeys" case | Miikka Heikkinen | 2011-05-05 | 1 | -0/+5 |
| | * | | Fix compile errors in bearer tests | Shane Kearns | 2011-05-04 | 3 | -12/+12 |
| | * | | Fix QNetworkConfigurationManager usage outside main thread first | Shane Kearns | 2011-05-04 | 3 | -4/+80 |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-05-05 | 10 | -0/+23 |
| |\ \ \ | |||||
| | * | | | Views do not notify count changes properly | Martin Jones | 2011-05-05 | 10 | -0/+23 |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-05-05 | 2 | -0/+4 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Uninitialized memory is compared. | Martin Jones | 2011-05-05 | 2 | -0/+4 |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-05-04 | 10 | -40/+146 |
| |\ \ \ \ | |||||
| | * | | | | Fix ordinal number conflict | Jiang Jiang | 2011-05-04 | 1 | -1/+1 |
| | * | | | | QPainterPath: Ignore calls with NaN/Infinite parameters | Ademar de Souza Reis Jr | 2011-05-03 | 2 | -19/+93 |
| | * | | | | memory leak fix | Tero Toivola | 2011-05-03 | 1 | -0/+4 |
| | * | | | | Fixes crash in QWidget::effectiveWinId. | Bjørn Erik Nilsen | 2011-05-02 | 3 | -0/+46 |
| | * | | | | Fix merge conflict | Jiang Jiang | 2011-04-29 | 10 | -2/+86 |
| | |\ \ \ \ | |||||
| | * | | | | | Revert symbol addition in b033bb9 | Jiang Jiang | 2011-04-29 | 4 | -20/+2 |
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast... | Qt Continuous Integration System | 2011-05-06 | 9 | -105/+173 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'origin/4.8' | Olivier Goffart | 2011-05-05 | 138 | -823/+2748 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | QSslConfiguration documentation fix | Taito Silvola | 2011-05-05 | 1 | -2/+2 |
| * | | | | | | | | Ensure that QDateTimeEdit::calendarWidget() will always return a valid widget. | Robin Burchell | 2011-05-05 | 3 | -18/+56 |
| * | | | | | | | | HTTP auto tests: do not load resources from cache that must be revalidtd | Peter Hartmann | 2011-05-04 | 2 | -6/+6 |
| * | | | | | | | | HTTP cache backend: do not load resources that must be revalidated | Peter Hartmann | 2011-05-04 | 1 | -2/+7 |
| * | | | | | | | | HTTP backend: do not load resources from cache that must be revalidated | Peter Hartmann | 2011-05-04 | 1 | -7/+5 |
| * | | | | | | | | Compile fix for QLocale on Symbian. | Denis Dzyubenko | 2011-05-04 | 1 | -1/+1 |
| * | | | | | | | | Added Kazakh language to the QLocale mapping table on Symbian. | Denis Dzyubenko | 2011-05-04 | 1 | -0/+1 |
| * | | | | | | | | Added support for QLocale::uiLanguages on Symbian. | Denis Dzyubenko | 2011-05-04 | 1 | -70/+96 |
* | | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-05-05 | 4 | -2/+36 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-05-04 | 4 | -2/+36 |
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-05-04 | 2 | -1/+28 |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | |||||
| | | * | | | | | | | QNAM HTTP: Fix bug with explicitly zero-length compressed responses. | Andreas Kling | 2011-05-04 | 2 | -1/+28 |
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-05-03 | 2 | -0/+33 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | / | | | | |_|_|_|_|/ | | | |/| | | | | | |||||
| | | * | | | | | | Add enablers for Symbian App Booster | Simon Frost | 2011-05-03 | 2 | -0/+33 |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-05-03 | 2 | -2/+3 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Don't rely on uninitialized data | João Abecasis | 2011-05-03 | 1 | -0/+1 |
| | | * | | | | | | | Don't realloc user-provided buffer | João Abecasis | 2011-05-03 | 1 | -2/+2 |
| | |/ / / / / / / | |||||
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-05-05 | 21 | -158/+204 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team | Qt Continuous Integration System | 2011-05-04 | 6 | -12/+60 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Compile on Windows | Eskil Abrahamsen Blomfeldt | 2011-05-04 | 1 | -1/+1 |
| | * | | | | | | | | Support gamma correction of text on GL | Eskil Abrahamsen Blomfeldt | 2011-05-03 | 6 | -12/+60 |
| * | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team | Qt Continuous Integration System | 2011-05-03 | 712 | -14739/+61375 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / |