summaryrefslogtreecommitdiffstats
path: root/examples/declarative/touchinteraction
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year in Digia's license headersSergio Ahumada2013-01-136-6/+6
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-296-36/+36
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-016-12/+12
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-116-6/+6
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix up examples.Daniel Molkentin2011-11-244-44/+0
| | | | | | | | | - Remove dependencies from examples - Remove stray copies of qtc_packaging - remove .desktop files - rename examples (to their old name) Reviewed-By: Casper van Donderen
* Fix build error: specifying full path to pro file is required here.Daniel Molkentin2011-11-231-2/+2
| | | | Reviewed-By: Oswald Buddenhagen
* Declarative Examples: Fall back to local qmlapplicationviewer.Daniel Molkentin2011-11-223-3/+6
| | | | Rubberstamped-by: Oswald Buddenhagen
* Fix "make install" for declarative examplesDaniel Molkentin2011-11-221-2/+2
| | | | Reviewed-by: Oswald Buddenhagen
* Fix use of qmlapplicationviewer.Daniel Molkentin2011-11-213-3/+6
| | | | | | | - Two separate copies for demos and example - Fix deployment (don't install to opt in desktop case) Reviewed-by: Casper van Donderen
* Touchintegration Examples Modificationsartoka2011-11-1726-1036/+178
| | | | | | | | | | | | touchintegration/ gestures, mousearea and pincharea example modifications Modified examples to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* 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).