summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-03-0453-638/+2109
|\
| * Merge remote branch 'earth/master' into masterJoão Abecasis2011-02-2853-638/+2109
| |\
| | * Readded a ';;' that was removed by mistake.axis2011-02-281-0/+1
| | * Fixed mkspec detection for Symbian.axis2011-02-251-3/+2
| | * Removed javascript-jit from default symbian-gcce build.axis2011-02-251-0/+2
| | * QAbstractSocket: Check for socket state on Unbuffered readsMarkus Goetz2011-02-251-0/+2
| | * Corrected a mismerge in GCCE link parameters.axis2011-02-241-1/+1
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-02-24874-19632/+39788
| | |\
| | * | QAbstractSocket: Check for engine validity on Unbuffered readsMarkus Goetz2011-02-241-2/+5
| | * | tst_qnetworkreply: fix the MiniHttpServer.Martin Petersson2011-02-241-1/+5
| | * | tst_qnetworkProxyFactory: fix debug output.Martin Petersson2011-02-241-2/+2
| | * | Fixed incorrect referral to an include file.axis2011-02-241-1/+1
| | * | tst_qnetworkreply: getErrors() only ignore warning for the specific testMartin Petersson2011-02-241-1/+6
| | * | Check engine existence before increasing reference countJiang Jiang2011-02-241-3/+6
| | * | Fixed library casing.axis2011-02-241-1/+1
| | * | Fix Q_INVOKABLE declared after Q_PROPERTYOlivier Goffart2011-02-242-1/+29
| | * | tst_qnetworkreply: small improvementsMartin Petersson2011-02-241-10/+15
| | * | QNAM: Add a warning for misuse of the file backend.Martin Petersson2011-02-241-0/+2
| | * | Keep reference count for cached font engines in QTextEngineJiang Jiang2011-02-241-0/+15
| | * | QNAM HTTP: Be more strict with HTTP channel stateMarkus Goetz2011-02-242-11/+30
| | * | tst_qnetworkreply: Add a test for broken gzip encodingMarkus Goetz2011-02-241-0/+27
| | * | QNAM HTTP: Add qWarning() for double-finished() bugMarkus Goetz2011-02-231-0/+10
| | * | fix documentation typos in isLowSurrogate and requiresSurrogatesJeremy Katz2011-02-231-2/+2
| | * | SSL backend: loat root certificates on demand on Unix (excluding Mac)Peter Hartmann2011-02-2312-15/+611
| | * | tst_qnetworkreply: Fix httpProxyCommands() on Windows.Martin Petersson2011-02-221-1/+4
| | * | do not test against imap.trolltech.comPeter Hartmann2011-02-211-5/+0
| | * | QNAM File: Switch back to use QFileMarkus Goetz2011-02-212-36/+18
| | * | tst_qnetworkreply: Skip known to be broken setReadBufferSize testingMarkus Goetz2011-02-211-2/+4
| | * | Stabilize tst_qtimerOlivier Goffart2011-02-211-3/+5
| | * | QNAM HTTP: Define SynchronousRequestAttribute instead of enum hackMarkus Goetz2011-02-215-20/+18
| | * | QNAM HTTP: Fix compilation 2Markus Goetz2011-02-211-2/+8
| | * | QNAM HTTP: Fix compilationMarkus Goetz2011-02-211-4/+6
| | * | tst_qnetworkreply: Fixes for building without SSL supportMarkus Goetz2011-02-211-0/+6
| | * | QNAM: Threaded HTTP implementationMarkus Goetz2011-02-2117-507/+1272
| | * | Avoid warning when seting a window iconOlivier Goffart2011-02-211-1/+1
| | * | QNativeSocketEngine: Check for WSAEADDRNOTAVAIL on Windows.Martin Petersson2011-02-181-0/+5
| | * | QAbstractSocket: compile without QT3SupportMartin Petersson2011-02-181-1/+1
| | * | QNativeSocketEngine: Only do SIO_UDP_CONNRESET for UDP socketsMartin Petersson2011-02-181-9/+11
| | * | tst_networkSelfTest: fix smbServer() testMartin Petersson2011-02-181-1/+1
| | * | QAbstractSocket: Do not always change notifier on setReadBufferSizeMartin Petersson2011-02-181-1/+1
| | * | Fix tst_v8Olivier Goffart2011-02-171-2/+2
| | * | Fix tst_sunspider.cppOlivier Goffart2011-02-171-1/+1
| | * | Remove useless processEventOlivier Goffart2011-02-171-1/+0
* | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-0339-181/+2070
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-0339-181/+2070
| |\ \ \ \ |/ / / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-031-3/+3
| |\ \ \ \
| | * | | | Use the generic QVoltileImage implementation on S60 3.1 and 3.2.Laszlo Agocs2011-03-031-3/+3
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-032-4/+3
| |\ \ \ \ \
| | * \ \ \ \ Merge commit 'v4.7.2' into 4.7Toby Tomkins2011-03-020-0/+0
| | |\ \ \ \ \
| | | * | | | | Fix typo in qglthreads auto test.v4.7.2Jani Hautakangas2011-02-211-1/+1