Public Git Hosting - qt-netbsd.git/commit

commit	fcfdccc03b6dd26a82e87a6b6a0ca48d67f78cf6
author	Simon Hausmann <simon.hausmann@nokia.com>
	Wed, 27 May 2009 21:04:41 +0000 (27 23:04 +0200)
committer	Simon Hausmann <simon.hausmann@nokia.com>
	Wed, 27 May 2009 21:04:41 +0000 (27 23:04 +0200)
tree	2cdd417bc0be39b12674f33052462d19d9e38ef9	tree \| snapshot (tar.gz zip)
parent	7b1f8c542bc9f41408f0a54b853d75d0c09a2775	commit \| diff
parent	d0bc0a26f8ac4c2f02819c262b8aa7c3dd1cad3b	commit \| diff

Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt

Conflicts:
tests/auto/qtreeview/tst_qtreeview.cpp

32 files changed:

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

RSS Atom

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