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

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

Conflicts:
examples/animation/animatedtiles/animatedtiles.pro
examples/animation/appchooser/appchooser.pro
examples/animation/moveblocks/moveblocks.pro
examples/animation/states/states.pro
examples/animation/stickman/stickman.pro
examples/dialogs/configdialog/configdialog.pro
examples/dialogs/sipdialog/sipdialog.pro
examples/dialogs/standarddialogs/standarddialogs.pro
examples/dialogs/tabdialog/tabdialog.pro
examples/draganddrop/draggableicons/draggableicons.pro
examples/draganddrop/draggabletext/draggabletext.pro
examples/draganddrop/fridgemagnets/fridgemagnets.pro
examples/draganddrop/puzzle/puzzle.pro
examples/gestures/imagegestures/imagegestures.pro
examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro
examples/graphicsview/collidingmice/collidingmice.pro
examples/graphicsview/elasticnodes/elasticnodes.pro
examples/graphicsview/weatheranchorlayout/weatheranchorlayout.pro
examples/itemviews/addressbook/addressbook.pro
examples/itemviews/chart/chart.pro
examples/itemviews/fetchmore/fetchmore.pro
examples/itemviews/puzzle/puzzle.pro
examples/mainwindows/menus/menus.pro
examples/painting/basicdrawing/basicdrawing.pro
examples/painting/concentriccircles/concentriccircles.pro
examples/painting/imagecomposition/imagecomposition.pro
examples/painting/painterpaths/painterpaths.pro
examples/painting/transformations/transformations.pro
examples/qtconcurrent/imagescaling/imagescaling.pro
examples/qtestlib/tutorial1/tutorial1.pro
examples/qtestlib/tutorial2/tutorial2.pro
examples/qtestlib/tutorial3/tutorial3.pro
examples/qtestlib/tutorial4/tutorial4.pro
examples/qtestlib/tutorial5/tutorial5.pro
examples/qws/dbscreen/dbscreen.pro
examples/qws/svgalib/svgalib.pro
examples/richtext/syntaxhighlighter/syntaxhighlighter.pro
examples/statemachine/rogue/rogue.pro
examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro
examples/tools/styleplugin/plugin/plugin.pro
examples/uitools/multipleinheritance/multipleinheritance.pro
examples/widgets/analogclock/analogclock.pro
examples/widgets/calculator/calculator.pro
examples/widgets/calendarwidget/calendarwidget.pro
examples/widgets/codeeditor/codeeditor.pro
examples/widgets/icons/icons.pro
examples/widgets/imageviewer/imageviewer.pro
examples/widgets/lineedits/lineedits.pro
examples/widgets/movie/movie.pro
examples/widgets/shapedclock/shapedclock.pro
examples/widgets/softkeys/softkeys.pro
examples/widgets/tetrix/tetrix.pro
src/gui/painting/qpaintengine_raster.cpp
src/gui/painting/qpaintengine_raster_p.h
src/openvg/openvg.pro
src/openvg/qpaintengine_vg_p.h
src/plugins/graphicssystems/meego/meego.pro
src/plugins/platforms/fontdatabases/basicunix/basicunix.pri

author	Jørgen Lind <jorgen.lind@nokia.com>
	Fri, 10 Jun 2011 08:50:10 +0000 (10:50 +0200)
committer	Jørgen Lind <jorgen.lind@nokia.com>
	Fri, 10 Jun 2011 11:09:57 +0000 (13:09 +0200)
commit	c70efdec0fa329091d98da215af446f03ef65ab2
tree	f201cebfb17c45f1f0d51aee60c513df5f13c644	tree \| snapshot
parent	f30b8b96b8540ba7d78e9ca7f6db152b40e9b2af	commit \| diff
parent	db37aa1004f1e2489b94f1d9cc21630b62e03552	commit \| diff

