summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-13134-2219/+2151
|\
| * fix macx not having UNICODE in DEFINES any moreOswald Buddenhagen2010-07-131-7/+7
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-132-4/+78
| |\
| | * Fix an Assert in QTextTablePierre Rossi2010-07-132-4/+78
| * | doc: Fixed several qdoc warnings.Martin Smith2010-07-136-21/+34
| |/
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-132-2/+19
| |\
| | * QSslSocket: Improve error handlingPeter Hartmann2010-07-131-1/+13
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-13124-2190/+2022
| | |\
| * | | doc: Fixed several qdoc warnings.Martin Smith2010-07-132-3/+4
| | |/ | |/|
| * | Fixing merge conflicts.Martin Smith2010-07-13189-6069/+7293
| |\ \
| * \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-131-2/+2
| |\ \ \
| | * | | QSslSocket: fix documentation for QSslSocket::setPeerVerifyMode()Peter Hartmann2010-07-131-2/+2
| * | | | qdoc: Fixed several <div> elements that had the "/>" ending.Martin Smith2010-07-131-4/+4
| |/ / /
| * | | qdoc: Fixed breadcrumbs for QML examples.Martin Smith2010-07-131-6/+11
| * | | remove redundand translations project filesOswald Buddenhagen2010-07-1212-305/+60
| * | | make projects lupdate-friendlyOswald Buddenhagen2010-07-127-17/+17
| * | | Timing fix for slow devices.Robert Griebl2010-07-121-1/+1
| * | | QNAM: Add future enum attribute for Zerocopy QNAMMarkus Goetz2010-07-122-0/+10
| * | | fixed built-in jpeg and tiff in configure.exe, QTBUG-12093Mark Brand2010-07-121-0/+4
| * | | fix indentationMark Brand2010-07-121-1/+1
| * | | fix build for -no-qt3supportPeter Hartmann2010-07-121-2/+2
| * | | Compile fix for bearermonitor exampleDominik Holland2010-07-122-1/+49
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-10101-1851/+1865
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-10101-1851/+1865
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-10101-1851/+1865
| | | |\ \ \
| | | | * \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-07-093-38/+321
| | | | |\ \ \
| | | | | * | | Add NTLMv2 authentication support to QAuthenticator.Thiago Macieira2010-07-091-7/+279
| | | | | * | | QIODPLB: Sync behavior of ungetBlock() and ungetChar()Andreas Kling2010-07-091-1/+1
| | | | | * | | QFileIconProvider: Load icons on demand.Friedemann Kleint2010-07-091-30/+41
| | | | * | | | Doc: Cleaning style and adding support for CreatorMorten Engvoldsen2010-07-095-479/+749
| | | | |/ / /
| | | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-07-092-20/+43
| | | | |\ \ \
| | | | | * | | Fix QWizard icon and metrics on Windows 7 and VistaJens Bache-Wiig2010-06-182-20/+43
| | | | * | | | Doc: fixing offline styleMorten Engvoldsen2010-07-091-7/+5
| | | | |/ / /
| | | | * | | Fix handling of SSL certificates with wildcard domain namesRichard J. Moore2010-07-093-4/+63
| | | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-07-0912-61/+68
| | | | |\ \ \
| | | | | * | | doc: Fixed several qdoc warnings.Martin Smith2010-07-092-3/+3
| | | | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-093-36/+36
| | | | | |\ \ \
| | | | | | * | | SSL library loading: load system libs only oncePeter Hartmann2010-07-091-16/+17
| | | | | | * | | Revert "SSL backend: load libraries for certificates only once"Peter Hartmann2010-07-093-30/+29
| | | | | * | | | doc: Fixed several qdoc warnings.Martin Smith2010-07-091-1/+6
| | | | | |/ / /
| | | | | * | | doc: Fixed several qdoc warnings.Martin Smith2010-07-091-1/+1
| | | | | * | | doc: Fixed several qdoc warnings.Martin Smith2010-07-091-2/+2
| | | | | * | | doc: Fixed several qdoc warnings.Martin Smith2010-07-092-2/+3
| | | | | * | | doc: Fixed several qdoc warnings.Martin Smith2010-07-091-1/+2
| | | | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-093-2/+18
| | | | | |\ \ \
| | | | | * | | | doc: Fixed several qdoc warnings.Martin Smith2010-07-093-15/+15
| | | | * | | | | Doc: fixing examples linkMorten Engvoldsen2010-07-091-1/+1
| | | | | |/ / / | | | | |/| | |
| | | | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-07-094-15/+23
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | doc: Fixed last of the declarative/QML qdoc warnings.Martin Smith2010-07-094-15/+23
| | | | * | | | Doc: Adding support for Qt Creator styleMorten Engvoldsen2010-07-093-2/+18
| | | | |/ / /