review.tizen.org Git - profile/ivi/qtbase.git/commit

Merge remote-tracking branch 'base/master' into refactor

Conflicts:
src/gui/embedded/qmousepc_qws.cpp
src/gui/embedded/qwslock.cpp
src/plugins/decorations/default/default.pro
src/plugins/decorations/styled/styled.pro
src/plugins/decorations/windows/windows.pro
src/plugins/gfxdrivers/ahi/ahi.pro
src/plugins/gfxdrivers/directfb/directfb.pro
src/plugins/gfxdrivers/eglnullws/eglnullws.pro
src/plugins/gfxdrivers/linuxfb/linuxfb.pro
src/plugins/gfxdrivers/qvfb/qvfb.pro
src/plugins/gfxdrivers/transformed/transformed.pro
src/plugins/gfxdrivers/vnc/vnc.pro
src/plugins/graphicssystems/meego/meego.pro
src/plugins/graphicssystems/opengl/opengl.pro
src/plugins/graphicssystems/openvg/openvg.pro
src/plugins/graphicssystems/shivavg/shivavg.pro
src/plugins/graphicssystems/trace/trace.pro
src/plugins/kbddrivers/linuxinput/linuxinput.pro
src/plugins/mousedrivers/linuxtp/linuxtp.pro
src/plugins/mousedrivers/pc/pc.pro
src/plugins/mousedrivers/tslib/tslib.pro
src/plugins/platforms/minimal/minimal.pro
tests/auto/qerrormessage/qerrormessage.pro

author	Jørgen Lind <jorgen.lind@nokia.com>
	Wed, 1 Jun 2011 13:34:58 +0000 (15:34 +0200)
committer	Jørgen Lind <jorgen.lind@nokia.com>
	Wed, 1 Jun 2011 13:34:58 +0000 (15:34 +0200)
commit	00ef07fe96f51cb309469454592daf5d4a92eb4b
tree	59f34f603882644ba25fb4bbc893fcb64ea6b262	tree \| snapshot
parent	f05236a40d7ee9299c5855d70e542143a2d342c8	commit \| diff
parent	7b6c3707dea3292b62cca02245a710f00db21427	commit \| diff

configure	diff1 \|	diff2 \|	blob \| history
examples/qtestlib/tutorial1/tutorial1.pro	diff1 \|	diff2 \|	blob \| history
examples/qtestlib/tutorial2/tutorial2.pro	diff1 \|	diff2 \|	blob \| history
examples/qtestlib/tutorial3/tutorial3.pro	diff1 \|	diff2 \|	blob \| history
examples/qtestlib/tutorial4/tutorial4.pro	diff1 \|	diff2 \|	blob \| history
examples/qtestlib/tutorial5/tutorial5.pro	diff1 \|	diff2 \|	blob \| history
src/corelib/global/qglobal.h	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontdatabase.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextengine.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextengine_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextlayout.cpp	diff1 \|	diff2 \|	blob \| history
src/opengl/qgl.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/accessible/widgets/widgets.pro	diff1 \|	diff2 \|	blob \| history
src/plugins/inputmethods/imsw-multi/imsw-multi.pro	diff1 \|	diff2 \|	blob \| history
src/plugins/platforms/cocoa/cocoa.pro	diff1 \|	diff2 \|	blob \| history
src/plugins/platforms/wayland/qwaylanddisplay.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/platforms/wayland/qwaylandwindow.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/platforms/wayland/wayland.pro	diff1 \|	diff2 \|	blob \| history
src/plugins/platforms/xcb/xcb.pro	diff1 \|	diff2 \|	blob \| history
src/testlib/qtestaccessible.h	diff1 \|	diff2 \|	blob \| history
src/widgets/platforms/mac/qcocoasharedwindowmethods_mac_p.h	diff1 \|	diff2 \|	blob \| history
src/widgets/platforms/mac/qfontengine_coretext.mm	diff1 \|	diff2 \|	blob \| history
src/widgets/platforms/mac/qpixmap_mac.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/platforms/mac/qwidget_mac.mm	diff1 \|	diff2 \|	blob \| history
src/widgets/platforms/x11/qfontdatabase_x11.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/platforms/x11/qfontengine_x11.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/to_be_moved/qlinecontrol.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/to_be_moved/qtextcontrol.cpp	diff1 \|	\|	blob \| history
tests/auto/qcompleter/qcompleter.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/qerrormessage/qerrormessage.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/qmessagebox/qmessagebox.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/qwidget/tst_qwidget.cpp	diff1 \|	diff2 \|	blob \| history