summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'qt-master/master'Sami Lempinen2011-03-1712-10/+173
|\
| * Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-03-1612-10/+173
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-162-0/+47
| | |\
| | | * Disabled non-QDeclarativeItems in Flickable break flickingMartin Jones2011-03-162-0/+47
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-151-0/+17
| | |\ \
| | | * | Adjust right bearing when breaking with line separatorsJiang Jiang2011-03-151-0/+17
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-151-2/+12
| | |\ \ \
| | | * | | Fix qgraphicstransform autotest for Symbian, where qreal is float.Laszlo Agocs2011-03-141-2/+12
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-156-1/+75
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Regression: currentIndex was not set correctly after model cleared.Martin Jones2011-03-152-0/+46
| | | * | | Remove bindings before assigning constants in VMEAaron Kennedy2011-03-154-1/+29
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-141-0/+5
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Prevented infinite recursion in QPainterPath::contains().Samuel Rødal2011-03-141-0/+5
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-141-7/+17
| | |\ \ \ \
| | | * | | | QNAM HTTP: error() in case connection is closed unexpectedlyMarkus Goetz2011-03-141-7/+17
* | | | | | | Merge remote branch 'qt-master/master'Guoqing Zhang2011-03-1698-295/+4515
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge earth-team into masterOlivier Goffart2011-03-156-36/+200
| |\ \ \ \ \ \
| | * | | | | | SSL: Switch default version to TlsV1SslV3 (i.e. use TLS 1 or SSL 3)Peter Hartmann2011-03-141-3/+15
| | * | | | | | SSL: introduce new option TlsV1SslV3 for SSL communicationPeter Hartmann2011-03-141-30/+120
| | * | | | | | tst_qnetworkreply: fix MiniHttpServer crashMartin Petersson2011-03-101-1/+0
| | * | | | | | Improve handling QByteArray with QStringBuilderDenis Dzyubenko2011-03-031-1/+25
| | * | | | | | 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-011-0/+2
| | * | | | | | Fix QTextStream::pos() causes buffer offset issues on large text files.Chris Kawano2011-03-011-0/+36
| | * | | | | | SSL: Switch default version to TLS 1.0Peter Hartmann2011-02-281-2/+2
| * | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-143-0/+16
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-143-0/+16
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-143-0/+16
| | | |\ \ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | |
| | | | * | | | | Fix TextEdit mouseSelectionMode overriding selectByMouse.Andrew den Exter2011-03-143-0/+16
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-03-144-58/+166
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master-upstream'Thierry Bastian2011-03-10115-1095/+5566
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master-upstream'Gabriel de Dietrich2011-02-15223-281/+16232
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Added QMdiArea::tabsMovable and tabsClosableJ-P Nurmi2011-02-101-0/+73
| | * | | | | | | | | | Merge branch 'master-upstream'Gabriel de Dietrich2011-02-0850-837/+2212
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2011-01-201710-6083/+6690
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Enable the widthForHeight() test case.Jan-Arve Saether2011-01-191-5/+4
| | * | | | | | | | | | | | Fix some wrong tests in heightForWidth()Jan-Arve Saether2011-01-191-15/+18
| | * | | | | | | | | | | | Fix and enable the tests that were disabled.Jan-Arve Saether2011-01-191-37/+33
| | * | | | | | | | | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-2542-554/+3578
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-245-0/+122
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-2219-49/+314
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-1720-390/+945
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-16102-192/+2237
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-1518-23/+501
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-142-2/+63
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-11152-2970/+9330
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-079-48/+25
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-053-0/+541
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-042-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \