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

projects / platform / upstream / qtdeclarative.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3c63ac0 27bee80)

author	Liang Qi <liang.qi@theqtcompany.com>
	Fri, 21 Aug 2015 13:18:07 +0000 (15:18 +0200)
committer	Liang Qi <liang.qi@theqtcompany.com>
	Fri, 21 Aug 2015 13:18:07 +0000 (15:18 +0200)
commit	4a1846acd122af58c601f9832ade4c4d8986e66a
tree	019b131bf411ba3c7e62fcff0199bdf073825fa2	tree \| snapshot
parent	3c63ac03ed262b59962b45ac974b82edc7c83880	commit \| diff
parent	27bee8076f50a948ffb9997e2a0673854681437d	commit \| diff

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

Conflicts:
tools/qml/main.cpp

Change-Id: I6d521b21be85d91ebb96c28e2c64186f02d94842

src/qml/types/qqmlobjectmodel.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/util/qquickpixmapcache.cpp	diff1 \|	diff2 \|	blob \| history
tools/qml/main.cpp	diff1 \|	diff2 \|	blob \| history

Domain: UI Framework / Qt;