examples/animation/animatedtiles/animatedtiles.pro	diff1 \|	diff2 \|	blob \| history
examples/animation/appchooser/appchooser.pro	diff1 \|	diff2 \|	blob \| history
examples/animation/moveblocks/moveblocks.pro	diff1 \|	diff2 \|	blob \| history
examples/animation/states/states.pro	diff1 \|	diff2 \|	blob \| history
examples/animation/stickman/stickman.pro	diff1 \|	diff2 \|	blob \| history
examples/dialogs/configdialog/configdialog.pro	diff1 \|	diff2 \|	blob \| history
examples/dialogs/sipdialog/sipdialog.pro	diff1 \|	diff2 \|	blob \| history
examples/dialogs/standarddialogs/standarddialogs.pro	diff1 \|	diff2 \|	blob \| history
examples/dialogs/tabdialog/tabdialog.pro	diff1 \|	diff2 \|	blob \| history
examples/draganddrop/draggableicons/draggableicons.pro	diff1 \|	diff2 \|	blob \| history
examples/draganddrop/draggabletext/draggabletext.pro	diff1 \|	diff2 \|	blob \| history
examples/draganddrop/fridgemagnets/fridgemagnets.pro	diff1 \|	diff2 \|	blob \| history
examples/draganddrop/puzzle/puzzle.pro	diff1 \|	diff2 \|	blob \| history
examples/effects/blurpicker/blurpicker.pro	diff1 \|	diff2 \|	blob \| history
examples/effects/fademessage/fademessage.pro	diff1 \|	diff2 \|	blob \| history
examples/effects/lighting/lighting.pro	diff1 \|	diff2 \|	blob \| history
examples/gestures/imagegestures/imagegestures.pro	diff1 \|	diff2 \|	blob \| history
examples/graphicsview/anchorlayout/anchorlayout.pro	diff1 \|	diff2 \|	blob \| history
examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro	diff1 \|	diff2 \|	blob \| history
examples/graphicsview/collidingmice/collidingmice.pro	diff1 \|	diff2 \|	blob \| history
examples/graphicsview/elasticnodes/elasticnodes.pro	diff1 \|	diff2 \|	blob \| history
examples/graphicsview/flowlayout/flowlayout.pro	diff1 \|	diff2 \|	blob \| history
examples/graphicsview/padnavigator/padnavigator.pro	diff1 \|	diff2 \|	blob \| history
examples/graphicsview/simpleanchorlayout/simpleanchorlayout.pro	diff1 \|	diff2 \|	blob \| history
examples/graphicsview/weatheranchorlayout/weatheranchorlayout.pro	diff1 \|	diff2 \|	blob \| history
examples/ipc/localfortuneclient/localfortuneclient.pro	diff1 \|	diff2 \|	blob \| history
examples/itemviews/addressbook/addressbook.pro	diff1 \|	diff2 \|	blob \| history
examples/itemviews/chart/chart.pro	diff1 \|	diff2 \|	blob \| history
examples/itemviews/combowidgetmapper/combowidgetmapper.pro	diff1 \|	diff2 \|	blob \| history
examples/itemviews/fetchmore/fetchmore.pro	diff1 \|	diff2 \|	blob \| history
examples/itemviews/frozencolumn/frozencolumn.pro	diff1 \|	diff2 \|	blob \| history
examples/itemviews/puzzle/puzzle.pro	diff1 \|	diff2 \|	blob \| history
examples/mainwindows/menus/menus.pro	diff1 \|	diff2 \|	blob \| history
examples/network/bearermonitor/bearermonitor.pro	diff1 \|	diff2 \|	blob \| history
examples/network/fortuneclient/fortuneclient.pro	diff1 \|	diff2 \|	blob \| history
examples/network/fortuneserver/fortuneserver.pro	diff1 \|	diff2 \|	blob \| history
examples/network/googlesuggest/googlesuggest.pro	diff1 \|	diff2 \|	blob \| history
examples/network/network-chat/network-chat.pro	diff1 \|	diff2 \|	blob \| history
examples/network/qftp/qftp.pro	diff1 \|	diff2 \|	blob \| history
examples/opengl/cube/cube.pro	diff1 \|	diff2 \|	blob \| history
examples/opengl/hellogl_es/hellogl_es.pro	diff1 \|	diff2 \|	blob \| history
examples/opengl/hellogl_es2/hellogl_es2.pro	diff1 \|	diff2 \|	blob \| history
examples/painting/basicdrawing/basicdrawing.pro	diff1 \|	diff2 \|	blob \| history
examples/painting/concentriccircles/concentriccircles.pro	diff1 \|	diff2 \|	blob \| history
examples/painting/imagecomposition/imagecomposition.pro	diff1 \|	diff2 \|	blob \| history
examples/painting/painterpaths/painterpaths.pro	diff1 \|	diff2 \|	blob \| history
examples/painting/transformations/transformations.pro	diff1 \|	diff2 \|	blob \| history
examples/qtconcurrent/imagescaling/imagescaling.pro	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
examples/qws/dbscreen/dbscreen.pro	diff1 \|	diff2 \|	blob \| history
examples/qws/framebuffer/framebuffer.pro	diff1 \|	diff2 \|	blob \| history
examples/qws/mousecalibration/mousecalibration.pro	diff1 \|	diff2 \|	blob \| history
examples/qws/simpledecoration/simpledecoration.pro	diff1 \|	diff2 \|	blob \| history
examples/qws/svgalib/svgalib.pro	diff1 \|	diff2 \|	blob \| history
examples/richtext/syntaxhighlighter/syntaxhighlighter.pro	diff1 \|	diff2 \|	blob \| history
examples/sql/drilldown/drilldown.pro	diff1 \|	diff2 \|	blob \| history
examples/sql/masterdetail/masterdetail.pro	diff1 \|	diff2 \|	blob \| history
examples/sql/sqlwidgetmapper/sqlwidgetmapper.pro	diff1 \|	diff2 \|	blob \| history
examples/statemachine/eventtransitions/eventtransitions.pro	diff1 \|	diff2 \|	blob \| history
examples/statemachine/rogue/rogue.pro	diff1 \|	diff2 \|	blob \| history
examples/statemachine/trafficlight/trafficlight.pro	diff1 \|	diff2 \|	blob \| history
examples/statemachine/twowaybutton/twowaybutton.pro	diff1 \|	diff2 \|	blob \| history
examples/threads/queuedcustomtype/queuedcustomtype.pro	diff1 \|	diff2 \|	blob \| history
examples/tools/contiguouscache/contiguouscache.pro	diff1 \|	diff2 \|	blob \| history
examples/tools/customtype/customtype.pro	diff1 \|	diff2 \|	blob \| history
examples/tools/customtypesending/customtypesending.pro	diff1 \|	diff2 \|	blob \| history
examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro	diff1 \|	diff2 \|	blob \| history
examples/tools/styleplugin/plugin/plugin.pro	diff1 \|	diff2 \|	blob \| history
examples/touch/dials/dials.pro	diff1 \|	diff2 \|	blob \| history
examples/touch/fingerpaint/fingerpaint.pro	diff1 \|	diff2 \|	blob \| history
examples/touch/knobs/knobs.pro	diff1 \|	diff2 \|	blob \| history
examples/touch/pinchzoom/pinchzoom.pro	diff1 \|	diff2 \|	blob \| history
examples/tutorials/addressbook-fr/part1/part1.pro	diff1 \|	diff2 \|	blob \| history
examples/tutorials/addressbook-fr/part2/part2.pro	diff1 \|	diff2 \|	blob \| history
examples/tutorials/addressbook-fr/part3/part3.pro	diff1 \|	diff2 \|	blob \| history
examples/tutorials/addressbook-fr/part4/part4.pro	diff1 \|	diff2 \|	blob \| history
examples/tutorials/addressbook-fr/part5/part5.pro	diff1 \|	diff2 \|	blob \| history
examples/tutorials/addressbook-fr/part6/part6.pro	diff1 \|	diff2 \|	blob \| history
examples/tutorials/addressbook-fr/part7/part7.pro	diff1 \|	diff2 \|	blob \| history
examples/tutorials/widgets/childwidget/childwidget.pro	diff1 \|	diff2 \|	blob \| history
examples/tutorials/widgets/nestedlayouts/nestedlayouts.pro	diff1 \|	diff2 \|	blob \| history
examples/tutorials/widgets/toplevel/toplevel.pro	diff1 \|	diff2 \|	blob \| history
examples/tutorials/widgets/windowlayout/windowlayout.pro	diff1 \|	diff2 \|	blob \| history
examples/uitools/multipleinheritance/multipleinheritance.pro	diff1 \|	diff2 \|	blob \| history
examples/widgets/analogclock/analogclock.pro	diff1 \|	diff2 \|	blob \| history
examples/widgets/applicationicon/applicationicon.pro	diff1 \|	diff2 \|	blob \| history
examples/widgets/calculator/calculator.pro	diff1 \|	diff2 \|	blob \| history
examples/widgets/calendarwidget/calendarwidget.pro	diff1 \|	diff2 \|	blob \| history
examples/widgets/codeeditor/codeeditor.pro	diff1 \|	diff2 \|	blob \| history
examples/widgets/elidedlabel/elidedlabel.pro	diff1 \|	diff2 \|	blob \| history
examples/widgets/icons/icons.pro	diff1 \|	diff2 \|	blob \| history
examples/widgets/imageviewer/imageviewer.pro	diff1 \|	diff2 \|	blob \| history
examples/widgets/lineedits/lineedits.pro	diff1 \|	diff2 \|	blob \| history
examples/widgets/movie/movie.pro	diff1 \|	diff2 \|	blob \| history
examples/widgets/orientation/orientation.pro	diff1 \|	diff2 \|	blob \| history
examples/widgets/shapedclock/shapedclock.pro	diff1 \|	diff2 \|	blob \| history
examples/widgets/softkeys/softkeys.pro	diff1 \|	diff2 \|	blob \| history
examples/widgets/tetrix/tetrix.pro	diff1 \|	diff2 \|	blob \| history
examples/widgets/wiggly/wiggly.pro	diff1 \|	diff2 \|	blob \| history
examples/xml/dombookmarks/dombookmarks.pro	diff1 \|	diff2 \|	blob \| history
examples/xml/saxbookmarks/saxbookmarks.pro	diff1 \|	diff2 \|	blob \| history
mkspecs/features/qpa/basicunixfontdatabase.prf	diff1 \|	\|	blob \| history
src/gui/gui.pro	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpaintengine_raster.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpaintengine_raster_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpaintengineex_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpainter.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfont.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfont.h	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontengine_ft_p.h	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/gui/text/text.pri	diff1 \|	diff2 \|	blob \| history
src/opengl/opengl.pro	diff1 \|	diff2 \|	blob \| history
src/plugins/platforms/wayland/qwaylandwindow.cpp	diff1 \|	diff2 \|	blob \| history
src/testlib/testlib.pro	diff1 \|	diff2 \|	blob \| history
src/widgets/dialogs/qfiledialog.cpp	diff1 \|	\|	blob \| history
src/widgets/platforms/mac/qfontdatabase_mac.cpp	diff1 \|	diff2 \|	blob \| history
src/widgets/platforms/mac/qfontengine_coretext.mm	diff1 \|	diff2 \|	blob \| history
src/widgets/platforms/mac/qfontengine_coretext_p.h	diff1 \|	diff2 \|	blob \| history
src/widgets/platforms/mac/qpaintengine_mac_p.h	diff1 \|	diff2 \|	blob \| history
src/widgets/platforms/x11/qfontdatabase_x11.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qfiledialog/tst_qfiledialog.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qstatictext/tst_qstatictext.cpp	diff1 \|	diff2 \|	blob \| history