summaryrefslogtreecommitdiffstats
path: root/examples/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Fixing merge conflicts.Martin Smith2010-07-1311-123/+108
|\ | | | | | | | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7 Conflicts: doc/src/declarative/advtutorial.qdoc src/declarative/graphicsitems/qdeclarativeloader.cpp src/declarative/graphicsitems/qdeclarativetextedit.cpp src/declarative/qml/qdeclarativeengine.cpp src/declarative/util/qdeclarativexmllistmodel.cpp
| * Follow -> Behaviormae2010-07-087-51/+53
| | | | | | | | Replace the usages of Follows with Behaviors, update docs.
| * Extend QDeclarativeImageProvider to support QPixmap loading andBea Lam2010-07-082-62/+39
| | | | | | | | | | | | | | | | | | | | synchronous loading of QImages. (QPixmaps can only be created in the main thread so they will always be loaded synchronously). This changes request() to requestImage() and adds requestPixmap() for pixmap support. Task-number: QTBUG-11989
| * Added QDeclarativeSpringAnimationmae2010-07-071-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | The QDeclarativeSpringAnimation is a replacement for QDeclarativeSpringFollow. The idea is to remove the Follows quickly. Follows used to have an inSync property. In order to provide an alternative mechanism, the commit also fixes the running property for animations which are controlled by a behavior. Previously running would always return false and never change. Now running does change and indicates that the animation is running indeed.
| * doc improvementsBea Lam2010-07-061-1/+6
| |
* | Doc: Fixing typo - background file nameMorten Engvoldsen2010-07-081-1/+1
|/
* Add abstractitemmodel example, and fix some model docsBea Lam2010-07-018-6/+304
|
* docs - quote code with snippets, other improvementsBea Lam2010-07-015-21/+31
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-309-20/+27
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (54 commits) update qml.qch to version 4.7 Undefined is undefined, and now qml warns about it Fix so window will resize with the root object (broken by Avoid duplicate code for testing initial sizes Remove an unnecessary connect() in TextInput Ensure micro focus is updated in TextEdit and TextInput Fix flow layout not taking into account whether it's width and height are implicit or not. Avoid binding loop. Ensure Loader item change listener is removed when Loader is destroyed Adapt all qmlviewer testcases to the code changes in the actual viewer. Stop QMLLauncher from crashing on exit on Mac when quitting app via the VisualDataModel hasModelChildren role shadowed user roles. Allow positioning of ListView items width sub-pixel precision. Examples clean up Docs Improve appearance when scaling Tweak Qt Demo Behaviour forget to rename the moc include when renaming deviceorientation_maemo.cpp fix namespace macros fix QML Viewer resize modes ...
| * Examples clean upBea Lam2010-06-287-13/+15
| |
| * Improve appearance when scalingBea Lam2010-06-281-6/+11
| |
| * Fix import path in cppextensions declarative example.Christian Kamm2010-06-241-1/+1
| | | | | | | | Reviewed-by: Erik Verbruggen
* | Fixed deployment paths for the symbian/linux-armcc mkspec.axis2010-06-292-2/+2
|/ | | | | | Paths to executables matter on that build system, unlike on Raptor. RevBy: Trust me
* Merge remote branch 'origin/4.7' into qml-4.7Rohan McGovern2010-06-228-8/+6
|\ | | | | | | | | Conflicts: examples/declarative/modelviews/webview/transparent.qml
| * Removed unnecessary data_caging_paths.prf loading from applicationsMiikka Heikkinen2010-06-222-2/+0
| | | | | | | | | | | | | | | | | | Since plugin and import paths variables were moved to symbian.conf, there were many unnecessary load(data_caging_paths) statements left in applications. Task-number: QTBUG-11619 Reviewed-by: Janne Koskinen
| * Fix WebKit declarative examples (second try)Simon Hausmann2010-06-221-1/+1
| | | | | | | | | | | | Forgot one occurrence of org.webkit :) Reviewed-by: Trust me
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-226-6/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Fix examples Updated WebKit to 45d1c9149ef8940081fa8dd35854d2b95ebaf3cd Updated WebKit to 4ad38c43081bedb69c7e26a9ca0fb2c50456066d Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185 Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185 Updated WebKit to 515aae71494436816cd0250cdc52caa4f2566aef Update S60 stuff after renaming the webkit component. Update qmlchanges from import org.webkit to QtWebKit Updated WebKit to e32cb21d4f1787147bcb681883b96a95f867749a Updated WebKit to a99218d1984be36e00966f988123fa7e2b18eec5 Remove the old WebView element in src/import. The new one is in src/3rdparty/webkit Updated WebKit to d7a095a2a9514e1f132b779b99279585820b46f5 Updated WebKit to c6f08f4c13f88491a5d1ae1794c72166af0c26ba
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-226-6/+6
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Fix examples Updated WebKit to 45d1c9149ef8940081fa8dd35854d2b95ebaf3cd Updated WebKit to 4ad38c43081bedb69c7e26a9ca0fb2c50456066d Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185 Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185 Updated WebKit to 515aae71494436816cd0250cdc52caa4f2566aef Update S60 stuff after renaming the webkit component. Update qmlchanges from import org.webkit to QtWebKit Updated WebKit to e32cb21d4f1787147bcb681883b96a95f867749a Updated WebKit to a99218d1984be36e00966f988123fa7e2b18eec5 Remove the old WebView element in src/import. The new one is in src/3rdparty/webkit Updated WebKit to d7a095a2a9514e1f132b779b99279585820b46f5 Updated WebKit to c6f08f4c13f88491a5d1ae1794c72166af0c26ba
| | | * Fix examplesSimon Hausmann2010-06-216-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Import QtWebKit instead of org.webkit Reviewed-by: Trust me
* | | | Remove transparent.qml example for now, until QTBUG-11591 is fixedBea Lam2010-06-221-55/+0
| | | |
* | | | qmldir no longer necessaryBea Lam2010-06-221-4/+0
|/ / /
* | | Rename example: edit -> textselectionBea Lam2010-06-226-0/+16
| | |
* | | Clean up some examplesBea Lam2010-06-2237-374/+195
| | |
* | | Rename example and add minor improvementsBea Lam2010-06-221-17/+32
| | |
* | | Spelling fixBea Lam2010-06-221-1/+1
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-06-218-21/+27
|\ \
| * | ListView doc improvements and examples clean upBea Lam2010-06-188-21/+27
| |/
* | Allow things that load SameGame to disable the Quit buttonAlan Alpert2010-06-211-0/+1
|/ | | | | | | If I missed any, just set inAnotherDemo to true on the SameGame root item. Task-number: QTBUG-11562
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-06-166-0/+0
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Attribute change to allow inclusion of image files.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-06-166-0/+0
| |\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Attribute change to allow inclusion of image files.
| | * Attribute change to allow inclusion of image files.Toby Tomkins2010-06-166-0/+0
| | |
* | | Clean up list examplesBea Lam2010-06-169-348/+240
|/ /
* | Move listview/itemlist.qml to a separate visualitemmodel exampleBea Lam2010-06-118-0/+16
| |
* | Add an example of animated item add/remove in ListViewMartin Jones2010-06-081-0/+33
| |
* | Add image example.Bea Lam2010-06-074-0/+142
| |
* | Improve input panel handling in declarative demos and examplesJoona Petrell2010-06-036-6/+32
|/ | | | | Task-number: QTBUG-11157 Reviewed-by: Warwick Allison
* Various doc fixes and improvementsBea Lam2010-05-315-1/+5
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-3122-753/+957
|\
| * Fix exampleBea Lam2010-05-311-1/+1
| |
| * Rename QGraphics...Layout classes/QML items to Graphics...LayoutBea Lam2010-05-318-64/+64
| | | | | | | | to make it clear they are custom classes/items (not built-in)
| * File shouldn't be in repositoryBea Lam2010-05-311-0/+0
| |
| * Implement removeAt() for layout classes to clean up item removal. AlsoBea Lam2010-05-318-36/+70
| | | | | | | | clean up qmlAttachedProperties() implementation and improve QML example
| * Split graphicsLayouts example into qgraphicslinearlayout andBea Lam2010-05-3116-585/+755
| | | | | | | | qgraphicsgridlayout and clean up
| * Rename example layoutItem -> layoutitem and improve docsBea Lam2010-05-315-2/+2
| |
* | Simplify selection setting. Make TextInput more like TextEdit.Warwick Allison2010-05-312-9/+9
|/ | | | | | By making selectionStart/End read-only, and adding adding select(). Task-number: QTBUG-11056
* Add selection methods to TextEditWarwick Allison2010-05-305-0/+258
| | | | | | | | Sufficient to allow different selection look and feel (see whacky example) Task-number: QTBUG-10968 Reviewed-by: Michael Brasser Reviewed-by: Alan Alpert
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-269-10/+21
|\
| * Doc fixes, improvementsBea Lam2010-05-261-0/+0
| |
| * Unify naming of import plugin targetsJoona Petrell2010-05-268-10/+21
| | | | | | | | | | Task-number: QTBUG-10834 Reviewed-by: Warwick Allison
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-267-166/+172
|\ \ | |/
generated by cgit v0.12 at 2025-01-10 04:09:53 (GMT)