projects
/
platform
/
upstream
/
qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e1fbfc0
0ea4944
)
Merge remote-tracking branch 'origin/5.3' into dev
author
Frederik Gladhorn
<frederik.gladhorn@digia.com>
Thu, 10 Jul 2014 08:12:12 +0000
(10:12 +0200)
committer
Frederik Gladhorn
<frederik.gladhorn@digia.com>
Thu, 10 Jul 2014 08:12:13 +0000
(10:12 +0200)
Change-Id: Iba61035910c46627e5e1c3824757da7b3d573657
1
2
src/qml/qml/qqmlengine.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/qml/types/qqmllistmodel.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/quick/accessible/qaccessiblequickitem.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/quick/doc/qtquick.qdocconf
patch
|
diff1
|
diff2
|
blob
|
history
src/quick/items/qquickimage.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/quick/items/qquicklistview.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/quick/items/qquickmousearea.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/quick/items/qquicktextinput.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/quick/scenegraph/qsgrenderloop.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/quick/util/qquickpropertychanges.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/qml/qml/qqmlengine.cpp
Simple merge
diff --cc
src/qml/types/qqmllistmodel.cpp
Simple merge
diff --cc
src/quick/accessible/qaccessiblequickitem.cpp
Simple merge
diff --cc
src/quick/doc/qtquick.qdocconf
Simple merge
diff --cc
src/quick/items/qquickimage.cpp
Simple merge
diff --cc
src/quick/items/qquicklistview.cpp
Simple merge
diff --cc
src/quick/items/qquickmousearea.cpp
Simple merge
diff --cc
src/quick/items/qquicktextinput.cpp
Simple merge
diff --cc
src/quick/scenegraph/qsgrenderloop.cpp
Simple merge
diff --cc
src/quick/util/qquickpropertychanges.cpp
Simple merge