summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-10147-0/+4885
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-05147-0/+4885
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-04147-0/+4885
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git-nokia.trolltech.com.au/qtsoftware/qt/kinetic Conflicts: src/xmlpatterns/type/qprimitives_p.h tools/linguist/lupdate/main.cpp
| | | * Disallow ids that start with uppercase letters and update docs andBea Lam2010-02-033-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | examples accordingly. Task-number: QT-2786
| | | * Merge commit 'qt/4.6' into kinetic-declarativeuiBjørn Erik Nilsen2010-01-272-1/+12
| | | |\
| | | * | Remove samegame README (mentioned images have been replaced)Kai Koehne2010-01-221-10/+0
| | | | |
| | | * | Tweak marble graphics in SamegameNigel Hietala2010-01-224-0/+0
| | | | |
| | | * | Updated graphics for SamegameNigel Hietala2010-01-216-0/+1
| | | | |
| | | * | Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-195-5/+156
| | | |\ \
| | | * \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2010-01-14267-283/+292
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: bin/syncqt src/corelib/io/qurl.cpp
| | | * | | | Follow naming conventions (pass examples test)Warwick Allison2010-01-1123-5/+6
| | | | | | |
| | | * | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Alan Alpert2010-01-076-202/+258
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | | | * | | | Avoid spurious error messagesWarwick Allison2010-01-061-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delegate is reused in Grid and PathView, so PathView attributes might not be defined
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiAaron Kennedy2010-01-055-200/+254
| | | | |\ \ \ \
| | | * | | | | | Make minehunt more responsiveAlan Alpert2010-01-071-1/+1
| | | |/ / / / /
| | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-171-2/+19
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore tests/benchmarks/benchmarks.pro
| | | * | | | | | Add a quit button to the toolbarHarald Fernengel2009-12-161-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows to run SameGame full-screen on the N900, and being able to quit without having to use xkill :)
| | | * | | | | | Set score text color (so that it will be visible)Alan Alpert2009-12-162-1/+2
| | | | | | | | |
| | | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-073-261/+345
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/tools/moc/generator.cpp
| | | * | | | | | | Fix initial scaling. QWebPage::setPreferredSize doesn't really work.Warwick Allison2009-12-021-3/+3
| | | | | | | | | |
| | | * | | | | | | Restructure for easier re-use.Warwick Allison2009-12-027-278/+276
| | | | | | | | | |
| | | * | | | | | | Change from scaling/zooming by zoomFactor to instead use painter scaling.Warwick Allison2009-12-021-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses a fixed zoomFactor of 4 to allow sufficient sub-"pixel" precision.
| | | * | | | | | | Fix use of XmlHttpRequest in examplesAlan Alpert2009-11-272-0/+2
| | | | | | | | | |
| | | * | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-2729-186/+260
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui
| | | * | | | | | | | binary?Warwick Allison2009-11-261-0/+0
| | | | | | | | | | |
| | | * | | | | | | | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-11-262-1/+1
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | * | | | | | | | reenable particles effect for the cookiemae2009-11-262-1/+1
| | | | | | | | | | | |
| | | * | | | | | | | | Fix minor clipping issue in twitter appAlan Alpert2009-11-262-3/+2
| | | |/ / / / / / / /
| | | * | | | | | | | Twitter demo touchupsAlan Alpert2009-11-267-29/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Arrowkey navigation on the login page, and Escape on the main page takes you back to the login page. Posting does not seem to be working still. Also switched to pixelSize fonts in many places.
| | | * | | | | | | | added a snake demomae2009-11-2522-0/+1019
| | | | | | | | | | |
| | | * | | | | | | | If zooming on nothing, zoom 2x rather than doing nothing.Warwick Allison2009-11-251-0/+2
| | | | | | | | | | |
| | | * | | | | | | | Use console.log, not printWarwick Allison2009-11-232-2/+2
| | | | | | | | | | |
| | | * | | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-1911-49/+40
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
| | | | * | | | | | | | Removed Browser demo from Symbian buildsMiikka Heikkinen2009-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Browser demo isn't currently compiling for Symbian GCCE builds because ARMV5 built static uitools.lib apparently isn't compatible with linking into GCCE application. Removed the browser from Symbian builds as a hotfix for 4.6.0. Task-number: QTBUG-5692 Reviewed-by: Janne Anttila (cherry picked from commit 31d29b227a7609ab0dadca4244cafec919264ba8)
| | | * | | | | | | | | Pass error messages through to WebView users.Warwick Allison2009-11-181-0/+2
| | | | | | | | | | | |
| | | * | | | | | | | | Fix URL update in demoWarwick Allison2009-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you manually typed in a url in the qml webbrowser demo the browser stopped updating the url bar with the current page your are on.
| | | * | | | | | | | | Update examples for new SQL API.Warwick Allison2009-11-181-22/+10
| | | | | | | | | | | |
| | | * | | | | | | | | Partial fix for QTBUGT-5845Warwick Allison2009-11-171-7/+8
| | | | | | | | | | | |
| | | * | | | | | | | | Merge remote branch 'qt/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-11-111-1/+1
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fix minehunt demoAlan Alpert2009-11-114-2/+17
| | | | | | | | | | | | |
| | | * | | | | | | | | | Remove WebView::pagewidth and tidy up - it's not needed and interferedWarwick Allison2009-11-101-17/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with zoomFactor.
| | | * | | | | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-094-21/+23
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | | | | | | | | Rename targets -> matchTargets and properties -> matchProperties.Michael Brasser2009-11-0617-27/+27
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Update semantics of targets/properties and target/property.Michael Brasser2009-11-063-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for renaming targets -> matchTargets and properties to matchProperties.
| | | * | | | | | | | | | | fix calculatorYann Bodson2009-11-051-19/+15
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Use darker() and lighter() functions from global Qt object rather than from ↵Yann Bodson2009-11-054-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SystemPalette.
| | | * | | | | | | | | | | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-11-051-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | * | | | | | | | | | | Remove "to" limit on minor version.Warwick Allison2009-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QML_DEFINE_TYPE etc. now define just the initial support version, with support in all future versions being thus implied. QTBUG-5421
| | | * | | | | | | | | | | | Particles cleaned up and placed in in qmlgraphics/Alan Alpert2009-11-052-11/+8
| | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API changes: Removed bool streamIn Added int emissionRate Added int emissionVariance Added void burst(count, emissionRate=-1) While rewriting the internals to accomodate this, all other outstanding particles bugs were believed fixed. Task-number: QT-2392 QT-2391 QT-2390 QT-2406
| | | * | | | | | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-0436-28985/+1446
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/gui/graphicsview/qgraphicsitem_p.h