Merge branch '4.5' into 4.6
authorThiago Macieira <thiago.macieira@nokia.com>
Tue, 6 Oct 2009 08:51:08 +0000 (10:51 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Tue, 6 Oct 2009 08:51:08 +0000 (10:51 +0200)
commit2dc7fae7ea38a0169c4c5c78d0534d688347aacb
treea32a448270ccd835b1aa670f2cfbbb98eecf2738
parentf1ea73bad48816222e192a95f8589493743f0c28
parent7851cbd64d15d39a0e9cc99efa6c2d007c935ce9
Merge branch '4.5' into 4.6

Conflicts:
src/corelib/global/qglobal.h
src/plugins/qpluginbase.pri
src/qbase.pri
tests/auto/qabstractitemview/tst_qabstractitemview.cpp
tests/auto/qcssparser/qcssparser.pro
tools/assistant/tools/assistant/doc/assistant.qdocconf
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
tests/auto/qabstractitemview/tst_qabstractitemview.cpp
tests/auto/qcssparser/qcssparser.pro
tests/auto/qcssparser/tst_qcssparser.cpp