summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'origin/4.6' into oslo1-masterRohan McGovern2010-02-019145-21480/+43400
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-227-7/+52
| |\
| | * Move avkon component transparency check to app initialization.Jani Hautakangas2010-01-224-34/+23
| | * Fix for symbian dialog background transparency.Jani Hautakangas2010-01-226-7/+63
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-224-7/+7
| |\ \
| | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-224-7/+7
| | |\ \ | |/ / /
| | * | Assistant docs: Fix link.ck2010-01-211-1/+1
| | * | QtHelp docs: Fix illegal namespace name.ck2010-01-212-2/+2
| | * | Assistant: Set correct mime type for text documents.ck2010-01-211-4/+4
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-2220-43/+116
| |\ \ \ | | |_|/ | |/| |
| | * | QSslSocket: Take better care on how we use the SSL buffersMarkus Goetz2010-01-211-3/+23
| | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-01-214-3/+27
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-2113-30/+41
| | |\ \
| | | * | Revert "Make an empty QUrl also be considered non-detached (d == 0)."Thiago Macieira2010-01-212-21/+1
| | | * | SSL Certificate: don't crash when the END CERTIFICATE line ends without CRLFThiago Macieira2010-01-215-4/+22
| | | * | QNAM HTTP: make it give some better error messages in case of socket failure.Thiago Macieira2010-01-213-5/+7
| | | * | qUncompress: Fix terminating \0Markus Goetz2010-01-212-0/+10
| | | * | Add qttracereplay.exe to gitignoreMarkus Goetz2010-01-211-0/+1
| | * | | doc: Documented the return value for QDomNode::appendChild().Martin Smith2010-01-211-4/+8
| | |/ /
| | * | Fix missing focus rect for check and radio buttons in some GTK+ themesJens Bache-Wiig2010-01-211-3/+17
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-2112-57/+141
| |\ \ \ | | |_|/ | |/| |
| | * | Update symbian def filesShane Kearns2010-01-216-6/+26
| | * | Merge from upstreamShane Kearns2010-01-213-23/+45
| | * | Merge from upstreamShane Kearns2010-01-213-22/+33
| | * | Fix pro file error affecting windows buildsShane Kearns2010-01-211-1/+1
| | * | Merge TRK client changes from upstream (QtCreator)Shane Kearns2010-01-212-5/+36
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-2110-62/+107
| |\ \ \ | | |_|/ | |/| |
| | * | QtHelp: Enable dynamic translation.ck2010-01-214-20/+63
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-216-42/+44
| | |\ \
| | | * | Designer: Fixed a crash when previewing in a non-existent style.Friedemann Kleint2010-01-211-0/+2
| | | * | uic3: Introduced option to preserve layout object names of Designer 3.Friedemann Kleint2010-01-215-42/+42
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-212-0/+34
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Menubar and dock disappear after hiding a fullscreen widget on Cocoa.Carlos Manuel Duclos Vergara2010-01-211-0/+32
| | * | | Changelog.Carlos Manuel Duclos Vergara2010-01-211-0/+2
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-211-3/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix semitransparent windows with DirectFBAnders Bakken2010-01-211-3/+0
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-201-3/+3
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-2099-467/+1202
| | |\ \ \
| | * | | | Doc: Fixed some earlier incorrect documentation fixes.David Boddie2010-01-201-3/+3
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-207-11/+171
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | 1st attempt at USB serial port enumerator for linuxShane Kearns2010-01-204-0/+127
| | * | | | Corrected alphabetic order in the docs for events.axis2010-01-201-1/+1
| | * | | | Implemented event filter functions for Symbian.axis2010-01-202-10/+43
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-208-18/+83
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | QGraphicsItem::hasFocus() performance regression.Bjørn Erik Nilsen2010-01-201-1/+8
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2010-01-201-2/+2
| | |\ \ \ \
| | | * | | | Fix crashes in QByteArrayOlivier Goffart2010-01-201-2/+2
| | * | | | | Move the labels a bit down so that they align better vertically with the field.Jan-Arve Sæther2010-01-201-3/+3
| | |/ / / /
| | * | | | Add command to qmake to do symbian-uid generationThomas Zander2010-01-201-1/+13
| | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-01-209031-12652/+15697
| | |\ \ \ \