Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 7 Jan 2010 06:02:23 +0000 (07:02 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 7 Jan 2010 06:02:23 +0000 (07:02 +0100)
commitb63cfd1d90dfd8be70c49c409b4f6f1cca176735
tree1c9813d932cd57c3ec1f026e1bd3142285c82122
parent7a5bca82738e6b782047e50a813972eccd928307
parent859bc191b1096c02cebad011c75a4573289904e7
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  QIODevice: Fix readAll()
  Temporary hackiesh solution to prevent BOM in the xml data.
  Fixed qxmlstream autotest when using shadow builds.
  Attempt at readding the capital P headers for Phonon
  Remove special Phonon processing from syncqt.
  Use the lowercase/shortname.h headers for Phonon includes
  Fixes a crash when setting focus on a widget with a focus proxy.
  Update copyright year to 2010
  doc: Clarified activeSubControls and subControls.
  Remove warning "statement with no effect"
  doc: Clarified that .lnk files are System files on Windows.
58 files changed:
configure
src/gui/dialogs/qfiledialog.cpp
src/gui/dialogs/qfilesystemmodel.cpp
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicsview.cpp
src/gui/graphicsview/qgridlayoutengine.cpp
src/gui/image/qpixmap_x11.cpp
src/gui/kernel/qboxlayout.cpp
src/gui/painting/qdrawhelper.cpp
src/gui/painting/qpainter.cpp
src/gui/styles/qstylesheetstyle.cpp
src/gui/text/qtextodfwriter.cpp
src/gui/widgets/qmainwindow.h
src/opengl/gl2paintengineex/qglengineshadermanager.cpp
src/opengl/gl2paintengineex/qglengineshadermanager_p.h
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
src/opengl/qgl.cpp
src/opengl/qgl.h
src/opengl/qgl_egl.cpp
src/opengl/qgl_mac.mm
src/opengl/qgl_p.h
src/opengl/qgl_win.cpp
src/opengl/qgl_x11.cpp
src/opengl/qgl_x11egl.cpp
src/opengl/qglpixelbuffer.cpp
src/opengl/qglshaderprogram.cpp
src/opengl/qglshaderprogram.h
src/openvg/qpaintengine_vg.cpp
src/openvg/qpixmapdata_vg.cpp
src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
src/plugins/gfxdrivers/directfb/qdirectfbscreen.h
src/plugins/imageformats/tiff/qtiffhandler.cpp
src/script/bridge/qscriptobject.cpp
src/script/bridge/qscriptobject_p.h
src/script/bridge/qscriptqobject.cpp
src/script/bridge/qscriptqobject_p.h
src/sql/drivers/odbc/qsql_odbc.cpp
src/tools/uic/cpp/cppwriteinitialization.cpp
tests/auto/qboxlayout/tst_qboxlayout.cpp
tests/auto/qfiledialog/tst_qfiledialog.cpp
tests/auto/qfiledialog2/tst_qfiledialog2.cpp
tests/auto/qfontcombobox/tst_qfontcombobox.cpp
tests/auto/qgl/tst_qgl.cpp
tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
tests/auto/qpauseanimation/tst_qpauseanimation.cpp
tests/auto/qscriptable/tst_qscriptable.cpp
tests/auto/qsqlquery/tst_qsqlquery.cpp
tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp
tests/auto/uic3/baseline/config.ui
tests/auto/uic3/baseline/config.ui.4
tools/designer/src/components/formeditor/widgetselection.cpp
tools/linguist/lrelease/main.cpp
tools/shared/qtpropertybrowser/qteditorfactory.cpp
tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp
tools/shared/qtpropertybrowser/qtpropertybrowserutils_p.h
tools/shared/qtpropertybrowser/qtpropertymanager.cpp