Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
authorSimon Hausmann <simon.hausmann@nokia.com>
Wed, 27 May 2009 21:04:41 +0000 (23:04 +0200)
committerSimon Hausmann <simon.hausmann@nokia.com>
Wed, 27 May 2009 21:04:41 +0000 (23:04 +0200)
commitfcfdccc03b6dd26a82e87a6b6a0ca48d67f78cf6
tree2cdd417bc0be39b12674f33052462d19d9e38ef9
parent7b1f8c542bc9f41408f0a54b853d75d0c09a2775
parentd0bc0a26f8ac4c2f02819c262b8aa7c3dd1cad3b
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt

Conflicts:
tests/auto/qtreeview/tst_qtreeview.cpp
32 files changed:
configure
doc/src/designer-manual.qdoc
doc/src/qset.qdoc
src/corelib/global/qglobal.cpp
src/gui/dialogs/qfiledialog.cpp
src/gui/dialogs/qfontdialog.cpp
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/image/qpixmap.cpp
src/gui/image/qpixmap_win.cpp
src/gui/image/qpixmap_x11.cpp
src/gui/itemviews/qheaderview.cpp
src/gui/itemviews/qsortfilterproxymodel.cpp
src/gui/itemviews/qtreeview.cpp
src/gui/kernel/qapplication_win.cpp
src/gui/kernel/qcocoaview_mac.mm
src/gui/kernel/qcocoaview_mac_p.h
src/gui/kernel/qkeysequence.cpp
src/gui/painting/qcolor.cpp
src/gui/painting/qpainterpath.cpp
src/gui/styles/qstylesheetstyle.cpp
src/gui/text/qfontengine_win.cpp
src/gui/widgets/qtabbar.cpp
src/network/access/qnetworkreplyimpl.cpp
src/network/ssl/qsslsocket_openssl.cpp
src/opengl/qgl.cpp
src/opengl/qgl_x11.cpp
src/svg/qsvggenerator.cpp
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
tests/auto/qtreeview/tst_qtreeview.cpp
tools/qdoc3/test/classic.css
translations/translations.pri