Merge remote branch 'gerrit/master' into refactor
authorSamuel Rødal <samuel.rodal@nokia.com>
Mon, 29 Aug 2011 10:11:53 +0000 (12:11 +0200)
committerSamuel Rødal <samuel.rodal@nokia.com>
Mon, 29 Aug 2011 10:11:53 +0000 (12:11 +0200)
commitd0c48efbae386dc88ea2313264e739715d9154b4
tree97a30a0c58c8ecb8a9a58ae892f53c6e9efe03d7
parente35a83b293e6b38f6060895262b5494d36515e6e
parentd7305c10948f501450b6b3358d261217d13c6d6e
Merge remote branch 'gerrit/master' into refactor

Conflicts:
src/gui/accessible/qaccessible.h
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication.h
src/gui/kernel/qapplication_mac.mm
src/gui/kernel/qapplication_qws.cpp
src/gui/kernel/qapplication_s60.cpp
src/gui/kernel/qapplication_win.cpp
src/gui/kernel/qapplication_x11.cpp
src/gui/kernel/qdnd_x11.cpp
src/gui/kernel/qwidget.cpp
src/gui/widgets/qlabel.cpp

Change-Id: Ief9c75724d2cff89ed45f009bdee2ffc5e4395ba
13 files changed:
src/gui/text/qfontengine_p.h
src/gui/text/qtextengine.cpp
src/gui/text/qtextlayout.cpp
src/testlib/testlib.pro
src/tools/uic/qclass_lib_map.h
src/widgets/accessible/qaccessible.h
src/widgets/accessible/qaccessible_unix.cpp
src/widgets/kernel/qapplication.cpp
src/widgets/kernel/qapplication.h
src/widgets/widgets/qlabel.cpp
tests/auto/qfiledialog/qfiledialog.pro
tests/auto/qlistwidget/qlistwidget.pro
tests/auto/qmenu/qmenu.pro