projects / platform / upstream / qtdeclarative.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c1d99c 2fdb6eb)
Merge remote-tracking branch 'origin/5.4' into 5.5
authorSimon Hausmann <simon.hausmann@theqtcompany.com>
Mon, 4 May 2015 08:20:20 +0000 (10:20 +0200)
committerSimon Hausmann <simon.hausmann@theqtcompany.com>
Mon, 4 May 2015 08:20:49 +0000 (10:20 +0200)
Change-Id: Ie8ea118ed0a1a9a1c3d81e1e34d85c03c695c9a4

1  2 
src/qml/compiler/qv4codegen.cpp patch | diff1 | diff2 | blob | history
src/quick/items/qquickscreen.cpp patch | diff1 | diff2 | blob | history
tests/auto/qml/qjsengine/tst_qjsengine.cpp patch | diff1 | diff2 | blob | history

diff --cc src/qml/compiler/qv4codegen.cpp
Simple merge
diff --cc src/quick/items/qquickscreen.cpp
Simple merge
Domain: UI Framework / Qt;