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
425 lines
13 KiB
C++
425 lines
13 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 <QtTest/QtTest>
|
|
#include <QtWidgets/qgraphicseffect.h>
|
|
#include <QtWidgets/qgraphicsview.h>
|
|
#include <QtWidgets/qgraphicsscene.h>
|
|
#include <QtWidgets/qgraphicsitem.h>
|
|
#include <QtWidgets/qstyleoption.h>
|
|
|
|
#include <private/qgraphicseffect_p.h>
|
|
|
|
#include "../../shared/util.h"
|
|
|
|
//TESTED_CLASS=
|
|
//TESTED_FILES=
|
|
|
|
class CustomItem : public QGraphicsRectItem
|
|
{
|
|
public:
|
|
CustomItem(qreal x, qreal y, qreal width, qreal height)
|
|
: QGraphicsRectItem(x, y, width, height), numRepaints(0),
|
|
m_painter(0)
|
|
{}
|
|
|
|
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
|
|
{
|
|
m_painter = painter;
|
|
++numRepaints;
|
|
QGraphicsRectItem::paint(painter, option, widget);
|
|
}
|
|
|
|
void reset()
|
|
{
|
|
numRepaints = 0;
|
|
m_painter = 0;
|
|
}
|
|
|
|
int numRepaints;
|
|
QPainter *m_painter;
|
|
};
|
|
|
|
class CustomEffect : public QGraphicsEffect
|
|
{
|
|
public:
|
|
CustomEffect()
|
|
: QGraphicsEffect(), numRepaints(0), m_margin(10), m_sourceChanged(false),
|
|
m_sourceBoundingRectChanged(false), doNothingInDraw(false),
|
|
storeDeviceDependentStuff(false),
|
|
m_painter(0), m_source(0)
|
|
{}
|
|
|
|
QRectF boundingRectFor(const QRectF &rect) const
|
|
{ return rect.adjusted(-m_margin, -m_margin, m_margin, m_margin); }
|
|
|
|
void reset()
|
|
{
|
|
numRepaints = 0;
|
|
m_sourceChanged = false;
|
|
m_sourceBoundingRectChanged = false;
|
|
m_painter = 0;
|
|
m_source = 0;
|
|
deviceCoordinatesPixmap = QPixmap();
|
|
deviceRect = QRect();
|
|
sourceDeviceBoundingRect = QRectF();
|
|
}
|
|
|
|
void setMargin(int margin)
|
|
{
|
|
m_margin = margin;
|
|
updateBoundingRect();
|
|
}
|
|
|
|
int margin() const
|
|
{ return m_margin; }
|
|
|
|
void draw(QPainter *painter)
|
|
{
|
|
++numRepaints;
|
|
if (storeDeviceDependentStuff) {
|
|
deviceCoordinatesPixmap = source()->pixmap(Qt::DeviceCoordinates);
|
|
deviceRect = QRect(0, 0, painter->device()->width(), painter->device()->height());
|
|
sourceDeviceBoundingRect = source()->boundingRect(Qt::DeviceCoordinates);
|
|
}
|
|
if (doNothingInDraw)
|
|
return;
|
|
m_source = source();
|
|
m_painter = painter;
|
|
source()->draw(painter);
|
|
}
|
|
|
|
void sourceChanged()
|
|
{ m_sourceChanged = true; }
|
|
|
|
void sourceBoundingRectChanged()
|
|
{ m_sourceBoundingRectChanged = true; }
|
|
|
|
int numRepaints;
|
|
int m_margin;
|
|
bool m_sourceChanged;
|
|
bool m_sourceBoundingRectChanged;
|
|
bool doNothingInDraw;
|
|
bool storeDeviceDependentStuff;
|
|
QPainter *m_painter;
|
|
QGraphicsEffectSource *m_source;
|
|
QPixmap deviceCoordinatesPixmap;
|
|
QRect deviceRect;
|
|
QRectF sourceDeviceBoundingRect;
|
|
};
|
|
|
|
class tst_QGraphicsEffectSource : public QObject
|
|
{
|
|
Q_OBJECT
|
|
public slots:
|
|
void initTestCase();
|
|
void cleanupTestCase();
|
|
void init();
|
|
|
|
private slots:
|
|
void graphicsItem();
|
|
void styleOption();
|
|
void isPixmap();
|
|
void draw();
|
|
void update();
|
|
void boundingRect();
|
|
void clippedBoundingRect();
|
|
void deviceRect();
|
|
void pixmap();
|
|
|
|
void pixmapPadding_data();
|
|
void pixmapPadding();
|
|
|
|
private:
|
|
QGraphicsView *view;
|
|
QGraphicsScene *scene;
|
|
CustomItem *item;
|
|
CustomEffect *effect;
|
|
};
|
|
|
|
void tst_QGraphicsEffectSource::initTestCase()
|
|
{
|
|
scene = new QGraphicsScene;
|
|
item = new CustomItem(0, 0, 100, 100);
|
|
effect = new CustomEffect;
|
|
item->setGraphicsEffect(effect);
|
|
scene->addItem(item);
|
|
view = new QGraphicsView(scene);
|
|
view->show();
|
|
#ifdef Q_WS_X11
|
|
qt_x11_wait_for_window_manager(view);
|
|
#endif
|
|
QTest::qWait(200);
|
|
}
|
|
|
|
void tst_QGraphicsEffectSource::cleanupTestCase()
|
|
{
|
|
delete view;
|
|
}
|
|
|
|
void tst_QGraphicsEffectSource::init()
|
|
{
|
|
QVERIFY(effect);
|
|
QVERIFY(item);
|
|
QVERIFY(effect->source());
|
|
effect->reset();
|
|
effect->storeDeviceDependentStuff = false;
|
|
effect->doNothingInDraw = false;
|
|
item->reset();
|
|
}
|
|
|
|
void tst_QGraphicsEffectSource::graphicsItem()
|
|
{
|
|
QVERIFY(effect->source());
|
|
QCOMPARE(effect->source()->graphicsItem(), (const QGraphicsItem*)item);
|
|
}
|
|
|
|
void tst_QGraphicsEffectSource::styleOption()
|
|
{
|
|
// We don't have style options unless the source is drawing.
|
|
QVERIFY(effect->source());
|
|
QVERIFY(!effect->source()->styleOption());
|
|
|
|
// Trigger an update and check that the style option in QGraphicsEffect::draw
|
|
// was the same as the one in QGraphicsItem::paint.
|
|
QCOMPARE(item->numRepaints, 0);
|
|
QCOMPARE(effect->numRepaints, 0);
|
|
item->update();
|
|
QTRY_COMPARE(item->numRepaints, 1);
|
|
QTRY_COMPARE(effect->numRepaints, 1);
|
|
}
|
|
|
|
void tst_QGraphicsEffectSource::isPixmap()
|
|
{
|
|
// Current source is a CustomItem (which is not a pixmap item).
|
|
QVERIFY(!effect->source()->isPixmap());
|
|
|
|
// Make sure isPixmap() returns true for QGraphicsPixmapItem.
|
|
QGraphicsPixmapItem *pixmapItem = new QGraphicsPixmapItem;
|
|
CustomEffect *anotherEffect = new CustomEffect;
|
|
pixmapItem->setGraphicsEffect(anotherEffect);
|
|
QVERIFY(anotherEffect->source());
|
|
QCOMPARE(anotherEffect->source()->graphicsItem(), static_cast<const QGraphicsItem *>(pixmapItem));
|
|
QVERIFY(anotherEffect->source()->isPixmap());
|
|
delete pixmapItem;
|
|
}
|
|
|
|
void tst_QGraphicsEffectSource::draw()
|
|
{
|
|
// The source can only draw as a result of QGraphicsEffect::draw.
|
|
QTest::ignoreMessage(QtWarningMsg, "QGraphicsEffectSource::draw: Can only begin as a result of QGraphicsEffect::draw");
|
|
QPixmap dummyPixmap(10, 10);
|
|
QPainter dummyPainter(&dummyPixmap);
|
|
effect->source()->draw(&dummyPainter);
|
|
}
|
|
|
|
void tst_QGraphicsEffectSource::update()
|
|
{
|
|
QCOMPARE(item->numRepaints, 0);
|
|
QCOMPARE(effect->numRepaints, 0);
|
|
|
|
effect->source()->update();
|
|
|
|
QTRY_COMPARE(item->numRepaints, 1);
|
|
QTRY_COMPARE(effect->numRepaints, 1);
|
|
}
|
|
|
|
void tst_QGraphicsEffectSource::boundingRect()
|
|
{
|
|
QTest::ignoreMessage(QtWarningMsg, "QGraphicsEffectSource::boundingRect: Not yet implemented, lacking device context");
|
|
QCOMPARE(effect->source()->boundingRect(Qt::DeviceCoordinates), QRectF());
|
|
|
|
QRectF itemBoundingRect = item->boundingRect();
|
|
if (!item->children().isEmpty())
|
|
itemBoundingRect |= item->childrenBoundingRect();
|
|
|
|
// We can at least check that the device bounding rect was correct in QGraphicsEffect::draw.
|
|
effect->storeDeviceDependentStuff = true;
|
|
effect->source()->update();
|
|
const QTransform deviceTransform = item->deviceTransform(view->viewportTransform());
|
|
QTRY_COMPARE(effect->sourceDeviceBoundingRect, deviceTransform.mapRect(itemBoundingRect));
|
|
|
|
// Bounding rect in logical coordinates is of course fine.
|
|
QTRY_COMPARE(effect->source()->boundingRect(Qt::LogicalCoordinates), itemBoundingRect);
|
|
// Make sure default value is Qt::LogicalCoordinates.
|
|
QTRY_COMPARE(effect->source()->boundingRect(), itemBoundingRect);
|
|
}
|
|
|
|
void tst_QGraphicsEffectSource::clippedBoundingRect()
|
|
{
|
|
QRectF itemBoundingRect = item->boundingRect();
|
|
item->setFlag(QGraphicsItem::ItemClipsChildrenToShape);
|
|
|
|
QGraphicsRectItem *child = new QGraphicsRectItem(-1000, -1000, 2000, 2000);
|
|
child->setBrush(Qt::red);
|
|
child->setParentItem(item);
|
|
|
|
effect->storeDeviceDependentStuff = true;
|
|
effect->source()->update();
|
|
QTRY_COMPARE(effect->source()->boundingRect(Qt::LogicalCoordinates), itemBoundingRect);
|
|
}
|
|
|
|
void tst_QGraphicsEffectSource::deviceRect()
|
|
{
|
|
effect->storeDeviceDependentStuff = true;
|
|
effect->source()->update();
|
|
QTRY_COMPARE(effect->deviceRect, view->viewport()->rect());
|
|
}
|
|
|
|
void tst_QGraphicsEffectSource::pixmap()
|
|
{
|
|
QTest::ignoreMessage(QtWarningMsg, "QGraphicsEffectSource::pixmap: Not yet implemented, lacking device context");
|
|
QCOMPARE(effect->source()->pixmap(Qt::DeviceCoordinates), QPixmap());
|
|
|
|
// We can at least verify a valid pixmap from QGraphicsEffect::draw.
|
|
effect->storeDeviceDependentStuff = true;
|
|
effect->source()->update();
|
|
QTRY_VERIFY(!effect->deviceCoordinatesPixmap.isNull());
|
|
|
|
// Pixmaps in logical coordinates we can do fine.
|
|
QPixmap pixmap1 = effect->source()->pixmap(Qt::LogicalCoordinates);
|
|
QVERIFY(!pixmap1.isNull());
|
|
|
|
// Make sure default value is Qt::LogicalCoordinates.
|
|
QPixmap pixmap2 = effect->source()->pixmap();
|
|
QCOMPARE(pixmap1, pixmap2);
|
|
}
|
|
|
|
class PaddingEffect : public QGraphicsEffect
|
|
{
|
|
public:
|
|
PaddingEffect(QObject *parent) : QGraphicsEffect(parent)
|
|
{
|
|
}
|
|
|
|
QRectF boundingRectFor(const QRectF &src) const {
|
|
return src.adjusted(-10, -10, 10, 10);
|
|
}
|
|
|
|
void draw(QPainter *) {
|
|
pix = source()->pixmap(coordinateMode, &offset, padMode);
|
|
}
|
|
|
|
QPixmap pix;
|
|
QPoint offset;
|
|
QGraphicsEffect::PixmapPadMode padMode;
|
|
Qt::CoordinateSystem coordinateMode;
|
|
};
|
|
|
|
void tst_QGraphicsEffectSource::pixmapPadding_data()
|
|
{
|
|
QTest::addColumn<int>("coordinateMode");
|
|
QTest::addColumn<int>("padMode");
|
|
QTest::addColumn<QSize>("size");
|
|
QTest::addColumn<QPoint>("offset");
|
|
QTest::addColumn<uint>("ulPixel");
|
|
|
|
QTest::newRow("log,nopad") << int(Qt::LogicalCoordinates)
|
|
<< int(QGraphicsEffect::NoPad)
|
|
<< QSize(10, 10) << QPoint(0, 0)
|
|
<< 0xffff0000u;
|
|
|
|
QTest::newRow("log,transparent") << int(Qt::LogicalCoordinates)
|
|
<< int(QGraphicsEffect::PadToTransparentBorder)
|
|
<< QSize(14, 14) << QPoint(-2, -2)
|
|
<< 0x00000000u;
|
|
|
|
QTest::newRow("log,effectrect") << int(Qt::LogicalCoordinates)
|
|
<< int(QGraphicsEffect::PadToEffectiveBoundingRect)
|
|
<< QSize(20, 20) << QPoint(-5, -5)
|
|
<< 0x00000000u;
|
|
|
|
QTest::newRow("dev,nopad") << int(Qt::DeviceCoordinates)
|
|
<< int(QGraphicsEffect::NoPad)
|
|
<< QSize(20, 20) << QPoint(40, 40)
|
|
<< 0xffff0000u;
|
|
|
|
QTest::newRow("dev,transparent") << int(Qt::DeviceCoordinates)
|
|
<< int(QGraphicsEffect::PadToTransparentBorder)
|
|
<< QSize(24, 24) << QPoint(38, 38)
|
|
<< 0x00000000u;
|
|
|
|
QTest::newRow("dev,effectrect") << int(Qt::DeviceCoordinates)
|
|
<< int(QGraphicsEffect::PadToEffectiveBoundingRect)
|
|
<< QSize(40, 40) << QPoint(30, 30)
|
|
<< 0x00000000u;
|
|
|
|
}
|
|
|
|
void tst_QGraphicsEffectSource::pixmapPadding()
|
|
{
|
|
QPixmap dummyTarget(100, 100);
|
|
QPainter dummyPainter(&dummyTarget);
|
|
dummyPainter.translate(40, 40);
|
|
dummyPainter.scale(2, 2);
|
|
|
|
QPixmap pm(10, 10);
|
|
pm.fill(Qt::red);
|
|
|
|
QGraphicsScene *scene = new QGraphicsScene();
|
|
PaddingEffect *effect = new PaddingEffect(scene);
|
|
QGraphicsPixmapItem *pmItem = new QGraphicsPixmapItem(pm);
|
|
scene->addItem(pmItem);
|
|
pmItem->setGraphicsEffect(effect);
|
|
|
|
QFETCH(int, coordinateMode);
|
|
QFETCH(int, padMode);
|
|
QFETCH(QPoint, offset);
|
|
QFETCH(QSize, size);
|
|
QFETCH(uint, ulPixel);
|
|
|
|
effect->padMode = (QGraphicsEffect::PixmapPadMode) padMode;
|
|
effect->coordinateMode = (Qt::CoordinateSystem) coordinateMode;
|
|
|
|
scene->render(&dummyPainter, scene->itemsBoundingRect(), scene->itemsBoundingRect());
|
|
|
|
QCOMPARE(effect->pix.size(), size);
|
|
QCOMPARE(effect->offset, offset);
|
|
QCOMPARE(effect->pix.toImage().pixel(0, 0), ulPixel);
|
|
|
|
// ### Fix corruption in scene destruction, then enable...
|
|
// delete scene;
|
|
}
|
|
|
|
QTEST_MAIN(tst_QGraphicsEffectSource)
|
|
#include "tst_qgraphicseffectsource.moc"
|
|
|