Merge branch '4.5' into 4.6-staging
authorThiago Macieira <thiago.macieira@nokia.com>
Wed, 2 Dec 2009 18:58:39 +0000 (19:58 +0100)
committerThiago Macieira <thiago.macieira@nokia.com>
Wed, 2 Dec 2009 18:58:39 +0000 (19:58 +0100)
commit6eb846ba57445be894e27141cd5f928584836b00
treeb0f8d3ffc08529c7632c6dfb23ab4806c9b880fe
parentba805d5e1a03824c75c4d17131063be1b0fd68a1
parent517e50706b154254bb2b51f19b8678c6a8df2590
Merge branch '4.5' into 4.6-staging

Conflicts:
doc/src/getting-started/known-issues.qdoc
src/script/qscriptextqobject.cpp
tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
doc/src/getting-started/known-issues.qdoc
tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp