summaryrefslogtreecommitdiffstats
path: root/examples/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Fix deployment for declarative tests, examples on SymbianDamian Jansen2011-10-042-2/+2
| | | | | Task-number: QTBUG-21306 Reviewed-by: Rohan McGovern
* Re-apply licenseheader text in source files for qt4.7Jyri Tahtela2011-07-0114-241/+241
| | | | | | Fixed license text in files having old license. Reviewed-by: Trust Me
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-06-201-1/+11
|\
| * Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, ↵Joona Petrell2011-05-271-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | effectiveHorizontalAlignment and anchors.mirror properties * these properties are seldomly used * they confuse developers that do not care about right-to-left user interfaces * LayoutMirroring.enabled property can be used instead to determine if mirroring is enabled * if needed, you can easily determine the effective layout directions and alignments with a little bit of JavaScript: function effectiveLayoutDirection() { if (LayoutMirroring.enabled) return (listView.layoutDirection == Qt.LeftToRight) ? Qt.RightToLeft : Qt.LeftToRight; else return listView.layoutDirection; } Task-number: QTBUG-11042 Reviewed-by: Martin Jones
* | Qmlshadersplugin examples added.Marko Niemelä2011-06-1335-0/+1448
|/ | | | | | Example application for OpenGL shading language and QML. Added also a link from qml examples main documents labs section. Reviewed-by: Kim Gronholm
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-141-0/+18
|\ | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Add pincharea.qmlproject file for PinchArea example. Moving contentY by large values in List/GridView is slow
| * Add pincharea.qmlproject file for PinchArea example.Martin Jones2011-04-141-0/+18
| | | | | | | | Change-Id: I9d3129be4d03904805e53489c1117104e08ce860
* | Fixed license headers for examples in 4.7Timo Turunen2011-04-056-162/+156
| | | | | | | | | | | | All examples should carry the BSD header. Reviewed-by: Trust Me
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-2212-151/+1021
|\ \ | |/ | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/examples/qml-examples.qdoc
| * fixes/improvements for new QML right-to-left docsBea Lam2011-03-213-9/+9
| | | | | | | | Clarify some of the docs and fix some broken doc links.
| * Write Qt Quick 1.1 right-to-left documentation and examplesJoona Petrell2011-03-1812-171/+1021
| | | | | | | | | | | | | | Task-number: QTBUG-11042 Reviewed-by: Martin Jones Change-Id: I6319992dec52a4d9252c2df39801ebe6a7dee75d
| * PinchArea example produced incorrect scaling.Martin Jones2011-03-081-2/+9
| | | | | | | | | | | | | | | | | | The maths was dodgy - producing far greater scaling than that provided by PinchArea. Change-Id: I4a1ee1b0d65eed623ec9ee92c22c9740116430c5 Task-number: QTBUG-17828 Reviewed-by: Michael Brasser
| * Merge branch '4.7' into qtquick11Martin Jones2011-03-012-2/+3
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativelistview.cpp Change-Id: Ic21311365c6139520ae337a379bdedb6ffe497db
| * | Add LayoutMirroring attached property for mirroring QML layoutsJoona Petrell2011-03-011-1/+21
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-17280 Reviewed-by: Martin Jones Change-Id: I34a623b49ce0fd5c05ae7a7ea5d0437c107b8a9b
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-091-2/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/dynamicobjects.qdoc doc/src/declarative/elements.qdoc
| * | | PinchArea example produced incorrect scaling.Martin Jones2011-03-071-2/+9
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | The maths was dodgy - producing far greater scaling than that provided by PinchArea. Change-Id: I4a1ee1b0d65eed623ec9ee92c22c9740116430c5 Task-number: QTBUG-17828 Reviewed-by: Michael Brasser
* | | Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into ↵David Boddie2011-02-231-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | merge-requests/1108 Conflicts: doc/src/declarative/basictypes.qdoc
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-181-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix TextEdit auto test failure on windows. Fix FocusScope example. Fix compilation on old Symbian platforms Export symbols from qtestlib required for QtQuickTest Allow MouseArea to prevent mouse grab begin stolen by Flickable. Fix QTBUG-17008 XmlListModel blocks Windows system events Fix TextInput, TextEdit auto test failure on windows and mac. QDeclarativeDebug: Fix crash when serializing list of QObjects Update the input context when the pre-edit cursor position changes.
| | * | Fix FocusScope example.Michael Brasser2011-02-181-1/+1
| | |/ | | | | | | | | | | | | Task-number: QTBUG-17501 Reviewed-by: Martin Jones
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-02-041-1/+2
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (216 commits) Doc: Fixed a reference to the wrong image. Fixed a bug that caused marked up inline text to be truncated. Doc: Renamed an image to ensure that it does not clash with another. Doc: Fixed QML, unindented snippet. Doc: Removed unnecessary HTML entity from the title. Doc: Fixed broken links to the old Symbian Foundation Wiki. Doc: Updated the copyright statements in the templates. Doc: Fixing typo Replace all occurances of "Qt 4.7" with "QtQuick 1.0" Doc: Adjusted the font sizes for the offline documentation. Doc: Added a missing style sheet to the qhp manifest. Doc: Fixed the qthelp namespace for the Qt documentation. Doc: including missing pages in overviews. Doc: Fixed typo in QCoreApplication docs Fixed whitespace. Avoid hard-coding product names in page titles. Doc: Unindented a code snippet. Doc: Fixed confusing wording of a sentence. Doc: Fixed a broken link. Doc: Updated the information about commercial editions of Qt. ...
* | | Merge branch 'jpasions-qt-doc-team-qtquick-4.7' into 4.7David Boddie2011-02-171-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/propertybinding.qdoc doc/src/overviews.qdoc src/declarative/util/qdeclarativeanimation.cpp src/declarative/util/qdeclarativeview.cpp
| * \ \ Merge branch '4.7' into jpasions-qt-doc-team-qtquick-4.7David Boddie2011-01-251-1/+2
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/extending.qdoc doc/src/external-resources.qdoc src/declarative/util/qdeclarativeanimation.cpp src/declarative/util/qdeclarativetransition.cpp
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-17237-237/+237
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/elements.qdoc doc/src/declarative/extending.qdoc src/declarative/qml/qdeclarativecomponent.cpp
| * | | | Re-organized the Qt Quick page. Changed titles and links.Jerome Pasion2010-12-201-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-02-0411-6/+262
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | Update Docs, Examples and Demos for new CreateObject overloadableChristopher Ham2011-01-281-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dynamic object in Docs explains QScriptValue argument. SameGame and Dynamic scene now make use of overloadable. Task-number: QTBUG-13087 Reviewed-by: Bea Lam
| * | | Add a layout direction example to positionersJoona Petrell2011-01-197-0/+169
| | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Alan Alpert
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-19237-237/+237
| |\ \ \ | | | |/ | | |/|
| * | | Fix examples autotest failureJoona Petrell2011-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| * | | PinchArea API changes following review.Martin Jones2011-01-071-3/+3
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15491 Reviewed-by: Michael Brasser
| * | | Use deselect() function in text selection exampleJoona Petrell2010-12-311-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16059 Reviewed-by: Christopher Ham
| * | | Add copyright headerMartin Jones2010-12-201-0/+40
| | | |
| * | | Revert "Add mirroring-positioners.qml example" that was accidentally pushedJoona Petrell2010-12-131-70/+0
| | | | | | | | | | | | | | | | This reverts commit 18b940539d0633f30ae055feedb48aeb15969814.
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2010-12-133-2/+79
| |\ \ \
| | * | | Add mirroring-positioners.qml exampleJoona Petrell2010-12-131-0/+70
| | | |/ | | |/|
| * | | Add an example of using PinchArea.Martin Jones2010-11-292-0/+50
| | | | | | | | | | | | | | | | Task-number: QTBUG-15491
* | | | Doc: Fixed invalid/incomplete QML code snippets.David Boddie2011-01-171-1/+2
| |_|/ |/| |
* | | Update copyright year to 2011.Jason McDonald2011-01-10237-237/+237
| |/ |/| | | | | Reviewed-by: Trust Me
* | Add 'Writing New Components' docs, and document the connect() function.Bea Lam2010-12-032-2/+9
|/ | | | | | | | The 'Writing QML Components' is mainly a restructuring of the 'Extending types from QML' page. It also documents the signal connect() function that was previously undocumented. Task-number: QTBUG-15718, QTBUG-15138
* docWarwick Allison2010-11-091-1/+1
|
* highlightranges.qml example and visual test contained binding loop.Martin Jones2010-11-031-9/+11
| | | | | | | | Also, the currentIndex stayed -1 since the views all bound to each others currentIndex, which starts as -1. Task-number: QTBUG-14794 Reviewed-by: Yann Bodson
* Remove accidentially committed .qmlproject.user file, ignore this filetypeDaniel Molkentin2010-10-221-41/+0
| | | | Reviewed-By: Thomas Hartmann
* Tic-tac-toe: Fix z-order of status text.Daniel Molkentin2010-10-191-16/+18
| | | | Reviewed-By: Bea Lam
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-141-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (51 commits) Revert "qmake: pass include directories to MS resource compiler" Fix User 46 Panic in bearer management on Symbian. Assistant: Insert all keywords with empty ids, as ids are not mendatory. qmake: delete .pdb file when making 'distclean' instead of 'clean' qmake: pass include directories to MS resource compiler use specified pkg-config qmake/symbian: Add icons with backslashes in pkg files Make qtconfig help messages translatable remove exec bits again ... Add TIFFClose to QTIffHandler::option() to avoid memory leak [QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel event is sent to two stacked MDI windows Added missing QtWebKit example files and some whitespace fixes. Added missing native separator transforms. Doc: tuning search reasult box qdoc: Don't generate html output for png files. Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0 Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize() Doc: correct spelling Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cpp Doc: correcting grammar on the installation pages ...
| * Doc: Fixing bug - line too long and not visible. Breaking the line in twoMorten Engvoldsen2010-10-071-1/+2
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-10-141-0/+108
|\ \
| * | Add new behavior example.Yann Bodson2010-10-131-0/+108
| |/
* | Fix samegame tutorial jsAlan Alpert2010-10-141-1/+1
|/ | | | | | Turns out that subtraction is not commutative. Who knew? Task-number: QTBUG-13532
* Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-29126-131/+131
| | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones
* Fix example.Michael Brasser2010-09-241-1/+1
|