Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 17 May 2011 00:40:07 +0000 (10:40 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 17 May 2011 00:40:07 +0000 (10:40 +1000)
commit5e38a334b1ef46a932c8aff65a7d448b5c7df853
treeefd294d5c727f432c5d0ffd3e3cbadc7d90f398e
parentfd5acfc663383c38e4d0993a4163023d46137e32
parent22aaef6c81897f96e9954b5aaae1816d143b456f
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Updating file with CRLF line endings for the updated header
  Fix a regression in QList::mid()
  update gitignore
  remove -fno-stack-protector
  Fix make confclean
  Update licenseheader text in source files
71 files changed:
doc/src/declarative/qmlviews.qdoc
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/inputmethod/qcoefepinputcontext_s60.cpp
src/gui/kernel/qapplication_s60.cpp
src/gui/kernel/qsoftkeymanager_s60.cpp
src/gui/kernel/qt_s60_p.h
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget_p.h
src/gui/kernel/qwidget_s60.cpp
src/gui/painting/qgraphicssystem.cpp
src/gui/painting/qgraphicssystem_p.h
src/gui/painting/qpainterpath.cpp
src/gui/text/qfontengine_ft.cpp
src/gui/text/qtextcontrol.cpp
src/gui/text/qtextobject.cpp
src/gui/text/qtextobject.h
src/gui/widgets/qlinecontrol.cpp
src/gui/widgets/qmainwindow.cpp
src/gui/widgets/qmainwindowlayout.cpp
src/gui/widgets/qmainwindowlayout_p.h
src/gui/widgets/qmenu.cpp
src/network/access/qhttpnetworkconnectionchannel.cpp
src/network/bearer/qnetworkconfigmanager_p.cpp
src/network/socket/qabstractsocket.cpp
src/network/socket/qhttpsocketengine.cpp
src/network/ssl/qsslsocket.cpp
src/opengl/qgl_symbian.cpp
src/opengl/qgraphicssystem_gl.cpp
src/opengl/qgraphicssystem_gl_p.h
src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp
src/plugins/graphicssystems/openvg/qgraphicssystem_vg_p.h
src/xmlpatterns/expr/qevaluationcache.cpp
src/xmlpatterns/expr/qevaluationcache_p.h
src/xmlpatterns/expr/qexpressionvariablereference.cpp
src/xmlpatterns/expr/qexpressionvariablereference_p.h
src/xmlpatterns/expr/qtemplateparameterreference.cpp
src/xmlpatterns/expr/qtemplateparameterreference_p.h
src/xmlpatterns/expr/quserfunctioncallsite.cpp
src/xmlpatterns/parser/qquerytransformparser.cpp
tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.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/qimage/tst_qimage.cpp
tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
tests/auto/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp
tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/qnetworksession/test/tst_qnetworksession.cpp
tests/auto/qpainterpath/tst_qpainterpath.cpp
tests/auto/qpixmap/tst_qpixmap.cpp
tests/auto/qtextblock/tst_qtextblock.cpp
tests/auto/qwidget/tst_qwidget.cpp
tools/qdoc3/atom.cpp
tools/qdoc3/atom.h
tools/qdoc3/config.cpp
tools/qdoc3/ditaxmlgenerator.cpp
tools/qdoc3/ditaxmlgenerator.h
tools/qdoc3/doc.cpp
tools/qdoc3/doc.h
tools/qdoc3/htmlgenerator.cpp