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-2218-23/+23
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: Replace QmlList* and QList* support with a single QmlListProperty type Rename MouseRegion -> MouseArea Update QmlChanges with animation API changes. Document the default velocity of EaseFollow Remove use of unexprted private classes. Fix compile error on Solaris Increase durations when testing Behaviors. Add cached path rounded rect painting benchmark. Remove use of direct event posting. Use QTest::keyClick() for keys.
| * Rename MouseRegion -> MouseAreaMartin Jones2010-02-2218-23/+23
| |
* | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-2036-46/+1280
|\ \ | |/ | | | | | | | | | | Conflicts: configure.exe src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl.cpp
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-1924-46/+59
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (81 commits) Revert "Speed up QmlGraphicsItem::setParentItem." Fix dynamic example More strict type checking of ListElement properties. Fix tst_QmlGraphicsLoader::networkRequestUrl autotest. Fix tst_qmlgraphicstextedit::delegateLoading autotest Delete the QmlImageRequestHandler in the correct thread. Fix "AnimatedImage ignores Anchors setting" Remove unused function that breaks build on AIX. doc Add support for startDragDistance in qmlviewer. Add pixmap benchmarks and make cached rounded rect the same as Rectangle. Make QmlDom API internal Compile fix with namepaces Doc: reformulate why we build a button Removed incorrect Q_UNUSED() macro from QmlPropertyAnimation::transition Doc: onExited, onEntered only work when button pressed or hoverEnabled Ensure visibleIndex and currentIndex are updated on itemsMoved(). QmlView API review. See QmlChanges.txt for details. Fix example after introduction of RotationAnimation. Animation doc fix. ...
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-181-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/linux-g++-x11egl/qplatformdefs.h src/declarative/qml/qmldom.h src/declarative/util/qmlview.cpp src/declarative/util/qmlview.h tools/qdoc3/cppcodemarker.cpp tools/qmldebugger/standalone/canvasframerate.cpp tools/qmldebugger/standalone/engine.cpp tools/qmldebugger/standalone/expressionquerywidget.cpp tools/qmldebugger/standalone/expressionquerywidget.h tools/qmldebugger/standalone/objectpropertiesview.cpp tools/qmldebugger/standalone/objectpropertiesview.h tools/qmldebugger/standalone/objecttree.cpp tools/qmldebugger/standalone/qmldebugger.cpp tools/qmldebugger/standalone/watchtable.cpp tools/qmldebugger/standalone/watchtable.h
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-1820-29/+29
| | |\ \
| | | * | Fix example after introduction of RotationAnimation.Michael Brasser2010-02-182-2/+2
| | | | | | | | | | | | | | | | | | | | id can't be the same as a TypeName.
| | | * | Get rid of the matchProperties/properties distinction, as itMichael Brasser2010-02-1818-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | has proven to be confusing in practice. property/target and properties/targets will be functionally equivilant (the only distinction being singular/plural). In a transition these properties can be used for both 'matching' and explicit animation based on whether a 'to' value is supplied. The documentation, tests, examples and demos have been updated as well.
| | * | | QmlView API review. See QmlChanges.txt for details.Martin Jones2010-02-182-11/+8
| | |/ /
| | * | Fix palette on the N900Harald Fernengel2010-02-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The N900 has by default black background with white text, but white line edits with black text. Use windowText for the "Score" label to make it readable. Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
| | * | Fix SameGame high scoresAlan Alpert2010-02-151-2/+3
| | | | | | | | | | | | | | | | | | | | When it's deployed across multiple devices, there is no 'standard' grid size. This allows non-desktop versions to display high scores.
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-153-6/+13
| | |\ \
| | * | | Enhance samegame high score dialogAlan Alpert2010-02-153-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | 'Better' layout mechanics, included animated resize for those people with long names.
| * | | | Change namespace; QtMedia -> QtMultimediaJustin McPherson2010-02-191-4/+4
| | | | |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into ↵Qt Continuous Integration System2010-02-1812-0/+1221
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team: (90 commits) Switch RGB24 and BGR24 shaders back. Disable the full screen video widget tests on X11. Use the IPropertyBag interface to get audio device names. Fix qmlgraphicsvideo.pro Add qmlgraphicsvideo test to auto.pro Fix QMediaServiceProvider test. Make QMediaPlaylist test pass. Fix QMediaPlayer test failure. Fix qmlaudio.pro. Make QMediaPlayer test compile. Remove tests not relevant to playback functionality. Remove tests that depend on playlist plugins. Support YUV444 formats in QPainterVideoSurface. Add qmlaudio test to auto.pro Fix license headers. Remove unused files. Extend the mappings between Direct Show and QVideoFrame color formats. Don't paint RGB24 frames as BGR24. Added multimedia to qmlviewer Fixed compile error in pulseaudio soundeffect implementation ...
| | * | | Merge branch 'master' of ../../qt/masterJustin McPherson2010-02-14151-6/+4900
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtJustin McPherson2010-02-053-2/+13
| | |\ \ \
| | * \ \ \ Merge ../../qt/masterJustin McPherson2010-01-295-5/+156
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/tests.xml
| | * | | | | Multimedia; Add player demo.Justin McPherson2010-01-1810-0/+1215
| | | | | | |
| | * | | | | Move QtMobility multimedia framework into Qt.Justin McPherson2010-01-152-0/+6
| | | | | | |
* | | | | | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-181-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/codecs/qtextcodec.h tests/auto/gestures/tst_gestures.cpp
| * | | | | | Fix copyright year.Jason McDonald2010-02-161-1/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | | Merge branch '4.6' into qt-master-from-4.6Thiago Macieira2010-02-172-10/+38
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/helpviewer.cpp
| * | | | | Update the composition demo at 60 FPS instead of at painting rateBenjamin Poulain2010-02-152-10/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Composition demo was updating as fast as the possible (update was called in the paint event). This is very CPU intensive, making the demo look slow on slower computer. The update is now made with a 16ms interval. Reviewed-by: Gabriel de Dietrich
* | | | | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-13147-0/+4885
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qlineedit/tst_qlineedit.cpp tests/benchmarks/benchmarks.pro
| * | | | | 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
| | | | | | | | | | | | | | |
generated by cgit v0.12 at 2024-09-22 21:19:31 (GMT)