gitorious.org Git - qt:qt.git/commit

author	Liang Qi <liang.qi@nokia.com>
	Fri, 7 Oct 2011 12:21:59 +0000 (14:21 +0200)
committer	Liang Qi <liang.qi@nokia.com>
	Fri, 7 Oct 2011 12:21:59 +0000 (14:21 +0200)
commit	7cf9030bd7a50b6d98d454510417c6ecc3f33d49
tree	7c5c562ba490e217d8cef81ff1fd5958a0cacccb	tree \| snapshot
parent	7f3cd2949ccb16b1b611c05bf6ab7274cf04a0f8	commit \| diff
parent	96fcfc720aa1c6d0b6d741f8169cd37ea9fcd9a9	commit \| diff

Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
doc/src/getting-started/installation.qdoc
doc/src/platforms/platform-notes.qdoc
src/corelib/tools/qlocale_symbian.cpp
src/gui/kernel/qwidget_p.h
src/network/access/qnetworkaccesshttpbackend.cpp
src/opengl/qgl.cpp
src/plugins/bearer/symbian/qnetworksession_impl.cpp

12 files changed:

6b46b7419a5aee9bd5fce67b7bfa8afe8e

RSS Atom

src/declarative/qml/qdeclarativeimport.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/egl/qegl.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qwidget.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qwidget_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qwidget_s60.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qlinecontrol.cpp	diff1 \|	diff2 \|	blob \| history
src/network/access/qhttpnetworkreply.cpp	diff1 \|	diff2 \|	blob \| history
src/network/access/qnetworkreplyimpl.cpp	diff1 \|	diff2 \|	blob \| history
src/network/access/qnetworkreplyimpl_p.h	diff1 \|	diff2 \|	blob \| history
src/opengl/qgl.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qnetworkreply/tst_qnetworkreply.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qwidget/tst_qwidget.cpp	diff1 \|	diff2 \|	blob \| history