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
838 lines
30 KiB
C++
838 lines
30 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/QPushButton>
|
|
#include <QtWidgets/QStyle>
|
|
#include <QtWidgets/QLayout>
|
|
#include <QtWidgets/QDialog>
|
|
#include <QtWidgets/QAction>
|
|
#include <qdialogbuttonbox.h>
|
|
#include <limits.h>
|
|
|
|
//TESTED_CLASS=
|
|
//TESTED_FILES=
|
|
|
|
Q_DECLARE_METATYPE(QList<int>)
|
|
Q_DECLARE_METATYPE(QDialogButtonBox::ButtonRole)
|
|
Q_DECLARE_METATYPE(QDialogButtonBox::StandardButton)
|
|
Q_DECLARE_METATYPE(QDialogButtonBox::StandardButtons)
|
|
Q_DECLARE_METATYPE(QAbstractButton*)
|
|
|
|
class tst_QDialogButtonBox : public QObject
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
tst_QDialogButtonBox();
|
|
~tst_QDialogButtonBox();
|
|
|
|
|
|
public slots:
|
|
void buttonClicked1(QAbstractButton *);
|
|
void acceptClicked();
|
|
void rejectClicked();
|
|
void helpRequestedClicked();
|
|
|
|
private slots:
|
|
void standardButtons();
|
|
void testConstructor1();
|
|
void testConstrurtor2();
|
|
void testConstrurtor2_data();
|
|
void testConstructor3();
|
|
void testConstructor3_data();
|
|
void setOrientation_data();
|
|
void setOrientation();
|
|
void addButton1_data();
|
|
void addButton1();
|
|
void addButton2_data();
|
|
void addButton2();
|
|
void addButton3_data();
|
|
void addButton3();
|
|
void clear_data();
|
|
void clear();
|
|
void removeButton_data();
|
|
void removeButton();
|
|
void buttonRole_data();
|
|
void buttonRole();
|
|
void setStandardButtons_data();
|
|
void setStandardButtons();
|
|
void layoutReuse();
|
|
|
|
|
|
// Skip these tests, buttons is used in every test thus far.
|
|
// void buttons_data();
|
|
// void buttons();
|
|
|
|
void testDelete();
|
|
void testRemove();
|
|
void testMultipleAdd();
|
|
void testStandardButtonMapping_data();
|
|
void testStandardButtonMapping();
|
|
void testSignals_data();
|
|
void testSignals();
|
|
void testSignalOrder();
|
|
void testDefaultButton_data();
|
|
void testDefaultButton();
|
|
void testS60SoftKeys();
|
|
#ifdef QT_SOFTKEYS_ENABLED
|
|
void testSoftKeyReparenting();
|
|
#endif
|
|
|
|
void task191642_default();
|
|
private:
|
|
qint64 timeStamp;
|
|
qint64 buttonClicked1TimeStamp;
|
|
qint64 acceptTimeStamp;
|
|
qint64 rejectTimeStamp;
|
|
qint64 helpRequestedTimeStamp;
|
|
};
|
|
|
|
tst_QDialogButtonBox::tst_QDialogButtonBox()
|
|
{
|
|
}
|
|
|
|
tst_QDialogButtonBox::~tst_QDialogButtonBox()
|
|
{
|
|
}
|
|
|
|
void tst_QDialogButtonBox::testConstructor1()
|
|
{
|
|
QDialogButtonBox buttonbox;
|
|
QCOMPARE(buttonbox.orientation(), Qt::Horizontal);
|
|
|
|
QCOMPARE(buttonbox.buttons().count(), 0);
|
|
}
|
|
|
|
void tst_QDialogButtonBox::layoutReuse()
|
|
{
|
|
QDialogButtonBox *box = new QDialogButtonBox(QDialogButtonBox::Ok);
|
|
QPointer<QLayout> layout = box->layout();
|
|
box->setCenterButtons(!box->centerButtons());
|
|
QVERIFY(layout == box->layout());
|
|
QEvent event(QEvent::StyleChange);
|
|
QApplication::sendEvent(box, &event);
|
|
QVERIFY(layout == box->layout());
|
|
box->setOrientation(box->orientation() == Qt::Horizontal ? Qt::Vertical : Qt::Horizontal);
|
|
QVERIFY(layout == 0);
|
|
QVERIFY(layout != box->layout());
|
|
delete box;
|
|
}
|
|
|
|
void tst_QDialogButtonBox::testConstrurtor2_data()
|
|
{
|
|
QTest::addColumn<int>("orientation");
|
|
|
|
QTest::newRow("horizontal") << int(Qt::Horizontal);
|
|
QTest::newRow("vertical") << int(Qt::Vertical);
|
|
}
|
|
|
|
void tst_QDialogButtonBox::testConstrurtor2()
|
|
{
|
|
QFETCH(int, orientation);
|
|
Qt::Orientation orient = Qt::Orientation(orientation);
|
|
QDialogButtonBox buttonBox(orient);
|
|
|
|
QCOMPARE(buttonBox.orientation(), orient);
|
|
QCOMPARE(buttonBox.buttons().count(), 0);
|
|
}
|
|
|
|
void tst_QDialogButtonBox::testConstructor3_data()
|
|
{
|
|
QTest::addColumn<int>("orientation");
|
|
QTest::addColumn<QDialogButtonBox::StandardButtons>("buttons");
|
|
QTest::addColumn<int>("buttonCount");
|
|
|
|
QTest::newRow("nothing") << int(Qt::Horizontal) << (QDialogButtonBox::StandardButtons)0 << 0;
|
|
QTest::newRow("only 1") << int(Qt::Horizontal) << QDialogButtonBox::StandardButtons(QDialogButtonBox::Ok) << 1;
|
|
QTest::newRow("only 1.. twice") << int(Qt::Horizontal)
|
|
<< (QDialogButtonBox::Ok | QDialogButtonBox::Ok)
|
|
<< 1;
|
|
QTest::newRow("only 2") << int(Qt::Horizontal)
|
|
<< (QDialogButtonBox::Ok | QDialogButtonBox::Cancel)
|
|
<< 2;
|
|
QTest::newRow("two different things") << int(Qt::Horizontal)
|
|
<< (QDialogButtonBox::Save | QDialogButtonBox::Close)
|
|
<< 2;
|
|
QTest::newRow("three") << int(Qt::Horizontal)
|
|
<< (QDialogButtonBox::Ok
|
|
| QDialogButtonBox::Cancel
|
|
| QDialogButtonBox::Help)
|
|
<< 3;
|
|
QTest::newRow("everything") << int(Qt::Vertical)
|
|
<< (QDialogButtonBox::StandardButtons)UINT_MAX
|
|
<< 18;
|
|
}
|
|
|
|
void tst_QDialogButtonBox::testConstructor3()
|
|
{
|
|
QFETCH(int, orientation);
|
|
QFETCH(QDialogButtonBox::StandardButtons, buttons);
|
|
|
|
QDialogButtonBox buttonBox(buttons, (Qt::Orientation)orientation);
|
|
QCOMPARE(int(buttonBox.orientation()), orientation);
|
|
QTEST(buttonBox.buttons().count(), "buttonCount");
|
|
}
|
|
|
|
void tst_QDialogButtonBox::setOrientation_data()
|
|
{
|
|
QTest::addColumn<int>("orientation");
|
|
|
|
QTest::newRow("Horizontal") << int(Qt::Horizontal);
|
|
QTest::newRow("Vertical") << int(Qt::Vertical);
|
|
}
|
|
|
|
void tst_QDialogButtonBox::setOrientation()
|
|
{
|
|
QFETCH(int, orientation);
|
|
QDialogButtonBox buttonBox;
|
|
QCOMPARE(int(buttonBox.orientation()), int(Qt::Horizontal));
|
|
|
|
buttonBox.setOrientation(Qt::Orientation(orientation));
|
|
QCOMPARE(int(buttonBox.orientation()), orientation);
|
|
}
|
|
|
|
/*
|
|
void tst_QDialogButtonBox::setLayoutPolicy_data()
|
|
{
|
|
QTest::addColumn<int>("layoutPolicy");
|
|
|
|
QTest::newRow("win") << int(QDialogButtonBox::WinLayout);
|
|
QTest::newRow("mac") << int(QDialogButtonBox::MacLayout);
|
|
QTest::newRow("kde") << int(QDialogButtonBox::KdeLayout);
|
|
QTest::newRow("gnome") << int(QDialogButtonBox::GnomeLayout);
|
|
|
|
}
|
|
|
|
void tst_QDialogButtonBox::setLayoutPolicy()
|
|
{
|
|
QFETCH(int, layoutPolicy);
|
|
|
|
QDialogButtonBox buttonBox;
|
|
QCOMPARE(int(buttonBox.layoutPolicy()),
|
|
int(buttonBox.style()->styleHint(QStyle::SH_DialogButtonLayout)));
|
|
buttonBox.setLayoutPolicy(QDialogButtonBox::ButtonLayout(layoutPolicy));
|
|
QCOMPARE(int(buttonBox.layoutPolicy()), layoutPolicy);
|
|
}
|
|
*/
|
|
|
|
void tst_QDialogButtonBox::addButton1_data()
|
|
{
|
|
QTest::addColumn<QDialogButtonBox::ButtonRole>("role");
|
|
QTest::addColumn<int>("totalCount");
|
|
|
|
QTest::newRow("InvalidRole") << QDialogButtonBox::InvalidRole << 0;
|
|
QTest::newRow("AcceptRole") << QDialogButtonBox::AcceptRole << 1;
|
|
QTest::newRow("RejectRole") << QDialogButtonBox::RejectRole << 1;
|
|
QTest::newRow("DestructiveRole") << QDialogButtonBox::DestructiveRole << 1;
|
|
QTest::newRow("ActionRole") << QDialogButtonBox::ActionRole << 1;
|
|
QTest::newRow("HelpRole") << QDialogButtonBox::HelpRole << 1;
|
|
QTest::newRow("WackyValue") << (QDialogButtonBox::ButtonRole)-1 << 0;
|
|
}
|
|
|
|
void tst_QDialogButtonBox::addButton1()
|
|
{
|
|
QFETCH(QDialogButtonBox::ButtonRole, role);
|
|
QDialogButtonBox buttonBox;
|
|
QCOMPARE(buttonBox.buttons().count(), 0);
|
|
QPushButton *button = new QPushButton();
|
|
buttonBox.addButton(button, role);
|
|
QTEST(buttonBox.buttons().count(), "totalCount");
|
|
QList<QAbstractButton *> children = qFindChildren<QAbstractButton *>(&buttonBox);
|
|
QTEST(children.count(), "totalCount");
|
|
delete button;
|
|
}
|
|
|
|
void tst_QDialogButtonBox::addButton2_data()
|
|
{
|
|
QTest::addColumn<QString>("text");
|
|
QTest::addColumn<QDialogButtonBox::ButtonRole>("role");
|
|
QTest::addColumn<int>("totalCount");
|
|
QTest::newRow("InvalidRole") << QString("foo") << QDialogButtonBox::InvalidRole << 0;
|
|
QTest::newRow("AcceptRole") << QString("foo") << QDialogButtonBox::AcceptRole << 1;
|
|
QTest::newRow("RejectRole") << QString("foo") << QDialogButtonBox::RejectRole << 1;
|
|
QTest::newRow("DestructiveRole") << QString("foo") << QDialogButtonBox::DestructiveRole << 1;
|
|
QTest::newRow("ActionRole") << QString("foo") << QDialogButtonBox::ActionRole << 1;
|
|
QTest::newRow("HelpRole") << QString("foo") << QDialogButtonBox::HelpRole << 1;
|
|
QTest::newRow("WackyValue") << QString("foo") << (QDialogButtonBox::ButtonRole)-1 << 0;
|
|
}
|
|
|
|
void tst_QDialogButtonBox::addButton2()
|
|
{
|
|
QFETCH(QString, text);
|
|
QFETCH(QDialogButtonBox::ButtonRole, role);
|
|
QDialogButtonBox buttonBox;
|
|
QCOMPARE(buttonBox.buttons().count(), 0);
|
|
buttonBox.addButton(text, role);
|
|
QTEST(buttonBox.buttons().count(), "totalCount");
|
|
QList<QAbstractButton *> children = qFindChildren<QAbstractButton *>(&buttonBox);
|
|
QTEST(children.count(), "totalCount");
|
|
}
|
|
|
|
void tst_QDialogButtonBox::addButton3_data()
|
|
{
|
|
QTest::addColumn<QDialogButtonBox::StandardButton>("button");
|
|
QTest::addColumn<int>("totalCount");
|
|
QTest::newRow("Ok") << QDialogButtonBox::Ok << 1;
|
|
QTest::newRow("Open") << QDialogButtonBox::Open << 1;
|
|
QTest::newRow("Save") << QDialogButtonBox::Save << 1;
|
|
QTest::newRow("Cancel") << QDialogButtonBox::Cancel << 1;
|
|
QTest::newRow("Close") << QDialogButtonBox::Close << 1;
|
|
QTest::newRow("Discard") << QDialogButtonBox::Discard << 1;
|
|
QTest::newRow("Apply") << QDialogButtonBox::Apply << 1;
|
|
QTest::newRow("Reset") << QDialogButtonBox::Reset << 1;
|
|
QTest::newRow("Help") << QDialogButtonBox::Help << 1;
|
|
QTest::newRow("noButton") << (QDialogButtonBox::StandardButton)0 << 0;
|
|
}
|
|
|
|
void tst_QDialogButtonBox::addButton3()
|
|
{
|
|
QFETCH(QDialogButtonBox::StandardButton, button);
|
|
QDialogButtonBox buttonBox;
|
|
QCOMPARE(buttonBox.buttons().count(), 0);
|
|
buttonBox.addButton(button);
|
|
QTEST(buttonBox.buttons().count(), "totalCount");
|
|
QList<QAbstractButton *> children = qFindChildren<QAbstractButton *>(&buttonBox);
|
|
QTEST(children.count(), "totalCount");
|
|
}
|
|
|
|
void tst_QDialogButtonBox::clear_data()
|
|
{
|
|
QTest::addColumn<int>("rolesToAdd");
|
|
|
|
QTest::newRow("nothing") << 0;
|
|
QTest::newRow("one") << 1;
|
|
QTest::newRow("all") << int(QDialogButtonBox::NRoles);
|
|
}
|
|
|
|
void tst_QDialogButtonBox::clear()
|
|
{
|
|
QFETCH(int, rolesToAdd);
|
|
|
|
QDialogButtonBox buttonBox;
|
|
for (int i = 1; i < rolesToAdd; ++i)
|
|
buttonBox.addButton("Happy", QDialogButtonBox::ButtonRole(i));
|
|
buttonBox.clear();
|
|
QCOMPARE(buttonBox.buttons().count(), 0);
|
|
QList<QAbstractButton *> children = qFindChildren<QAbstractButton *>(&buttonBox);
|
|
QCOMPARE(children.count(), 0);
|
|
}
|
|
|
|
void tst_QDialogButtonBox::removeButton_data()
|
|
{
|
|
QTest::addColumn<QDialogButtonBox::ButtonRole>("roleToAdd");
|
|
QTest::addColumn<int>("expectedCount");
|
|
QTest::newRow("no button added") << QDialogButtonBox::InvalidRole << 0;
|
|
QTest::newRow("a button") << QDialogButtonBox::AcceptRole << 1;
|
|
}
|
|
|
|
void tst_QDialogButtonBox::removeButton()
|
|
{
|
|
QFETCH(QDialogButtonBox::ButtonRole, roleToAdd);
|
|
|
|
QDialogButtonBox buttonBox;
|
|
QCOMPARE(buttonBox.buttons().count(), 0);
|
|
QPushButton *button = new QPushButton("RemoveButton test");
|
|
buttonBox.addButton(button, roleToAdd);
|
|
QTEST(buttonBox.buttons().count(), "expectedCount");
|
|
|
|
buttonBox.removeButton(button);
|
|
QCOMPARE(buttonBox.buttons().count(), 0);
|
|
delete button;
|
|
}
|
|
|
|
void tst_QDialogButtonBox::testDelete()
|
|
{
|
|
QDialogButtonBox buttonBox;
|
|
QCOMPARE(buttonBox.buttons().count(), 0);
|
|
|
|
QPushButton *deleteMe = new QPushButton("Happy");
|
|
buttonBox.addButton(deleteMe, QDialogButtonBox::HelpRole);
|
|
QCOMPARE(buttonBox.buttons().count(), 1);
|
|
QList<QAbstractButton *> children = qFindChildren<QAbstractButton *>(&buttonBox);
|
|
QCOMPARE(children.count(), 1);
|
|
|
|
delete deleteMe;
|
|
children = qFindChildren<QAbstractButton *>(&buttonBox);
|
|
QCOMPARE(children.count(), 0);
|
|
QCOMPARE(buttonBox.buttons().count(), 0);
|
|
}
|
|
|
|
void tst_QDialogButtonBox::testMultipleAdd()
|
|
{
|
|
// Add a button into the thing multiple times.
|
|
QDialogButtonBox buttonBox;
|
|
QCOMPARE(buttonBox.buttons().count(), 0);
|
|
|
|
QPushButton *button = new QPushButton("Foo away");
|
|
buttonBox.addButton(button, QDialogButtonBox::AcceptRole);
|
|
QCOMPARE(buttonBox.buttons().count(), 1);
|
|
QCOMPARE(buttonBox.buttonRole(button), QDialogButtonBox::AcceptRole);
|
|
buttonBox.addButton(button, QDialogButtonBox::AcceptRole);
|
|
QCOMPARE(buttonBox.buttons().count(), 1);
|
|
QCOMPARE(buttonBox.buttonRole(button), QDialogButtonBox::AcceptRole);
|
|
|
|
// Add it again with a different role
|
|
buttonBox.addButton(button, QDialogButtonBox::RejectRole);
|
|
QCOMPARE(buttonBox.buttons().count(), 1);
|
|
QCOMPARE(buttonBox.buttonRole(button), QDialogButtonBox::RejectRole);
|
|
|
|
// Add it as an "invalid" role
|
|
buttonBox.addButton(button, QDialogButtonBox::InvalidRole);
|
|
QCOMPARE(buttonBox.buttons().count(), 1);
|
|
QCOMPARE(buttonBox.buttonRole(button), QDialogButtonBox::RejectRole);
|
|
}
|
|
|
|
void tst_QDialogButtonBox::buttonRole_data()
|
|
{
|
|
QTest::addColumn<QDialogButtonBox::ButtonRole>("roleToAdd");
|
|
QTest::addColumn<QDialogButtonBox::ButtonRole>("expectedRole");
|
|
|
|
QTest::newRow("AcceptRole stuff") << QDialogButtonBox::AcceptRole
|
|
<< QDialogButtonBox::AcceptRole;
|
|
QTest::newRow("Nothing") << QDialogButtonBox::InvalidRole << QDialogButtonBox::InvalidRole;
|
|
QTest::newRow("bad stuff") << (QDialogButtonBox::ButtonRole)-1 << QDialogButtonBox::InvalidRole;
|
|
}
|
|
|
|
void tst_QDialogButtonBox::buttonRole()
|
|
{
|
|
QFETCH(QDialogButtonBox::ButtonRole, roleToAdd);
|
|
QDialogButtonBox buttonBox;
|
|
QAbstractButton *button = buttonBox.addButton("Here's a button", roleToAdd);
|
|
QTEST(buttonBox.buttonRole(button), "expectedRole");
|
|
}
|
|
|
|
void tst_QDialogButtonBox::testStandardButtonMapping_data()
|
|
{
|
|
QTest::addColumn<QDialogButtonBox::StandardButton>("button");
|
|
QTest::addColumn<QDialogButtonBox::ButtonRole>("expectedRole");
|
|
QTest::addColumn<QString>("expectedText");
|
|
|
|
int layoutPolicy = qApp->style()->styleHint(QStyle::SH_DialogButtonLayout);
|
|
|
|
QTest::newRow("QDialogButtonBox::Ok") << QDialogButtonBox::Ok
|
|
<< QDialogButtonBox::AcceptRole
|
|
<< QDialogButtonBox::tr("OK");
|
|
QTest::newRow("QDialogButtonBox::Open") << QDialogButtonBox::Open
|
|
<< QDialogButtonBox::AcceptRole
|
|
<< QDialogButtonBox::tr("Open");
|
|
QTest::newRow("QDialogButtonBox::Save") << QDialogButtonBox::Save
|
|
<< QDialogButtonBox::AcceptRole
|
|
<< QDialogButtonBox::tr("Save");
|
|
QTest::newRow("QDialogButtonBox::Cancel") << QDialogButtonBox::Cancel
|
|
<< QDialogButtonBox::RejectRole
|
|
<< QDialogButtonBox::tr("Cancel");
|
|
QTest::newRow("QDialogButtonBox::Close") << QDialogButtonBox::Close
|
|
<< QDialogButtonBox::RejectRole
|
|
<< QDialogButtonBox::tr("Close");
|
|
if (layoutPolicy == QDialogButtonBox::MacLayout) {
|
|
QTest::newRow("QDialogButtonBox::Discard") << QDialogButtonBox::Discard
|
|
<< QDialogButtonBox::DestructiveRole
|
|
<< QDialogButtonBox::tr("Don't Save");
|
|
} else if (layoutPolicy == QDialogButtonBox::GnomeLayout) {
|
|
QTest::newRow("QDialogButtonBox::Discard")
|
|
<< QDialogButtonBox::Discard
|
|
<< QDialogButtonBox::DestructiveRole
|
|
<< QDialogButtonBox::tr("Close without Saving");
|
|
} else {
|
|
QTest::newRow("QDialogButtonBox::Discard") << QDialogButtonBox::Discard
|
|
<< QDialogButtonBox::DestructiveRole
|
|
<< QDialogButtonBox::tr("Discard");
|
|
}
|
|
QTest::newRow("QDialogButtonBox::Apply") << QDialogButtonBox::Apply
|
|
<< QDialogButtonBox::ApplyRole
|
|
<< QDialogButtonBox::tr("Apply");
|
|
QTest::newRow("QDialogButtonBox::Reset") << QDialogButtonBox::Reset
|
|
<< QDialogButtonBox::ResetRole
|
|
<< QDialogButtonBox::tr("Reset");
|
|
QTest::newRow("QDialogButtonBox::Help") << QDialogButtonBox::Help
|
|
<< QDialogButtonBox::HelpRole
|
|
<< QDialogButtonBox::tr("Help");
|
|
}
|
|
|
|
void tst_QDialogButtonBox::testStandardButtonMapping()
|
|
{
|
|
QFETCH(QDialogButtonBox::StandardButton, button);
|
|
QDialogButtonBox buttonBox;
|
|
|
|
QAbstractButton *theButton = buttonBox.addButton(button);
|
|
QTEST(buttonBox.buttonRole(theButton), "expectedRole");
|
|
QString textWithoutMnemonic = theButton->text().remove("&");
|
|
QTEST(textWithoutMnemonic, "expectedText");
|
|
}
|
|
|
|
void tst_QDialogButtonBox::testSignals_data()
|
|
{
|
|
QTest::addColumn<QDialogButtonBox::ButtonRole>("buttonToClick");
|
|
QTest::addColumn<int>("clicked2Count");
|
|
QTest::addColumn<int>("acceptCount");
|
|
QTest::addColumn<int>("rejectCount");
|
|
QTest::addColumn<int>("helpRequestedCount");
|
|
|
|
QTest::newRow("nothing") << QDialogButtonBox::InvalidRole << 0 << 0 << 0 << 0;
|
|
QTest::newRow("accept") << QDialogButtonBox::AcceptRole << 1 << 1 << 0 << 0;
|
|
QTest::newRow("reject") << QDialogButtonBox::RejectRole << 1 << 0 << 1 << 0;
|
|
QTest::newRow("destructive") << QDialogButtonBox::DestructiveRole << 1 << 0 << 0 << 0;
|
|
QTest::newRow("Action") << QDialogButtonBox::ActionRole << 1 << 0 << 0 << 0;
|
|
QTest::newRow("Help") << QDialogButtonBox::HelpRole << 1 << 0 << 0 << 1;
|
|
}
|
|
|
|
void tst_QDialogButtonBox::testSignals()
|
|
{
|
|
QFETCH(QDialogButtonBox::ButtonRole, buttonToClick);
|
|
QDialogButtonBox buttonBox;
|
|
qRegisterMetaType<QAbstractButton *>("QAbstractButton*");
|
|
QSignalSpy clicked2(&buttonBox, SIGNAL(clicked(QAbstractButton*)));
|
|
QSignalSpy accept(&buttonBox, SIGNAL(accepted()));
|
|
QSignalSpy reject(&buttonBox, SIGNAL(rejected()));
|
|
QSignalSpy helpRequested(&buttonBox, SIGNAL(helpRequested()));
|
|
|
|
QPushButton *clickMe = 0;
|
|
for (int i = QDialogButtonBox::AcceptRole; i < QDialogButtonBox::NRoles; ++i) {
|
|
QPushButton *button = buttonBox.addButton(QString::number(i),
|
|
QDialogButtonBox::ButtonRole(i));
|
|
|
|
if (i == buttonToClick)
|
|
clickMe = button;
|
|
}
|
|
if (clickMe) {
|
|
clickMe->animateClick(0);
|
|
QTest::qWait(100);
|
|
}
|
|
|
|
QTEST(clicked2.count(), "clicked2Count");
|
|
if (clicked2.count() > 0)
|
|
QCOMPARE(qvariant_cast<QAbstractButton *>(clicked2.at(0).at(0)), (QAbstractButton *)clickMe);
|
|
|
|
QTEST(accept.count(), "acceptCount");
|
|
QTEST(reject.count(), "rejectCount");
|
|
QTEST(helpRequested.count(), "helpRequestedCount");
|
|
}
|
|
|
|
void tst_QDialogButtonBox::testSignalOrder()
|
|
{
|
|
const qint64 longLongZero = 0;
|
|
buttonClicked1TimeStamp = acceptTimeStamp
|
|
= rejectTimeStamp = helpRequestedTimeStamp = timeStamp = 0;
|
|
QDialogButtonBox buttonBox;
|
|
connect(&buttonBox, SIGNAL(clicked(QAbstractButton *)),
|
|
this, SLOT(buttonClicked1(QAbstractButton *)));
|
|
connect(&buttonBox, SIGNAL(accepted()), this, SLOT(acceptClicked()));
|
|
connect(&buttonBox, SIGNAL(rejected()), this, SLOT(rejectClicked()));
|
|
connect(&buttonBox, SIGNAL(helpRequested()), this, SLOT(helpRequestedClicked()));
|
|
|
|
QPushButton *acceptButton = buttonBox.addButton("OK", QDialogButtonBox::AcceptRole);
|
|
QPushButton *rejectButton = buttonBox.addButton("Cancel", QDialogButtonBox::RejectRole);
|
|
QPushButton *actionButton = buttonBox.addButton("Action This", QDialogButtonBox::ActionRole);
|
|
QPushButton *helpButton = buttonBox.addButton("Help Me!", QDialogButtonBox::HelpRole);
|
|
|
|
// Try accept
|
|
acceptButton->animateClick(0);
|
|
QTest::qWait(100);
|
|
QCOMPARE(rejectTimeStamp, longLongZero);
|
|
QCOMPARE(helpRequestedTimeStamp, longLongZero);
|
|
|
|
QVERIFY(buttonClicked1TimeStamp < acceptTimeStamp);
|
|
acceptTimeStamp = 0;
|
|
|
|
rejectButton->animateClick(0);
|
|
QTest::qWait(100);
|
|
QCOMPARE(acceptTimeStamp, longLongZero);
|
|
QCOMPARE(helpRequestedTimeStamp, longLongZero);
|
|
QVERIFY(buttonClicked1TimeStamp < rejectTimeStamp);
|
|
|
|
rejectTimeStamp = 0;
|
|
actionButton->animateClick(0);
|
|
QTest::qWait(100);
|
|
QCOMPARE(acceptTimeStamp, longLongZero);
|
|
QCOMPARE(rejectTimeStamp, longLongZero);
|
|
QCOMPARE(helpRequestedTimeStamp, longLongZero);
|
|
|
|
helpButton->animateClick(0);
|
|
QTest::qWait(100);
|
|
QCOMPARE(acceptTimeStamp, longLongZero);
|
|
QCOMPARE(rejectTimeStamp, longLongZero);
|
|
QVERIFY(buttonClicked1TimeStamp < helpRequestedTimeStamp);
|
|
}
|
|
|
|
void tst_QDialogButtonBox::buttonClicked1(QAbstractButton *)
|
|
{
|
|
buttonClicked1TimeStamp = ++timeStamp;
|
|
}
|
|
|
|
void tst_QDialogButtonBox::acceptClicked()
|
|
{
|
|
acceptTimeStamp = ++timeStamp;
|
|
}
|
|
|
|
void tst_QDialogButtonBox::rejectClicked()
|
|
{
|
|
rejectTimeStamp = ++timeStamp;
|
|
}
|
|
|
|
void tst_QDialogButtonBox::helpRequestedClicked()
|
|
{
|
|
helpRequestedTimeStamp = ++timeStamp;
|
|
}
|
|
|
|
void tst_QDialogButtonBox::setStandardButtons_data()
|
|
{
|
|
QTest::addColumn<QDialogButtonBox::StandardButtons>("buttonsToAdd");
|
|
QTest::addColumn<QDialogButtonBox::StandardButtons>("expectedResult");
|
|
|
|
QTest::newRow("Nothing") << QDialogButtonBox::StandardButtons(QDialogButtonBox::NoButton)
|
|
<< QDialogButtonBox::StandardButtons(QDialogButtonBox::NoButton);
|
|
QTest::newRow("Everything") << (QDialogButtonBox::StandardButtons)0xffffffff
|
|
<< (QDialogButtonBox::Ok
|
|
| QDialogButtonBox::Open
|
|
| QDialogButtonBox::Save
|
|
| QDialogButtonBox::Cancel
|
|
| QDialogButtonBox::Close
|
|
| QDialogButtonBox::Discard
|
|
| QDialogButtonBox::Apply
|
|
| QDialogButtonBox::Reset
|
|
| QDialogButtonBox::Help
|
|
| QDialogButtonBox::Yes
|
|
| QDialogButtonBox::YesToAll
|
|
| QDialogButtonBox::No
|
|
| QDialogButtonBox::NoToAll
|
|
| QDialogButtonBox::SaveAll
|
|
| QDialogButtonBox::Abort
|
|
| QDialogButtonBox::Retry
|
|
| QDialogButtonBox::Ignore
|
|
| QDialogButtonBox::RestoreDefaults
|
|
);
|
|
QTest::newRow("Simple thing") << QDialogButtonBox::StandardButtons(QDialogButtonBox::Help)
|
|
<< QDialogButtonBox::StandardButtons(QDialogButtonBox::Help);
|
|
QTest::newRow("Standard thing") << (QDialogButtonBox::Ok | QDialogButtonBox::Cancel)
|
|
<< (QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
|
|
}
|
|
|
|
void tst_QDialogButtonBox::setStandardButtons()
|
|
{
|
|
QFETCH(QDialogButtonBox::StandardButtons, buttonsToAdd);
|
|
QDialogButtonBox buttonBox;
|
|
buttonBox.setStandardButtons(buttonsToAdd);
|
|
QTEST(buttonBox.standardButtons(), "expectedResult");
|
|
}
|
|
|
|
void tst_QDialogButtonBox::standardButtons()
|
|
{
|
|
// Test various cases of setting StandardButtons
|
|
QDialogButtonBox buttonBox;
|
|
|
|
QCOMPARE(buttonBox.standardButtons(),
|
|
QDialogButtonBox::StandardButtons(QDialogButtonBox::NoButton));
|
|
|
|
// Set some buttons
|
|
buttonBox.setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
|
|
QCOMPARE(buttonBox.standardButtons(), QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
|
|
|
|
// Now add a button
|
|
buttonBox.addButton(QDialogButtonBox::Apply);
|
|
QCOMPARE(buttonBox.standardButtons(),
|
|
QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::Apply);
|
|
|
|
// Set the standard buttons to other things
|
|
buttonBox.setStandardButtons(QDialogButtonBox::Save | QDialogButtonBox::Cancel
|
|
| QDialogButtonBox::Discard);
|
|
QCOMPARE(buttonBox.standardButtons(), QDialogButtonBox::Save | QDialogButtonBox::Cancel
|
|
| QDialogButtonBox::Discard);
|
|
QCOMPARE(buttonBox.buttons().size(), 3);
|
|
|
|
// Add another button (not a standard one)
|
|
buttonBox.addButton(QLatin1String("Help"), QDialogButtonBox::HelpRole);
|
|
QCOMPARE(buttonBox.standardButtons(), QDialogButtonBox::Save | QDialogButtonBox::Cancel
|
|
| QDialogButtonBox::Discard);
|
|
QCOMPARE(buttonBox.buttons().size(), 4);
|
|
|
|
// Finally, check if we construct with standard buttons that they show up.
|
|
QDialogButtonBox buttonBox2(QDialogButtonBox::Open | QDialogButtonBox::Reset);
|
|
QCOMPARE(buttonBox2.standardButtons(), QDialogButtonBox::Open | QDialogButtonBox::Reset);
|
|
}
|
|
|
|
void tst_QDialogButtonBox::testRemove()
|
|
{
|
|
// Make sure that removing a button and clicking it, doesn't trigger any latent signals
|
|
QDialogButtonBox buttonBox;
|
|
QSignalSpy clicked(&buttonBox, SIGNAL(clicked(QAbstractButton*)));
|
|
|
|
QAbstractButton *button = buttonBox.addButton(QDialogButtonBox::Ok);
|
|
|
|
buttonBox.removeButton(button);
|
|
|
|
button->animateClick(0);
|
|
QTest::qWait(100);
|
|
QCOMPARE(clicked.count(), 0);
|
|
delete button;
|
|
}
|
|
|
|
void tst_QDialogButtonBox::testDefaultButton_data()
|
|
{
|
|
QTest::addColumn<int>("whenToSetDefault"); // -1 Do nothing, 0 after accept, 1 before accept
|
|
QTest::addColumn<int>("buttonToBeDefault");
|
|
QTest::addColumn<int>("indexThatIsDefault");
|
|
|
|
QTest::newRow("do nothing First Accept implicit") << -1 << -1 << 0;
|
|
QTest::newRow("First accept explicit before add") << 1 << 0 << 0;
|
|
QTest::newRow("First accept explicit after add") << 0 << 0 << 0;
|
|
QTest::newRow("second accept explicit before add") << 1 << 1 << 1;
|
|
QTest::newRow("second accept explicit after add") << 0 << 1 << 1;
|
|
QTest::newRow("third accept explicit befare add") << 1 << 2 << 2;
|
|
QTest::newRow("third accept explicit after add") << 0 << 2 << 2;
|
|
}
|
|
|
|
static int softKeyCount(QWidget *widget)
|
|
{
|
|
int softkeyCount = 0;
|
|
#ifndef QT_NO_ACTION
|
|
QList<QAction *> actions = widget->actions();
|
|
foreach (QAction *action, actions) {
|
|
if (action->softKeyRole() != QAction::NoSoftKey)
|
|
softkeyCount++;
|
|
}
|
|
#endif
|
|
return softkeyCount;
|
|
}
|
|
|
|
void tst_QDialogButtonBox::testS60SoftKeys()
|
|
{
|
|
#ifdef Q_WS_S60
|
|
QDialog dialog(0);
|
|
QDialogButtonBox buttonBox(&dialog);
|
|
buttonBox.setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
|
|
dialog.show();
|
|
|
|
#ifndef QT_NO_ACTION
|
|
QCOMPARE( softKeyCount(&dialog), 2);
|
|
#endif
|
|
|
|
QDialog dialog2(0);
|
|
QDialogButtonBox buttonBox2(&dialog2);
|
|
buttonBox2.setStandardButtons(QDialogButtonBox::Cancel);
|
|
dialog2.show();
|
|
|
|
#ifndef QT_NO_ACTION
|
|
QCOMPARE( softKeyCount(&dialog2), 1);
|
|
#endif
|
|
|
|
#else
|
|
QSKIP("S60-specific test", SkipAll );
|
|
#endif
|
|
}
|
|
|
|
#ifdef QT_SOFTKEYS_ENABLED
|
|
void tst_QDialogButtonBox::testSoftKeyReparenting()
|
|
{
|
|
QDialog dialog;
|
|
QDialogButtonBox *buttonBox = new QDialogButtonBox;
|
|
buttonBox->addButton(QDialogButtonBox::Ok);
|
|
buttonBox->addButton(QDialogButtonBox::Cancel);
|
|
|
|
#ifndef QT_NO_ACTION
|
|
QCOMPARE(softKeyCount(&dialog), 0);
|
|
QCOMPARE(softKeyCount(buttonBox), 2);
|
|
#endif
|
|
|
|
// Were the softkeys re-parented correctly?
|
|
dialog.setLayout(new QVBoxLayout);
|
|
dialog.layout()->addWidget(buttonBox);
|
|
#ifndef QT_NO_ACTION
|
|
QCOMPARE(softKeyCount(&dialog), 2);
|
|
QCOMPARE(softKeyCount(buttonBox), 0);
|
|
#endif
|
|
|
|
// Softkeys are only added to QDialog, not QWidget
|
|
QWidget *nested = new QWidget;
|
|
nested->setLayout(new QVBoxLayout);
|
|
nested->layout()->addWidget(buttonBox);
|
|
#ifndef QT_NO_ACTION
|
|
QCOMPARE(softKeyCount(nested), 0);
|
|
QCOMPARE(softKeyCount(buttonBox), 2);
|
|
#endif
|
|
}
|
|
#endif
|
|
|
|
void tst_QDialogButtonBox::testDefaultButton()
|
|
{
|
|
QFETCH(int, whenToSetDefault);
|
|
QFETCH(int, buttonToBeDefault);
|
|
QFETCH(int, indexThatIsDefault);
|
|
QDialogButtonBox buttonBox;
|
|
QPushButton *buttonArray[] = { new QPushButton("Foo"), new QPushButton("Bar"), new QPushButton("Baz") };
|
|
|
|
for (int i = 0; i < 3; ++i) {
|
|
if (whenToSetDefault == 1 && i == buttonToBeDefault)
|
|
buttonArray[i]->setDefault(true);
|
|
buttonBox.addButton(buttonArray[i], QDialogButtonBox::AcceptRole);
|
|
if (whenToSetDefault == 0 && i == buttonToBeDefault)
|
|
buttonArray[i]->setDefault(true);
|
|
}
|
|
buttonBox.show();
|
|
|
|
for (int i = 0; i < 3; ++i) {
|
|
if (i == indexThatIsDefault)
|
|
QVERIFY(buttonArray[i]->isDefault());
|
|
else
|
|
QVERIFY(!buttonArray[i]->isDefault());
|
|
}
|
|
}
|
|
|
|
void tst_QDialogButtonBox::task191642_default()
|
|
{
|
|
QDialog dlg;
|
|
QPushButton *def = new QPushButton(&dlg);
|
|
QSignalSpy clicked(def, SIGNAL(clicked(bool)));
|
|
def->setDefault(true);
|
|
QDialogButtonBox *bb = new QDialogButtonBox(&dlg);
|
|
bb->addButton(QDialogButtonBox::Ok);
|
|
bb->addButton(QDialogButtonBox::Cancel);
|
|
bb->addButton(QDialogButtonBox::Help);
|
|
|
|
dlg.show();
|
|
QTest::qWait(10);
|
|
QVERIFY(def->isDefault());
|
|
QTest::keyPress( &dlg, Qt::Key_Enter );
|
|
QTest::qWait(100);
|
|
QCOMPARE(clicked.count(), 1);
|
|
}
|
|
|
|
QTEST_MAIN(tst_QDialogButtonBox)
|
|
#include "tst_qdialogbuttonbox.moc"
|