43b9a99983
Conflicts: examples/animation/animatedtiles/animatedtiles.pro examples/animation/appchooser/appchooser.pro examples/animation/easing/easing.pro examples/animation/easing/window.h examples/animation/moveblocks/moveblocks.pro examples/animation/states/states.pro examples/animation/stickman/stickman.pro examples/dbus/dbus-chat/dbus-chat.pro examples/dbus/dbus.pro examples/dbus/remotecontrolledcar/car/car.pro examples/dbus/remotecontrolledcar/controller/controller.pro examples/dbus/remotecontrolledcar/remotecontrolledcar.pro examples/desktop/desktop.pro examples/desktop/screenshot/screenshot.pro examples/dialogs/classwizard/classwizard.pro examples/dialogs/configdialog/configdialog.pro examples/dialogs/dialogs.pro examples/dialogs/extension/extension.pro examples/dialogs/findfiles/findfiles.pro examples/dialogs/licensewizard/licensewizard.pro examples/dialogs/sipdialog/sipdialog.pro examples/dialogs/standarddialogs/standarddialogs.pro examples/dialogs/tabdialog/tabdialog.pro examples/dialogs/trivialwizard/trivialwizard.pro examples/draganddrop/draggableicons/draggableicons.pro examples/draganddrop/draggabletext/draggabletext.pro examples/draganddrop/dropsite/dropsite.pro examples/draganddrop/fridgemagnets/fridgemagnets.pro examples/draganddrop/puzzle/puzzle.pro examples/effects/blurpicker/blurpicker.pro examples/effects/fademessage/fademessage.pro examples/effects/lighting/lighting.pro examples/examples.pro examples/gestures/imagegestures/imagegestures.pro examples/graphicsview/anchorlayout/anchorlayout.pro examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro examples/graphicsview/collidingmice/collidingmice.pro examples/graphicsview/diagramscene/diagramscene.pro examples/graphicsview/dragdroprobot/dragdroprobot.pro examples/graphicsview/elasticnodes/elasticnodes.pro examples/graphicsview/flowlayout/flowlayout.pro examples/graphicsview/graphicsview.pro examples/graphicsview/simpleanchorlayout/simpleanchorlayout.pro examples/graphicsview/weatheranchorlayout/weatheranchorlayout.pro examples/ipc/ipc.pro examples/ipc/sharedmemory/sharedmemory.pro examples/itemviews/addressbook/addressbook.pro examples/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro examples/itemviews/chart/chart.pro examples/itemviews/coloreditorfactory/coloreditorfactory.pro examples/itemviews/combowidgetmapper/combowidgetmapper.pro examples/itemviews/customsortfiltermodel/customsortfiltermodel.pro examples/itemviews/dirview/dirview.pro examples/itemviews/editabletreemodel/editabletreemodel.pro examples/itemviews/fetchmore/fetchmore.pro examples/itemviews/frozencolumn/frozencolumn.pro examples/itemviews/itemviews.pro examples/itemviews/pixelator/pixelator.pro examples/itemviews/puzzle/puzzle.pro examples/itemviews/simpletreemodel/simpletreemodel.pro examples/itemviews/simplewidgetmapper/simplewidgetmapper.pro examples/itemviews/spinboxdelegate/spinboxdelegate.pro examples/itemviews/stardelegate/stardelegate.pro examples/ja_JP/linguist/hellotr/hellotr.pro examples/layouts/basiclayouts/basiclayouts.pro examples/layouts/borderlayout/borderlayout.pro examples/layouts/dynamiclayouts/dynamiclayouts.pro examples/layouts/flowlayout/flowlayout.pro examples/layouts/layouts.pro examples/linguist/arrowpad/arrowpad.pro examples/linguist/hellotr/hellotr.pro examples/linguist/linguist.pro examples/linguist/trollprint/trollprint.pro examples/mainwindows/application/application.pro examples/mainwindows/dockwidgets/dockwidgets.pro examples/mainwindows/mainwindows.pro examples/mainwindows/mdi/mdi.pro examples/mainwindows/menus/menus.pro examples/mainwindows/recentfiles/recentfiles.pro examples/mainwindows/sdi/sdi.pro examples/network/network.pro examples/opengl/opengl.pro examples/openvg/openvg.pro examples/painting/basicdrawing/basicdrawing.pro examples/painting/concentriccircles/concentriccircles.pro examples/painting/fontsampler/fontsampler.pro examples/painting/imagecomposition/imagecomposition.pro examples/painting/painterpaths/painterpaths.pro examples/painting/painting.pro examples/painting/transformations/transformations.pro examples/qtconcurrent/imagescaling/imagescaling.pro examples/qtconcurrent/map/map.pro examples/qtconcurrent/progressdialog/progressdialog.pro examples/qtconcurrent/qtconcurrent.pro examples/qtconcurrent/runfunction/runfunction.pro examples/qtconcurrent/wordcount/wordcount.pro examples/qtestlib/qtestlib.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/framebuffer/framebuffer.pro examples/qws/mousecalibration/mousecalibration.pro examples/qws/simpledecoration/simpledecoration.pro examples/qws/svgalib/svgalib.pro examples/richtext/calendar/calendar.pro examples/richtext/orderform/orderform.pro examples/richtext/richtext.pro examples/richtext/syntaxhighlighter/syntaxhighlighter.pro examples/sql/sql.pro examples/statemachine/eventtransitions/eventtransitions.pro examples/statemachine/rogue/rogue.pro examples/statemachine/trafficlight/trafficlight.pro examples/statemachine/twowaybutton/twowaybutton.pro examples/threads/mandelbrot/mandelbrot.pro examples/threads/queuedcustomtype/queuedcustomtype.pro examples/threads/threads.pro examples/tools/codecs/codecs.pro examples/tools/completer/completer.pro examples/tools/contiguouscache/contiguouscache.pro examples/tools/customcompleter/customcompleter.pro examples/tools/customtype/customtype.pro examples/tools/customtypesending/customtypesending.pro examples/tools/echoplugin/echoplugin.pro examples/tools/echoplugin/echowindow/echowindow.pro examples/tools/echoplugin/plugin/plugin.pro examples/tools/i18n/i18n.pro examples/tools/inputpanel/inputpanel.pro examples/tools/plugandpaint/plugandpaint.pro examples/tools/plugandpaintplugins/basictools/basictools.pro examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro examples/tools/plugandpaintplugins/plugandpaintplugins.pro examples/tools/regexp/regexp.pro examples/tools/settingseditor/settingseditor.pro examples/tools/styleplugin/plugin/plugin.pro examples/tools/styleplugin/styleplugin.pro examples/tools/styleplugin/stylewindow/stylewindow.pro examples/tools/tools.pro examples/tools/treemodelcompleter/treemodelcompleter.pro examples/tools/undoframework/undoframework.pro examples/touch/dials/dials.pro examples/touch/fingerpaint/fingerpaint.pro examples/touch/knobs/knobs.pro examples/touch/pinchzoom/pinchzoom.pro examples/tutorials/addressbook-fr/addressbook-fr.pro examples/tutorials/addressbook-fr/part1/part1.pro examples/tutorials/addressbook-fr/part2/part2.pro examples/tutorials/addressbook-fr/part3/part3.pro examples/tutorials/addressbook-fr/part4/part4.pro examples/tutorials/addressbook-fr/part5/part5.pro examples/tutorials/addressbook-fr/part6/part6.pro examples/tutorials/addressbook-fr/part7/part7.pro examples/tutorials/addressbook/addressbook.pro examples/tutorials/addressbook/part1/part1.pro examples/tutorials/addressbook/part2/part2.pro examples/tutorials/addressbook/part3/part3.pro examples/tutorials/addressbook/part4/part4.pro examples/tutorials/addressbook/part5/part5.pro examples/tutorials/addressbook/part6/part6.pro examples/tutorials/addressbook/part7/part7.pro examples/tutorials/modelview/1_readonly/1_readonly.pro examples/tutorials/modelview/2_formatting/2_formatting.pro examples/tutorials/modelview/3_changingmodel/3_changingmodel.pro examples/tutorials/modelview/4_headers/4_headers.pro examples/tutorials/modelview/5_edit/5_edit.pro examples/tutorials/modelview/6_treeview/6_treeview.pro examples/tutorials/modelview/7_selections/7_selections.pro examples/tutorials/modelview/modelview.pro examples/tutorials/widgets/childwidget/childwidget.pro examples/tutorials/widgets/nestedlayouts/nestedlayouts.pro examples/tutorials/widgets/toplevel/toplevel.pro examples/tutorials/widgets/windowlayout/windowlayout.pro examples/uitools/multipleinheritance/multipleinheritance.pro examples/uitools/textfinder/textfinder.pro examples/uitools/uitools.pro examples/widgets/analogclock/analogclock.pro examples/widgets/calculator/calculator.pro examples/widgets/calendarwidget/calendarwidget.pro examples/widgets/charactermap/charactermap.pro examples/widgets/codeeditor/codeeditor.pro examples/widgets/digitalclock/digitalclock.pro examples/widgets/groupbox/groupbox.pro examples/widgets/icons/icons.pro examples/widgets/imageviewer/imageviewer.pro examples/widgets/lineedits/lineedits.pro examples/widgets/movie/movie.pro examples/widgets/scribble/scribble.pro examples/widgets/shapedclock/shapedclock.pro examples/widgets/sliders/sliders.pro examples/widgets/softkeys/softkeys.pro examples/widgets/spinboxes/spinboxes.pro examples/widgets/styles/styles.pro examples/widgets/stylesheet/stylesheet.pro examples/widgets/tablet/tablet.pro examples/widgets/tetrix/tetrix.pro examples/widgets/tooltips/tooltips.pro examples/widgets/validators/validators.pro examples/widgets/widgets.pro examples/widgets/windowflags/windowflags.pro examples/xml/xml.pro mkspecs/qws/freebsd-generic-g++/qplatformdefs.h mkspecs/qws/linux-arm-g++/qplatformdefs.h mkspecs/qws/linux-arm-gnueabi-g++/qplatformdefs.h mkspecs/qws/linux-armv6-g++/qplatformdefs.h mkspecs/qws/linux-avr32-g++/qplatformdefs.h mkspecs/qws/linux-cellon-g++/qplatformdefs.h mkspecs/qws/linux-dm7000-g++/qplatformdefs.h mkspecs/qws/linux-dm800-g++/qplatformdefs.h mkspecs/qws/linux-generic-g++-32/qplatformdefs.h mkspecs/qws/linux-generic-g++/qplatformdefs.h mkspecs/qws/linux-ipaq-g++/qplatformdefs.h mkspecs/qws/linux-lsb-g++/qplatformdefs.h mkspecs/qws/linux-mips-g++/qplatformdefs.h mkspecs/qws/linux-nacl-g++/qplatformdefs.h mkspecs/qws/linux-powerpc-g++/qplatformdefs.h mkspecs/qws/linux-sh-g++/qplatformdefs.h mkspecs/qws/linux-sh4al-g++/qplatformdefs.h mkspecs/qws/linux-sharp-g++/qplatformdefs.h mkspecs/qws/linux-x86-g++/qplatformdefs.h mkspecs/qws/linux-x86_64-g++/qplatformdefs.h mkspecs/qws/linux-zylonite-g++/qplatformdefs.h mkspecs/qws/macx-generic-g++/qplatformdefs.h mkspecs/qws/macx-iphonedevice-g++/qplatformdefs.h mkspecs/qws/macx-iphonesimulator-g++/qplatformdefs.h mkspecs/qws/macx-nacl-g++/qplatformdefs.h mkspecs/qws/solaris-generic-g++/qplatformdefs.h src/gui/dialogs/qprintdialog_qws.cpp src/gui/egl/qegl_qws.cpp src/gui/embedded/qcopchannel_qws.cpp src/gui/embedded/qcopchannel_qws.h src/gui/embedded/qdecoration_qws.cpp src/gui/embedded/qdecoration_qws.h src/gui/embedded/qdecorationdefault_qws.cpp src/gui/embedded/qdecorationdefault_qws.h src/gui/embedded/qdecorationfactory_qws.cpp src/gui/embedded/qdecorationfactory_qws.h src/gui/embedded/qdecorationplugin_qws.cpp src/gui/embedded/qdecorationplugin_qws.h src/gui/embedded/qdecorationstyled_qws.cpp src/gui/embedded/qdecorationstyled_qws.h src/gui/embedded/qdecorationwindows_qws.cpp src/gui/embedded/qdecorationwindows_qws.h src/gui/embedded/qdirectpainter_qws.cpp src/gui/embedded/qdirectpainter_qws.h src/gui/embedded/qkbd_defaultmap_qws_p.h src/gui/embedded/qkbd_qws.cpp src/gui/embedded/qkbd_qws.h src/gui/embedded/qkbd_qws_p.h src/gui/embedded/qkbddriverfactory_qws.cpp src/gui/embedded/qkbddriverfactory_qws.h src/gui/embedded/qkbddriverplugin_qws.cpp src/gui/embedded/qkbddriverplugin_qws.h src/gui/embedded/qkbdintegrity_qws.cpp src/gui/embedded/qkbdintegrity_qws.h src/gui/embedded/qkbdlinuxinput_qws.cpp src/gui/embedded/qkbdlinuxinput_qws.h src/gui/embedded/qkbdqnx_qws.cpp src/gui/embedded/qkbdqnx_qws.h src/gui/embedded/qkbdtty_qws.cpp src/gui/embedded/qkbdtty_qws.h src/gui/embedded/qkbdum_qws.cpp src/gui/embedded/qkbdum_qws.h src/gui/embedded/qkbdvfb_qws.cpp src/gui/embedded/qkbdvfb_qws.h src/gui/embedded/qlock.cpp src/gui/embedded/qlock_p.h src/gui/embedded/qmouse_qws.cpp src/gui/embedded/qmouse_qws.h src/gui/embedded/qmousedriverfactory_qws.cpp src/gui/embedded/qmousedriverfactory_qws.h src/gui/embedded/qmousedriverplugin_qws.cpp src/gui/embedded/qmousedriverplugin_qws.h src/gui/embedded/qmouseintegrity_qws.cpp src/gui/embedded/qmouseintegrity_qws.h src/gui/embedded/qmouselinuxinput_qws.cpp src/gui/embedded/qmouselinuxinput_qws.h src/gui/embedded/qmouselinuxtp_qws.cpp src/gui/embedded/qmouselinuxtp_qws.h src/gui/embedded/qmousepc_qws.cpp src/gui/embedded/qmousepc_qws.h src/gui/embedded/qmouseqnx_qws.cpp src/gui/embedded/qmouseqnx_qws.h src/gui/embedded/qmousetslib_qws.cpp src/gui/embedded/qmousetslib_qws.h src/gui/embedded/qmousevfb_qws.cpp src/gui/embedded/qmousevfb_qws.h src/gui/embedded/qscreen_qws.cpp src/gui/embedded/qscreen_qws.h src/gui/embedded/qscreendriverfactory_qws.cpp src/gui/embedded/qscreendriverfactory_qws.h src/gui/embedded/qscreendriverplugin_qws.cpp src/gui/embedded/qscreendriverplugin_qws.h src/gui/embedded/qscreenintegrityfb_qws.cpp src/gui/embedded/qscreenintegrityfb_qws.h src/gui/embedded/qscreenlinuxfb_qws.cpp src/gui/embedded/qscreenlinuxfb_qws.h src/gui/embedded/qscreenmulti_qws.cpp src/gui/embedded/qscreenmulti_qws_p.h src/gui/embedded/qscreenproxy_qws.cpp src/gui/embedded/qscreenproxy_qws.h src/gui/embedded/qscreenqnx_qws.cpp src/gui/embedded/qscreenqnx_qws.h src/gui/embedded/qscreentransformed_qws.cpp src/gui/embedded/qscreentransformed_qws.h src/gui/embedded/qscreenvfb_qws.cpp src/gui/embedded/qscreenvfb_qws.h src/gui/embedded/qsoundqss_qws.cpp src/gui/embedded/qsoundqss_qws.h src/gui/embedded/qtransportauth_qws.cpp src/gui/embedded/qtransportauth_qws.h src/gui/embedded/qtransportauth_qws_p.h src/gui/embedded/qtransportauthdefs_qws.h src/gui/embedded/qunixsocket.cpp src/gui/embedded/qunixsocket_p.h src/gui/embedded/qunixsocketserver.cpp src/gui/embedded/qunixsocketserver_p.h src/gui/embedded/qvfbhdr.h src/gui/embedded/qwindowsystem_p.h src/gui/embedded/qwindowsystem_qws.cpp src/gui/embedded/qwindowsystem_qws.h src/gui/embedded/qwscommand_qws.cpp src/gui/embedded/qwscommand_qws_p.h src/gui/embedded/qwscursor_qws.cpp src/gui/embedded/qwsdisplay_qws.h src/gui/embedded/qwsdisplay_qws_p.h src/gui/embedded/qwsembedwidget.cpp src/gui/embedded/qwsevent_qws.cpp src/gui/embedded/qwsevent_qws.h src/gui/embedded/qwslock.cpp src/gui/embedded/qwslock_p.h src/gui/embedded/qwsmanager_p.h src/gui/embedded/qwsmanager_qws.cpp src/gui/embedded/qwsmanager_qws.h src/gui/embedded/qwsproperty_qws.cpp src/gui/embedded/qwsproperty_qws.h src/gui/embedded/qwsprotocolitem_qws.h src/gui/embedded/qwssharedmemory.cpp src/gui/embedded/qwssharedmemory_p.h src/gui/embedded/qwssignalhandler.cpp src/gui/embedded/qwssignalhandler_p.h src/gui/embedded/qwssocket_qws.cpp src/gui/embedded/qwssocket_qws.h src/gui/embedded/qwsutils_qws.h src/gui/image/qpixmap_qws.cpp src/gui/inputmethod/qwsinputcontext_p.h src/gui/inputmethod/qwsinputcontext_qws.cpp src/gui/kernel/qapplication_qpa.cpp src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qclipboard_qws.cpp src/gui/kernel/qcursor_qws.cpp src/gui/kernel/qdesktopwidget_qws.cpp src/gui/kernel/qeventdispatcher_glib_qws.cpp src/gui/kernel/qeventdispatcher_glib_qws_p.h src/gui/kernel/qeventdispatcher_qws.cpp src/gui/kernel/qeventdispatcher_qws_p.h src/gui/kernel/qplatformintegration_qpa.cpp src/gui/kernel/qplatformwindowformat_qpa.cpp src/gui/kernel/qplatformwindowformat_qpa.h src/gui/kernel/qsessionmanager_qws.cpp src/gui/kernel/qsound_qws.cpp src/gui/kernel/qwidget_qws.cpp src/gui/painting/qcolormap_qws.cpp src/gui/painting/qgraphicssystem.cpp src/gui/painting/qgraphicssystem_mac.cpp src/gui/painting/qgraphicssystem_mac_p.h src/gui/painting/qgraphicssystem_p.h src/gui/painting/qgraphicssystem_qws.cpp src/gui/painting/qgraphicssystem_qws_p.h src/gui/painting/qgraphicssystem_raster.cpp src/gui/painting/qgraphicssystem_raster_p.h src/gui/painting/qgraphicssystem_runtime.cpp src/gui/painting/qgraphicssystem_runtime_p.h src/gui/painting/qgraphicssystemfactory.cpp src/gui/painting/qgraphicssystemfactory_p.h src/gui/painting/qgraphicssystemplugin.cpp src/gui/painting/qgraphicssystemplugin_p.h src/gui/painting/qpaintdevice_x11.cpp src/gui/painting/qprintengine_ps.cpp src/gui/painting/qprintengine_ps_p.h src/gui/painting/qprintengine_qws.cpp src/gui/painting/qprintengine_qws_p.h src/gui/painting/qregion_qws.cpp src/gui/painting/qunifiedtoolbarsurface_mac.cpp src/gui/painting/qunifiedtoolbarsurface_mac_p.h src/gui/painting/qwindowsurface_mac.cpp src/gui/painting/qwindowsurface_qws.cpp src/gui/painting/qwindowsurface_qws_p.h src/gui/painting/qwindowsurface_raster.cpp src/gui/painting/qwindowsurface_raster_p.h src/gui/painting/qwindowsurface_s60.cpp src/gui/painting/qwindowsurface_s60_p.h src/gui/painting/qwindowsurface_x11.cpp src/gui/painting/qwindowsurface_x11_p.h src/gui/painting/qwmatrix.h src/gui/text/qabstractfontengine_qws.cpp src/gui/text/qabstractfontengine_qws.h src/gui/text/qfont_qws.cpp src/gui/text/qfontdatabase_qws.cpp src/gui/text/qfontengine_qws.cpp src/opengl/qgl_qpa.cpp src/opengl/qgl_qws.cpp src/opengl/qglscreen_qws.cpp src/opengl/qglscreen_qws.h src/opengl/qglwindowsurface_qws.cpp src/opengl/qgraphicssystem_gl.cpp src/opengl/qgraphicssystem_gl_p.h src/openvg/qpaintengine_vg.cpp src/openvg/qpaintengine_vg_p.h src/openvg/qpixmapdata_vg.cpp src/openvg/qpixmapdata_vg_p.h src/openvg/qpixmapfilter_vg.cpp src/openvg/qpixmapfilter_vg_p.h src/openvg/qvg.h src/openvg/qvg_p.h src/openvg/qvg_symbian.cpp src/openvg/qvgcompositionhelper_p.h src/openvg/qvgfontglyphcache_p.h src/openvg/qvgimagepool.cpp src/openvg/qvgimagepool_p.h src/openvg/qwindowsurface_vg.cpp src/openvg/qwindowsurface_vg_p.h src/openvg/qwindowsurface_vgegl.cpp src/openvg/qwindowsurface_vgegl_p.h src/plugins/decorations/default/main.cpp src/plugins/decorations/styled/main.cpp src/plugins/decorations/windows/main.cpp src/plugins/gfxdrivers/ahi/qscreenahi_qws.cpp src/plugins/gfxdrivers/ahi/qscreenahi_qws.h src/plugins/gfxdrivers/ahi/qscreenahiplugin.cpp src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.h src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp src/plugins/gfxdrivers/directfb/qdirectfbmouse.h src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp src/plugins/gfxdrivers/directfb/qdirectfbscreen.h src/plugins/gfxdrivers/directfb/qdirectfbscreenplugin.cpp src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h src/plugins/gfxdrivers/eglnullws/eglnullwsscreen.cpp src/plugins/gfxdrivers/eglnullws/eglnullwsscreen.h src/plugins/gfxdrivers/eglnullws/eglnullwsscreenplugin.cpp src/plugins/gfxdrivers/eglnullws/eglnullwsscreenplugin.h src/plugins/gfxdrivers/eglnullws/eglnullwswindowsurface.cpp src/plugins/gfxdrivers/eglnullws/eglnullwswindowsurface.h src/plugins/gfxdrivers/linuxfb/main.cpp src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.c src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.h src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable_p.h src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.h src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreenplugin.cpp src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.cpp src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.h src/plugins/gfxdrivers/qvfb/main.cpp src/plugins/gfxdrivers/transformed/main.cpp src/plugins/gfxdrivers/vnc/main.cpp src/plugins/gfxdrivers/vnc/qscreenvnc_p.h src/plugins/gfxdrivers/vnc/qscreenvnc_qws.cpp src/plugins/gfxdrivers/vnc/qscreenvnc_qws.h src/plugins/graphicssystems/meego/dithering.cpp src/plugins/graphicssystems/meego/qmeegoextensions.cpp src/plugins/graphicssystems/meego/qmeegoextensions.h src/plugins/graphicssystems/meego/qmeegographicssystem.cpp src/plugins/graphicssystems/meego/qmeegographicssystem.h src/plugins/graphicssystems/meego/qmeegographicssystemplugin.cpp src/plugins/graphicssystems/meego/qmeegographicssystemplugin.h src/plugins/graphicssystems/meego/qmeegolivepixmapdata.cpp src/plugins/graphicssystems/meego/qmeegolivepixmapdata.h src/plugins/graphicssystems/meego/qmeegopixmapdata.cpp src/plugins/graphicssystems/meego/qmeegopixmapdata.h src/plugins/graphicssystems/meego/qmeegorasterpixmapdata.cpp src/plugins/graphicssystems/opengl/main.cpp src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp src/plugins/graphicssystems/openvg/qgraphicssystem_vg_p.h src/plugins/graphicssystems/shivavg/main.cpp src/plugins/graphicssystems/shivavg/shivavggraphicssystem.cpp src/plugins/graphicssystems/shivavg/shivavggraphicssystem.h src/plugins/graphicssystems/shivavg/shivavgwindowsurface.cpp src/plugins/graphicssystems/shivavg/shivavgwindowsurface.h src/plugins/graphicssystems/trace/main.cpp src/plugins/graphicssystems/trace/qgraphicssystem_trace.cpp src/plugins/graphicssystems/trace/qgraphicssystem_trace_p.h src/plugins/kbddrivers/linuxinput/main.cpp src/plugins/mousedrivers/linuxtp/main.cpp src/plugins/mousedrivers/pc/main.cpp src/plugins/mousedrivers/tslib/main.cpp src/widgets/kernel/qwidget_qpa.cpp
920 lines
28 KiB
C++
920 lines
28 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
|
|
** All rights reserved.
|
|
** Contact: Nokia Corporation (qt-info@nokia.com)
|
|
**
|
|
** This file is part of the test suite of the Qt Toolkit.
|
|
**
|
|
** $QT_BEGIN_LICENSE:LGPL$
|
|
** GNU Lesser General Public License Usage
|
|
** This file may be used under the terms of the GNU Lesser General Public
|
|
** License version 2.1 as published by the Free Software Foundation and
|
|
** appearing in the file LICENSE.LGPL included in the packaging of this
|
|
** file. Please review the following information to ensure the GNU Lesser
|
|
** General Public License version 2.1 requirements will be met:
|
|
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
**
|
|
** In addition, as a special exception, Nokia gives you certain additional
|
|
** rights. These rights are described in the Nokia Qt LGPL Exception
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
**
|
|
** GNU General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU General
|
|
** Public License version 3.0 as published by the Free Software Foundation
|
|
** and appearing in the file LICENSE.GPL included in the packaging of this
|
|
** file. Please review the following information to ensure the GNU General
|
|
** Public License version 3.0 requirements will be met:
|
|
** http://www.gnu.org/copyleft/gpl.html.
|
|
**
|
|
** Other Usage
|
|
** Alternatively, this file may be used in accordance with the terms and
|
|
** conditions contained in a signed written agreement between you and Nokia.
|
|
**
|
|
**
|
|
**
|
|
**
|
|
**
|
|
** $QT_END_LICENSE$
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include <qtest.h>
|
|
#include <QtCore/QDebug>
|
|
#include <QtWidgets/QGraphicsItem>
|
|
#include <QtWidgets/QGraphicsScene>
|
|
#include <QtWidgets/QGraphicsView>
|
|
#include <QtGui/QImage>
|
|
#include <QtGui/QPixmapCache>
|
|
#include <QtWidgets/QDesktopWidget>
|
|
|
|
#include "chiptester/chiptester.h"
|
|
//#define CALLGRIND_DEBUG
|
|
#ifdef CALLGRIND_DEBUG
|
|
#include "valgrind/callgrind.h"
|
|
#endif
|
|
|
|
//TESTED_FILES=
|
|
|
|
static inline void processEvents()
|
|
{
|
|
QPixmapCache::clear();
|
|
QApplication::flush();
|
|
QApplication::processEvents();
|
|
QApplication::processEvents();
|
|
}
|
|
|
|
class TestView : public QGraphicsView
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
TestView() : QGraphicsView(), waiting(false), timerId(-1)
|
|
{}
|
|
|
|
void waitForPaintEvent(int timeout = 4000)
|
|
{
|
|
if (waiting)
|
|
return;
|
|
waiting = true;
|
|
timerId = startTimer(timeout);
|
|
eventLoop.exec();
|
|
killTimer(timerId);
|
|
timerId = -1;
|
|
waiting = false;
|
|
}
|
|
|
|
void tryResize(int width, int height)
|
|
{
|
|
QDesktopWidget *desktop = QApplication::desktop();
|
|
if (desktop->width() < width)
|
|
width = desktop->width();
|
|
if (desktop->height() < height)
|
|
height = desktop->height();
|
|
if (size() != QSize(width, height)) {
|
|
resize(width, height);
|
|
QTest::qWait(250);
|
|
processEvents();
|
|
}
|
|
}
|
|
|
|
protected:
|
|
void paintEvent(QPaintEvent *event)
|
|
{
|
|
QGraphicsView::paintEvent(event);
|
|
if (waiting)
|
|
eventLoop.exit();
|
|
}
|
|
|
|
void timerEvent(QTimerEvent *event)
|
|
{
|
|
if (event->timerId() == timerId)
|
|
eventLoop.exit();
|
|
}
|
|
|
|
private:
|
|
QEventLoop eventLoop;
|
|
bool waiting;
|
|
int timerId;
|
|
};
|
|
|
|
class tst_QGraphicsView : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
tst_QGraphicsView();
|
|
virtual ~tst_QGraphicsView();
|
|
|
|
public slots:
|
|
void initTestCase();
|
|
void init();
|
|
void cleanup();
|
|
|
|
private slots:
|
|
void construct();
|
|
void paintSingleItem();
|
|
void paintDeepStackingItems();
|
|
void paintDeepStackingItems_clipped();
|
|
void moveSingleItem();
|
|
void mapPointToScene_data();
|
|
void mapPointToScene();
|
|
void mapPointFromScene_data();
|
|
void mapPointFromScene();
|
|
void mapRectToScene_data();
|
|
void mapRectToScene();
|
|
void mapRectFromScene_data();
|
|
void mapRectFromScene();
|
|
void chipTester_data();
|
|
void chipTester();
|
|
void deepNesting_data();
|
|
void deepNesting();
|
|
void imageRiver_data();
|
|
void imageRiver();
|
|
void textRiver_data();
|
|
void textRiver();
|
|
void moveItemCache_data();
|
|
void moveItemCache();
|
|
void paintItemCache_data();
|
|
void paintItemCache();
|
|
|
|
private:
|
|
TestView mView;
|
|
};
|
|
|
|
tst_QGraphicsView::tst_QGraphicsView()
|
|
{
|
|
}
|
|
|
|
tst_QGraphicsView::~tst_QGraphicsView()
|
|
{
|
|
}
|
|
|
|
void tst_QGraphicsView::initTestCase()
|
|
{
|
|
mView.setFrameStyle(0);
|
|
mView.setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
|
|
mView.setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
|
|
mView.tryResize(100, 100);
|
|
mView.show();
|
|
QTest::qWaitForWindowShown(&mView);
|
|
QTest::qWait(300);
|
|
processEvents();
|
|
}
|
|
|
|
void tst_QGraphicsView::init()
|
|
{
|
|
mView.setRenderHints(QPainter::RenderHints(0));
|
|
mView.viewport()->setMouseTracking(false);
|
|
mView.setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
|
|
for (int i = 0; i < 3; ++i)
|
|
processEvents();
|
|
}
|
|
|
|
void tst_QGraphicsView::cleanup()
|
|
{
|
|
}
|
|
|
|
void tst_QGraphicsView::construct()
|
|
{
|
|
QBENCHMARK {
|
|
QGraphicsView view;
|
|
}
|
|
}
|
|
|
|
void tst_QGraphicsView::paintSingleItem()
|
|
{
|
|
QGraphicsScene scene(0, 0, 100, 100);
|
|
scene.addRect(0, 0, 10, 10);
|
|
|
|
mView.setScene(&scene);
|
|
mView.tryResize(100, 100);
|
|
processEvents();
|
|
|
|
QImage image(100, 100, QImage::Format_ARGB32_Premultiplied);
|
|
QPainter painter(&image);
|
|
QBENCHMARK {
|
|
mView.viewport()->render(&painter);
|
|
}
|
|
}
|
|
|
|
#define DEEP_STACKING_COUNT 85
|
|
|
|
void tst_QGraphicsView::paintDeepStackingItems()
|
|
{
|
|
QGraphicsScene scene(0, 0, 100, 100);
|
|
QGraphicsRectItem *item = scene.addRect(0, 0, 10, 10);
|
|
QGraphicsRectItem *lastRect = item;
|
|
for (int i = 0; i < DEEP_STACKING_COUNT; ++i) {
|
|
QGraphicsRectItem *rect = scene.addRect(0, 0, 10, 10);
|
|
rect->setPos(1, 1);
|
|
rect->setParentItem(lastRect);
|
|
lastRect = rect;
|
|
}
|
|
|
|
mView.setScene(&scene);
|
|
mView.tryResize(100, 100);
|
|
processEvents();
|
|
|
|
QImage image(100, 100, QImage::Format_ARGB32_Premultiplied);
|
|
QPainter painter(&image);
|
|
QBENCHMARK {
|
|
mView.viewport()->render(&painter);
|
|
}
|
|
}
|
|
|
|
void tst_QGraphicsView::paintDeepStackingItems_clipped()
|
|
{
|
|
QGraphicsScene scene(0, 0, 100, 100);
|
|
QGraphicsRectItem *item = scene.addRect(0, 0, 10, 10);
|
|
item->setFlag(QGraphicsItem::ItemClipsChildrenToShape);
|
|
QGraphicsRectItem *lastRect = item;
|
|
for (int i = 0; i < DEEP_STACKING_COUNT; ++i) {
|
|
QGraphicsRectItem *rect = scene.addRect(0, 0, 10, 10);
|
|
rect->setPos(1, 1);
|
|
rect->setParentItem(lastRect);
|
|
lastRect = rect;
|
|
}
|
|
|
|
mView.setScene(&scene);
|
|
mView.tryResize(100, 100);
|
|
processEvents();
|
|
|
|
QImage image(100, 100, QImage::Format_ARGB32_Premultiplied);
|
|
QPainter painter(&image);
|
|
QBENCHMARK {
|
|
mView.viewport()->render(&painter);
|
|
}
|
|
}
|
|
|
|
void tst_QGraphicsView::moveSingleItem()
|
|
{
|
|
QGraphicsScene scene(0, 0, 100, 100);
|
|
QGraphicsRectItem *item = scene.addRect(0, 0, 10, 10);
|
|
|
|
mView.setScene(&scene);
|
|
mView.tryResize(100, 100);
|
|
processEvents();
|
|
|
|
int n = 1;
|
|
QBENCHMARK {
|
|
item->setPos(25 * n, 25 * n);
|
|
mView.waitForPaintEvent();
|
|
n = n ? 0 : 1;
|
|
}
|
|
}
|
|
|
|
void tst_QGraphicsView::mapPointToScene_data()
|
|
{
|
|
QTest::addColumn<QTransform>("transform");
|
|
QTest::addColumn<QPoint>("point");
|
|
|
|
QTest::newRow("null") << QTransform() << QPoint();
|
|
QTest::newRow("identity QPoint(100, 100)") << QTransform() << QPoint(100, 100);
|
|
QTest::newRow("rotate QPoint(100, 100)") << QTransform().rotate(90) << QPoint(100, 100);
|
|
QTest::newRow("scale QPoint(100, 100)") << QTransform().scale(5, 5) << QPoint(100, 100);
|
|
QTest::newRow("translate QPoint(100, 100)") << QTransform().translate(5, 5) << QPoint(100, 100);
|
|
QTest::newRow("shear QPoint(100, 100)") << QTransform().shear(1.5, 1.5) << QPoint(100, 100);
|
|
QTest::newRow("perspect QPoint(100, 100)") << QTransform().rotate(45, Qt::XAxis) << QPoint(100, 100);
|
|
}
|
|
|
|
void tst_QGraphicsView::mapPointToScene()
|
|
{
|
|
QFETCH(QTransform, transform);
|
|
QFETCH(QPoint, point);
|
|
|
|
QGraphicsView view;
|
|
view.setTransform(transform);
|
|
processEvents();
|
|
|
|
QBENCHMARK {
|
|
view.mapToScene(point);
|
|
}
|
|
}
|
|
|
|
void tst_QGraphicsView::mapPointFromScene_data()
|
|
{
|
|
QTest::addColumn<QTransform>("transform");
|
|
QTest::addColumn<QPointF>("point");
|
|
|
|
QTest::newRow("null") << QTransform() << QPointF();
|
|
QTest::newRow("identity QPointF(100, 100)") << QTransform() << QPointF(100, 100);
|
|
QTest::newRow("rotate QPointF(100, 100)") << QTransform().rotate(90) << QPointF(100, 100);
|
|
QTest::newRow("scale QPointF(100, 100)") << QTransform().scale(5, 5) << QPointF(100, 100);
|
|
QTest::newRow("translate QPointF(100, 100)") << QTransform().translate(5, 5) << QPointF(100, 100);
|
|
QTest::newRow("shear QPointF(100, 100)") << QTransform().shear(1.5, 1.5) << QPointF(100, 100);
|
|
QTest::newRow("perspect QPointF(100, 100)") << QTransform().rotate(45, Qt::XAxis) << QPointF(100, 100);
|
|
}
|
|
|
|
void tst_QGraphicsView::mapPointFromScene()
|
|
{
|
|
QFETCH(QTransform, transform);
|
|
QFETCH(QPointF, point);
|
|
|
|
QGraphicsView view;
|
|
view.setTransform(transform);
|
|
processEvents();
|
|
|
|
QBENCHMARK {
|
|
view.mapFromScene(point);
|
|
}
|
|
}
|
|
|
|
void tst_QGraphicsView::mapRectToScene_data()
|
|
{
|
|
QTest::addColumn<QTransform>("transform");
|
|
QTest::addColumn<QRect>("rect");
|
|
|
|
QTest::newRow("null") << QTransform() << QRect();
|
|
QTest::newRow("identity QRect(0, 0, 100, 100)") << QTransform() << QRect(0, 0, 100, 100);
|
|
QTest::newRow("rotate QRect(0, 0, 100, 100)") << QTransform().rotate(90) << QRect(0, 0, 100, 100);
|
|
QTest::newRow("scale QRect(0, 0, 100, 100)") << QTransform().scale(5, 5) << QRect(0, 0, 100, 100);
|
|
QTest::newRow("translate QRect(0, 0, 100, 100)") << QTransform().translate(5, 5) << QRect(0, 0, 100, 100);
|
|
QTest::newRow("shear QRect(0, 0, 100, 100)") << QTransform().shear(1.5, 1.5) << QRect(0, 0, 100, 100);
|
|
QTest::newRow("perspect QRect(0, 0, 100, 100)") << QTransform().rotate(45, Qt::XAxis) << QRect(0, 0, 100, 100);
|
|
}
|
|
|
|
void tst_QGraphicsView::mapRectToScene()
|
|
{
|
|
QFETCH(QTransform, transform);
|
|
QFETCH(QRect, rect);
|
|
|
|
QGraphicsView view;
|
|
view.setTransform(transform);
|
|
processEvents();
|
|
|
|
QBENCHMARK {
|
|
view.mapToScene(rect);
|
|
}
|
|
}
|
|
|
|
void tst_QGraphicsView::mapRectFromScene_data()
|
|
{
|
|
QTest::addColumn<QTransform>("transform");
|
|
QTest::addColumn<QRectF>("rect");
|
|
|
|
QTest::newRow("null") << QTransform() << QRectF();
|
|
QTest::newRow("identity QRectF(0, 0, 100, 100)") << QTransform() << QRectF(0, 0, 100, 100);
|
|
QTest::newRow("rotate QRectF(0, 0, 100, 100)") << QTransform().rotate(90) << QRectF(0, 0, 100, 100);
|
|
QTest::newRow("scale QRectF(0, 0, 100, 100)") << QTransform().scale(5, 5) << QRectF(0, 0, 100, 100);
|
|
QTest::newRow("translate QRectF(0, 0, 100, 100)") << QTransform().translate(5, 5) << QRectF(0, 0, 100, 100);
|
|
QTest::newRow("shear QRectF(0, 0, 100, 100)") << QTransform().shear(1.5, 1.5) << QRectF(0, 0, 100, 100);
|
|
QTest::newRow("perspect QRectF(0, 0, 100, 100)") << QTransform().rotate(45, Qt::XAxis) << QRectF(0, 0, 100, 100);
|
|
}
|
|
|
|
void tst_QGraphicsView::mapRectFromScene()
|
|
{
|
|
QFETCH(QTransform, transform);
|
|
QFETCH(QRectF, rect);
|
|
|
|
QGraphicsView view;
|
|
view.setTransform(transform);
|
|
processEvents();
|
|
|
|
QBENCHMARK {
|
|
view.mapFromScene(rect);
|
|
}
|
|
}
|
|
|
|
void tst_QGraphicsView::chipTester_data()
|
|
{
|
|
QTest::addColumn<bool>("antialias");
|
|
QTest::addColumn<bool>("opengl");
|
|
QTest::addColumn<int>("operation");
|
|
QTest::newRow("rotate, normal") << false << false << 0;
|
|
QTest::newRow("rotate, normal, antialias") << true << false << 0;
|
|
QTest::newRow("rotate, opengl") << false << true << 0;
|
|
QTest::newRow("rotate, opengl, antialias") << true << true << 0;
|
|
QTest::newRow("zoom, normal") << false << false << 1;
|
|
QTest::newRow("zoom, normal, antialias") << true << false << 1;
|
|
QTest::newRow("zoom, opengl") << false << true << 1;
|
|
QTest::newRow("zoom, opengl, antialias") << true << true << 1;
|
|
QTest::newRow("translate, normal") << false << false << 2;
|
|
QTest::newRow("translate, normal, antialias") << true << false << 2;
|
|
QTest::newRow("translate, opengl") << false << true << 2;
|
|
QTest::newRow("translate, opengl, antialias") << true << true << 2;
|
|
}
|
|
|
|
void tst_QGraphicsView::chipTester()
|
|
{
|
|
#ifdef Q_WS_WINCE_WM
|
|
QSKIP("WinCE WM: Fails on Windows Mobile w/o OpenGL", SkipAll);
|
|
#endif
|
|
QFETCH(bool, antialias);
|
|
QFETCH(bool, opengl);
|
|
QFETCH(int, operation);
|
|
|
|
ChipTester tester;
|
|
tester.setAntialias(antialias);
|
|
tester.setOpenGL(opengl);
|
|
tester.setOperation(ChipTester::Operation(operation));
|
|
tester.show();
|
|
QTest::qWaitForWindowShown(&tester);
|
|
QTest::qWait(250);
|
|
processEvents();
|
|
|
|
QBENCHMARK {
|
|
tester.runBenchmark();
|
|
}
|
|
}
|
|
|
|
static void addChildHelper(QGraphicsItem *parent, int n, bool rotate)
|
|
{
|
|
if (!n)
|
|
return;
|
|
QGraphicsRectItem *item = new QGraphicsRectItem(QRectF(0, 0, 50, 50), parent);
|
|
item->setPos(10, 10);
|
|
if (rotate)
|
|
item->rotate(10);
|
|
addChildHelper(item, n - 1, rotate);
|
|
}
|
|
|
|
void tst_QGraphicsView::deepNesting_data()
|
|
{
|
|
QTest::addColumn<bool>("rotate");
|
|
QTest::addColumn<bool>("sortCache");
|
|
QTest::addColumn<bool>("bsp");
|
|
|
|
QTest::newRow("bsp, no transform") << false << false << true;
|
|
QTest::newRow("bsp, rotation") << true << false << true;
|
|
QTest::newRow("bsp, no transform, sort cache") << false << true << true;
|
|
QTest::newRow("bsp, rotation, sort cache") << true << true << true;
|
|
QTest::newRow("no transform") << false << false << false;
|
|
QTest::newRow("rotation") << true << false << false;
|
|
QTest::newRow("no transform, sort cache") << false << true << false;
|
|
QTest::newRow("rotation, sort cache") << true << true << false;
|
|
}
|
|
|
|
void tst_QGraphicsView::deepNesting()
|
|
{
|
|
QFETCH(bool, rotate);
|
|
QFETCH(bool, sortCache);
|
|
QFETCH(bool, bsp);
|
|
|
|
QGraphicsScene scene;
|
|
for (int y = 0; y < 15; ++y) {
|
|
for (int x = 0; x < 15; ++x) {
|
|
QGraphicsItem *item1 = scene.addRect(QRectF(0, 0, 50, 50));
|
|
if (rotate) item1->rotate(10);
|
|
item1->setPos(x * 25, y * 25);
|
|
addChildHelper(item1, 30, rotate);
|
|
}
|
|
}
|
|
scene.setItemIndexMethod(bsp ? QGraphicsScene::BspTreeIndex : QGraphicsScene::NoIndex);
|
|
scene.setSortCacheEnabled(sortCache);
|
|
scene.setSceneRect(scene.sceneRect());
|
|
|
|
mView.setRenderHint(QPainter::Antialiasing);
|
|
mView.setScene(&scene);
|
|
mView.tryResize(600, 600);
|
|
(void)scene.itemAt(0, 0);
|
|
processEvents();
|
|
|
|
QBENCHMARK {
|
|
#ifdef CALLGRIND_DEBUG
|
|
CALLGRIND_START_INSTRUMENTATION
|
|
#endif
|
|
mView.viewport()->update();
|
|
mView.waitForPaintEvent();
|
|
#ifdef CALLGRIND_DEBUG
|
|
CALLGRIND_STOP_INSTRUMENTATION
|
|
#endif
|
|
}
|
|
}
|
|
|
|
class AnimatedPixmapItem : public QGraphicsPixmapItem
|
|
{
|
|
public:
|
|
AnimatedPixmapItem(int x, int y, bool rot, bool scal, QGraphicsItem *parent = 0)
|
|
: QGraphicsPixmapItem(parent), rotateFactor(0), scaleFactor(0)
|
|
{
|
|
rotate = rot;
|
|
scale = scal;
|
|
xspeed = x;
|
|
yspeed = y;
|
|
}
|
|
|
|
protected:
|
|
void advance(int i)
|
|
{
|
|
if (!i)
|
|
return;
|
|
int x = int(pos().x()) + pixmap().width();
|
|
x += xspeed;
|
|
x = (x % (300 + pixmap().width() * 2)) - pixmap().width();
|
|
int y = int(pos().y()) + pixmap().width();
|
|
y += yspeed;
|
|
y = (y % (300 + pixmap().width() * 2)) - pixmap().width();
|
|
setPos(x, y);
|
|
|
|
int rot = rotateFactor;
|
|
int sca = scaleFactor;
|
|
if (rotate)
|
|
rotateFactor = 1 + (rot + xspeed) % 360;
|
|
if (scale)
|
|
scaleFactor = 1 + (sca + yspeed) % 50;
|
|
|
|
if (rotate || scale) {
|
|
qreal s = 0.5 + scaleFactor / 50.0;
|
|
setTransform(QTransform().rotate(rotateFactor).scale(s, s));
|
|
}
|
|
}
|
|
|
|
private:
|
|
int xspeed;
|
|
int yspeed;
|
|
int rotateFactor;
|
|
int scaleFactor;
|
|
bool rotate;
|
|
bool scale;
|
|
};
|
|
|
|
void tst_QGraphicsView::imageRiver_data()
|
|
{
|
|
QTest::addColumn<int>("direction");
|
|
QTest::addColumn<bool>("rotation");
|
|
QTest::addColumn<bool>("scale");
|
|
QTest::newRow("horizontal") << 0 << false << false;
|
|
QTest::newRow("vertical") << 1 << false << false;
|
|
QTest::newRow("both") << 2 << false << false;
|
|
QTest::newRow("horizontal rot") << 0 << true << false;
|
|
QTest::newRow("horizontal scale") << 0 << false << true;
|
|
QTest::newRow("horizontal rot + scale") << 0 << true << true;
|
|
}
|
|
|
|
void tst_QGraphicsView::imageRiver()
|
|
{
|
|
QFETCH(int, direction);
|
|
QFETCH(bool, rotation);
|
|
QFETCH(bool, scale);
|
|
|
|
QGraphicsScene scene(0, 0, 300, 300);
|
|
|
|
QPixmap pix(":/images/designer.png");
|
|
QVERIFY(!pix.isNull());
|
|
|
|
QList<QGraphicsItem *> items;
|
|
QFile file(":/random.data");
|
|
QVERIFY(file.open(QIODevice::ReadOnly));
|
|
QDataStream str(&file);
|
|
for (int i = 0; i < 50; ++i) {
|
|
AnimatedPixmapItem *item = 0;
|
|
if (direction == 0) item = new AnimatedPixmapItem((i % 4) + 1, 0, rotation, scale);
|
|
if (direction == 1) item = new AnimatedPixmapItem(0, (i % 4) + 1, rotation, scale);
|
|
if (direction == 2) item = new AnimatedPixmapItem((i % 4) + 1, (i % 4) + 1, rotation, scale);
|
|
item->setPixmap(pix);
|
|
int rnd1, rnd2;
|
|
str >> rnd1 >> rnd2;
|
|
item->setPos(-pix.width() + rnd1 % (300 + pix.width()),
|
|
-pix.height() + rnd2 % (300 + pix.height()));
|
|
scene.addItem(item);
|
|
}
|
|
scene.setSceneRect(0, 0, 300, 300);
|
|
|
|
mView.setScene(&scene);
|
|
mView.tryResize(300, 300);
|
|
processEvents();
|
|
|
|
QBENCHMARK {
|
|
#ifdef CALLGRIND_DEBUG
|
|
CALLGRIND_START_INSTRUMENTATION
|
|
#endif
|
|
for (int i = 0; i < 50; ++i) {
|
|
scene.advance();
|
|
mView.waitForPaintEvent();
|
|
}
|
|
#ifdef CALLGRIND_DEBUG
|
|
CALLGRIND_STOP_INSTRUMENTATION
|
|
#endif
|
|
}
|
|
}
|
|
|
|
class AnimatedTextItem : public QGraphicsSimpleTextItem
|
|
{
|
|
public:
|
|
AnimatedTextItem(int x, int y, bool rot, bool scal, QGraphicsItem *parent = 0)
|
|
: QGraphicsSimpleTextItem(parent), rotateFactor(0), scaleFactor(25)
|
|
{
|
|
setText("River of text");
|
|
rotate = rot;
|
|
scale = scal;
|
|
xspeed = x;
|
|
yspeed = y;
|
|
}
|
|
|
|
protected:
|
|
void advance(int i)
|
|
{
|
|
if (!i)
|
|
return;
|
|
QRect r = boundingRect().toRect();
|
|
int x = int(pos().x()) + r.width();
|
|
x += xspeed;
|
|
x = (x % (300 + r.width() * 2)) - r.width();
|
|
int y = int(pos().y()) + r.width();
|
|
y += yspeed;
|
|
y = (y % (300 + r.width() * 2)) - r.width();
|
|
setPos(x, y);
|
|
|
|
int rot = rotateFactor;
|
|
int sca = scaleFactor;
|
|
if (rotate)
|
|
rotateFactor = 1 + (rot + xspeed) % 360;
|
|
if (scale)
|
|
scaleFactor = 1 + (sca + yspeed) % 50;
|
|
|
|
if (rotate || scale) {
|
|
qreal s = 0.5 + scaleFactor / 50.0;
|
|
setTransform(QTransform().rotate(rotateFactor).scale(s, s));
|
|
}
|
|
}
|
|
|
|
private:
|
|
int xspeed;
|
|
int yspeed;
|
|
int rotateFactor;
|
|
int scaleFactor;
|
|
bool rotate;
|
|
bool scale;
|
|
};
|
|
|
|
void tst_QGraphicsView::textRiver_data()
|
|
{
|
|
QTest::addColumn<int>("direction");
|
|
QTest::addColumn<bool>("rotation");
|
|
QTest::addColumn<bool>("scale");
|
|
QTest::newRow("horizontal") << 0 << false << false;
|
|
QTest::newRow("vertical") << 1 << false << false;
|
|
QTest::newRow("both") << 2 << false << false;
|
|
QTest::newRow("horizontal rot") << 0 << true << false;
|
|
QTest::newRow("horizontal scale") << 0 << false << true;
|
|
QTest::newRow("horizontal rot + scale") << 0 << true << true;
|
|
}
|
|
|
|
void tst_QGraphicsView::textRiver()
|
|
{
|
|
QFETCH(int, direction);
|
|
QFETCH(bool, rotation);
|
|
QFETCH(bool, scale);
|
|
|
|
QGraphicsScene scene(0, 0, 300, 300);
|
|
|
|
QPixmap pix(":/images/designer.png");
|
|
QVERIFY(!pix.isNull());
|
|
|
|
QList<QGraphicsItem *> items;
|
|
QFile file(":/random.data");
|
|
QVERIFY(file.open(QIODevice::ReadOnly));
|
|
QDataStream str(&file);
|
|
for (int i = 0; i < 50; ++i) {
|
|
AnimatedTextItem *item = 0;
|
|
if (direction == 0) item = new AnimatedTextItem((i % 4) + 1, 0, rotation, scale);
|
|
if (direction == 1) item = new AnimatedTextItem(0, (i % 4) + 1, rotation, scale);
|
|
if (direction == 2) item = new AnimatedTextItem((i % 4) + 1, (i % 4) + 1, rotation, scale);
|
|
int rnd1, rnd2;
|
|
str >> rnd1 >> rnd2;
|
|
item->setPos(-pix.width() + rnd1 % (300 + pix.width()),
|
|
-pix.height() + rnd2 % (300 + pix.height()));
|
|
item->setAcceptDrops(false);
|
|
item->setAcceptHoverEvents(false);
|
|
scene.addItem(item);
|
|
}
|
|
scene.setSceneRect(0, 0, 300, 300);
|
|
|
|
mView.setScene(&scene);
|
|
mView.tryResize(300, 300);
|
|
processEvents();
|
|
|
|
QBENCHMARK {
|
|
#ifdef CALLGRIND_DEBUG
|
|
CALLGRIND_START_INSTRUMENTATION
|
|
#endif
|
|
for (int i = 0; i < 50; ++i) {
|
|
scene.advance();
|
|
mView.waitForPaintEvent();
|
|
}
|
|
#ifdef CALLGRIND_DEBUG
|
|
CALLGRIND_STOP_INSTRUMENTATION
|
|
#endif
|
|
}
|
|
}
|
|
|
|
class AnimatedPixmapCacheItem : public QGraphicsPixmapItem
|
|
{
|
|
public:
|
|
AnimatedPixmapCacheItem(int x, int y, QGraphicsItem *parent = 0)
|
|
: QGraphicsPixmapItem(parent)
|
|
{
|
|
xspeed = x;
|
|
yspeed = y;
|
|
}
|
|
|
|
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0)
|
|
{
|
|
QGraphicsPixmapItem::paint(painter,option,widget);
|
|
//We just want to wait, and we don't want to process the event loop with qWait
|
|
QTest::qSleep(3);
|
|
}
|
|
protected:
|
|
void advance(int i)
|
|
{
|
|
if (!i)
|
|
return;
|
|
int x = int(pos().x()) + pixmap().width();
|
|
x += xspeed;
|
|
x = (x % (300 + pixmap().width() * 2)) - pixmap().width();
|
|
int y = int(pos().y()) + pixmap().width();
|
|
y += yspeed;
|
|
y = (y % (300 + pixmap().width() * 2)) - pixmap().width();
|
|
setPos(x, y);
|
|
}
|
|
|
|
private:
|
|
int xspeed;
|
|
int yspeed;
|
|
};
|
|
|
|
void tst_QGraphicsView::moveItemCache_data()
|
|
{
|
|
QTest::addColumn<int>("direction");
|
|
QTest::addColumn<bool>("rotation");
|
|
QTest::addColumn<int>("cacheMode");
|
|
QTest::newRow("Horizontal movement : ItemCoordinate Cache") << 0 << false << (int)QGraphicsItem::ItemCoordinateCache;
|
|
QTest::newRow("Horizontal movement : DeviceCoordinate Cache") << 0 << false << (int)QGraphicsItem::DeviceCoordinateCache;
|
|
QTest::newRow("Horizontal movement : No Cache") << 0 << false << (int)QGraphicsItem::NoCache;
|
|
QTest::newRow("Vertical + Horizontal movement : ItemCoordinate Cache") << 2 << false << (int)QGraphicsItem::ItemCoordinateCache;
|
|
QTest::newRow("Vertical + Horizontal movement : DeviceCoordinate Cache") << 2 << false << (int)QGraphicsItem::DeviceCoordinateCache;
|
|
QTest::newRow("Vertical + Horizontal movement : No Cache") << 2 << false << (int)QGraphicsItem::NoCache;
|
|
QTest::newRow("Horizontal movement + Rotation : ItemCoordinate Cache") << 0 << true << (int)QGraphicsItem::ItemCoordinateCache;
|
|
QTest::newRow("Horizontal movement + Rotation : DeviceCoordinate Cache") << 0 << true << (int)QGraphicsItem::DeviceCoordinateCache;
|
|
QTest::newRow("Horizontal movement + Rotation : No Cache") << 0 << true << (int)QGraphicsItem::NoCache;
|
|
}
|
|
|
|
void tst_QGraphicsView::moveItemCache()
|
|
{
|
|
QFETCH(int, direction);
|
|
QFETCH(bool, rotation);
|
|
QFETCH(int, cacheMode);
|
|
|
|
QGraphicsScene scene(0, 0, 300, 300);
|
|
|
|
QPixmap pix(":/images/wine.jpeg");
|
|
QVERIFY(!pix.isNull());
|
|
|
|
QList<QGraphicsItem *> items;
|
|
QFile file(":/random.data");
|
|
QVERIFY(file.open(QIODevice::ReadOnly));
|
|
QDataStream str(&file);
|
|
for (int i = 0; i < 5; ++i) {
|
|
AnimatedPixmapCacheItem *item = 0;
|
|
if (direction == 0) item = new AnimatedPixmapCacheItem((i % 4) + 1, 0);
|
|
if (direction == 1) item = new AnimatedPixmapCacheItem(0, (i % 4) + 1);
|
|
if (direction == 2) item = new AnimatedPixmapCacheItem((i % 4) + 1, (i % 4) + 1);
|
|
item->setPixmap(pix);
|
|
item->setCacheMode((QGraphicsItem::CacheMode)cacheMode);
|
|
if (rotation)
|
|
item->setTransform(QTransform().rotate(45));
|
|
int rnd1, rnd2;
|
|
str >> rnd1 >> rnd2;
|
|
item->setPos(-pix.width() + rnd1 % (400 + pix.width()),
|
|
-pix.height() + rnd2 % (400 + pix.height()));
|
|
scene.addItem(item);
|
|
}
|
|
scene.setSceneRect(0, 0, 400, 400);
|
|
|
|
mView.setScene(&scene);
|
|
mView.tryResize(400, 400);
|
|
processEvents();
|
|
|
|
QBENCHMARK {
|
|
#ifdef CALLGRIND_DEBUG
|
|
CALLGRIND_START_INSTRUMENTATION
|
|
#endif
|
|
for (int i = 0; i < 5; ++i) {
|
|
scene.advance();
|
|
mView.waitForPaintEvent();
|
|
}
|
|
#ifdef CALLGRIND_DEBUG
|
|
CALLGRIND_STOP_INSTRUMENTATION
|
|
#endif
|
|
}
|
|
}
|
|
|
|
class UpdatedPixmapCacheItem : public QGraphicsPixmapItem
|
|
{
|
|
public:
|
|
UpdatedPixmapCacheItem(bool partial, QGraphicsItem *parent = 0)
|
|
: QGraphicsPixmapItem(parent), partial(partial)
|
|
{
|
|
}
|
|
|
|
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0)
|
|
{
|
|
QGraphicsPixmapItem::paint(painter,option,widget);
|
|
}
|
|
protected:
|
|
void advance(int i)
|
|
{
|
|
Q_UNUSED(i);
|
|
if (partial)
|
|
update(QRectF(boundingRect().center().x(), boundingRect().center().x(), 30, 30));
|
|
else
|
|
update();
|
|
}
|
|
|
|
private:
|
|
bool partial;
|
|
};
|
|
|
|
void tst_QGraphicsView::paintItemCache_data()
|
|
{
|
|
QTest::addColumn<bool>("updatePartial");
|
|
QTest::addColumn<bool>("rotation");
|
|
QTest::addColumn<int>("cacheMode");
|
|
QTest::newRow("Partial Update : ItemCoordinate Cache") << true << false << (int)QGraphicsItem::ItemCoordinateCache;
|
|
QTest::newRow("Partial Update : DeviceCoordinate Cache") << true << false << (int)QGraphicsItem::DeviceCoordinateCache;
|
|
QTest::newRow("Partial Update : No Cache") << true << false << (int)QGraphicsItem::NoCache;
|
|
QTest::newRow("Full Update : ItemCoordinate Cache") << false << false << (int)QGraphicsItem::ItemCoordinateCache;
|
|
QTest::newRow("Full Update : DeviceCoordinate Cache") << false << false << (int)QGraphicsItem::DeviceCoordinateCache;
|
|
QTest::newRow("Full Update : No Cache") << false << false << (int)QGraphicsItem::NoCache;
|
|
QTest::newRow("Partial Update : ItemCoordinate Cache item rotated") << true << true << (int)QGraphicsItem::ItemCoordinateCache;
|
|
QTest::newRow("Partial Update : DeviceCoordinate Cache item rotated") << true << true << (int)QGraphicsItem::DeviceCoordinateCache;
|
|
QTest::newRow("Partial Update : No Cache item rotated") << true << true << (int)QGraphicsItem::NoCache;
|
|
QTest::newRow("Full Update : ItemCoordinate Cache item rotated") << false << true << (int)QGraphicsItem::ItemCoordinateCache;
|
|
QTest::newRow("Full Update : DeviceCoordinate Cache item rotated") << false << true << (int)QGraphicsItem::DeviceCoordinateCache;
|
|
QTest::newRow("Full Update : No Cache item rotated") << false << true <<(int)QGraphicsItem::NoCache;
|
|
}
|
|
|
|
void tst_QGraphicsView::paintItemCache()
|
|
{
|
|
QFETCH(bool, updatePartial);
|
|
QFETCH(bool, rotation);
|
|
QFETCH(int, cacheMode);
|
|
|
|
QGraphicsScene scene(0, 0, 300, 300);
|
|
|
|
QPixmap pix(":/images/wine.jpeg");
|
|
QVERIFY(!pix.isNull());
|
|
|
|
QList<QGraphicsItem *> items;
|
|
QFile file(":/random.data");
|
|
QVERIFY(file.open(QIODevice::ReadOnly));
|
|
QDataStream str(&file);
|
|
UpdatedPixmapCacheItem *item = new UpdatedPixmapCacheItem(updatePartial);
|
|
item->setPixmap(pix);
|
|
item->setCacheMode((QGraphicsItem::CacheMode)cacheMode);
|
|
if (rotation)
|
|
item->setTransform(QTransform().rotate(45));
|
|
item->setPos(-100, -100);
|
|
scene.addItem(item);
|
|
|
|
QPixmap pix2(":/images/wine-big.jpeg");
|
|
item = new UpdatedPixmapCacheItem(updatePartial);
|
|
item->setPixmap(pix2);
|
|
item->setCacheMode((QGraphicsItem::CacheMode)cacheMode);
|
|
if (rotation)
|
|
item->setTransform(QTransform().rotate(45));
|
|
item->setPos(0, 0);
|
|
scene.addItem(item);
|
|
scene.setSceneRect(-100, -100, 600, 600);
|
|
|
|
mView.tryResize(600, 600);
|
|
mView.setScene(&scene);
|
|
processEvents();
|
|
|
|
QBENCHMARK {
|
|
#ifdef CALLGRIND_DEBUG
|
|
CALLGRIND_START_INSTRUMENTATION
|
|
#endif
|
|
for (int i = 0; i < 5; ++i) {
|
|
scene.advance();
|
|
mView.waitForPaintEvent();
|
|
}
|
|
#ifdef CALLGRIND_DEBUG
|
|
CALLGRIND_STOP_INSTRUMENTATION
|
|
#endif
|
|
}
|
|
}
|
|
|
|
QTEST_MAIN(tst_QGraphicsView)
|
|
#include "tst_qgraphicsview.moc"
|