summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Compile on Mac OS 10.4Kent Hansen2010-04-146-3/+12
* Merge remote branch 'staging/4.7' into bearermanagement/mobility-changes-squashAaron McCarthy2010-04-1435-560/+1752
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-1417-542/+1593
| |\
| | * Partially revert "Sunstudio12.1(5.10): Fix compile errors GTK style and other...Thiago Macieira2010-04-131-1/+1
| | * Fix margins for placeholdertext in QLineEditJens Bache-Wiig2010-04-131-3/+6
| | * Merge remote branch 'staging/master' into 4.7Thiago Macieira2010-04-130-0/+0
| | |\
| | | * Fix QTextDocument::undo() cursor positioningmae2010-04-072-7/+59
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-1314-527/+1562
| | |\ \
| | | * | Doc: Updating design files.Morten Engvoldsen2010-04-133-3/+3
| | | * | Doc: Fixing design bugs. Updating the index page and script/style files. Addi...Morten Engvoldsen2010-04-1314-524/+1559
| | * | | qdoc: Added TOC to module pages.Martin Smith2010-04-131-15/+19
| | |/ /
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-138-44/+77
| | |\ \
| | * | | qdoc: Changed <ul> elements in TOC.Martin Smith2010-04-131-2/+11
| * | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-04-1418-18/+159
| |\ \ \ \
| | * | | | Revert change 07c347f54 from 4.6.Thiago Macieira2010-04-131-0/+1
| | * | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-1319-19/+159
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-133-4/+10
| | | |\ \ \ \
| | | | * | | | Implement some changes to the AIX xlC mkspec suggested by IBM.Thiago Macieira2010-04-133-4/+10
| | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-1212-12/+125
| | | |\ \ \ \ \
| | | | * | | | | Fixed app freeze if switching to offline in middle of HTTP transaction.Aleksandar Sasha Babic2010-04-121-1/+7
| | | | * | | | | Document Symbian platform security requirements on Qt APIsFrans Englich2010-04-128-0/+96
| | | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Frans Englich2010-04-1215-135/+177
| | | | |\ \ \ \ \
| | | | | * | | | | Fixed app freeze if switching to offline in middle of HTTP transaction.Janne Anttila2010-04-121-9/+20
| | | | | * | | | | Removed QtDeclarative.dll deployment from qt.iby in 4.6 branch.Miikka Heikkinen2010-04-121-1/+0
| | | | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Frans Englich2010-04-1021-37/+294
| | | | |\ \ \ \ \ \
| | | | * | | | | | | Don't build QtXmlPatterns' command line tools on Symbian.Frans Englich2010-04-091-1/+2
| | | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-04-123-2/+23
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | |
| | | | * | | | | | | CSS: fixes border only affecting the first widget.Olivier Goffart2010-04-122-1/+14
| | | | * | | | | | | fix closing state in QLocalSocket on WindowsJoerg Bornemann2010-04-121-1/+9
| | | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-121-1/+1
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | |
| | | | * | | | | | | Fix segfault, if QPixmap::loadFromData() failsJohannes Zellner2010-04-121-1/+1
* | | | | | | | | | | Bearer management changes from Qt Mobility (7a5ff985)Aaron McCarthy2010-04-1431-990/+2246
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-147-73/+58
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix writing duplicate headers' properties in designer.Jarek Kobus2010-04-132-65/+0
| * | | | | | | | | | Fix dealing with the default dynamic properties of string type.Jarek Kobus2010-04-131-7/+15
| * | | | | | | | | | Use unifiedToolBarOnMac, by default don't show some tool action.Jarek Kobus2010-04-134-1/+43
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-136-9/+9
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Iain2010-04-1340-184/+401
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-136-9/+9
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Fix compile errorShane Kearns2010-04-122-5/+6
| | | * | | | | | | | | | | Don't try to use so much permissions, use something a lot more saneThomas Zander2010-04-121-1/+1
| | | * | | | | | | | | | | A bit saner suggestionThomas Zander2010-04-121-1/+1
| | | * | | | | | | | | | | Remove not needed permissionsThomas Zander2010-04-121-1/+0
| * | | | | | | | | | | | | Fix qmake.pro after Symbian alternate build system integrationIain2010-04-131-0/+2
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Make compile on SymbianThomas Zander2010-04-121-1/+1
* | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-133627-151605/+318232
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | QtWebKit: Corrects symbols visibility for JavaScriptCore.Jocelyn Turcotte2010-04-131-0/+4
| * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-133627-151605/+318228
| |\ \ \ \ \ \ \ \ \ \ \ \ \ |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | QtWebKit: Fix the QWebHistory serialization auto-testJocelyn Turcotte2010-04-132-9/+16
| * | | | | | | | | | | | | Mark QWebFrame::overloadedSlots autotest as expected failureKent Hansen2010-04-131-0/+1