summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge earth-team into masterOlivier Goffart2011-03-1555-2906/+1914
|\
| * SSL: give protocol enum SecureProtocols an own valuePeter Hartmann2011-03-154-6/+8
| * QMAKE: Fix post build events for VS2010Martin Petersson2011-03-151-3/+8
| * SSL backend: avoid setting SNI hostname for old SSL versionsPeter Hartmann2011-03-142-2/+5
| * SSL: Switch default version to TlsV1SslV3 (i.e. use TLS 1 or SSL 3)Peter Hartmann2011-03-146-8/+23
| * SSL: introduce new option TlsV1SslV3 for SSL communicationPeter Hartmann2011-03-144-31/+130
| * Mac Style: Compile FixMartin Petersson2011-03-141-1/+1
| * Mac: Center the Window title on Cocoa.Martin Petersson2011-03-101-0/+2
| * Fix corner of scroll area so it is stylable on Mac.Martin Petersson2011-03-101-1/+1
| * QNAM HTTP: Pair channels with requests at a later state.Martin Petersson2011-03-103-24/+48
| * tst_qnetworkreply: fix MiniHttpServer crashMartin Petersson2011-03-101-1/+0
| * Windows: Activate the context menu on tray icons when shown.Martin Petersson2011-03-101-0/+1
| * SSL backend: check at runtime for the right OpenSSL version for SNIPeter Hartmann2011-03-044-3/+9
| * QNAM HTTP: Fix the ioPostToHttpFromSocket auto testMartin Petersson2011-03-043-7/+18
| * Disable capabilities example for symbian-gcce due to a bug in elf2e32axis2011-03-031-0/+3
| * Fixed documentation for QByteArrayDenis Dzyubenko2011-03-031-16/+19
| * Improve handling QByteArray with QStringBuilderDenis Dzyubenko2011-03-033-5/+30
| * Do not handle posted events in QSplashScreen.Denis Dzyubenko2011-03-032-4/+10
| * SSL tests: Be more verbose in on-demand cert testMarkus Goetz2011-03-032-2/+2
| * Fix qstringbuilder test.Olivier Goffart2011-03-021-0/+1
| * Wrap qPrintable inside QStringOlivier Goffart2011-03-012-1/+3
| * Fix QTextStream::pos() causes buffer offset issues on large text files.Chris Kawano2011-03-012-0/+37
| * Don't compile qtconfig on symbianOlivier Goffart2011-02-281-1/+1
| * qtconfig: don't connect to qt3support signalsOlivier Goffart2011-02-282-7/+8
| * Fix errors and warnings in qtconfig.Olivier Goffart2011-02-282-2/+2
| * Remove qt3support dependency of qtconfigOlivier Goffart2011-02-2823-2798/+1496
| * SSL TLS extension on Symbian: work around missing symbolPeter Hartmann2011-02-281-0/+6
| * SSL: Switch default version to TLS 1.0Peter Hartmann2011-02-285-9/+9
| * QSslSocket backend: resolve symbols for SNI for SymbianPeter Hartmann2011-02-281-0/+3
| * Add QSslSocket::setPeerVerifyName()/peerVerifyName()David Faure2011-02-282-0/+31
| * QSslSocket SNI: prefer verificationPeerName then peerName then hostNameDavid Faure2011-02-281-2/+5
| * Add Server Name Identification (RFC4366 section 3.1)Daniel Black2011-02-284-0/+22
* | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-145-4/+30
|\ \
| * \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-145-4/+30
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-141-2/+5
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2011-03-149-14/+61
| | | |\ \
| | | * | | QS60Style: QTreeView::indexRowSizeHint returns incorrect valueSami Merila2011-03-141-2/+5
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-144-2/+25
| | |\ \ \ \
| | | * | | | Fix TextEdit mouseSelectionMode overriding selectByMouse.Andrew den Exter2011-03-144-2/+25
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-03-1421-126/+433
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-03-10480-3725/+15032
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master-upstream'Thierry Bastian2011-03-10479-3725/+15025
| | |\ \ \ \ \ \ \
| | * | | | | | | | Merge request: 1111Richard Moe Gustavsen2011-02-251-0/+7
| * | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-02-251-0/+63
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Doc: inform better about how you can tweak Qt apps on MacRichard Moe Gustavsen2011-02-251-0/+63
| * | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-02-214-21/+53
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Mac: add support for closing dialogs using Cmd-DRichard Moe Gustavsen2011-02-211-0/+8
| | * | | | | | | | Cocoa: use mouse location from eventRichard Moe Gustavsen2011-02-182-3/+3
| | * | | | | | | | Cocoa: implement eventdispatcher flag excludeUserInputEventsRichard Moe Gustavsen2011-02-181-18/+42
| * | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-02-201-2/+8
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /