summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-063-1/+199
|\
| * Support QSslSocket::systemCaCertificates() on SymbianSimon Hausmann2010-07-063-1/+199
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-063-71/+15
|\ \ | |/
| * Spectrum demo: fixed installationGareth Stockwell2010-07-062-10/+11
| * Spectrum build: fixed DLL rpathGareth Stockwell2010-07-062-60/+3
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-054-4/+41
|\
| * Support time zone designator in QDateTime::fromString() based on ISO 8601-200...Liang Qi2010-07-054-4/+41
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-0511-36/+161
|\ \
| * | Set the registration time while using the collection generator to register.kh12010-07-051-0/+2
| * | Network: Optimize HTTP proxy lookup on WindowsMarkus Goetz2010-07-051-5/+32
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-055-15/+61
| |\ \
| | * | QSslSocket::systemCaCertificates(): fix for WinCEPeter Hartmann2010-07-052-0/+18
| | * | Doc: fixing search script and styleMorten Engvoldsen2010-07-053-15/+43
| * | | qdoc: Added explanation of autmatically generated signal hanlers.Martin Smith2010-07-051-12/+58
| |/ /
| * | qdoc: Fixed type linking for QML properties (most of them).Martin Smith2010-07-053-4/+8
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-051-13/+39
|\ \ \ | |_|/ |/| |
| * | Revert "Character spacing when drawing a QPicture to a high DPI device."Trond Kjernåsen2010-07-051-13/+39
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-053-7/+16
|\ \ \ | |/ / |/| / | |/
| * Warn when drawPixmapFragments is called with an invalid source rectAndy Shaw2010-07-051-0/+9
| * Fix build failure with cs2009q3 toolchain.Aaron McCarthy2010-07-052-7/+7
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-0448-486/+591
|\ \ | |/
| * make image handler includes privateOswald Buddenhagen2010-07-0418-32/+32
| * fix symbian buildOswald Buddenhagen2010-07-031-2/+2
| * doc improvementsOswald Buddenhagen2010-07-031-5/+4
| * rebuild configureOswald Buddenhagen2010-07-031-0/+0
| * s/INCPATH/INCLUDEPATH/Oswald Buddenhagen2010-07-031-1/+2
| * Fix Windows buildMark Brand2010-07-031-4/+4
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-0341-456/+561
| |\ |/ /
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-0241-456/+561
| |\
| | * Consolidate zlib configuration redundancyMark Brand2010-07-026-64/+21
| | * Fixed whitespace formattingMark Brand2010-07-021-55/+57
| | * Fix incomplete support for built-in jpeg, mng, tiff and gif handlersMark Brand2010-07-026-55/+155
| | * Split image handler plugin project filesMark Brand2010-07-0225-208/+204
| | * No explicit link to zlib/jpeg for system mng/tiffMark Brand2010-07-022-19/+14
| | * Removed stray line continuationsMark Brand2010-07-021-4/+2
| | * Long live else!Mark Brand2010-07-021-4/+4
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-07-02459-10752/+10430
| | |\
| | | * Fixed size hint for combo box on windowsJens Bache-Wiig2010-06-112-25/+4
| | * | qdoc: Added a solution for creating tables of contents for manuals.David Boddie2010-07-023-34/+112
| | * | Doc: Fixed markup.David Boddie2010-06-302-4/+4
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-0352-197/+644
|\ \ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-0252-197/+644
| |\ \ \ \
| | * | | | Hide some more files from git-status.axis2010-07-022-0/+4
| | * | | | Fixed Qt symbian/linux-armcc mkspec when configured with -qtlibinfix.axis2010-07-021-0/+1
| | * | | | Fixed symbian/linux-armcc mkspec when configured with -qtlibinfix.axis2010-07-025-11/+26
| | * | | | Fixed deployment locations for various profiles.axis2010-07-025-5/+8
| | * | | | Added a top-level runonphone target for Qt and QtWebKit.axis2010-07-021-0/+11
| | * | | | QS60Style: Simplify QMenu drawingSami Merila2010-07-021-35/+32
| | * | | | QS60Style: Remove gap from QProgressDialogSami Merila2010-07-021-0/+5
| | * | | | ColorDialog is incorrectly positionedSami Merila2010-07-021-2/+1