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

projects / konrad/qtdeclarative.git / commit

author	Kent Hansen <kent.hansen@nokia.com>
	Fri, 23 Mar 2012 13:31:47 +0000 (14:31 +0100)
committer	Kent Hansen <kent.hansen@nokia.com>
	Fri, 23 Mar 2012 13:31:47 +0000 (14:31 +0100)
commit	0655209fdad022bd0f6eb20ce85522cb56506bf0
tree	cdba0c1590655f5cb75a68cedff74f8a683db3a2	tree \| snapshot
parent	c3babc03c99c6ca5fa210486e133eb456a405bab	commit \| diff
parent	3d8f103c2641f35e7681485102a1b59886db8934	commit \| diff

Merge master into api_changes

Conflicts:
src/qml/qml/qqmlboundsignal.cpp
src/qml/qml/qqmlpropertycache.cpp

Change-Id: I5193a193fa301c0b518291645bf626a5fa07118f

20 files changed:

src/qml/debugger/qqmlenginedebugservice.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/debugger/qqmlprofilerservice_p.h	diff1 \|	diff2 \|	blob \| history
src/qml/qml/qqmlboundsignal.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/qqmlcompiler.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/qqmlmetatype.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/qqmlpropertycache.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/qqmlstringconverters.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/qqmlvme.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/qqmlxmlhttprequest.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/v4/qv4bindings.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/v8/qqmlbuiltinfunctions.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/v8/qv8engine.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickcanvas.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickitem.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickitem.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickshadereffect.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/particles/qquickcustomparticle.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/qsgcontext.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquicktext/tst_qquicktext.cpp	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

src/qml/debugger/qqmlenginedebugservice.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/debugger/qqmlprofilerservice_p.h	diff1 \|	diff2 \|	blob \| history
src/qml/qml/qqmlboundsignal.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/qqmlcompiler.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/qqmlmetatype.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/qqmlpropertycache.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/qqmlstringconverters.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/qqmlvme.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/qqmlxmlhttprequest.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/v4/qv4bindings.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/v8/qqmlbuiltinfunctions.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/v8/qv8engine.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickcanvas.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickitem.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickitem.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickshadereffect.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/particles/qquickcustomparticle.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/qsgcontext.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquicktext/tst_qquicktext.cpp	diff1 \|	diff2 \|	blob \| history