summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Prevent crash in OpenGL engine when scaling images / pixmaps.Samuel Rødal2011-05-094-0/+20
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-0511-18/+129
|\
| * Skip test on MacOS due to problems with corewlan pluginShane Kearns2011-05-051-1/+5
| * Send User-Agent from the network request in http proxy CONNECT commandShane Kearns2011-05-055-2/+28
| * Fix initial main window dimensions for "fullscreen with softkeys" caseMiikka Heikkinen2011-05-051-0/+5
| * Fix compile errors in bearer testsShane Kearns2011-05-043-12/+12
| * Fix QNetworkConfigurationManager usage outside main thread firstShane Kearns2011-05-043-4/+80
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-0510-0/+23
|\ \
| * | Views do not notify count changes properlyMartin Jones2011-05-0510-0/+23
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-052-0/+4
|\ \ \ | |/ /
| * | Uninitialized memory is compared.Martin Jones2011-05-052-0/+4
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-05-0410-40/+146
|\ \ \
| * | | Fix ordinal number conflictJiang Jiang2011-05-041-1/+1
| * | | QPainterPath: Ignore calls with NaN/Infinite parametersAdemar de Souza Reis Jr2011-05-032-19/+93
| * | | memory leak fixTero Toivola2011-05-031-0/+4
| * | | Fixes crash in QWidget::effectiveWinId.Bjørn Erik Nilsen2011-05-023-0/+46
| * | | Fix merge conflictJiang Jiang2011-04-2910-2/+86
| |\ \ \
| * | | | Revert symbol addition in b033bb9Jiang Jiang2011-04-294-20/+2
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-042-1/+28
|\ \ \ \ \
| * | | | | QNAM HTTP: Fix bug with explicitly zero-length compressed responses.Andreas Kling2011-05-042-1/+28
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-032-0/+33
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Add enablers for Symbian App BoosterSimon Frost2011-05-032-0/+33
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-032-2/+3
|\ \ \ \ \
| * | | | | Don't rely on uninitialized dataJoão Abecasis2011-05-031-0/+1
| * | | | | Don't realloc user-provided bufferJoão Abecasis2011-05-031-2/+2
|/ / / / /
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-031-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Clarified sendCustomRequest documentation to include HTTPSJanne Anttila2011-05-031-1/+1
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-05-0215-204/+312
|\ \ \ \ \
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-05-0215-204/+312
| |\ \ \ \ \
| | * \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-291-1/+1
| | |\ \ \ \ \
| | | * | | | | Fixing potential js hole in the js function for the feedback channel.Morten Engvoldsen2011-04-291-1/+1
| | * | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-151-0/+2
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | qdoc: Completed task QTBUG-18790Martin Smith2011-04-151-0/+2
| | * | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-145-125/+74
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | qdoc: Completed task QTBUG-18733Martin Smith2011-04-145-125/+74
| | * | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-132-1/+27
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-04-133-2/+10
| | | |\ \ \ \ \
| | | * | | | | | qdoc: Last commit before merge into master.Martin Smith2011-04-132-1/+27
| | * | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-113-2/+10
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-111-21/+7
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | * | | | | | Doc: Fixed reference to a name in a table.David Boddie2011-04-111-1/+1
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-073-50/+184
| | | |\ \ \ \ \ \
| | | * | | | | | | Ensured that incomplete downloads are removed.David Boddie2011-04-072-1/+9
| | * | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-081-21/+7
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | * | | | | | | qdoc: Fixed license comment.Martin Smith2011-04-081-21/+7
| | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-075-75/+210
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | qdoc: Added missing copyright noticeMartin Smith2011-04-071-0/+41
| | | * | | | | | qdoc: Updated the QDoc manual.Martin Smith2011-04-071-5/+6
| | | * | | | | | qdoc: Updated the QDoc manual.Martin Smith2011-04-071-10/+13
| | | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-04-071-1/+3
| | | |\ \ \ \ \ \ | | | | |/ / / / /