summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* clip if tile mode is 'PreserveAspectCrop' and 'clip' property is true.Yann Bodson2010-02-081-3/+9
|
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-080-0/+0
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBill King2010-02-081-6/+6
| |\
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBill King2010-02-081-2/+1
| |\ \
| * | | Fixes: make qt-creator compileBill King2010-02-081-1/+1
| | | |
* | | | Fix item removal.Martin Jones2010-02-081-7/+7
| |_|/ |/| |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-081-1/+1
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-083-2/+11
| |\ \
| * | | Fix private header include.Bea Lam2010-02-081-1/+1
| | | |
* | | | Make atBeginning/viewArea calculations account for min extent.Martin Jones2010-02-081-6/+6
| |/ / |/| |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-0813-84/+119
|\ \ \ | | |/ | |/|
| * | Fix autotest.Michael Brasser2010-02-082-0/+10
| |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-052592-35/+318503
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3324 commits) Fix test. Remove hacky fix (breaks autotest). Fix Behaviors for object-type properties. Pass symbols::prefix (Action -> QmlAction) Add license header. Fix bad merge (compile) Pass tst_headers::licenseCheck Fix ListView tests. Test fixes. More test fixes. Clean up QmlImageReader thread on engine destruction. Update test to handle QmlNetworkAccessManagerFactory Test fixes. Add a QEXPECT_FAIL for known bug. Fix autotest. Add some painting benchmarks. Make sure cookies are saved. Fix headers::licenseCheck autotest failure Re-add accidentally deleted file Test SizeItemToLoader to SizeLoaderToItem resizeMode change. ...
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-052592-35/+318503
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3324 commits) Fix test. Remove hacky fix (breaks autotest). Fix Behaviors for object-type properties. Pass symbols::prefix (Action -> QmlAction) Add license header. Fix bad merge (compile) Pass tst_headers::licenseCheck Fix ListView tests. Test fixes. More test fixes. Clean up QmlImageReader thread on engine destruction. Update test to handle QmlNetworkAccessManagerFactory Test fixes. Add a QEXPECT_FAIL for known bug. Fix autotest. Add some painting benchmarks. Make sure cookies are saved. Fix headers::licenseCheck autotest failure Re-add accidentally deleted file Test SizeItemToLoader to SizeLoaderToItem resizeMode change. ...
| * | \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-056-45/+30
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Revert "Prevent widgets with WA_DontShowOnScreen from keeping the app running" Fix for number entry in QDateTimeEntry using Shift+KeyPad (QTBUG-7842) Get rid of setFirstActionActive on mouse release in QMenu
| | * | | Revert "Prevent widgets with WA_DontShowOnScreen from keeping the app running"Tor Arne Vestbø2010-02-052-41/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 424eabac69df3234006669a69ca0ec9653e4ce63. The commit changed behavior of WA_QuitOnClose when WA_DontShowOnScreen was used, but WA_DontShowOnScreen should only have visual effects. Reviewed-by: Bjørn Erik Nilsen <bjorn.nilsen@nokia.com>
| | * | | Fix for number entry in QDateTimeEntry using Shift+KeyPad (QTBUG-7842)Thomas Sondergaard2010-02-052-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2300 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| | * | | Get rid of setFirstActionActive on mouse release in QMenuPierre Rossi2010-02-052-3/+18
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The point in keeping this behaviour seems limited, and it is causing a bug on touch-screens where there are no mouse moves. Task-number: QTBUG-7907 Reviewed-by: ogoffart Reviewed-by: Thierry
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-054-39/+40
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: doc: Fixed some qdoc warnings. doc: Fixed some qdoc warnings. doc: Fixed some qdoc warnings. doc: Fixed some qdoc warnings.
| | * | doc: Fixed some qdoc warnings.Martin Smith2010-02-051-2/+0
| | | |
| | * | doc: Fixed some qdoc warnings.Martin Smith2010-02-051-14/+16
| | | |
| | * | doc: Fixed some qdoc warnings.Martin Smith2010-02-051-23/+0
| | | |
| | * | doc: Fixed some qdoc warnings.Martin Smith2010-02-051-0/+24
| | | |
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-052-0/+39
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add QMacCompatGLenum overrides for new QGLShaderProgram functions
| | * | Add QMacCompatGLenum overrides for new QGLShaderProgram functionsRhys Weatherley2010-02-052-0/+39
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7391 Reviewed-by: Sarah Smith
* | | | Fix test.Martin Jones2010-02-051-2/+1
| |_|/ |/| |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-0516-97/+141
|\ \ \
| * | | Remove hacky fix (breaks autotest).Michael Brasser2010-02-051-1/+0
| | | | | | | | | | | | | | | | Proper fix should be in 4.6 soon.
| * | | Fix Behaviors for object-type properties.Michael Brasser2010-02-054-3/+48
| | | | | | | | | | | | | | | | Task-number: QT-2269
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-051-1/+1
| |\ \ \
| * | | | Pass symbols::prefix (Action -> QmlAction)Warwick Allison2010-02-0511-93/+93
| | | | |
* | | | | Fix test.Martin Jones2010-02-052-9/+18
| |/ / / |/| | |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-052-85/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: tests/benchmarks/declarative/painting/paintbenchmark.cpp
| * | | Fix bad merge (compile)Warwick Allison2010-02-051-83/+0
| | | |
| * | | Pass tst_headers::licenseCheckWarwick Allison2010-02-051-0/+40
| | | |
* | | | Add license header.Martin Jones2010-02-051-1/+41
|/ / /
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-0513-24/+24
|\ \ \
| * | | Test fixes.Michael Brasser2010-02-058-12/+12
| | | |
| * | | More test fixes.Michael Brasser2010-02-055-12/+12
| | | |
* | | | Fix ListView tests.Martin Jones2010-02-052-15/+33
|/ / /
* | | Clean up QmlImageReader thread on engine destruction.Martin Jones2010-02-054-13/+22
| | |
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-054-2/+5
|\ \ \
| * | | Test fixes.Michael Brasser2010-02-053-2/+3
| | | |
| * | | Add a QEXPECT_FAIL for known bug.Michael Brasser2010-02-051-0/+2
| | | |
* | | | Update test to handle QmlNetworkAccessManagerFactoryMartin Jones2010-02-051-19/+22
|/ / /
* | | Fix autotest.Michael Brasser2010-02-051-49/+43
| | | | | | | | | | | | The vme instruction set has changed.
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-052592-35/+318466
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3309 commits) Add some painting benchmarks. Make sure cookies are saved. Fix headers::licenseCheck autotest failure Re-add accidentally deleted file Test SizeItemToLoader to SizeLoaderToItem resizeMode change. Document QmlContext ownership. Add bug note. Fix elision and multilength strings when resizing a Text element. Document calling C++ methods from QML. Document margins property Augment documentation doc: There is no easeNone, it is called easeLinear doc: Converted the basic types page to use \qmlbasictype Focus focusScope from focusing for focusOnPress Really run image reader in its own thread. Don't create one QNetworkAccessManager per XMLHttpRequest We use JavaScript, not ECMAScript. XMLHttpRequest redirection update Image.paintedWidth and Image.paintedHeight when the source changes Remove debug. ...
| * | Add some painting benchmarks.Martin Jones2010-02-052-0/+282
| | | | | | | | | | | | Task-number: QT-2780
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-042-0/+46
| |\ \
| | * | Fix headers::licenseCheck autotest failureLeonardo Sobral Cunha2010-02-041-0/+40
| | | |
generated by cgit v0.12 at 2025-08-25 16:57:43 (GMT)