Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declarativeui
authorWarwick Allison <warwick.allison@nokia.com>
Thu, 14 Jan 2010 00:31:37 +0000 (10:31 +1000)
committerWarwick Allison <warwick.allison@nokia.com>
Thu, 14 Jan 2010 00:31:37 +0000 (10:31 +1000)
commit2ec89699a6f372ccbd92ce2bda753ec0e28f8650
treee8f5a9c9bb8cb41a7e47e7b75cd3f6ddac702814
parent351060bd313220044b9323d59d56627e78deea9f
parent48592026bc9eb024f304411895c3f233b2296cfa
Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declarativeui

Conflicts:
bin/syncqt
src/corelib/io/qurl.cpp
19 files changed:
bin/syncqt
doc/src/index.qdoc
doc/src/modules.qdoc
src/corelib/io/qurl.h
src/corelib/kernel/qmetaobject_p.h
src/corelib/kernel/qobject.cpp
src/corelib/kernel/qobjectdefs.h
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/text/qzipreader_p.h
src/script/bridge/qscriptdeclarativeclass.cpp
src/script/bridge/qscriptdeclarativeclass_p.h
src/script/bridge/qscriptdeclarativeobject.cpp
src/xmlpatterns/type/qprimitives_p.h
tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
tests/benchmarks/benchmarks.pro
tools/linguist/lupdate/lupdate.h
tools/linguist/lupdate/main.cpp
tools/qdoc3/cppcodemarker.cpp