Merge remote-tracking branch 'qt/4.8'
authorJyri Tahtela <jyri.tahtela@nokia.com>
Wed, 18 May 2011 07:41:09 +0000 (10:41 +0300)
committerJyri Tahtela <jyri.tahtela@nokia.com>
Wed, 18 May 2011 07:41:09 +0000 (10:41 +0300)
commit9cacde74f7de702689725882633073e60c0a2baa
tree330d22dadbd28b14a7d8896823d1c33597e9993e
parent006c8e22075112eff6230d8168d716e44a9e29d5
parent2c07b5d2cba8d8e499bd0861eefef12d4e00d99a
Merge remote-tracking branch 'qt/4.8'

Conflicts:
doc/src/examples/wheel.qdoc
src/gui/util/qflickgesture.cpp
src/gui/util/qflickgesture_p.h
src/gui/util/qscroller.cpp
src/gui/util/qscroller.h
src/gui/util/qscroller_p.h
src/gui/util/qscrollerproperties.cpp
src/gui/util/qscrollerproperties.h
tests/auto/qscroller/tst_qscroller.cpp
197 files changed:
configure
qmake/generators/makefile.cpp
src/corelib/global/qlibraryinfo.cpp
src/corelib/global/qnamespace.h
src/corelib/kernel/qcoreevent.cpp
src/corelib/kernel/qcoreevent.h
src/declarative/graphicsitems/qdeclarativegridview.cpp
src/declarative/graphicsitems/qdeclarativelistview.cpp
src/declarative/graphicsitems/qdeclarativemousearea.cpp
src/declarative/graphicsitems/qdeclarativemousearea_p.h
src/declarative/graphicsitems/qdeclarativepathview.cpp
src/declarative/qml/qdeclarativeproperty.cpp
src/declarative/qml/qmetaobjectbuilder.cpp
src/gui/image/qimage.cpp
src/gui/image/qpixmap.cpp
src/gui/image/qpixmap_mac.cpp
src/gui/inputmethod/qcoefepinputcontext_s60.cpp
src/gui/itemviews/qabstractitemview.cpp
src/gui/itemviews/qabstractitemview.h
src/gui/itemviews/qabstractitemview_p.h
src/gui/kernel/qapplication_s60.cpp
src/gui/kernel/qapplication_x11.cpp
src/gui/kernel/qevent.cpp
src/gui/kernel/qevent.h
src/gui/kernel/qevent_p.h
src/gui/kernel/qsoftkeymanager_s60.cpp
src/gui/kernel/qt_s60_p.h
src/gui/kernel/qt_x11_p.h
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget_mac.mm
src/gui/kernel/qwidget_p.h
src/gui/kernel/qwidget_s60.cpp
src/gui/painting/qcolor.cpp
src/gui/painting/qgraphicssystem.cpp
src/gui/painting/qgraphicssystem_p.h
src/gui/painting/qgraphicssystemex_p.h
src/gui/painting/qgraphicssystemex_symbian_p.h
src/gui/painting/qgraphicssystemfactory.cpp
src/gui/painting/qpaintbuffer.cpp
src/gui/painting/qpainter.cpp
src/gui/painting/qpainter.h
src/gui/painting/qunifiedtoolbarsurface_mac_p.h
src/gui/text/qfont_mac.cpp
src/gui/text/qfontengine_coretext.mm
src/gui/text/qfontengine_coretext_p.h
src/gui/text/qfontengine_ft.cpp
src/gui/text/qglyphrun.cpp
src/gui/text/qglyphrun.h
src/gui/text/qglyphrun_p.h
src/gui/text/qrawfont.cpp
src/gui/text/qrawfont.h
src/gui/text/qtextcontrol.cpp
src/gui/text/qtextcursor.cpp
src/gui/text/qtextcursor.h
src/gui/text/qtextdocument.cpp
src/gui/text/qtextdocument.h
src/gui/text/qtextdocument_p.cpp
src/gui/text/qtextdocument_p.h
src/gui/text/qtextengine_p.h
src/gui/text/qtextlayout.cpp
src/gui/text/qtextlayout.h
src/gui/text/qtextobject.cpp
src/gui/text/qtextobject.h
src/gui/widgets/qabstractscrollarea.cpp
src/gui/widgets/qabstractscrollarea_p.h
src/gui/widgets/qlinecontrol.cpp
src/gui/widgets/qlinecontrol_p.h
src/gui/widgets/qlineedit.cpp
src/gui/widgets/qlineedit.h
src/gui/widgets/qmainwindow.cpp
src/gui/widgets/qmainwindowlayout.cpp
src/gui/widgets/qmainwindowlayout_p.h
src/gui/widgets/qmenu.cpp
src/network/access/qnetworkreplyimpl.cpp
src/network/bearer/qnetworkconfigmanager_p.cpp
src/network/bearer/qnetworkconfigmanager_p.h
src/network/kernel/qnetworkinterface_unix.cpp
src/network/socket/qabstractsocket.cpp
src/opengl/qgl_symbian.cpp
src/opengl/qglfunctions.cpp
src/opengl/qgraphicssystem_gl.cpp
src/opengl/qgraphicssystem_gl_p.h
src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp
src/plugins/graphicssystems/openvg/qgraphicssystem_vg_p.h
tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp
tests/auto/gestures/tst_gestures.cpp
tests/auto/modeltest/dynamictreemodel.cpp
tests/auto/modeltest/modeltest.cpp
tests/auto/modeltest/tst_modeltest.cpp
tests/auto/q3listview/tst_q3listview.cpp
tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
tests/auto/qabstractfileengine/tst_qabstractfileengine.cpp
tests/auto/qabstractxmlnodemodel/LoadingModel.cpp
tests/auto/qaccessibility/tst_qaccessibility.cpp
tests/auto/qalgorithms/tst_qalgorithms.cpp
tests/auto/qatomicint/tst_qatomicint.cpp
tests/auto/qatomicpointer/tst_qatomicpointer.cpp
tests/auto/qbuffer/tst_qbuffer.cpp
tests/auto/qchar/tst_qchar.cpp
tests/auto/qcolor/tst_qcolor.cpp
tests/auto/qcompleter/tst_qcompleter.cpp
tests/auto/qcomplextext/tst_qcomplextext.cpp
tests/auto/qcopchannel/testSend/main.cpp
tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp
tests/auto/qdbusthreading/tst_qdbusthreading.cpp
tests/auto/qdirmodel/tst_qdirmodel.cpp
tests/auto/qdom/tst_qdom.cpp
tests/auto/qfile/largefile/tst_largefile.cpp
tests/auto/qfiledialog2/tst_qfiledialog2.cpp
tests/auto/qglyphrun/tst_qglyphrun.cpp
tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
tests/auto/qheaderview/tst_qheaderview.cpp
tests/auto/qimage/tst_qimage.cpp
tests/auto/qinputdialog/tst_qinputdialog.cpp
tests/auto/qitemmodel/modelstotest.cpp
tests/auto/qitemmodel/tst_qitemmodel.cpp
tests/auto/qitemview/tst_qitemview.cpp
tests/auto/qitemview/viewstotest.cpp
tests/auto/qlibrary/tst_qlibrary.cpp
tests/auto/qlineedit/tst_qlineedit.cpp
tests/auto/qlocale/tst_qlocale.cpp
tests/auto/qmake/tst_qmake.cpp
tests/auto/qmenu/tst_qmenu.cpp
tests/auto/qmessagebox/tst_qmessagebox.cpp
tests/auto/qmetaobject/tst_qmetaobject.cpp
tests/auto/qmetatype/tst_qmetatype.cpp
tests/auto/qmutex/tst_qmutex.cpp
tests/auto/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp
tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/qobject/signalbug.cpp
tests/auto/qobject/tst_qobject.cpp
tests/auto/qpixmap/tst_qpixmap.cpp
tests/auto/qprocess/tst_qprocess.cpp
tests/auto/qrawfont/tst_qrawfont.cpp
tests/auto/qreadwritelock/tst_qreadwritelock.cpp
tests/auto/qscriptable/tst_qscriptable.cpp
tests/auto/qscriptclass/tst_qscriptclass.cpp
tests/auto/qscriptengine/tst_qscriptengine.cpp
tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp
tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
tests/auto/qscriptvaluegenerated/testgen/testgenerator.cpp
tests/auto/qscriptvaluegenerated/testgen/testgenerator.h
tests/auto/qscriptvalueiterator/tst_qscriptvalueiterator.cpp
tests/auto/qsharedpointer/externaltests.cpp
tests/auto/qsharedpointer/tst_qsharedpointer.cpp
tests/auto/qsplitter/tst_qsplitter.cpp
tests/auto/qsqldatabase/tst_qsqldatabase.cpp
tests/auto/qsslsocket/tst_qsslsocket.cpp
tests/auto/qstring/tst_qstring.cpp
tests/auto/qtableview/tst_qtableview.cpp
tests/auto/qtcpsocket/tst_qtcpsocket.cpp
tests/auto/qtessellator/dataparser.cpp
tests/auto/qtessellator/oldtessellator.cpp
tests/auto/qtessellator/testtessellator.cpp
tests/auto/qtextblock/tst_qtextblock.cpp
tests/auto/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
tests/auto/qtextcodec/tst_qtextcodec.cpp
tests/auto/qtextdocument/tst_qtextdocument.cpp
tests/auto/qtextedit/tst_qtextedit.cpp
tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp
tests/auto/qthread/tst_qthread.cpp
tests/auto/qtipc/qsharedmemory/src/qsystemlock_unix.cpp
tests/auto/qtipc/qsharedmemory/src/qsystemlock_win.cpp
tests/auto/qtreeview/tst_qtreeview.cpp
tests/auto/qvariant/tst_qvariant.cpp
tests/auto/qwidget/tst_qwidget.cpp
tests/auto/qwizard/tst_qwizard.cpp
tests/auto/qxmlinputsource/tst_qxmlinputsource.cpp
tests/auto/qxmlquery/MessageValidator.cpp
tests/auto/qxmlquery/NetworkOverrider.h
tests/auto/qxmlquery/PushBaseliner.h
tests/auto/qxmlquery/tst_qxmlquery.cpp
tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp
tests/auto/qxmlstream/qc14n.h
tests/auto/qxmlstream/tst_qxmlstream.cpp
tests/auto/selftests/alive/qtestalive.cpp
tests/auto/xmlpatterns/tst_xmlpatterns.cpp
tests/auto/xmlpatternsxqts/tst_suitetest.cpp
tools/qml/texteditautoresizer_maemo5.h