summaryrefslogtreecommitdiffstats
path: root/examples/declarative/touchinteraction
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Added missing license headers for documentation and examples.David Boddie2011-06-086-0/+240
|
* Doc: Added missing project and desktop files.David Boddie2011-05-111-0/+16
|
* Squashed commit of changes from the 4.8-temp branch.David Boddie2011-05-1121-0/+1238
|
* Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-05-043-48/+0
| | | | | (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-181-0/+18
|\ | | | | | | | | | | | | | | | | Conflicts: qmake/generators/makefile.cpp qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/global/qnamespace.h src/gui/text/qtextcontrol.cpp
| * Add pincharea.qmlproject file for PinchArea example.Martin Jones2011-04-141-0/+18
| | | | | | | | Change-Id: I9d3129be4d03904805e53489c1117104e08ce860
* | Update copyright year to 2011.Rohan McGovern2011-03-101-1/+1
|/ | | | | Reviewed-by: Trust Me (cherry picked from commit 774a3536b00c4d6e4c4c10b708e31b4373a338e3)
* 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 branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-192-2/+2
|\
| * Update copyright year to 2011.Jason McDonald2011-01-102-2/+2
| | | | | | | | Reviewed-by: Trust Me
* | 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
* | Add copyright headerMartin Jones2010-12-201-0/+40
| |
* | Add an example of using PinchArea.Martin Jones2010-11-292-0/+50
|/ | | | Task-number: QTBUG-15491
* Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-292-2/+2
| | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones
* Doc: Fixed text in license headers.David Boddie2010-09-132-2/+2
|
* improvements to docs and examplesBea Lam2010-07-141-27/+37
|
* Rename example and add minor improvementsBea Lam2010-06-221-17/+32
|
* Add license headers for .qml files.Jason McDonald2010-05-212-0/+80
| | | | | | | Examples get the BSD license, while all other .qml files get the LGPL/tech-preview license. Reviewed-by: Trust Me
* Restructure the examples. They are now organized into variousBea Lam2010-05-165-0/+131
subdirectories to make it easier to locate examples for certain features (e.g. animation) and to distinguish between different types of examples (e.g. very basic examples vs complex demo-like examples).