summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Fix copyright year.Jason McDonald2010-02-1655-55/+55
| | | | Reviewed-by: Trust Me
* Fix broken license headers.Jason McDonald2010-02-162-30/+30
| | | | Reviewed-by: Trust Me
* Compile fix for OSX.Roberto Raggi2010-02-121-1/+2
|
* Removed "running: true" for animations used as propertyvaluesourceLeonardo Sobral Cunha2010-02-1112-20/+19
| | | | | | This attribution is not necessary anymore since 923710196d6d5..., Reviewed-by: Michael Brasser
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-10324-1/+12534
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3377 commits) Expect fail. Expect fails. Attempt to clairify highlight range docs Make sure item release isn't deferred indefinately Expect fail. Missing file Exclude plugins example in test. Test Crash Fix tests Compile. Remove pathview test. Remove unneeded Fix repeater test. Revert "Remove unimplemented methods from header" Revert "Replace QList<>* support with QmlListProperty" Revert "Compile" Add expected fail and created QTBUG-8072 for qml animation auto-test Fix expected error message. Consolidate the two pathview tests and fix them all. ...
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-09324-1/+12534
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3355 commits) Get test compiling Remove unimplemented methods from header Properly insert objects into the context's object list Missed a file Compile Replace QList<>* support with QmlListProperty Remove old implicit module support. Use networkAccessManagerFactory() for worker threads too. Connect to localhost instead of QHostAddress::Any. Fixes test on Windows. Support the other validators Add empty constructor for validators. Add getter functions to QAbstractDynamicMetaObject and QmlOpenMetaObjectType Document QtObject Changed define name to reflect change in Creator. re-enable QT_USE_FAST_CONCATENATION XMLHttpRequest collection bug For local fonts, we can just addApplicationFont() rather than loading data. The virtual keyboard is now working for TextEdit and TextInput components. Fix viewport size update. Make transformOrigin Center by default ...
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-05324-1/+12534
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. ...
| | | * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2010-02-04324-1/+12534
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git-nokia.trolltech.com.au/qtsoftware/qt/kinetic Conflicts: src/xmlpatterns/type/qprimitives_p.h tools/linguist/lupdate/main.cpp
| | | | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Bea Lam2010-02-0311-14/+17
| | | | |\ | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | | | | * Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2010-02-0211-14/+17
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: tools/linguist/lupdate/main.cpp
| | | | * | | Disallow ids that start with uppercase letters and update docs andBea Lam2010-02-0312-37/+37
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | examples accordingly. Task-number: QT-2786
| | | | * | Fix QList<QObject*> as a model. Add docs and example.Martin Jones2010-02-016-0/+252
| | | | | |
| | | | * | Update advanced tutorial with new imagesAlan Alpert2010-02-018-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of the images used in the example and documentation were still with the old graphics. This has been fixed so as to only use the new graphics.
| | | | * | Don't use statics for type definition, at least for plugin modules.Warwick Allison2010-02-011-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2798
| | | | * | Replace FreeMono by OCRA fontKai Koehne2010-01-223-1/+1
| | | | | |
| | | | * | Remove samegame README (mentioned images have been replaced)Kai Koehne2010-01-221-10/+0
| | | | | |
| | | | * | Copy updated images from demos/samegame to samegame tutorialKai Koehne2010-01-225-0/+0
| | | | | |
| | | | * | Fix examples/declarative/plugins exampleAlan Alpert2010-01-191-1/+2
| | | | | |
| | | | * | Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-195-172/+174
| | | | |\ \
| | | | * \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2010-01-141125-1244/+1275
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: bin/syncqt src/corelib/io/qurl.cpp
| | | | * | | | Allow QML types defined in both C++ and QML files to be in the same module.Warwick Allison2010-01-089-31/+135
| | | | | | | |
| | | | * | | | Load qmlmodules plugins.Warwick Allison2010-01-074-0/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows projects which use the declarative module to add QML types through C++ modules, such that qmlviewer (or any QML) can import those types.
| | | | * | | | Remove loader. Its functionality is now available in qmlviewer.Martin Jones2009-12-2212-1086/+0
| | | | | | | |
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-179-76/+113
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore tests/benchmarks/benchmarks.pro
| | | | * | | | | Allow a ListView.section.delegate to avoid creating sections in delegate.Martin Jones2009-12-161-15/+10
| | | | | | | | |
| | | | * | | | | Faster sections.Martin Jones2009-12-161-1/+2
| | | | | | | | |
| | | | * | | | | spring follows do not like to operate on "var" sourcesmae2009-12-141-1/+1
| | | | | | | | |
| | | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-101-2/+2
| | | | |\ \ \ \ \
| | | | * | | | | | Update FlowPositioner to the new BasePositioner implementationAlan Alpert2009-12-091-5/+0
| | | | | | | | | |
| | | | * | | | | | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-12-091-9/+53
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | | * | | | | | Add a Flow positioner.Martin Jones2009-12-081-9/+53
| | | | | | | | | | |
| | | | * | | | | | | Update positioners exampleAlan Alpert2009-12-091-18/+2
| | | | |/ / / / / /
| | | | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-071-1/+1
| | | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-077-22/+25
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/tools/moc/generator.cpp
| | | | * \ \ \ \ \ \ \ Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-12-023-87/+2
| | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | | * \ \ \ \ \ \ \ Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Martin Jones2009-12-022-3/+19
| | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | | | | * | | | | | | | | Remove qlistmodelinterface.h duplicateMartin Jones2009-12-023-87/+2
| | | | | | | | | | | | | |
| | | | * | | | | | | | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-12-022-3/+19
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | | * | | | | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2009-12-011-60/+0
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | | | | * | | | | | | | | Merge branch 'kinetic-declarativeui' of /Users/akennedy/Qt/kinetic2 into ↵Aaron Kennedy2009-11-304-13/+17
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui
| | | | | | * \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiAaron Kennedy2009-11-304-13/+17
| | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/animation/qabstractanimation.cpp
| | | | | * | | | | | | | | | | Two way WorkerScript communicationsAaron Kennedy2009-11-302-3/+19
| | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | | When loading QML, reset the Browser view.Martin Jones2009-12-021-4/+17
| | | | | |_|/ / / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Remove accidentally added file.Michael Brasser2009-12-011-60/+0
| | | | | | | | | | | | | |
| | | | * | | | | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-304-13/+17
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| / / / / / / / / | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/corelib/animation/qabstractanimation.cpp
| | | | * | | | | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2009-11-301-7/+1
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | | | | * \ \ \ \ \ \ \ \ Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-303-2/+3
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | | * | | | | | | | | | Add ListView snapMode to ensure flicking settles on an item boundary.Martin Jones2009-11-301-7/+1
| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | Basic WorkerScript functionalityAaron Kennedy2009-11-302-0/+46
| | | | | |/ / / / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-293-2/+3
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui