Merge remote branch 'gerrit/master' into refactor
authorSamuel Rødal <samuel.rodal@nokia.com>
Tue, 12 Jul 2011 10:52:22 +0000 (12:52 +0200)
committerSamuel Rødal <samuel.rodal@nokia.com>
Tue, 12 Jul 2011 10:52:22 +0000 (12:52 +0200)
commit2371147354d4436bb54c588662ac315dd4c2f940
tree5c90b1dd18de394cff2fb4e1bedc628da3c7d341
parent54ec6d177e0e8fb04cd01e70461484a80ca1f7a4
parent82454b6014a7ee0b048b4db8d64a21de849d4ab9
Merge remote branch 'gerrit/master' into refactor

Conflicts:
src/gui/image/qicon.cpp
src/gui/image/qicon.h
src/gui/image/qicon_p.h
src/gui/text/qfontdatabase.cpp
src/plugins/platforms/wayland/gl_integration/qwaylandglwindowsurface.cpp
src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp
src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp
sync.profile

Change-Id: Ie0a23a12177ff51bf562e15b2dd41f071afb19b4
21 files changed:
examples/embedded/embedded.pro
examples/embedded/styleexample/styleexample.pro
examples/graphicsview/chip/mainwindow.cpp
examples/graphicsview/embeddeddialogs/main.cpp
qmake/qmake.pri
src/corelib/global/qglobal.h
src/corelib/kernel/qcoreapplication.cpp
src/corelib/kernel/qobject.cpp
src/gui/painting/qpainter.cpp
src/gui/text/qfontdatabase.cpp
src/gui/text/qfontdatabase_qpa.cpp
src/gui/text/qtextdocument.cpp
src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp
src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.h
src/widgets/platforms/mac/qfontdatabase_mac.cpp
src/widgets/platforms/mac/qfontengine_coretext.mm
src/widgets/platforms/mac/qfontengine_coretext_p.h
src/widgets/platforms/s60/qfontdatabase_s60.cpp
src/widgets/platforms/win/qfontdatabase_win.cpp
src/widgets/platforms/x11/qfontdatabase_x11.cpp
sync.profile