review.tizen.org Git - platform/upstream/qtdeclarative.git/commit

projects / platform / upstream / qtdeclarative.git / commit

author	Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
	Tue, 24 Feb 2015 16:36:04 +0000 (17:36 +0100)
committer	Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
	Tue, 24 Feb 2015 16:36:04 +0000 (17:36 +0100)
commit	ad67ec26d0cbc98e3440dd38bb20eef4da2ee96d
tree	9f8135751df2f995a4f55837ea065a4687245b71	tree \| snapshot
parent	83a16630c13969e68cd3a5aaab73335ccb0d4414	commit \| diff
parent	20d160d0513a04be187ed851a25b029f47c27b27	commit \| diff

Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
.qmake.conf
LICENSE.GPLv2
examples/qml/networkaccessmanagerfactory/view.qml
src/qml/jsruntime/qv4runtime.cpp
src/qml/jsruntime/qv4stringobject.cpp

Change-Id: I5d12f436d60995e51d5c2f59d364e9cbc24f8e32

47 files changed:

examples/qml/networkaccessmanagerfactory/view.qml	diff1 \|	diff2 \|	blob \| history
examples/quick/demos/maroon/doc/src/maroon.qdoc	diff1 \|	diff2 \|	blob \| history
examples/quick/demos/photoviewer/doc/src/photoviewer.qdoc	diff1 \|	diff2 \|	blob \| history
src/imports/statemachine/state.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/compiler/qv4isel_p.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc	diff1 \|	diff2 \|	blob \| history
src/qml/doc/src/qmllanguageref/syntax/signals.qdoc	diff1 \|	diff2 \|	blob \| history
src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc	diff1 \|	diff2 \|	blob \| history
src/qml/doc/src/whatsnew.qdoc	diff1 \|	diff2 \|	blob \| history
src/qml/jit/qv4regalloc.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/jsruntime/qv4engine.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/jsruntime/qv4globalobject.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/jsruntime/qv4runtime.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/jsruntime/qv4stringobject.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/qqmlengine.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/qqmltypeloader.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/types/qqmldelegatemodel.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/types/qqmltimer.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/types/qquickpackage.cpp	diff1 \|	diff2 \|	blob \| history
src/qmltest/quicktest.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/doc/src/concepts/effects/sprites.qdoc	diff1 \|	diff2 \|	blob \| history
src/quick/doc/src/concepts/input/focus.qdoc	diff1 \|	diff2 \|	blob \| history
src/quick/doc/src/dynamicview-tutorial.qdoc	diff1 \|	diff2 \|	blob \| history
src/quick/doc/src/whatsnew.qdoc	diff1 \|	diff2 \|	blob \| history
src/quick/items/context2d/qquickcanvasitem.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickaccessibleattached.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickdrag.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickimagebase.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickitem.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickmousearea.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickscreen.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickscreen_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicktext.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicktextinput.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicktextnodeengine.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickwindow.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/qsgdefaultglyphnode_p.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/util/qsgtexture.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/util/qquickfontmetrics.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/util/qquickimageprovider.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/util/qquicktextmetrics.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qml/qjsengine/tst_qjsengine.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qml/qqmltimer/tst_qqmltimer.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/nodes/tst_nodestest.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquicktext/tst_qquicktext.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/scenegraph/tst_scenegraph.cpp	diff1 \|	diff2 \|	blob \| history

Domain: UI Framework / Qt;

RSS Atom

examples/qml/networkaccessmanagerfactory/view.qml	diff1 \|	diff2 \|	blob \| history
examples/quick/demos/maroon/doc/src/maroon.qdoc	diff1 \|	diff2 \|	blob \| history
examples/quick/demos/photoviewer/doc/src/photoviewer.qdoc	diff1 \|	diff2 \|	blob \| history
src/imports/statemachine/state.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/compiler/qv4isel_p.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc	diff1 \|	diff2 \|	blob \| history
src/qml/doc/src/qmllanguageref/syntax/signals.qdoc	diff1 \|	diff2 \|	blob \| history
src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc	diff1 \|	diff2 \|	blob \| history
src/qml/doc/src/whatsnew.qdoc	diff1 \|	diff2 \|	blob \| history
src/qml/jit/qv4regalloc.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/jsruntime/qv4engine.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/jsruntime/qv4globalobject.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/jsruntime/qv4runtime.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/jsruntime/qv4stringobject.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/qqmlengine.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/qqmltypeloader.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/types/qqmldelegatemodel.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/types/qqmltimer.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/types/qquickpackage.cpp	diff1 \|	diff2 \|	blob \| history
src/qmltest/quicktest.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/doc/src/concepts/effects/sprites.qdoc	diff1 \|	diff2 \|	blob \| history
src/quick/doc/src/concepts/input/focus.qdoc	diff1 \|	diff2 \|	blob \| history
src/quick/doc/src/dynamicview-tutorial.qdoc	diff1 \|	diff2 \|	blob \| history
src/quick/doc/src/whatsnew.qdoc	diff1 \|	diff2 \|	blob \| history
src/quick/items/context2d/qquickcanvasitem.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickaccessibleattached.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickdrag.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickimagebase.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickitem.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickmousearea.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickscreen.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickscreen_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicktext.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicktextinput.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicktextnodeengine.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickwindow.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/qsgdefaultglyphnode_p.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/util/qsgtexture.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/util/qquickfontmetrics.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/util/qquickimageprovider.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/util/qquicktextmetrics.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qml/qjsengine/tst_qjsengine.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qml/qqmltimer/tst_qqmltimer.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/nodes/tst_nodestest.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquicktext/tst_qquicktext.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/scenegraph/tst_scenegraph.cpp	diff1 \|	diff2 \|	blob \| history