summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'qt-master/master'Guoqing Zhang2011-03-16284-936/+3847
|\
| * Merge earth-team into masterOlivier Goffart2011-03-1524-66/+203
| |\
| | * SSL: give protocol enum SecureProtocols an own valuePeter Hartmann2011-03-154-6/+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-145-5/+8
| | * SSL: introduce new option TlsV1SslV3 for SSL communicationPeter Hartmann2011-03-143-1/+10
| | * 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
| | * 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
| | * Fixed documentation for QByteArrayDenis Dzyubenko2011-03-031-16/+19
| | * Improve handling QByteArray with QStringBuilderDenis Dzyubenko2011-03-032-4/+5
| | * Do not handle posted events in QSplashScreen.Denis Dzyubenko2011-03-032-4/+10
| | * Wrap qPrintable inside QStringOlivier Goffart2011-03-011-1/+1
| | * Fix QTextStream::pos() causes buffer offset issues on large text files.Chris Kawano2011-03-011-0/+1
| | * SSL TLS extension on Symbian: work around missing symbolPeter Hartmann2011-02-281-0/+6
| | * SSL: Switch default version to TLS 1.0Peter Hartmann2011-02-284-7/+7
| | * 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-142-4/+14
| |\ \
| | * \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-142-4/+14
| | |\ \
| | | * \ 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-141-2/+9
| | | |\ \ \ \
| | | | * | | | Fix TextEdit mouseSelectionMode overriding selectByMouse.Andrew den Exter2011-03-141-2/+9
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-03-1416-68/+204
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master-upstream'Thierry Bastian2011-03-10277-1970/+7280
| | |\ \ \ \ \ \ \
| | * | | | | | | | Merge request: 1111Richard Moe Gustavsen2011-02-251-0/+7
| | * | | | | | | | 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
| | * | | | | | | | Cocoa: processEvents does not always send posted eventsRichard Moe Gustavsen2011-02-171-2/+8
| | * | | | | | | | Merge branch 'master-upstream'Gabriel de Dietrich2011-02-15242-2126/+8306
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Added QMdiArea::tabsMovable and tabsClosableJ-P Nurmi2011-02-103-1/+94
| | * | | | | | | | | Merge branch 'master-upstream'Gabriel de Dietrich2011-02-08215-3544/+11602
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2011-01-203874-5152/+12160
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Enable the widthForHeight() test case.Jan-Arve Saether2011-01-191-1/+1
| | * | | | | | | | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-2541-380/+1397
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-2412-86/+235
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Fixed a double selection in QFileDialog when savingThierry Bastian2010-12-221-0/+1
| | * | | | | | | | | | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-2257-814/+736
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-212-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-1652-2920/+6097
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-1548-311/+522
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \