Merge remote branch 'origin/master' into qtruntime
authorRoberto Raggi <roberto.raggi@nokia.com>
Mon, 22 Feb 2010 11:26:08 +0000 (12:26 +0100)
committerRoberto Raggi <roberto.raggi@nokia.com>
Mon, 22 Feb 2010 11:26:08 +0000 (12:26 +0100)
commit97930918c8f5d20c6a27c22a1f0670ac7576c17a
tree688f93eacf376df07679f06203834e44143103fa
parent80fc5bf17e5f049a395d6a5612843c69c5b0fde1
parent66818ea9bc50af50bb26515cf667fe1c0c62a12d
Merge remote branch 'origin/master' into qtruntime

Conflicts:
src/declarative/qml/qml.pri
src/declarative/qml/qmlengine.cpp
src/declarative/util/qmlview.h
src/declarative/qml/qml.pri
src/declarative/qml/qmlengine.cpp
src/declarative/util/qmlview.cpp
src/declarative/util/qmlview.h