qt/qtdeclarative.git - Qt Declarative (Quick 2)

	Commit message (Collapse)	Author	Age	Files	Lines
*	qtdeclarative: update .qmltypes, and use -notrelocatable option	Fawzi Mohamed	2013-04-24	1	-29/+57
\| \| \| \| \| \| \| \|	this should fix some bugs in the code support due to incorrec/outdated meta info Change-Id: I90925daa5376ebdfb9a6f9d73103893065c15d64 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
*	Update copyright year in Digia's license headers	Sergio Ahumada	2013-01-10	1	-1/+1
\| \| \| \| \| \|	Change-Id: I6c3bd7bebe3d62d1cfd0fa6334544c9db8398c76 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
*	Change copyrights from Nokia to Digia	Iikka Eklund	2012-09-23	1	-24/+24
\| \| \| \| \| \| \|	Change copyrights and license headers from Nokia to Digia Change-Id: Ie7f5d49ed8235d7a7845ab68f99ad1c220e64d5c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
*	Add .qmltypes files	Kai Koehne	2012-09-12	3	-0/+1175
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	.qmltypes files are used by e.g. Qt Creator to provide code completion etc for QML types defined in plugins. The added files where generated with qmlplugindump, e.g. qmlplugindump QtQuick.Particles 2.0 > plugins.qmltypes (ideally make qmltypes would do the same, but it's not working as expected right now). The exception is the QtQuick plugin: Here the file is generated with qmlplugindump -builtins > plugins.qmltypes and contains also the types registered in the qml library itself. Change-Id: I1a6b6641cb5ec3ecffe08e8926d8c1bc082ae6de Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
*	Implement strict mode for qmldir modules	Matthew Vogt	2012-07-31	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow a module's qmldir to contain a module directive, which when present specifies 'strict mode' import processing. In strict mode, type registrations are only permitted into the namespace identified in the qmldir file's module directive. In addition, any type registrations to that namespace originating from other modules are treated as error conditions. Task-number: QTBUG-26551 Change-Id: I081bde2d3b83d3f28524440177fb2cd1ccee34ad Reviewed-by: Chris Adams <christopher.adams@nokia.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
*	use centralized qml plugin project handling	Oswald Buddenhagen	2012-07-11	1	-11/+2
\| \| \| \| \|	Change-Id: I27b773b042560d3a95d943ad942e84d9aaeeba40 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
*	Extract Particles code to an independent library	Matthew Vogt	2012-04-16	1	-1/+1
\| \| \| \| \| \| \| \| \|	QtQuick clients that do not use particles features should not have to load these classes. Task-number: QTBUG-25178 Change-Id: Ib15f7655dc4d821595e06f9160d2770375279027 Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
*	Create plugins for Particles and Window submodules	Matthew Vogt	2012-04-05	3	-0/+85
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To prevent errors when QML files import QtQuick.Particles or QtQuick.Window before importing QtQuick itself, create plugins for these submodules that make their import statements independent of the QtQuick import. Remove the automatic re-ordering of the imports list prior to loading to ensure registered name conflicts can be resolved by changing the order of import statements. Task-number: QTBUG-24369 Change-Id: I248625fa30a813dddd2a64feb9a489768931939f Reviewed-by: Martin Jones <martin.jones@nokia.com>
*	Remove QtQuick1 elements from qtdeclarative	Matthew Vogt	2012-02-03	5	-1646/+0
\| \| \| \| \| \| \| \|	QtQuick1 is now contained in a separate repository. Task-number: QTBUG-23737 Change-Id: I09eae67af5693a22b896b916f816f73ccc3a89b1 Reviewed-by: Martin Jones <martin.jones@nokia.com>
*	Remove "All rights reserved" line from license headers.	Jason McDonald	2012-01-30	3	-3/+3
\| \| \| \| \| \| \| \| \| \|	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: If39bd256b0fa85eba17ea30f8ab87ea27d758908 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
*	Update obsolete contact address.	Jason McDonald	2012-01-23	3	-3/+3
\| \| \| \| \| \| \| \|	Replace Nokia contact email address with Qt Project website. Change-Id: I6a730abc0c396fb545a48b2d6938abedac2e3f1c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
*	Remove the use of QT_MODULE()	Gunnar Sletta	2012-01-20	1	-1/+0
\| \| \| \| \|	Change-Id: I1c07231b0bf412fe490a44b9a060bb2e2ef11154 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
*	Update copyright year in Nokia copyright headers.	Jason McDonald	2012-01-17	1	-1/+1
\| \| \| \| \| \| \| \|	Update copyright headers from before 2011, and a couple of new ones that were merged after the previous change to copyright headers. Change-Id: Ia76e08e2734afa4ef3f1207dbcda5ff3bc81b366 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
*	Update copyright year in license headers.	Jason McDonald	2012-01-05	2	-2/+2
\| \| \| \| \|	Change-Id: I0a8d99909cac867dce72da70b1bbcb649989a51b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
*	Remove Q_WS_*, symbian and maemo code in QtDeclarative	Damian Jansen	2011-10-26	1	-10/+0
\| \| \| \| \|	Change-Id: If64daf80f9d19973e0bc2d864b003a66be5ca61d Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
*	Merge branch 'master' into refactor	Gunnar Sletta	2011-08-31	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/3rdparty/v8 src/declarative/declarative.pro src/declarative/items/qsgcanvas.cpp src/declarative/items/qsgshadereffectsource_p.h src/declarative/items/qsgview.cpp src/declarative/particles/qsgcustomparticle.cpp src/imports/gestures/gestures.pro src/imports/particles/particles.pro src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro src/qtquick1/qtquick1.pro tests/auto/declarative/examples/examples.pro tests/auto/declarative/qsglistview/qsglistview.pro tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro Change-Id: I423344f83e1835116cad531b877fde6e68a8849a
\| *	Remove V8 submodule from QtDeclarative	Kent Hansen	2011-08-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QtDeclarative should now link against the QtV8 library from qtbase. The patch files have been moved to qtbase as well. Applications that use the QtDeclarative private headers may need to add the following to their .pro file: QT += v8-private This ensures that <private/v8.h> is found, which is (indirectly) included by many QtDeclarative private headers. Task-number: QTBUG-20963 Change-Id: I31e973a6fcc0c416d3b258a61c26564cee3dcd4b Reviewed-on: http://codereview.qt.nokia.com/3093 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* \|	Build against refactor.	Samuel Rødal	2011-07-29	2	-2/+2
\|/ \| \| \|	Change-Id: I0143767405afe968c0aea71651bd9e3dc7a74e23
*	Extract all QtQuick 1 elements into a separate library/plugin.	Martin Jones	2011-07-12	3	-5/+5
\| \| \| \| \| \|	Change-Id: I41a280de2739ee08202f4be2519e5012870090f2 Reviewed-on: http://codereview.qt.nokia.com/1391 Reviewed-by: Martin Jones <martin.jones@nokia.com>
*	Update licenseheader text in source files for qtdeclarative Qt module	Jyri Tahtela	2011-07-08	1	-17/+17
\| \| \| \| \| \| \| \|	Replace old license header with correct one. Change-Id: I492ddaaa0227b2c8faf11bdcd6e12e7231a54a10 Reviewed-on: http://codereview.qt.nokia.com/1312 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
*	Merge branch 'master' into qtquick2	Aaron Kennedy	2011-06-09	2	-34/+34
\|\ \| \| \| \| \| \| \| \|	Conflicts: src/declarative/qml/qdeclarativeengine.cpp
\| *	Merge branch 'qtquick2'	Martin Jones	2011-05-31	109	-74/+14470
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: demos/declarative/flickr/common/Progress.qml demos/declarative/flickr/common/RssModel.qml demos/declarative/flickr/common/ScrollBar.qml demos/declarative/flickr/common/Slider.qml demos/declarative/flickr/mobile/Button.qml demos/declarative/flickr/mobile/GridDelegate.qml demos/declarative/flickr/mobile/ImageDetails.qml demos/declarative/flickr/mobile/ListDelegate.qml demos/declarative/flickr/mobile/TitleBar.qml demos/declarative/flickr/mobile/ToolBar.qml demos/declarative/webbrowser/content/Button.qml demos/declarative/webbrowser/content/FlickableWebView.qml demos/declarative/webbrowser/content/Header.qml demos/declarative/webbrowser/content/ScrollBar.qml demos/declarative/webbrowser/content/UrlInput.qml demos/declarative/webbrowser/webbrowser.qml doc/src/snippets/declarative/mousearea/mousearea-snippet.qml examples/declarative/modelviews/webview/newwindows/qml/alerts.html examples/declarative/modelviews/webview/newwindows/qml/content/Mapping/map.html examples/declarative/modelviews/webview/newwindows/qml/content/pics/cancel.png examples/declarative/modelviews/webview/newwindows/qml/content/pics/ok.png examples/declarative/modelviews/webview/newwindows/qml/newwindows.html src/declarative/graphicsitems/qdeclarativetextinput.cpp src/declarative/qml/qdeclarativecompiledbindings.cpp src/declarative/qml/qdeclarativecompiledbindings_p.h src/declarative/qml/qdeclarativedom.cpp src/declarative/qml/qdeclarativedom_p.h src/declarative/qml/qdeclarativedom_p_p.h src/declarative/qml/qdeclarativeengine.cpp src/declarative/qml/qdeclarativetypeloader.cpp src/imports/particles/particles.cpp tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.4.png tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.6.png tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.0.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.0.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.1.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.2.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.3.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.4.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.5.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.6.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.7.png tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-X11/multilineAlign.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-X11/parentanchor.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.1.png tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.1.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.1.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.1.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.1.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.2.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.3.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.4.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.5.png tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext3.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext2.0.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.0.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.1.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.10.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.11.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.2.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.3.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.4.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.5.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.6.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.7.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.8.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.9.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.0.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.1.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.2.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.3.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.4.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.5.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.6.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.0.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.1.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.2.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.3.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.4.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.10.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.11.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.12.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.7.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.9.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.7.png tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.0.png tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.1.png tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.2.png tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.11.png tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp Change-Id: I40df8a9403a58a6c03a0f1734f16a5cbed6c85ff
\| * \|	Update licenseheader text in source files for qtdeclarative Qt module	Jyri Tahtela	2011-05-24	3	-51/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* \| \|	Immense Particles Refactor Part A	Alan Alpert	2011-06-07	106	-14414/+21
\| \|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Qt.labs.particles 2.0 moved to QtQuick.Particles 2.0. All C++ classes changed names, some renaming of QML types. Also adds CustomParticle.
* \|	Multi-line sprite files will now work	Alan Alpert	2011-05-26	8	-45/+195
\| \|
* \|	Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵	Gunnar Sletta	2011-05-23	2	-4/+0
\|\ \ \| \| \| \| \| \| \| \| \|	into qtquick2
\| * \|	Compile on Mac	Alan Alpert	2011-05-23	2	-4/+0
\| \| \|
* \| \|	Don't store texture references after the view has gone away	Gunnar Sletta	2011-05-23	1	-3/+1
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a partial fix only. We will eventually need to get proper sharing of resources across multiple GL contexts, but this fixes the autotest and will work for most usecases. The task QTBUG-19455 has been created to solve it properly.
* \|	Remove ModelParticle	Alan Alpert	2011-05-23	4	-462/+4
\| \| \| \| \| \| \| \|	Nothing is using it anymore, lets keep it that way.
* \|	Split up ModelParticle	Alan Alpert	2011-05-23	9	-3/+766
\| \| \| \| \| \| \| \| \| \| \| \|	Now has DataParticle (with model and delegate) and an ItemParticle (which you just feed items manually). ModelParticle left for now for damage control - it will probably just disappear someday.
* \|	Fixed switching between particle performance modes	Alan Alpert	2011-05-23	2	-210/+262
\| \| \| \| \| \| \| \|	Actually switches shaders, and does not lose emitted particle data.
* \|	Add BurstEmitter, and a simple render path for UltraParticles	Alan Alpert	2011-05-19	10	-64/+536
\| \| \| \| \| \| \| \| \| \|	None of the intermediate paths are written though. It's all or virtually nothing.
* \|	Add UltraParticle	Alan Alpert	2011-05-18	11	-4/+2106
\| \| \| \| \| \| \| \| \| \|	They're not as cool as they sound. Includes example, and the now pointless SuperParticle (for possible performance comparisions).
* \|	Fix emitter burst method bugs	Alan Alpert	2011-05-17	5	-130/+139
\| \| \| \| \| \| \| \| \| \| \| \|	Burst will now always burst at the x,y where it was called, and doesn't leave trails between close bursts. Kill affector also gets a fix for double killing things sometimes.
* \|	Upgrade Flickr demo to QtQuick 2.	Alan Alpert	2011-05-12	6	-14/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	And throw in particle effects. Includes a variety of fixes to modelparticle and picture affector which were arrived at during this demo.
* \|	Documentation and API cleanup of QSGMaterial	Gunnar Sletta	2011-05-11	4	-46/+46
\| \|
* \|	Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵	Alan Alpert	2011-05-05	1	-0/+2
\|\ \ \| \| \| \| \| \| \| \| \|	into qtquick2
\| * \|	Merge branch 'master' into qtquick2	Gunnar Sletta	2011-05-04	1	-0/+2
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/imports/particles/particles.pro
\| \| *	Use private headers	Marius Storm-Olsen	2011-05-02	1	-1/+1
\| \| \|
* \| \|	Model Particle fixes	Alan Alpert	2011-05-05	3	-17/+47
\|/ / \| \| \| \| \| \|	Now tracks model count changes.
* \|	Affector Augmentation	Alan Alpert	2011-05-03	6	-10/+60
\| \| \| \| \| \| \| \| \| \| \| \|	Affectors gained shape and signal properties, and the affected(x,y) signal (turned on by the signal property, a theorized performance improvement).
* \|	Update particles to use QElapsedTimer	Alan Alpert	2011-04-28	7	-11/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Step one of fixing the limited lifetime bug. As this step should also increase the lifetime 'a lot' step two may take a while. Change-Id: I87bbe762803451f751e23d4bf8559c662fdf57a3 (cherry picked from commit 9cf15c135373f8190bf2cb62f9f99890cacf7d88)
* \|	Add variable rotation speed to deformable particle	Alan Alpert	2011-04-28	3	-6/+45
\| \| \| \| \| \| \| \| \| \|	Change-Id: I105f18f0d7ec860de5d8bc8a9f3e4f007ea71ae2 (cherry picked from commit 41296b3ed046ddf73eca320bf0a97008decca287)
* \|	Merged master into qtquick2.	axis	2011-04-27	1	-1/+1
\|\\|
\| *	Switched to using QT.declaratice.imports variable.	axis	2011-04-27	1	-1/+1
\| \|
* \|	Initial import from qtquick2.	Qt by Nokia	2011-04-27	94	-22/+11179
\|/ \| \| \| \|	Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
*	Initial import from the monolithic Qt.	Qt by Nokia	2011-04-27	5	-0/+1654
	This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12