projects
/
konrad/qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5a705d8
438d50d
)
Merge branch 'v8'
author
Aaron Kennedy
<aaron.kennedy@nokia.com>
Fri, 8 Jul 2011 05:56:48 +0000 (15:56 +1000)
committer
Aaron Kennedy
<aaron.kennedy@nokia.com>
Fri, 8 Jul 2011 05:56:48 +0000 (15:56 +1000)
Conflicts:
src/declarative/qml/qdeclarativescarceresourcescriptclass.cpp
src/declarative/qml/qdeclarativescarceresourcescriptclass_p.h
Change-Id: I54e579307cbeafbbad21884218c5e797ba245c8b
16 files changed:
1
2
src/declarative/items/qsgcanvasitem.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/declarative/items/qsgcanvasitem_p.h
patch
|
diff1
|
diff2
|
blob
|
history
src/declarative/items/qsgcontext2d.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/declarative/items/qsgcontext2d_p.h
patch
|
diff1
|
diff2
|
blob
|
history
src/declarative/items/qsgcontext2d_p_p.h
patch
|
diff1
|
diff2
|
blob
|
history
src/declarative/items/qsgitem.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/declarative/items/qsgitem.h
patch
|
diff1
|
diff2
|
blob
|
history
src/declarative/qml/qintrusivelist_p.h
patch
|
diff1
|
diff2
|
blob
|
history
src/declarative/qml/v4/qdeclarativev4bindings.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/declarative/qml/v4/qdeclarativev4irbuilder.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/imports/testlib/SignalSpy.qml
patch
|
diff1
|
diff2
|
blob
|
history
src/imports/testlib/TestCase.qml
patch
|
diff1
|
diff2
|
blob
|
history
src/imports/testlib/main.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/qmltest/quicktest.cpp
patch
|
diff1
|
diff2
|
blob
|
history
tests/auto/declarative/nodes/tst_nodestest.cpp
patch
|
diff1
|
diff2
|
blob
|
history
tests/auto/declarative/qsgvisualdatamodel/tst_qsgvisualdatamodel.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/declarative/items/qsgcanvasitem.cpp
Simple merge
diff --cc
src/declarative/items/qsgcanvasitem_p.h
Simple merge
diff --cc
src/declarative/items/qsgcontext2d.cpp
Simple merge
diff --cc
src/declarative/items/qsgcontext2d_p.h
Simple merge
diff --cc
src/declarative/items/qsgcontext2d_p_p.h
Simple merge
diff --cc
src/declarative/items/qsgitem.cpp
Simple merge
diff --cc
src/declarative/items/qsgitem.h
Simple merge
diff --cc
src/declarative/qml/qintrusivelist_p.h
Simple merge
diff --cc
src/declarative/qml/v4/qdeclarativev4bindings.cpp
Simple merge
diff --cc
src/declarative/qml/v4/qdeclarativev4irbuilder.cpp
Simple merge
diff --cc
src/imports/testlib/SignalSpy.qml
Simple merge
diff --cc
src/imports/testlib/TestCase.qml
Simple merge
diff --cc
src/imports/testlib/main.cpp
Simple merge
diff --cc
src/qmltest/quicktest.cpp
Simple merge
diff --cc
tests/auto/declarative/nodes/tst_nodestest.cpp
Simple merge
diff --cc
tests/auto/declarative/qsgvisualdatamodel/tst_qsgvisualdatamodel.cpp
Simple merge