summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-175-5/+234
|\
| * Usefully convert from QtScript object/array to QVariantKent Hansen2010-06-175-5/+234
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-174-7/+52
|\ \
| * | Add test for model data changes.Martin Jones2010-06-172-2/+47
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-162-5/+5
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-06-161-0/+28
| | |\ \
| | * | | Minor demo fixesAlan Alpert2010-06-161-4/+5
| | * | | Fix autoScroll implementationAlan Alpert2010-06-161-1/+0
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-171-22/+64
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-161-22/+64
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fixed problem with wrong size hints when items were removed.Jan-Arve Sæther2010-06-161-22/+64
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-164-4/+4
|\ \ \ \ \
| * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-159-9/+9
| |\ \ \ \ \
| | * | | | | Bump version number after 4.6.3 release.Jason McDonald2010-06-159-9/+9
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-1613-34/+97
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-1613-34/+97
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Temporary fix for regression in QSslCertificate::fromPath()Zeno Albisser2010-06-151-0/+3
| | * | | | | Fix symbian building of TARGET with a slashThomas Zander2010-06-151-1/+1
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-1511-33/+93
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-1211-33/+93
| | | |\ \ \ \ \
| | | | * | | | | use "win32-g++*" scope to match all MinGW makespecsMark Brand2010-06-104-4/+4
| | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-087-29/+89
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-s...Denis Dzyubenko2010-06-0729-148/+854
| | | | | |\ \ \ \ \
| | | | | | * | | | | XQuery test suite (and others): remove p4 dependencyPeter Hartmann2010-06-071-4/+0
| | | | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-053-18/+5
| | | | | | |\ \ \ \ \
| | | | | | | * | | | | Add convenience constructor to QTextOption::TabDavid Faure2010-06-043-18/+5
| | | | | * | | | | | | Fix QApplication/QWidget to really take ownership of input contextsMichael Hasselmann2010-06-072-7/+18
| | | | | * | | | | | | Fixed GestureOverride event delivery in GraphicsView.Denis Dzyubenko2010-06-071-0/+66
* | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-163-0/+68
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-162-0/+40
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | / | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | Fix bug with childrenRect resizing on startup.Michael Brasser2010-06-152-0/+40
| | |/ / / / / / / /
| * | | | | | | | | Fixed QImageReader::format() inconsistency.Samuel Rødal2010-06-151-0/+28
| |/ / / / / / / /
* | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-152-12/+41
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Fixed unit test failure in qimagereader.Kurt Korbatits2010-06-151-2/+2
| * | | | | | | | beautify tst_QLocalSocket::writeToClientAndDisconnectJoerg Bornemann2010-06-141-9/+2
| * | | | | | | | QLocalSocket/Win: check for broken pipe in waitForReadyReadJoerg Bornemann2010-06-141-0/+17
| * | | | | | | | QLocalSocket/Win: call close on async connection lossJoerg Bornemann2010-06-141-1/+20
* | | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-06-144-47/+130
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-134-47/+130
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | / / / / / / | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fix incorrect line breaking in QtWebKit.Pierre Rossi2010-06-111-6/+105
| | | |_|_|_|/ | | |/| | | |
| | * | | | | QLocalSocket: don't emit readChannelFinished() twice on WindowsJoerg Bornemann2010-06-101-1/+1
| | * | | | | QLocalSocket: fix reading from a socket after broken connectionJoerg Bornemann2010-06-101-3/+13
| | * | | | | tst_QLocalSocket::threadedConnection autotest stabilizedJoerg Bornemann2010-06-101-26/+12
| | * | | | | tst_qlocalsocket: pro files of client / server examples fixedJoerg Bornemann2010-06-102-12/+0
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-12125-232/+838
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-12125-232/+838
| |\ \ \ \ \ \
| | * | | | | | Fix test - sizeHint should not change after initial load. Also useBea Lam2010-06-111-5/+3
| | * | | | | | Fix qmlviewer test failure on windowsMartin Jones2010-06-111-8/+8
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-101-0/+17
| | |\ \ \ \ \ \
| | | * | | | | | Improve test stability.Warwick Allison2010-06-101-0/+17