aboutsummaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year in license headers.Jason McDonald2012-01-05680-680/+680
| | | | | Change-Id: I0a8d99909cac867dce72da70b1bbcb649989a51b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Examples: Remove commented out 'plugins' list from .qmlproject filesKai Koehne2012-01-0499-220/+0
| | | | | Change-Id: I24bacdd52f2f191dde8e0a2fa9718b38ab329597 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Examples: Hard-code the 'main' file in .qmlprojectKai Koehne2012-01-0365-65/+209
| | | | | | | | | | | Set the 'mainFile:' property in .qmlproject files where it makes sense (i.e. there's one natural candidate). This makes sure Qt Creator doesn't fall back to 'current file in editor' as main file, which is unexpected to a lot of people. (This requires Qt Creator version 2.2 and newer). Change-Id: Ia5d20b0d982038520d7892bca155267c5f13644b Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add accessibility to qmlFrederik Gladhorn2012-01-023-0/+188
| | | | | | | | | | | | | | | This consists of two parts: An attached property for QML items and a plugin for the accessibility framework. The attached property simply takes care of some properties (name, role) that are needed in order to expose semantics of the application to assistive tools. The plugin exposes the hierarchy of QML items to the accessibility framework. Change-Id: I32f5603d0d9549b01b3645b205b710b9801762f7 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Update to not use old properties.Alan Alpert2011-12-303-6/+6
| | | | | Change-Id: I428d702613186adfc761925de23ae67677f286ba Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Minimize the number of objects created per item in VisualDataModel.Andrew den Exter2011-12-231-1/+1
| | | | | | | | | | | | | | Derive from QDeclarativeContext and reference count the context object instead of parenting it to the context. Combined with a weak persistent v8 handle the allows the context object to be returned by javascript accessors instead of creating a new instance for every use. In addition to the efficiency advantages of creating fewer objects, routing all data access through a single object means that object can also persist data instead of just acting as a proxy. Change-Id: I107dc8c901f16f2a4b420ff1cbffa7a6be27de89 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add currentSprite property to SpriteImageAlan Alpert2011-12-231-3/+3
| | | | | | | | Also renames goalState to goalSprite, to help distinguish it from item states. Change-Id: I77e81595586e69e47a50a7a767fdb7ad775ad7be Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix compilation due to header changesSergio Ahumada2011-12-177-7/+7
| | | | | | | | | | - Fix QtGui/QApplication => QtWidgets/QApplication - Fix QtGui/QStylePlugin => QtWidgets/QStylePlugin - Fix QtWidgets/QStringListModel => QtCore/QStringListModel - Fix QtWidgets/qstringlistmodel.h => QtCore/qstringlistmodel.h Change-Id: I8df28f032f039107b900c81be27d2d6e5e69e06e Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Make PlainText the default textFormat of a TextEdit.Andrew den Exter2011-12-162-0/+2
| | | | | | | | | | | With AutoText as the default it's easy to assume that a TextEdit accepts plain text or rich text only which can lead to unexpected behaviour when user supplied text is does not have the expected formatting and implicitly changes the text format. Task-number: QTBUG-23109 Change-Id: I08900fb23545672fd0e181058633bafeb826a746 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add a tutorial describing how to re-arrange items in a ListView.Andrew den Exter2011-12-149-0/+1089
| | | | | | | | This example describes both how to use drag and drop to re-order items and how to use VisualDataGroup to sort a view using model data. Change-Id: I034963ea87c8ab0c30555536ac28495a396c0577 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Augment Samegame with resource efficient particle systemAlan Alpert2011-12-142-1/+2
| | | | | | | | | | | The particle system cannot automatically turn itself off when it's not needed, however it is easy enough to do so manually. This change does so in SameGame as an example. Task-number: QTBUG-22923 Change-Id: I5f2b3e572222f03c9412fd24c40276529e7d0e7e Reviewed-by: Alan Alpert <alan.alpert@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add Screen attached objectAlan Alpert2011-12-092-4/+128
| | | | | | | | | | | Use this to get details of the screen such as size and current orientation. As well as adding its own example, this commit updates Calculator to use Screen instead of Runtime for orientation. Change-Id: I1b73d2ee22a92b1dee827de1bd893eebec9f5817 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Decrease debug output of modelview examples.Alan Alpert2011-12-063-5/+5
| | | | | Change-Id: Idc7fd22f05eee7943c3b824a460897f13dc0408b Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Use qt_Opacity in shadersAlan Alpert2011-12-062-10/+16
| | | | | Change-Id: Ie9da3e980ece4bcb71c0886d58bc46335f5289a6 Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
* Fix image pathAlan Alpert2011-12-061-1/+1
| | | | | | | Plasma Patrol wasn't finding a text mask. Change-Id: I10934d3cecd076df885ba68833d7654f4b3978d0 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Say hello to QtQuick moduleKent Hansen2011-12-0238-44/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change moves the QtQuick 2 types and C++ API (including SceneGraph) to a new module (AKA library), QtQuick. 99% of this change is moving files from src/declarative to src/quick, and from tests/auto/declarative to tests/auto/qtquick2. The loading of QtQuick 2 ("import QtQuick 2.0") is now delegated to a plugin, src/imports/qtquick2, just like it's done for QtQuick 1. All tools, examples, and tests that use QtQuick C++ API have gotten "QT += quick" or "QT += quick-private" added to their .pro file. A few additional internal QtDeclarative classes had to be exported (via Q_DECLARATIVE_PRIVATE_EXPORT) since they're needed by the QtQuick 2 implementation. The old header locations (e.g. QtDeclarative/qquickitem.h) will still be supported for some time, but will produce compile-time warnings. (To avoid the QtQuick implementation using the compatibility headers (since QtDeclarative's includepath comes first), a few include statements were modified, e.g. from "#include <qsgnode.h>" to "#include <QtQuick/qsgnode.h>".) There's a change in qtbase that automatically adds QtQuick to the module list if QtDeclarative is used. Together with the compatibility headers, this should help reduce the migration pain for existing projects. In theory, simply getting an existing QtDeclarative-based project to compile and link shouldn't require any changes for now -- but porting to the new scheme is of course recommended, and will eventually become mandatory. Task-number: QTBUG-22889 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Change-Id: Ia52be9373172ba2f37e7623231ecb060316c96a7 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Addd expectFail() to qmltestexmaple to avoid failure report from CI.Charles Yin2011-12-021-0/+3
| | | | | Change-Id: I35637c9951085d42d216b8eb1eb03ef1206d51d6 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Move XmlListModel to seperate pluginCharles Yin2011-12-019-0/+9
| | | | | | | | | | | | | XmlListModel is the only feature inside QtDeclarative which depends on the QtXmlPatterns module, move this item to a separate plugin can reduce the unnecessary dependency in most use cases. To use the new XmlListModel, an additional "import QtQuick.xmllistmodel 2.0" is needed. Task-number:QTBUG-22158 Change-Id: I9e19eb6cbba46cd40fb7ffcdbd741f346779a54d Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Have tutorial built along with other examplesAlan Alpert2011-12-0179-1/+3
| | | | | Change-Id: I9f64659ca1621a5fea8e9013ecd264d971207d4d Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Update to QtQuick 2.0Alan Alpert2011-11-2936-36/+36
| | | | | | | Note that the plugin only exposes QObject types, not QDeclarativeItem. Change-Id: I817d143f762239e32456a7ac8fcca29c483a4f8e Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Get the tutorial running againAlan Alpert2011-11-2912-53/+11
| | | | | | | Note that it still uses QtQuick 1.0 Change-Id: I1b6e174c2ec06ba6108f11cb295e32bc76ac3e36 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Initial window implementationAlan Alpert2011-11-294-0/+192
| | | | | | | | | Includes adding a color property on QQuickCanvas. Note that most Window related properties come from the QWindow inheritance. Task-number: QTBUG-19799 Change-Id: I00f6c90a1e2a5c85d787793d6edac2cd7d5309ab Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Better falling bear spriteAlan Alpert2011-11-282-1/+1
| | | | | | | He looked too comfortable. Change-Id: I8de05188587c53b18639cd2dc2a011db193b7790 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* SpriteImage ExampleAlan Alpert2011-11-226-0/+109
| | | | | | | Click the bear! Change-Id: I804f95930000ec1b4dec2cd631bc51dd88689d1c Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Qt.locale() and JS locale type extension.Martin Jones2011-11-221-0/+132
| | | | | | | Task-number: QTBUG-17129 Change-Id: I69cbbe858735b750b4e37ce489f2fa1ad5d8b5d3 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Adding custom easing curves to property animationsAaron Kennedy2011-11-211-2/+13
| | | | | | | | QDeclarativeEasingValueType gets the property customBezierCurve. This allows to define a custom easing curve as a cubic bezier curve. Change-Id: I33ae128ce29bba2834eedcbb90a9769a5391f997 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Copy QSGEngine functions to QQuickCanvas.Gunnar Sletta2011-11-185-0/+349
| | | | | | | | | | | | Long term we intend to remove the QSGEngine class all together so this is the first step. It duplicates some of the logic but doesn't break anything. Also including an example on how to use it in examples/declarative/openglunderqml Change-Id: I69ed93ec5fa1b5c4c746169306d38f8d6ce80477 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Remove embarassing line from tutorial.Frederik Gladhorn2011-11-162-4/+5
| | | | | Change-Id: Ie392214f1b0bea0314ebf94f24fac1122db6483a Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Correct image pathAlan Alpert2011-11-161-1/+1
| | | | | Change-Id: I9bf07a90d6e9c64a9f8470da0744766a391a06cd Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Get tst_examples passing againAlan Alpert2011-11-1418-18/+18
| | | | | | | | | | | | | | Shared QDeclarativeEngine sidesteps GC slowdown issue. New approach also verifies that the root object successfully loaded, this picks up all the cases where it did not successfully load before. Most of these were because they weren't importing QtQuick 2.0, import statements have been updated. One was because it does not create a QQuickItem root, it has been manually excluded. This required adding per file exclusions to the current directory exclusions. Change-Id: I809f0f20acc319aef58ba2e30e672e32f640686d Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix GravityAlan Alpert2011-11-031-1/+1
| | | | | | | | Now simulates acceleration instead of setting it, and properties are renamed to be consistent with AngleDirection Change-Id: I648aa9122c49b46aa7b7d7796bc25d5bd56bfffe Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Add Text.onLineLaidOut exampleYann Bodson2011-11-011-0/+109
| | | | | Change-Id: I87bef980cea9c9b5525c3dc88c15b4a9a555888c Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Add non-floats to particle typeAlan Alpert2011-11-011-1/+1
| | | | | | | | booleans exposed for the 1.0 or 0.0 floats, and color exposed as 0.0-1.0 even though it's 0-255 internally. Change-Id: Idc7ab2527fef150fddb077fc73ac1c7cf122cfdd Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* ImageParticle Sprite ImprovementsAlan Alpert2011-10-311-1/+2
| | | | | | | | Sprite updates are now from signals instead of polled, and update ParticleData as well as vertices. Change-Id: Ib91604a70f4b1fe849bd27c3212ccc1d1482c075 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix PaintedItem redraw bugCharles Yin2011-10-282-8/+95
| | | | | | | | | | | | 1) After QQuickItem::update() being called (means item's content is dirty), the paint() function should always been called, so the contentsDirty and geometryDirty flags are not needed. 2) Update the smile example to validate the above changes Task-number:QTBUG-22250 Change-Id: I5a72f18e6982bdb3ba23e78a253c2876aca2e8cb Reviewed-by: Michael Brasser <michael.brasser@nokia.com> Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
* Remove Q_WS_*, symbian and maemo code in QtDeclarativeDamian Jansen2011-10-2626-171/+15
| | | | | Change-Id: If64daf80f9d19973e0bc2d864b003a66be5ca61d Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fold Move into AffectorAlan Alpert2011-10-242-12/+9
| | | | | | | | | | | | | | | | | | Since 'Move' was just a generic physics property affector, it makes sense to fold it into the generic affector as an easier way of implementing the common case of custom affector (and much faster, since it doesn't hit JS). For completeness in the Move behavior, 'once' now applies the effect of affectors over a second in that one time, so as to avoid exposing the simulation tick. This allows once to have actual meaning for continous affectors. Gravity is also going to be kept around as a convenience (although it will change slightly), so just removing its deprecation warning. Change-Id: Ieb52f8990445fe95f94070175a0f9beb6686324b Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Affectors now simulate with a minimum granularityAlan Alpert2011-10-241-23/+25
| | | | | | | | | | Since all time is sourced from the ParticleSystem, the easiest way is to alter the common time point while doing the multiple simulation runs. Also removes the experimental TargetAffector. Change-Id: Ieb52f8990445fe95f94070175a0f9beb6686324a Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix abstractitemmodel for QGuiApplicationDamian Jansen2011-10-242-2/+3
| | | | | Change-Id: If9117f54f0dbe1c05cc5b46b6a6e662613e1b38f Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
* Rename Qt Quick-specific classes to QQuick*Kent Hansen2011-10-2131-86/+86
| | | | | | | | | | | | | | | | | | | | | | The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Fix build error for canvas stockchart example.Charles Yin2011-10-211-1/+1
| | | | | | Change-Id: I82115738ada4fe6a77023a56e962c71284ebc91b Reviewed-by: Michael Brasser <michael.brasser@nokia.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
* Replace Smiles with StarfishAlan Alpert2011-10-2136-150/+61
| | | | | | | | And a bear. Change-Id: I9809bca1664a7fe1aa6734edc986440b6ca2a63c Reviewed-by: Martin Jones <martin.jones@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Remove the InputContext module.Andrew den Exter2011-10-185-479/+0
| | | | | | | | | | | | | The input context module provided a bridge between QML and a QInputContext which allowed an application to implement it's own input method in-process. However since QInputContext has been replaced and now only exists as a QWidget compatibility API this module no longer works with the QtQuick 2 items and porting it to the new QPlatformInputContext API does not seem to be an option as there is no way to override the instance provided by the platform integration. Change-Id: Ica602377436fcea42b9ffd05e1b347e2ee52acc8 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Allow sizing of TrailEmitter emit area based on particle sizeAlan Alpert2011-10-171-5/+7
| | | | | Change-Id: I7ce2ba29459b9a66e62933f9bfb9e066baedaaef Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add Move affectorAlan Alpert2011-10-142-3/+147
| | | | | | | | | Slated to replace the 'Gravity' affector which only did one specialized gravity usecase anyways. This one is more generic. Change-Id: I3cbb975bad24e8f6fca7e07b671aa8ba5a3a916c Reviewed-on: http://codereview.qt-project.org/6657 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Allow view items to be preserved.Andrew den Exter2011-10-121-0/+155
| | | | | | | | | | | | | | | | | | | | Do not destroy items that are members of the VisualDataModel persistedItems group when they are released by the view. The create function on VisualDataGroup will return a reference to an instantiated item within that group, any item returned by this function is automatically added to the persistedItems group and can be released by removing it from the group. Uninstantiated items added to the persistedItems group by any other means are not instantiated until requested by a view or create. Task-number: QTBUG-21518 Task-number: QTBUG-20854 Change-Id: I59554711208504c8f20a3ebe783bddab9b21a558 Reviewed-on: http://codereview.qt-project.org/5831 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add DropArea item and Drag attached property.Andrew den Exter2011-10-1010-596/+177
| | | | | | | | | | | | | | | | | | | Refactors drag API to improve compatibility with traditional drag and drop by reusing events and adding drop actions. Event sending is removed from MouseArea, instead the Drag object can be attached to the item that is dragged and it will send drag events when the position of that item is changed or when its active property changes. The DragTarget item is renamed to DropArea and can now communicate supported and suggested actions. Task-number: QTBUG-19747 Change-Id: I46cb77e68cf1ff32bbcbf0945facb593c9c2243c Reviewed-on: http://codereview.qt-project.org/4638 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add a get function to VisualDataGroup.Andrew den Exter2011-10-062-0/+157
| | | | | | | | | | | | | This returns an object with properties for accessing the model data of an item, membership in the visual data model's groups and the index of the item in each group. Task-number: QTBUG-21512 Change-Id: I878442c8a2e30cc6f9941f7412303581613a6142 Reviewed-on: http://codereview.qt-project.org/5515 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add support for filtering VisualDataModels.Andrew den Exter2011-10-061-0/+198
| | | | | | | | | | | | | | | | | Add a VisualDataGroup element which items within a VisualDataModel can be assigned to. Setting the group property of a VisualDataModel or one of its parts models will filter the items visible within a view to just items belonging to that group. By default all items belong to an 'items' group. The VisualDataModel attached object includes properties indicating whether a item is a member of a group and its index in the group. Task-number: QTBUG-21513 QTBUG-21515 Change-Id: If3df6a359a888a6f79923775d2f78076d5e7d2cf Reviewed-on: http://codereview.qt-project.org/4115 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Split GroupGoal out of SpriteGoalAlan Alpert2011-10-051-6/+3
| | | | | | | | | | Leaving SpriteGoal alone for a few weeks with a deprecation message, but a functioning GroupGoal has been added. Change-Id: I395046c00526e7caa38bdbc499a8191308c476fa Reviewed-on: http://codereview.qt-project.org/5950 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>