Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
authorOlivier Goffart <olivier.goffart@nokia.com>
Thu, 7 Apr 2011 13:13:08 +0000 (15:13 +0200)
committerOlivier Goffart <olivier.goffart@nokia.com>
Thu, 7 Apr 2011 13:14:27 +0000 (15:14 +0200)
commit7c8980ee041e874a6c430f01b2daff4955517b03
treeaa19249a7fb469176fb22adfa9a1b702ae3be6c0
parent8031eada2f81963865390b4d899631b09d4ca6f3
parenta05f73499a187c67a394893e2cc74516ccbc46f5
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
src/gui/text/qfontengine_mac.mm
tests/auto/qdiriterator/tst_qdiriterator.cpp
41 files changed:
configure
demos/browser/networkaccessmanager.cpp
demos/demos.pro
doc/src/getting-started/examples.qdoc
mkspecs/common/symbian/symbian.conf
qmake/Makefile.win32-g++
qmake/Makefile.win32-g++-sh
qmake/qmake.pri
src/corelib/global/qnamespace.h
src/corelib/global/qnamespace.qdoc
src/corelib/io/qdiriterator.cpp
src/declarative/debugger/qdeclarativedebugserver.cpp
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/declarative/graphicsitems/qdeclarativegridview.cpp
src/declarative/graphicsitems/qdeclarativelistview.cpp
src/declarative/util/qdeclarativexmllistmodel.cpp
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/image/qimagereader.cpp
src/gui/itemviews/qstyleditemdelegate.cpp
src/gui/kernel/qapplication_s60.cpp
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget_mac.mm
src/gui/kernel/qwidget_s60.cpp
src/gui/painting/qbrush.cpp
src/gui/s60framework/qs60mainappui.cpp
src/gui/widgets/qcombobox.cpp
src/network/bearer/qnetworkconfigmanager.cpp
src/network/bearer/qnetworksession.cpp
src/opengl/qpixmapdata_poolgl.cpp
tests/auto/qdiriterator/tst_qdiriterator.cpp
tools/configure/configureapp.cpp
tools/qdoc3/jscodemarker.cpp
tools/qdoc3/qmlcodemarker.cpp
tools/qdoc3/qmlcodeparser.cpp
tools/qdoc3/qmlmarkupvisitor.cpp
tools/qdoc3/qmlmarkupvisitor.h
tools/qdoc3/qmlvisitor.cpp
tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf
tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
tools/qdoc3/test/qt-project.qdocconf