projects / platform / upstream / qtdeclarative.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c63ac0 27bee80)
Merge remote-tracking branch 'origin/5.5' into 5.6
authorLiang Qi <liang.qi@theqtcompany.com>
Fri, 21 Aug 2015 13:18:07 +0000 (15:18 +0200)
committerLiang Qi <liang.qi@theqtcompany.com>
Fri, 21 Aug 2015 13:18:07 +0000 (15:18 +0200)
Conflicts:
tools/qml/main.cpp

Change-Id: I6d521b21be85d91ebb96c28e2c64186f02d94842

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

diff --cc src/qml/types/qqmlobjectmodel.cpp
Simple merge
diff --cc src/quick/util/qquickpixmapcache.cpp
Simple merge
diff --cc tools/qml/main.cpp
Simple merge
Domain: UI Framework / Qt;