Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-05 | 1 | -2/+2 |
|\ | | | | | | | | | Conflicts: tests/benchmarks/declarative/painting/paintbenchmark.cpp | ||||
| * | Pass tst_headers::licenseCheck | Warwick Allison | 2010-02-05 | 1 | -0/+40 |
| | | |||||
* | | Add license header. | Martin Jones | 2010-02-05 | 1 | -1/+41 |
|/ | |||||
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵ | Qt Continuous Integration System | 2010-02-05 | 67 | -2/+3015 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Jones | 2010-02-05 | 2 | -0/+282 |
| | | | | | | | | Task-number: QT-2780 | ||||
| * | Fix headers::licenseCheck autotest failure | Leonardo Sobral Cunha | 2010-02-04 | 1 | -0/+40 |
| | | |||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2010-02-04 | 65 | -2/+2693 |
| |\ | | | | | | | | | | | | | | | | | | | | | | git://git-nokia.trolltech.com.au/qtsoftware/qt/kinetic Conflicts: src/xmlpatterns/type/qprimitives_p.h tools/linguist/lupdate/main.cpp | ||||
| | * | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵ | Warwick Allison | 2010-02-02 | 5 | -0/+826 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: tools/linguist/lupdate/main.cpp | ||||
| | * | | Remove benchmarks that have been migrated to 4.6. | Michael Brasser | 2010-01-29 | 7 | -1016/+0 |
| | | | | |||||
| | * | | Benchmark performance of a block of script containing multiple property ↵ | Michael Brasser | 2010-01-27 | 3 | -0/+72 |
| | | | | | | | | | | | | | | | | accesses. | ||||
| | * | | Remove unneeded test dependency. | Michael Brasser | 2010-01-26 | 1 | -5/+2 |
| | | | | |||||
| | * | | Merge branch '4.6' of ../qt into kinetic-declarativeui | Aaron Kennedy | 2010-01-19 | 2 | -1/+50 |
| | |\ \ | |||||
| | * | | | More benchmark cleanup. | Michael Brasser | 2010-01-14 | 3 | -73/+19 |
| | | | | | |||||
| | * | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Michael Brasser | 2010-01-14 | 79 | -90/+612 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | | * \ \ | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵ | Warwick Allison | 2010-01-14 | 79 | -90/+612 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: bin/syncqt src/corelib/io/qurl.cpp | ||||
| | * | | | | | Benchmark cleanup. | Michael Brasser | 2010-01-14 | 28 | -23/+198 |
| | | | | | | | |||||
| | * | | | | | Update pointer benchmark to use QmlGuard rather than QGuard. | Michael Brasser | 2010-01-14 | 2 | -4/+5 |
| | |/ / / / | |||||
| | * | | | | Simple QmlGraphicsImage benchmark | Aaron Kennedy | 2010-01-12 | 3 | -0/+121 |
| | | | | | | |||||
| | * | | | | More text benchmarks. | Michael Brasser | 2010-01-11 | 1 | -2/+73 |
| | | | | | | |||||
| | * | | | | Optimization: Passing QScriptEngine to QScriptValue is much faster | Aaron Kennedy | 2010-01-09 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | QML dynamic function benchmark | Aaron Kennedy | 2010-01-08 | 5 | -0/+117 |
| | | | | | | |||||
| | * | | | | QML signal handler benchmark | Aaron Kennedy | 2010-01-08 | 5 | -0/+97 |
| | | | | | | |||||
| | * | | | | Basic QML JS benchmark | Aaron Kennedy | 2010-01-08 | 2 | -0/+462 |
| | | | | | | |||||
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Aaron Kennedy | 2010-01-05 | 5 | -1/+240 |
| | |\ \ \ \ | |||||
| | * | | | | | Benchmarks | Aaron Kennedy | 2009-12-23 | 3 | -0/+102 |
| | | | | | | | |||||
| | * | | | | | benchmark | Aaron Kennedy | 2009-12-22 | 1 | -2/+27 |
| | | | | | | | |||||
| | * | | | | | Benchmark | Aaron Kennedy | 2009-12-18 | 1 | -0/+34 |
| | | | | | | | |||||
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Michael Brasser | 2009-12-17 | 12 | -160/+259 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore tests/benchmarks/benchmarks.pro | ||||
| | * | | | | | | Disable indexing | Aaron Kennedy | 2009-12-17 | 1 | -0/+1 |
| | | | | | | | | |||||
| | * | | | | | | Add -parent option | Aaron Kennedy | 2009-12-17 | 1 | -3/+37 |
| | | | | | | | | |||||
| | * | | | | | | Benchmarks | Aaron Kennedy | 2009-12-17 | 3 | -0/+108 |
| | | | | | | | | |||||
| | * | | | | | | Benchmarks | Aaron Kennedy | 2009-12-17 | 4 | -0/+114 |
| | | | | | | | | |||||
| | * | | | | | | Expand text benchmark. | Michael Brasser | 2009-12-15 | 2 | -7/+41 |
| | | | | | | | | |||||
| | * | | | | | | Add basic text benchmark. | Michael Brasser | 2009-12-15 | 2 | -0/+128 |
| | | | | | | | | |||||
| | * | | | | | | Benchmark cleanup. | Michael Brasser | 2009-12-14 | 3 | -108/+43 |
| | | | | | | | | |||||
| | * | | | | | | Another creation benchmark. | Michael Brasser | 2009-12-09 | 1 | -0/+20 |
| | | | | | | | | |||||
| | * | | | | | | Add missing file. | Michael Brasser | 2009-12-09 | 1 | -0/+34 |
| | | | | | | | | |||||
| | * | | | | | | Item creation benchmarks. | Michael Brasser | 2009-12-09 | 1 | -0/+83 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Michael Brasser | 2009-12-07 | 4 | -2/+134 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/tools/moc/generator.cpp | ||||
| | * | | | | | | | Separate out first time construction cost | Aaron Kennedy | 2009-12-03 | 1 | -1/+12 |
| | | | | | | | | | |||||
| | * | | | | | | | Compile | Aaron Kennedy | 2009-12-02 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | QML timing utility | Aaron Kennedy | 2009-12-02 | 3 | -0/+155 |
| | | | | | | | | | |||||
| | * | | | | | | | Update benchmarks to run again | Aaron Kennedy | 2009-11-23 | 15 | -6/+275 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge remote branch 'qt/4.6' into kinetic-declarativeui | Andreas Aardal Hanssen | 2009-11-11 | 1 | -0/+530 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix samegame tutorial 3 | Alan Alpert | 2009-11-10 | 1 | -7/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the js file hadn't been updated to avoid global vars Also updating a missed particles element | ||||
| | * | | | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵ | Warwick Allison | 2009-11-09 | 4 | -31/+9 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/corelib/animation/qabstractanimation.cpp src/gui/graphicsview/qgraphicsview.cpp src/s60installs/s60installs.pro tools/configure/configureapp.cpp tools/qdoc3/node.h | ||||
| | * | | | | | | | | | renaming QmlGraphicsRect -> QmlGraphicsRectangle | Yann Bodson | 2009-11-02 | 1 | -3/+3 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-30 | 9 | -16/+312 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/debugger/qmldebug.cpp src/declarative/fx/qmlgraphicsimagebase_p.h src/declarative/util/qmlanimation.h src/declarative/util/qmlstate.h src/declarative/util/qmltimer.cpp | ||||
| | | * | | | | | | | | | fix headers | Warwick Allison | 2009-10-30 | 4 | -0/+160 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | fix headers | Warwick Allison | 2009-10-29 | 5 | -16/+152 |
| | | | | | | | | | | | |