Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt | David Boddie | 2011-05-24 | 1 | -22/+26 |
|\ | |||||
| * | Merge remote-tracking branch 'qt/4.8' | Jyri Tahtela | 2011-05-18 | 1 | -5/+9 |
| |\ | |||||
| | * | Remove redundant Q_ASSERT from qmlvisual autotest. | Jason McDonald | 2011-04-15 | 1 | -2/+0 |
| | * | Remove Q_ASSERT calls that wrap side-effecting code. | Jason McDonald | 2011-04-15 | 1 | -3/+9 |
| * | | Update licenseheader text in source files for qt4.8 | Jyri Tahtela | 2011-05-13 | 1 | -17/+17 |
| |/ | |||||
* | | Doc: Removed files that were accidentally committed. | David Boddie | 2011-05-06 | 4 | -0/+0 |
* | | Squashed commit of the changes from the mobile-examples repository | David Boddie | 2011-04-28 | 70 | -0/+0 |
|/ | |||||
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2011-03-11 | 15 | -0/+1568 |
|\ | |||||
| * | Merge branch '4.7' into qtquick11 | Joona Petrell | 2011-02-15 | 19 | -0/+6871 |
| |\ | |||||
| * | | Add support for anchor mirroring | Joona Petrell | 2011-02-15 | 15 | -0/+1568 |
* | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-02-10 | 19 | -0/+6871 |
|\ \ \ | | |/ | |/| | |||||
| * | | Allow text to selected in a TextEdit or TextInput inside a Flickable. | Andrew den Exter | 2011-02-10 | 19 | -0/+6871 |
| |/ | |||||
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-04 | 47 | -0/+1697 |
|\ \ | |/ | |||||
| * | Fix MaximumLineCount in Text and add tests | Christopher Ham | 2011-01-28 | 25 | -0/+181 |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11 | Martin Jones | 2011-01-19 | 16 | -319/+319 |
| |\ | |||||
| * | | Fix declarative autotest compilation on Symbian | Joona Petrell | 2011-01-18 | 1 | -1/+1 |
| * | | Fix word selection in QLineControl | Alan Alpert | 2011-01-10 | 8 | -0/+1052 |
| * | | Merge branch 'qtquick11' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11 | Martin Jones | 2011-01-07 | 7 | -0/+397 |
| |\ \ | |||||
| | * | | Add linkActivated signal to TextEdit | Alan Alpert | 2011-01-07 | 7 | -0/+397 |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11 | Martin Jones | 2011-01-07 | 54 | -1572/+5432 |
| |\ \ \ | | |/ / | |/| | | |||||
| * | | | Support for justification in Text and TextEdit elements. | Yann Bodson | 2010-12-17 | 6 | -0/+66 |
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-01-17 | 16 | -319/+319 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Update copyright year to 2011. | Jason McDonald | 2011-01-10 | 1 | -1/+1 |
| * | | | Update pathview test | Alan Alpert | 2011-01-10 | 15 | -318/+318 |
| | |/ | |/| | |||||
* | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-01-05 | 30 | -1053/+2702 |
|\ \ \ | |/ / | |||||
| * | | Fix outdated tests | Alan Alpert | 2011-01-05 | 10 | -130/+1779 |
| * | | Update visual tests | Alan Alpert | 2011-01-04 | 20 | -923/+923 |
* | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-12-23 | 24 | -519/+2730 |
|\ \ \ | |/ / | |||||
| * | | Ensure PathView doesn't jump when starting to drag. | Martin Jones | 2010-12-23 | 16 | -519/+521 |
| * | | Nested flickables would react alternately to flicks. | Martin Jones | 2010-12-23 | 8 | -0/+2209 |
| |/ | |||||
* | | Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil... | Qt Continuous Integration System | 2010-12-14 | 1 | -2/+1 |
|\ \ | |||||
| * \ | Merge remote branch 'origin/master' into file-engine-refactor | João Abecasis | 2010-12-02 | 131 | -5134/+18426 |
| |\ \ | |||||
| * | | | QtDeclarative: make autotests compile on symbian | Shane Kearns | 2010-11-30 | 1 | -1/+0 |
| * | | | Merge remote branch 'qt/master' into file-engine-refactor | João Abecasis | 2010-11-23 | 820 | -65027/+49454 |
| |\ \ \ | |||||
| * | | | | Fix deployment for examples and tests | Shane Kearns | 2010-10-12 | 1 | -1/+1 |
* | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-06 | 118 | -2937/+7710 |
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | |||||
| * | | | Update visual tests for the recent qmlviewer change | Alan Alpert | 2010-12-03 | 31 | -1113/+1113 |
| * | | | Do not use openGL on Mac OS X for QML visual tests | Alan Alpert | 2010-12-03 | 1 | -0/+6 |
| * | | | Update QML visual tests | Alan Alpert | 2010-12-03 | 59 | -1892/+2838 |
| * | | | fix line endings | Robert Loehning | 2010-12-01 | 1 | -35/+35 |
| * | | | Slightly improved tst_qmlvisual output | Alan Alpert | 2010-11-26 | 1 | -3/+4 |
| * | | | More detail when the process crashes in tst_qmlvisual. | Alan Alpert | 2010-11-26 | 1 | -2/+3 |
| * | | | Update qml visual tests for mac. | Yann Bodson | 2010-11-25 | 47 | -699/+4512 |
| * | | | Fixup visual tests on Mac | Alan Alpert | 2010-11-25 | 1 | -1/+7 |
| * | | | Update visual tests | Alan Alpert | 2010-11-25 | 2 | -3/+3 |
* | | | | Line ending fix. | Kim Motoyoshi Kalland | 2010-11-26 | 1 | -35/+35 |
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-25 | 131 | -5134/+18426 |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | |||||
| * | | Flickable and MouseArea were too eager to take/keep mouse grab. | Martin Jones | 2010-11-24 | 12 | -0/+5101 |
| * | | Ensure WebView press delay timer is cancelled when grab is taken. | Martin Jones | 2010-11-23 | 15 | -0/+6121 |
| * | | Update qml visual tests on mac. | Yann Bodson | 2010-11-22 | 102 | -5131/+7199 |