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
14 KiB
C++
425 lines
14 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 <QtCore/QtCore>
|
|
#include <QtSql/QtSql>
|
|
#include <QSortFilterProxyModel>
|
|
|
|
/*
|
|
To add a model to be tested add the header file to the includes
|
|
and impliment what is needed in the four functions below.
|
|
|
|
You can add more then one model, several Qt models and included as examples.
|
|
|
|
In tst_qitemmodel.cpp a new ModelsToTest object is created for each test.
|
|
|
|
When you have errors fix the first ones first. Later tests depend upon them working
|
|
*/
|
|
|
|
class ModelsToTest {
|
|
|
|
public:
|
|
ModelsToTest();
|
|
|
|
QAbstractItemModel *createModel(const QString &modelType);
|
|
QModelIndex populateTestArea(QAbstractItemModel *model);
|
|
void cleanupTestArea(QAbstractItemModel *model);
|
|
|
|
enum Read {
|
|
ReadOnly, // wont perform remove(), insert(), and setData()
|
|
ReadWrite
|
|
};
|
|
enum Contains {
|
|
Empty, // Confirm that rowCount() == 0 etc throughout the test
|
|
HasData // Confirm that rowCount() != 0 etc throughout the test
|
|
};
|
|
|
|
struct test {
|
|
test(QString m, Read r, Contains c) : modelType(m), read(r), contains(c){};
|
|
|
|
QString modelType;
|
|
Read read;
|
|
Contains contains;
|
|
};
|
|
|
|
QList<test> tests;
|
|
|
|
static void setupDatabase();
|
|
};
|
|
|
|
|
|
/*!
|
|
Add new tests, they can be the same model, but in a different state.
|
|
|
|
The name of the model is passed to createModel
|
|
If readOnly is true the remove tests will be skipped. Example: QDirModel is disabled.
|
|
If createModel returns an empty model. Example: QDirModel does not
|
|
*/
|
|
ModelsToTest::ModelsToTest()
|
|
{
|
|
setupDatabase();
|
|
|
|
tests.append(test("QDirModel", ReadOnly, HasData));
|
|
tests.append(test("QStringListModel", ReadWrite, HasData));
|
|
tests.append(test("QStringListModelEmpty", ReadWrite, Empty));
|
|
|
|
tests.append(test("QStandardItemModel", ReadWrite, HasData));
|
|
tests.append(test("QStandardItemModelEmpty", ReadWrite, Empty));
|
|
|
|
// QSortFilterProxyModel test uses QStandardItemModel so test it first
|
|
tests.append(test("QSortFilterProxyModel", ReadWrite, HasData));
|
|
tests.append(test("QSortFilterProxyModelEmpty", ReadWrite, Empty));
|
|
tests.append(test("QSortFilterProxyModelRegExp", ReadWrite, HasData));
|
|
|
|
tests.append(test("QListModel", ReadWrite, HasData));
|
|
tests.append(test("QListModelEmpty", ReadWrite, Empty));
|
|
tests.append(test("QTableModel", ReadWrite, HasData));
|
|
tests.append(test("QTableModelEmpty", ReadWrite, Empty));
|
|
|
|
tests.append(test("QTreeModel", ReadWrite, HasData));
|
|
tests.append(test("QTreeModelEmpty", ReadWrite, Empty));
|
|
|
|
tests.append(test("QSqlQueryModel", ReadOnly, HasData));
|
|
tests.append(test("QSqlQueryModelEmpty", ReadOnly, Empty));
|
|
|
|
// Fails on remove
|
|
tests.append(test("QSqlTableModel", ReadOnly, HasData));
|
|
}
|
|
|
|
/*!
|
|
Return a new modelType.
|
|
*/
|
|
QAbstractItemModel *ModelsToTest::createModel(const QString &modelType)
|
|
{
|
|
if (modelType == "QStringListModelEmpty")
|
|
return new QStringListModel();
|
|
|
|
if (modelType == "QStringListModel") {
|
|
QStringListModel *model = new QStringListModel();
|
|
populateTestArea(model);
|
|
return model;
|
|
}
|
|
|
|
if (modelType == "QStandardItemModelEmpty") {
|
|
return new QStandardItemModel();
|
|
}
|
|
|
|
if (modelType == "QStandardItemModel") {
|
|
QStandardItemModel *model = new QStandardItemModel();
|
|
populateTestArea(model);
|
|
return model;
|
|
}
|
|
|
|
if (modelType == "QSortFilterProxyModelEmpty") {
|
|
QSortFilterProxyModel *model = new QSortFilterProxyModel;
|
|
QStandardItemModel *standardItemModel = new QStandardItemModel;
|
|
model->setSourceModel(standardItemModel);
|
|
return model;
|
|
}
|
|
|
|
if (modelType == "QSortFilterProxyModelRegExp") {
|
|
QSortFilterProxyModel *model = new QSortFilterProxyModel;
|
|
QStandardItemModel *standardItemModel = new QStandardItemModel;
|
|
model->setSourceModel(standardItemModel);
|
|
populateTestArea(model);
|
|
model->setFilterRegExp(QRegExp("(^$|0.*)"));
|
|
return model;
|
|
}
|
|
|
|
if (modelType == "QSortFilterProxyModel") {
|
|
QSortFilterProxyModel *model = new QSortFilterProxyModel;
|
|
QStandardItemModel *standardItemModel = new QStandardItemModel;
|
|
model->setSourceModel(standardItemModel);
|
|
populateTestArea(model);
|
|
return model;
|
|
}
|
|
|
|
if (modelType == "QDirModel") {
|
|
QDirModel *model = new QDirModel();
|
|
model->setReadOnly(false);
|
|
return model;
|
|
}
|
|
|
|
if (modelType == "QSqlQueryModel") {
|
|
QSqlQueryModel *model = new QSqlQueryModel();
|
|
populateTestArea(model);
|
|
return model;
|
|
}
|
|
|
|
if (modelType == "QSqlQueryModelEmpty") {
|
|
QSqlQueryModel *model = new QSqlQueryModel();
|
|
return model;
|
|
}
|
|
|
|
if (modelType == "QSqlTableModel") {
|
|
QSqlTableModel *model = new QSqlTableModel();
|
|
populateTestArea(model);
|
|
return model;
|
|
}
|
|
|
|
if (modelType == "QListModelEmpty")
|
|
return (new QListWidget)->model();
|
|
|
|
if (modelType == "QListModel") {
|
|
QListWidget *widget = new QListWidget;
|
|
populateTestArea(widget->model());
|
|
return widget->model();
|
|
}
|
|
|
|
if (modelType == "QTableModelEmpty")
|
|
return (new QTableWidget)->model();
|
|
|
|
if (modelType == "QTableModel") {
|
|
QTableWidget *widget = new QTableWidget;
|
|
populateTestArea(widget->model());
|
|
return widget->model();
|
|
}
|
|
|
|
if (modelType == "QTreeModelEmpty") {
|
|
QTreeWidget *widget = new QTreeWidget;
|
|
return widget->model();
|
|
}
|
|
|
|
if (modelType == "QTreeModel") {
|
|
QTreeWidget *widget = new QTreeWidget;
|
|
populateTestArea(widget->model());
|
|
return widget->model();
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*!
|
|
Fills model with some test data at least twenty rows and if possible twenty or more columns.
|
|
Return the parent of a row/column that can be tested.
|
|
|
|
NOTE: If readOnly is true tests will try to remove and add rows and columns.
|
|
If you have a tree model returning not the root index will help catch more errors.
|
|
*/
|
|
QModelIndex ModelsToTest::populateTestArea(QAbstractItemModel *model)
|
|
{
|
|
if (QStringListModel *stringListModel = qobject_cast<QStringListModel *>(model)) {
|
|
QString alphabet = "a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z";
|
|
stringListModel->setStringList( alphabet.split(",") );
|
|
return QModelIndex();
|
|
}
|
|
|
|
if (qobject_cast<QStandardItemModel *>(model)) {
|
|
// Basic tree StandardItemModel
|
|
QModelIndex parent;
|
|
QVariant blue = QVariant(QColor(Qt::blue));
|
|
#ifndef Q_OS_WINCE
|
|
for (int i = 0; i < 4; ++i) {
|
|
#else
|
|
for (int i = 0; i < 2; ++i) {
|
|
#endif
|
|
parent = model->index(0, 0, parent);
|
|
model->insertRows(0, 26 + i, parent);
|
|
#ifndef Q_OS_WINCE
|
|
model->insertColumns(0, 26 + i, parent);
|
|
#else
|
|
model->insertColumns(0, 4 + i, parent);
|
|
#endif
|
|
// Fill in some values to make it easier to debug
|
|
/*
|
|
for (int x = 0; x < 26 + i; ++x) {
|
|
QString xval = QString::number(x);
|
|
for (int y = 0; y < 26 + i; ++y) {
|
|
QString val = xval + QString::number(y) + QString::number(i);
|
|
QModelIndex index = model->index(x, y, parent);
|
|
model->setData(index, val);
|
|
model->setData(index, blue, Qt::TextColorRole);
|
|
}
|
|
}
|
|
*/
|
|
}
|
|
return model->index(0,0);
|
|
}
|
|
|
|
if (qobject_cast<QSortFilterProxyModel *>(model)) {
|
|
QAbstractItemModel *realModel = (qobject_cast<QSortFilterProxyModel *>(model))->sourceModel();
|
|
// Basic tree StandardItemModel
|
|
QModelIndex parent;
|
|
QVariant blue = QVariant(QColor(Qt::blue));
|
|
#ifndef Q_OS_WINCE
|
|
for (int i = 0; i < 4; ++i) {
|
|
#else
|
|
for (int i = 0; i < 2; ++i) {
|
|
#endif
|
|
parent = realModel->index(0, 0, parent);
|
|
realModel->insertRows(0, 26+i, parent);
|
|
#ifndef Q_OS_WINCE
|
|
realModel->insertColumns(0, 26+i, parent);
|
|
#else
|
|
realModel->insertColumns(0, 4, parent);
|
|
#endif
|
|
// Fill in some values to make it easier to debug
|
|
/*
|
|
for (int x = 0; x < 26+i; ++x) {
|
|
QString xval = QString::number(x);
|
|
for (int y = 0; y < 26 + i; ++y) {
|
|
QString val = xval + QString::number(y) + QString::number(i);
|
|
QModelIndex index = realModel->index(x, y, parent);
|
|
realModel->setData(index, val);
|
|
realModel->setData(index, blue, Qt::TextColorRole);
|
|
}
|
|
}
|
|
*/
|
|
}
|
|
QModelIndex returnIndex = model->index(0,0);
|
|
if (!returnIndex.isValid())
|
|
qFatal("%s: model index to be returned is invalid", Q_FUNC_INFO);
|
|
return returnIndex;
|
|
}
|
|
|
|
if (QDirModel *dirModel = qobject_cast<QDirModel *>(model)) {
|
|
if (!QDir::current().mkdir("test"))
|
|
qFatal("%s: cannot create directory %s",
|
|
Q_FUNC_INFO,
|
|
qPrintable(QDir::toNativeSeparators(QDir::currentPath()+"/test")));
|
|
for (int i = 0; i < 26; ++i) {
|
|
QString subdir = QString("test/foo_%1").arg(i);
|
|
if (!QDir::current().mkdir(subdir))
|
|
qFatal("%s: cannot create directory %s",
|
|
Q_FUNC_INFO,
|
|
qPrintable(QDir::toNativeSeparators(QDir::currentPath()+"/"+subdir)));
|
|
}
|
|
return dirModel->index(QDir::currentPath()+"/test");
|
|
}
|
|
|
|
if (QSqlQueryModel *queryModel = qobject_cast<QSqlQueryModel *>(model)) {
|
|
QSqlQuery q;
|
|
q.exec("CREATE TABLE test(id int primary key, name varchar(30))");
|
|
q.prepare("INSERT INTO test(id, name) values (?, ?)");
|
|
#ifndef Q_OS_WINCE
|
|
for (int i = 0; i < 1024; ++i) {
|
|
#else
|
|
for (int i = 0; i < 512; ++i) {
|
|
#endif
|
|
q.addBindValue(i);
|
|
q.addBindValue("Mr. Smith" + QString::number(i));
|
|
q.exec();
|
|
}
|
|
if (QSqlTableModel *tableModel = qobject_cast<QSqlTableModel *>(model)) {
|
|
tableModel->setTable("test");
|
|
tableModel->setEditStrategy(QSqlTableModel::OnManualSubmit);
|
|
tableModel->select();
|
|
} else {
|
|
queryModel->setQuery("select * from test");
|
|
}
|
|
return QModelIndex();
|
|
}
|
|
|
|
if (QListWidget *listWidget = qobject_cast<QListWidget *>(model->parent())) {
|
|
#ifndef Q_OS_WINCE
|
|
int items = 100;
|
|
#else
|
|
int items = 50;
|
|
#endif
|
|
while (items--)
|
|
listWidget->addItem(QString("item %1").arg(items));
|
|
return QModelIndex();
|
|
}
|
|
|
|
if (QTableWidget *tableWidget = qobject_cast<QTableWidget *>(model->parent())) {
|
|
tableWidget->setColumnCount(20);
|
|
tableWidget->setRowCount(20);
|
|
return QModelIndex();
|
|
}
|
|
|
|
if (QTreeWidget *treeWidget = qobject_cast<QTreeWidget *>(model->parent())) {
|
|
int topItems = 20;
|
|
treeWidget->setColumnCount(1);
|
|
QTreeWidgetItem *parent;
|
|
while (topItems--){
|
|
parent = new QTreeWidgetItem(treeWidget, QStringList(QString("top %1").arg(topItems)));
|
|
for (int i = 0; i < 20; ++i)
|
|
new QTreeWidgetItem(parent, QStringList(QString("child %1").arg(topItems)));
|
|
}
|
|
return QModelIndex();
|
|
}
|
|
|
|
qFatal("%s: unknown type of model", Q_FUNC_INFO);
|
|
return QModelIndex();
|
|
}
|
|
|
|
/*!
|
|
If you need to cleanup from populateTest() do it here.
|
|
Note that this is called after every test even if populateTestArea isn't called.
|
|
*/
|
|
void ModelsToTest::cleanupTestArea(QAbstractItemModel *model)
|
|
{
|
|
if (qobject_cast<QDirModel *>(model))
|
|
{
|
|
if (QDir(QDir::currentPath()+"/test").exists())
|
|
{
|
|
for (int i = 0; i < 26; ++i) {
|
|
QString subdir(QString("test/foo_%1").arg(i));
|
|
if (!QDir::current().rmdir(subdir))
|
|
qFatal("%s: cannot remove directory %s",
|
|
Q_FUNC_INFO,
|
|
qPrintable(QDir::toNativeSeparators(QDir::currentPath()+"/"+subdir)));
|
|
}
|
|
if (!QDir::current().rmdir("test"))
|
|
qFatal("%s: cannot remove directory %s",
|
|
Q_FUNC_INFO,
|
|
qPrintable(QDir::toNativeSeparators(QDir::currentPath()+"/test")));
|
|
}
|
|
} else if (qobject_cast<QSqlQueryModel *>(model)) {
|
|
QSqlQuery q("DROP TABLE test");
|
|
}
|
|
}
|
|
|
|
void ModelsToTest::setupDatabase()
|
|
{
|
|
if (!QSqlDatabase::database().isValid()) {
|
|
QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE");
|
|
db.setDatabaseName(":memory:");
|
|
if (!db.open()) {
|
|
qWarning() << "Unable to open database" << db.lastError();
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|