summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-053-0/+541
|\
| * Make it compile on Mac OS X 10.5Robert Griebl2010-12-031-2/+2
| * Touch events do not work on Mac OS 10.5Robert Griebl2010-12-031-2/+10
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-12-033-0/+533
| |\
| | * QScroller merge, part 1Robert Griebl2010-12-023-0/+533
* | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-042-2/+2
|\ \ \ | |/ /
| * | Changed various DEPLOYMENT variable ".sources" suffixes to ".files"Miikka Heikkinen2010-12-022-2/+2
| |/
* | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-021-0/+41
|\ \ | |/
| * Fix license headersJason McDonald2010-12-011-0/+41
* | Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-273-51/+41
|\ \ | |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-261-35/+35
| |\
| | * Line ending fix.Kim Motoyoshi Kalland2010-11-261-35/+35
| * | QFileSystemWatcher: don't try to stop non-running threadJoão Abecasis2010-11-261-0/+1
| * | Fix QSettings auto test to use QTRY_VERIFYJoão Abecasis2010-11-261-8/+5
| * | tst_QFileSystemWatcher: Don't exit the event loop on first signal.Tijl Coosemans2010-11-261-8/+0
| |/
* | Compile fix on solarisThierry Bastian2010-11-261-1/+1
* | Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-26157-5238/+19695
|\ \ | |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-252-0/+68
| |\
| | * Allow QDial to wrap value when wrapping property is set.Andy Nichols2010-11-251-0/+64
| | * QtScript variant conversion: Convert numbers to (u)int if applicable (reviewe...Thomas Senyk2010-11-251-0/+4
| * | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-11-25146-5174/+19163
| |\ \
| | * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-25146-5174/+19163
| | |\ \ | | | |/ | | |/|
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-246-17/+22
| | | |\
| | | | * Fixed tst_qwidget::winIdChangeEventGareth Stockwell2010-11-241-12/+17
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-245-5/+5
| | | | |\
| | | | | * Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-23103-5133/+7201
| | | | | |\
| | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-195-5/+5
| | | | | |\ \
| | | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-185-5/+5
| | | | | | |\ \
| | | | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-185-5/+5
| | | | | | | |\ \
| | | | | | | | * \ Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-18428-13242/+10315
| | | | | | | | |\ \
| | | | | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-125-5/+5
| | | | | | | | |\ \ \
| | | | | | | | | * | | Bump Qt version to 4.7.2.Jason McDonald2010-11-125-5/+5
| | | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-2432-0/+11289
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Flickable and MouseArea were too eager to take/keep mouse grab.Martin Jones2010-11-2413-0/+5108
| | | | * | | | | | | | Allow javascript date and regexp objects in WorkerScript messagesBea Lam2010-11-241-0/+5
| | | | * | | | | | | | Avoid lockup in ListView when animating delegates.Martin Jones2010-11-242-0/+52
| | | | * | | | | | | | Fix asynchronous reload call in test, broken by previous submitDamian Jansen2010-11-241-0/+3
| | | | * | | | | | | | Ensure WebView press delay timer is cancelled when grab is taken.Martin Jones2010-11-2315-0/+6121
| | | | | |_|_|_|_|_|/ | | | | |/| | | | | |
| | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-241-0/+41
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | tst_qthread: fix compilationOlivier Goffart2010-11-221-1/+2
| | | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-221-0/+40
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | | * | | | | | | QThread::exec(): Fix possibility to enter several time the event loopOlivier Goffart2010-11-221-0/+40
| | | | | |/ / / / / /
| | | * | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-22103-5133/+7201
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-221-2/+2
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-191-2/+2
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / / | | | | | |/| | | | | |
| | | | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-191-2/+2
| | | | | | |\ \ \ \ \ \
| | | | | | | * | | | | | Fix compilation with Sun Studio 12.1.Thiago Macieira2010-11-191-2/+2
| | | | | | | |/ / / / /
| | | | * | | | | | | | Update qml visual tests on mac.Yann Bodson2010-11-22102-5131/+7199
| | | | |/ / / / / / /
| | | * | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-195-5/+30
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-193-2/+25
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | |