git.six.silmor.de Git - konrad/qtdeclarative.git/commit

projects / konrad/qtdeclarative.git / commit

author	Gunnar Sletta <gunnar.sletta@nokia.com>
	Wed, 31 Aug 2011 06:55:16 +0000 (08:55 +0200)
committer	Gunnar Sletta <gunnar.sletta@nokia.com>
	Wed, 31 Aug 2011 06:55:16 +0000 (08:55 +0200)
commit	71478352376022faa9be6d79f2a760c289945ff5
tree	0f8ff4a88c1b033367337a93d23a329d145ee903	tree \| snapshot
parent	c38efcb67cf93ba3e91e184c3b891efef4ef75a3	commit \| diff
parent	05daa9bfe1a03ffe1cc580b6cfd88e093e2493c0	commit \| diff

Merge branch 'master' into refactor

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

27 files changed:

src/declarative/declarative.pro	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgborderimage.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgcanvas.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgshadereffect.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgshadereffectsource.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgshadereffectsource_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgview.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgview_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/particles/qsgcustomparticle.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/particles/qsgimageparticle.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/parser/qdeclarativejsparser.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qdeclarativeengine.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qdeclarativemetatype.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/util/qdeclarativestateoperations.cpp	diff1 \|	diff2 \|	blob \| history
src/imports/gestures/gestures.pro	diff1 \|	diff2 \|	blob \| history
src/imports/particles/particles.pro	diff1 \|	diff2 \|	blob \| history
src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro	diff1 \|	diff2 \|	blob \| history
src/qmltest/quicktest.cpp	diff1 \|	diff2 \|	blob \| history
src/qtquick1/graphicsitems/qdeclarativeitem.cpp	diff1 \|	diff2 \|	blob \| history
src/qtquick1/qtquick1.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/declarative/examples/examples.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/declarative/qsglistview/qsglistview.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/declarative/qsglistview/tst_qsglistview.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro	diff1 \|	diff2 \|	blob \| history
tools/qmlplugindump/main.cpp	diff1 \|	diff2 \|	blob \| history
tools/qmlscene/main.cpp	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

src/declarative/declarative.pro	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgborderimage.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgcanvas.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgshadereffect.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgshadereffectsource.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgshadereffectsource_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgview.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgview_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/particles/qsgcustomparticle.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/particles/qsgimageparticle.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/parser/qdeclarativejsparser.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qdeclarativeengine.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qdeclarativemetatype.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/util/qdeclarativestateoperations.cpp	diff1 \|	diff2 \|	blob \| history
src/imports/gestures/gestures.pro	diff1 \|	diff2 \|	blob \| history
src/imports/particles/particles.pro	diff1 \|	diff2 \|	blob \| history
src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro	diff1 \|	diff2 \|	blob \| history
src/qmltest/quicktest.cpp	diff1 \|	diff2 \|	blob \| history
src/qtquick1/graphicsitems/qdeclarativeitem.cpp	diff1 \|	diff2 \|	blob \| history
src/qtquick1/qtquick1.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/declarative/examples/examples.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/declarative/qsglistview/qsglistview.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/declarative/qsglistview/tst_qsglistview.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro	diff1 \|	diff2 \|	blob \| history
tools/qmlplugindump/main.cpp	diff1 \|	diff2 \|	blob \| history
tools/qmlscene/main.cpp	diff1 \|	diff2 \|	blob \| history