Merge remote-tracking branch 'base/master' into refactor
authorJørgen Lind <jorgen.lind@nokia.com>
Mon, 27 Jun 2011 10:27:54 +0000 (12:27 +0200)
committerJørgen Lind <jorgen.lind@nokia.com>
Mon, 27 Jun 2011 10:27:54 +0000 (12:27 +0200)
commit18a3f6169bb8a763366003d92b8013950578c79f
treee39fa00a9511410fea9be35a6130007e43719ad8
parent371d398f70e10408e0eaba7b5f05e638a0048599
parenta06c8405d053b16327d65415f3335eceb37abd3b
Merge remote-tracking branch 'base/master' into refactor

Conflicts:
demos/demos.pro
demos/embedded/digiflip/digiflip.pro
examples/examples.pro
examples/graphicsview/embeddeddialogs/embeddeddialogs.pro
src/gui/kernel/qplatformglcontext_qpa.cpp
src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp
src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp
src/plugins/platforms/wayland/qwaylanddisplay.cpp
src/plugins/platforms/wayland/qwaylandwindow.cpp

Change-Id: I2a4ec9e2ca9c9aa9d57b55f98985e810b77bb745
102 files changed:
configure
examples/animation/animation.pro
examples/animation/sub-attaq/boat_p.h
examples/animation/sub-attaq/graphicsscene.cpp
examples/animation/sub-attaq/graphicsscene.h
examples/animation/sub-attaq/main.cpp
examples/animation/sub-attaq/mainwindow.h
examples/animation/sub-attaq/pixmapitem.h
examples/animation/sub-attaq/progressitem.h
examples/animation/sub-attaq/states.cpp
examples/animation/sub-attaq/states.h
examples/animation/sub-attaq/sub-attaq.pro
examples/animation/sub-attaq/submarine.h
examples/animation/sub-attaq/submarine_p.h
examples/animation/sub-attaq/textinformationitem.h
examples/embedded/digiflip/digiflip.cpp
examples/embedded/embedded.pro
examples/embedded/flickable/flickable.cpp
examples/embedded/flickable/flickable.pro
examples/embedded/flickable/main.cpp
examples/embedded/flightinfo/flightinfo.cpp
examples/embedded/flightinfo/flightinfo.pro
examples/embedded/lightmaps/lightmaps.cpp
examples/embedded/lightmaps/lightmaps.pro
examples/embedded/lightmaps/mapzoom.cpp
examples/embedded/lightmaps/slippymap.cpp
examples/embedded/raycasting/raycasting.cpp
examples/embedded/raycasting/raycasting.pro
examples/embedded/styledemo/styledemo.pro
examples/examples.pro
examples/graphicsview/boxes/boxes.pro
examples/graphicsview/boxes/glbuffers.h
examples/graphicsview/boxes/gltrianglemesh.h
examples/graphicsview/boxes/main.cpp
examples/graphicsview/boxes/qtbox.h
examples/graphicsview/boxes/roundedbox.h
examples/graphicsview/boxes/scene.h
examples/graphicsview/boxes/trackball.h
examples/graphicsview/chip/chip.cpp
examples/graphicsview/chip/chip.h
examples/graphicsview/chip/chip.pro
examples/graphicsview/chip/mainwindow.cpp
examples/graphicsview/chip/mainwindow.h
examples/graphicsview/chip/view.cpp
examples/graphicsview/embeddeddialogs/customproxy.cpp
examples/graphicsview/embeddeddialogs/customproxy.h
examples/graphicsview/embeddeddialogs/embeddeddialog.cpp
examples/graphicsview/embeddeddialogs/embeddeddialog.h
examples/graphicsview/embeddeddialogs/embeddeddialogs.pro
examples/graphicsview/embeddeddialogs/main.cpp
examples/graphicsview/graphicsview.pro
examples/itemviews/interview/interview.pro
examples/itemviews/spreadsheet/main.cpp
examples/itemviews/spreadsheet/spreadsheet.cpp
examples/itemviews/spreadsheet/spreadsheet.pro
examples/itemviews/spreadsheet/spreadsheetdelegate.cpp
examples/itemviews/spreadsheet/spreadsheetitem.h
examples/mainwindows/macmainwindow/macmainwindow.h
examples/mainwindows/macmainwindow/macmainwindow.pro
examples/mainwindows/macmainwindow/main.cpp
examples/mainwindows/mainwindow/mainwindow.pro
examples/painting/affine/affine.pro
examples/painting/composition/composition.pro
examples/painting/deform/deform.pro
examples/painting/gradients/gradients.h
examples/painting/gradients/gradients.pro
examples/painting/pathstroke/pathstroke.h
examples/painting/pathstroke/pathstroke.pro
examples/painting/shared/hoverpoints.h
examples/painting/shared/shared.pro
examples/richtext/textedit/textedit.pro
examples/sql/books/bookdelegate.cpp
examples/sql/books/books.pro
examples/sql/books/bookwindow.h
examples/sql/books/main.cpp
examples/sql/sql.pro
examples/sql/sqlbrowser/browser.cpp
examples/sql/sqlbrowser/connectionwidget.cpp
examples/sql/sqlbrowser/main.cpp
examples/sql/sqlbrowser/sqlbrowser.pro
examples/tools/undo/undo.pro
src/corelib/io/qprocess.cpp
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfont.cpp
src/gui/text/qfontdatabase.cpp
src/gui/text/qtextdocument.cpp
src/gui/text/qtextlayout.cpp
src/plugins/platforms/wayland/qwaylandclipboard.cpp
src/plugins/platforms/wayland/qwaylanddisplay.cpp
src/plugins/platforms/wayland/qwaylandintegration.cpp
src/plugins/platforms/wayland/qwaylandintegration.h
src/widgets/platforms/mac/qfontengine_coretext_p.h
src/widgets/platforms/mac/qwidget_mac.mm
src/widgets/platforms/x11/qfontdatabase_x11.cpp
src/widgets/platforms/x11/qfontengine_x11.cpp
src/widgets/styles/qcommonstyle.cpp
src/widgets/util/qscroller_mac.mm
tests/auto/qfontdialog/qfontdialog.pro
tests/auto/qlayout/tst_qlayout.cpp
tests/auto/qmacstyle/tst_qmacstyle.cpp
tests/auto/qwidget/qwidget.pro
tools/configure/configureapp.cpp