summaryrefslogtreecommitdiffstats
path: root/examples/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-061-0/+27
|\ | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Labs (experimental) Gesture support.
| * Labs (experimental) Gesture support.Warwick Allison2010-04-061-0/+27
| | | | | | | | By popular demand.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-021-0/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Revert "Make s60main static lib not depend on QtCore" Fix regression on Symbian Fix broken test case Cleanup the deployment code Fix 'make sis' finding the dll on symbian Re-add line that was lost during webkit update. Work around bad naming of exported class in symbian sdk causing conflict Fix building on public symbian SDK. Fix qmake with the symbian makespec failing when project has a dash in it Make s60main static lib not depend on QtCore Remove stray non-latin1 character Fix out-of-source symbian build for external apps Update EABI def files for 4.7 Exporting QFontDatabase::removeAllApplicationFonts() Adding QFontDatabase::removeAllApplicationFonts()
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-011-0/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix regression on Symbian Fix broken test case Cleanup the deployment code Fix 'make sis' finding the dll on symbian Re-add line that was lost during webkit update. Work around bad naming of exported class in symbian sdk causing conflict Fix building on public symbian SDK. Fix qmake with the symbian makespec failing when project has a dash in it Make s60main static lib not depend on QtCore Remove stray non-latin1 character Fix out-of-source symbian build for external apps Update EABI def files for 4.7 Exporting QFontDatabase::removeAllApplicationFonts() Adding QFontDatabase::removeAllApplicationFonts()
| | * \ Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-04-0126-74/+81
| | |\ \ | | | |/ | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.pro
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-311-0/+3
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix regression on Symbian Fix broken test case Cleanup the deployment code Fix 'make sis' finding the dll on symbian Re-add line that was lost during webkit update. Work around bad naming of exported class in symbian sdk causing conflict Fix building on public symbian SDK. Fix qmake with the symbian makespec failing when project has a dash in it Make s60main static lib not depend on QtCore Remove stray non-latin1 character Fix out-of-source symbian build for external apps Update EABI def files for 4.7 Exporting QFontDatabase::removeAllApplicationFonts() Adding QFontDatabase::removeAllApplicationFonts()
| | | * \ Merge commit 'origin/4.7' into symbian47Thomas Zander2010-03-316-327/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/WebCore/WebCore.pro src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| | | * | | Work around bad naming of exported class in symbian sdk causing conflictThomas Zander2010-03-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The symbian SDK has a Time class defined which means that the compiler complains about the name already being used. Lets just disable the compile as this is not worth disturbing the example over.
* | | | | | Fix some more Q_PROPERTY followed by semi-colonThiago Macieira2010-04-025-8/+8
|/ / / / /
* | | | | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-04-0126-74/+81
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/proxywidgets/proxywidgets.pro examples/declarative/widgets/mywidgets.pro examples/declarative/widgets/widgets.pro
| * | | | Make QML 'hello world' tutorial less confusing.Yann Bodson2010-04-013-20/+19
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9384
| * | | | Doc improvements, fixesBea Lam2010-04-0113-31/+31
| | | | |
| * | | | Fix imageprovider example compilation on Symbian armJoona Petrell2010-04-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9523 Reviewed-by: Martin Jones
| * | | | Fix plugin example compilation on Symbian armJoona Petrell2010-04-012-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9520 Reviewed-by: Martin Jones
| * | | | Renamed widgets example to proxywidgets to avoid conflictsJoona Petrell2010-04-017-11/+14
| |/ / / | | | | | | | | | | | | | | | | Task-number: QTBUG-9518 Reviewed-by: Martin Jones
* | | | Fix build on WinCE and Symbian: .pro file must match dir name.Thiago Macieira2010-04-011-0/+0
| | | |
* | | | Fix compilation: no semi-colon after Q_ENUM or Q_PROPERTYThiago Macieira2010-04-011-1/+1
|/ / /
* | | Minor cleanup.Yann Bodson2010-03-312-6/+5
| | |
* | | Improve flipable example.Yann Bodson2010-03-317-32/+46
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-314-26/+32
|\ \ \
| * | | Update examples/declarative.proYann Bodson2010-03-311-1/+1
| | | |
| * | | Declarative examples cleanup.Yann Bodson2010-03-313-25/+31
| | |/ | |/|
* | | example of WebView onAlert, and of popups in general.Warwick Allison2010-03-312-0/+63
|/ /
* | Move basic focusscope examples into auto tests.Yann Bodson2010-03-306-327/+0
|/
* Change and rename qml EaseFollow to SmoothedAnimationLeonardo Sobral Cunha2010-03-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDeclarativeSmoothedAnimation inherits from QDeclarativeNumberAnimation, as a consequence SmoothedAnimation can be used inside Behaviors and as PropertySourceValues, like any other animation. The old EaseFollow properties changed to comply with the other declarative animations ('source' changed to 'to'), so now 'to' changes are not automatically 'followed' anymore. You can achieve the following behavior by putting a SmoothedAnimation inside a Behavior of a property that is bound to another, as the following example: If you want to follow an hypothetical rect1, you should do now: Rectangle { color: "green" width: 60; height: 60; x: rect1.x - 5; y: rect1.y - 5; Behavior on x { SmoothedAnimation { velocity: 200 } } Behavior on y { SmoothedAnimation { velocity: 200 } } } SmoothedAnimation also supports animating multiple target(s)/property(ies) in the transition case. When a QDeclarativeSmoothedAnimation is restarted, it will match the QDeclarativeProperty which were being animated and transfer the corresponding track velocity to the new starting animations. QSmoothedAnimation is an uncontrolled animation, duration == -1. The duration is set as -1 to avoid consecutive animation state changes stop()/start(). This is particularly useful when using QSmoothAnimation to 'follow' another property, which is also being animated (change the 'to' property every tick). Reviewed-by: Michael Brasser
* Update examples/declarative.proYann Bodson2010-03-292-2/+7
|
* Remove colorbrowser exampleYann Bodson2010-03-295-311/+0
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-2912-0/+381
|\
| * Add focus and key navigation example.Yann Bodson2010-03-298-0/+209
| |
| * Add example on how to use Qt widgets in qml.Yann Bodson2010-03-294-0/+172
| |
* | Update for import dir and imageProvider changes.Warwick Allison2010-03-292-3/+14
|/
* sourceWidth/sourceHeight -> sourceSizeWarwick Allison2010-03-261-12/+11
|
* Control of image rendered size (esp. SVG).Warwick Allison2010-03-262-0/+70
| | | | | | | Add Translate transform. Image::sourceWidth and Image::sourceHeight read/write properties. Task-number: QTBUG-8984
* Qt.Infinite -> Animation.InfiniteMichael Brasser2010-03-2512-21/+21
| | | | | Too misleading to have on the Qt object, as it only means infinite for animation loops.
* Replace Animation's repeat property with loops.Michael Brasser2010-03-2512-21/+21
| | | | | You can now loop a fixed number of times as well as forever. The old repeat behavior (loop forever) can be acheived with loops: Qt.Infinite.
* Remove support for QML-in-HTML-in-WebViewWarwick Allison2010-03-243-119/+0
| | | | Currently, this feature too prone to accidental misuse and abuse.
* Show loading progressWarwick Allison2010-03-233-2/+21
| | | | Task-number: QTBUG-9260
* Deprecate inline Script {} blocksAaron Kennedy2010-03-225-194/+43
| | | | | | | | Inline blocks/includes have been replaced with an import syntax: import "foo.js" as Foo this gives better separation between QML and code. Imported script blocks also have a mandatory qualifier, which leads to better optimization potential.
* Fix examples after 47fb07c9fdf47584ae55f3412102bbeef5576b04.Yann Bodson2010-03-187-0/+0
|
* Fix documentationmae2010-03-162-4/+4
|
* add alan's tic-tac-toe AImae2010-03-163-7/+151
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-1616-47/+50
|\ | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativeengine.cpp tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-111-2/+2
| |\
| | * Add a positioning 'mode' to positionViewAtIndex()Martin Jones2010-03-111-2/+2
| | | | | | | | | | | | Provides more control over where and how the view is positioned.
| * | Move particles in their own plugin (Qt.labs.particles)Yann Bodson2010-03-113-0/+3
| |/ | | | | | | Task-number: QT-2846
| * Document - and use - the qmlRegisterXXX template functionsmae2010-03-1010-44/+43
| | | | | | | | This commit removes the obsolete QML_REGISTER_TYPE macros.
| * Merge remote branch 'qt/4.7' into qml-4.7Qt Continuous Integration System2010-03-101-0/+1
| |\ | | | | | | | | | | | | Conflicts: src/declarative/util/qdeclarativestateoperations.cpp
| | * doc: Fixed several qdoc errors.Martin Smith2010-03-091-0/+1
| | |
| * | Oooops --- revert wrong commitmae2010-03-101-1/+1
| |/
* | Remove WorkerListModel and integrate its functionality into ListModel.Bea Lam2010-03-162-1/+1
|/ | | | Task-number: QT-2829