Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
authorThiago Macieira <thiago.macieira@nokia.com>
Fri, 11 Mar 2011 10:21:11 +0000 (11:21 +0100)
committerThiago Macieira <thiago.macieira@nokia.com>
Fri, 11 Mar 2011 10:21:11 +0000 (11:21 +0100)
commit649e65519bef38948a818f282e3022d034dc80a5
tree9f4b1de9322e304efd003a1f8c03047327732557
parentbb7b62f3cb7aca178a9e5e65263d0a4a8d40829c
parentfcdf5a5471b7cf1d2bc72855ed1f627c8d6f4fc4
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
mkspecs/common/symbian/symbian.conf
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
22 files changed:
mkspecs/common/symbian/symbian.conf
src/corelib/global/qglobal.h
src/corelib/thread/qthread_unix.cpp
src/declarative/graphicsitems/qdeclarativetext.cpp
src/declarative/qml/qdeclarativescriptparser.cpp
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicsscene_p.h
src/gui/image/image.pri
src/gui/image/qpixmapdata_p.h
src/gui/kernel/qapplication_p.h
src/gui/kernel/qapplication_s60.cpp
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget_p.h
src/gui/kernel/qwidget_s60.cpp
src/gui/painting/qbackingstore.cpp
src/gui/text/qtextobject.cpp
tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
tests/auto/other.pro
tests/auto/qpixmap/qpixmap.pro
tests/auto/qpixmap/tst_qpixmap.cpp
tools/assistant/tools/assistant/doc/assistant.qdocconf