summaryrefslogtreecommitdiffstats
path: root/tests
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 System2011-03-311-15/+19
|\
| * QSoftkeyManager auto test updateTitta Heikkala2011-03-301-15/+19
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-301-1/+1
|\ \ | |/
| * Corrected case mismatch.axis2011-03-291-1/+1
| * Merge commit 'refs/merge-requests/2584' of gitorious.org:qt/qt into merge-req...Sami Merila2011-03-2966-171/+4106
| |\
* | \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-302-23/+18
|\ \ \
| * | | Return correct boundaries reasons from QTextBoundaryFinder.Andrew den Exter2011-03-302-23/+18
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-282-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Fixed autotests on Windows.axis2011-03-252-2/+2
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-281-0/+12
|\ \ \ \ | | |/ / | |/| |
| * | | Fix text selection with shift-click.Andrew den Exter2011-03-281-0/+12
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-281-0/+4
|\ \ \ \
| * | | | Fixed infinite loop in QPainterPath::intersects() when qreal=float.Samuel Rødal2011-03-281-0/+4
| | |_|/ | |/| |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-2813-3/+256
|\ \ \ \ | |/ / / |/| | |
| * | | QSslSocket: add test for blacklisted certificatesPeter Hartmann2011-03-253-3/+74
| * | | QSslCertificate: fix test for blacklisted certs on WindowsPeter Hartmann2011-03-251-2/+2
| * | | QSslCertificate: report fraudulent certificates as invalidPeter Hartmann2011-03-2410-0/+182
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-251-0/+20
|\ \ \ \
| * | | | Make sure num_glyphs pass to HarfBuzz is large enoughJiang Jiang2011-03-241-0/+20
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-221-0/+18
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Text bounding rect calculated incorrectly if non-top aligned.Martin Jones2011-03-211-0/+18
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-226-6/+6
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge remote-tracking branch 'mainline/4.7' into 4.7Oswald Buddenhagen2011-03-2113-24/+219
| |\ \ \ \
| * | | | | Bump Qt version to 4.7.4Timo Turunen2011-03-216-6/+6
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-211-3/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Remove incorrect check in qpixmap autotest.Laszlo Agocs2011-03-211-3/+6
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-211-1/+5
|\ \ \ \ \ | |/ / / /
| * | | | Prepare fromSymbianCFbsBitmap autotest for 16 bpp format.Laszlo Agocs2011-03-211-1/+5
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-212-8/+28
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Fix writing to an attached property from script.Michael Brasser2011-03-212-8/+28
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-171-21/+146
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Fix accidental population of the disk cache with partial contentSimon Hausmann2011-03-171-0/+93
| * | | | Fix disk cache interaction for range retrieval HTTP requests.Simon Hausmann2011-03-171-21/+53
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-174-1/+95
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | PathView doesn't update if preferred highlight range changes.Martin Jones2011-03-172-1/+41
| * | | | Image.PreserveAspectFit has unexpected effect on Image's sourceSizeMartin Jones2011-03-172-0/+54
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-171-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Re-enable lineHeight tests.Yann Bodson2011-03-171-3/+3
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-03-161-11/+58
|\ \ \ \ \
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Jan-Arve Sæther2011-03-1649-89/+2645
| |\ \ \ \ \
| * | | | | | Introduce QGraphicsItem::ItemStopsFocusHandling flagMichael Hasselmann2011-03-161-11/+58
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-164-0/+30
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | |_|_|/ / / |/| | | | |
| * | | | | Qt.include() used in WorkerScript is broken on Windows.Martin Jones2011-03-164-0/+30
* | | | | | 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
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |