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
910 lines
26 KiB
C++
910 lines
26 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 <qlayout.h>
|
|
#include <qapplication.h>
|
|
#include <qwidget.h>
|
|
#include <qwindowsstyle.h>
|
|
#include <qsizepolicy.h>
|
|
|
|
#include <QtWidgets/QWindowsStyle>
|
|
#include <QStyleFactory>
|
|
|
|
#include <qformlayout.h>
|
|
|
|
//TESTED_CLASS=
|
|
//TESTED_FILES=
|
|
|
|
class tst_QFormLayout : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
tst_QFormLayout();
|
|
~tst_QFormLayout();
|
|
|
|
public slots:
|
|
void initTestCase();
|
|
void cleanupTestCase();
|
|
void init();
|
|
void cleanup();
|
|
|
|
private slots:
|
|
void rowCount();
|
|
void buddies();
|
|
void getItemPosition();
|
|
void wrapping();
|
|
void spacing();
|
|
void contentsRect();
|
|
|
|
void setFormStyle();
|
|
void setFieldGrowthPolicy();
|
|
void setRowWrapPolicy();
|
|
void setLabelAlignment();
|
|
void setFormAlignment();
|
|
|
|
/*
|
|
void setHorizontalSpacing(int spacing);
|
|
int horizontalSpacing() const;
|
|
void setVerticalSpacing(int spacing);
|
|
int verticalSpacing() const;
|
|
*/
|
|
|
|
void addRow();
|
|
void insertRow_QWidget_QWidget();
|
|
void insertRow_QWidget_QLayout();
|
|
void insertRow_QString_QWidget();
|
|
void insertRow_QString_QLayout();
|
|
void insertRow_QWidget();
|
|
void insertRow_QLayout();
|
|
void setWidget();
|
|
void setLayout();
|
|
|
|
/*
|
|
QLayoutItem *itemAt(int row, ItemRole role) const;
|
|
void getItemPosition(int index, int *rowPtr, ItemRole *rolePtr) const;
|
|
void getLayoutPosition(QWidget *widget, int *rowPtr, ItemRole *rolePtr) const;
|
|
void getItemPosition(QLayoutItem *item, int *rowPtr, ItemRole *rolePtr) const;
|
|
QWidget *labelForField(QWidget *widget) const;
|
|
QWidget *labelForField(QLayoutItem *item) const;
|
|
|
|
void addItem(QLayoutItem *item);
|
|
*/
|
|
|
|
void itemAt();
|
|
void takeAt();
|
|
void layoutAlone();
|
|
/*
|
|
void setGeometry(const QRect &rect);
|
|
QSize minimumSize() const;
|
|
QSize sizeHint() const;
|
|
|
|
bool hasHeightForWidth() const;
|
|
int heightForWidth(int width) const;
|
|
Qt::Orientations expandingDirections() const;
|
|
*/
|
|
|
|
};
|
|
|
|
tst_QFormLayout::tst_QFormLayout()
|
|
{
|
|
}
|
|
|
|
tst_QFormLayout::~tst_QFormLayout()
|
|
{
|
|
}
|
|
|
|
void tst_QFormLayout::initTestCase()
|
|
{
|
|
}
|
|
|
|
void tst_QFormLayout::cleanupTestCase()
|
|
{
|
|
}
|
|
|
|
void tst_QFormLayout::init()
|
|
{
|
|
}
|
|
|
|
void tst_QFormLayout::cleanup()
|
|
{
|
|
}
|
|
|
|
void tst_QFormLayout::rowCount()
|
|
{
|
|
QWidget *w = new QWidget;
|
|
QFormLayout *fl = new QFormLayout(w);
|
|
|
|
fl->addRow(tr("Label 1"), new QLineEdit);
|
|
fl->addRow(tr("Label 2"), new QLineEdit);
|
|
fl->addRow(tr("Label 3"), new QLineEdit);
|
|
QCOMPARE(fl->rowCount(), 3);
|
|
|
|
fl->addRow(new QWidget);
|
|
fl->addRow(new QHBoxLayout);
|
|
QCOMPARE(fl->rowCount(), 5);
|
|
|
|
fl->insertRow(1, tr("Label 0.5"), new QLineEdit);
|
|
QCOMPARE(fl->rowCount(), 6);
|
|
|
|
//TODO: remove items
|
|
|
|
delete w;
|
|
}
|
|
|
|
void tst_QFormLayout::buddies()
|
|
{
|
|
QWidget *w = new QWidget;
|
|
QFormLayout *fl = new QFormLayout(w);
|
|
|
|
//normal buddy case
|
|
QLineEdit *le = new QLineEdit;
|
|
fl->addRow(tr("Label 1"), le);
|
|
QLabel *label = qobject_cast<QLabel *>(fl->labelForField(le));
|
|
QVERIFY(label);
|
|
QWidget *lew = le;
|
|
QCOMPARE(label->buddy(), lew);
|
|
|
|
//null label
|
|
QLineEdit *le2 = new QLineEdit;
|
|
fl->addRow(0, le2);
|
|
QWidget *label2 = fl->labelForField(le2);
|
|
QVERIFY(label2 == 0);
|
|
|
|
//no label
|
|
QLineEdit *le3 = new QLineEdit;
|
|
fl->addRow(le3);
|
|
QWidget *label3 = fl->labelForField(le3);
|
|
QVERIFY(label3 == 0);
|
|
|
|
//TODO: empty label?
|
|
|
|
delete w;
|
|
}
|
|
|
|
void tst_QFormLayout::getItemPosition()
|
|
{
|
|
QWidget *w = new QWidget;
|
|
QFormLayout *fl = new QFormLayout(w);
|
|
|
|
QList<QLabel*> labels;
|
|
QList<QLineEdit*> fields;
|
|
for (int i = 0; i < 5; ++i) {
|
|
labels.append(new QLabel(QString("Label %1").arg(i+1)));
|
|
fields.append(new QLineEdit);
|
|
fl->addRow(labels[i], fields[i]);
|
|
}
|
|
|
|
//a field
|
|
{
|
|
int row;
|
|
QFormLayout::ItemRole role;
|
|
fl->getWidgetPosition(fields[3], &row, &role);
|
|
QCOMPARE(row, 3);
|
|
QCOMPARE(role, QFormLayout::FieldRole);
|
|
}
|
|
|
|
//a label
|
|
{
|
|
int row;
|
|
QFormLayout::ItemRole role;
|
|
fl->getWidgetPosition(labels[2], &row, &role);
|
|
QCOMPARE(row, 2);
|
|
QCOMPARE(role, QFormLayout::LabelRole);
|
|
}
|
|
|
|
//a layout that's been inserted
|
|
{
|
|
QVBoxLayout *vbl = new QVBoxLayout;
|
|
fl->insertRow(2, "Label 1.5", vbl);
|
|
int row;
|
|
QFormLayout::ItemRole role;
|
|
fl->getLayoutPosition(vbl, &row, &role);
|
|
QCOMPARE(row, 2);
|
|
QCOMPARE(role, QFormLayout::FieldRole);
|
|
}
|
|
|
|
delete w;
|
|
}
|
|
|
|
void tst_QFormLayout::wrapping()
|
|
{
|
|
QWidget *w = new QWidget;
|
|
QFormLayout *fl = new QFormLayout(w);
|
|
fl->setRowWrapPolicy(QFormLayout::WrapLongRows);
|
|
|
|
QLineEdit *le = new QLineEdit;
|
|
QLabel *lbl = new QLabel("A long label");
|
|
le->setMinimumWidth(200);
|
|
fl->addRow(lbl, le);
|
|
|
|
w->setFixedWidth(240);
|
|
w->show();
|
|
|
|
QCOMPARE(le->geometry().y() > lbl->geometry().y(), true);
|
|
|
|
//TODO: additional tests covering different wrapping cases
|
|
|
|
delete w;
|
|
}
|
|
|
|
class CustomLayoutStyle : public QWindowsStyle
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
CustomLayoutStyle()
|
|
{
|
|
hspacing = 5;
|
|
vspacing = 10;
|
|
}
|
|
|
|
virtual int pixelMetric(PixelMetric metric, const QStyleOption * option = 0,
|
|
const QWidget * widget = 0 ) const;
|
|
|
|
int hspacing;
|
|
int vspacing;
|
|
};
|
|
|
|
int CustomLayoutStyle::pixelMetric(PixelMetric metric, const QStyleOption * option /*= 0*/,
|
|
const QWidget * widget /*= 0*/ ) const
|
|
{
|
|
switch (metric) {
|
|
case PM_LayoutHorizontalSpacing:
|
|
return hspacing;
|
|
case PM_LayoutVerticalSpacing:
|
|
return vspacing;
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
return QWindowsStyle::pixelMetric(metric, option, widget);
|
|
}
|
|
|
|
void tst_QFormLayout::spacing()
|
|
{
|
|
//TODO: confirm spacing behavior
|
|
QWidget *w = new QWidget;
|
|
CustomLayoutStyle *style = new CustomLayoutStyle;
|
|
style->hspacing = 5;
|
|
style->vspacing = 10;
|
|
w->setStyle(style);
|
|
QFormLayout *fl = new QFormLayout(w);
|
|
QCOMPARE(style->hspacing, fl->horizontalSpacing());
|
|
QCOMPARE(style->vspacing, fl->verticalSpacing());
|
|
|
|
//QCOMPARE(fl->spacing(), -1);
|
|
fl->setVerticalSpacing(5);
|
|
QCOMPARE(5, fl->horizontalSpacing());
|
|
QCOMPARE(5, fl->verticalSpacing());
|
|
//QCOMPARE(fl->spacing(), 5);
|
|
fl->setVerticalSpacing(-1);
|
|
QCOMPARE(style->hspacing, fl->horizontalSpacing());
|
|
QCOMPARE(style->vspacing, fl->verticalSpacing());
|
|
|
|
style->hspacing = 5;
|
|
style->vspacing = 5;
|
|
//QCOMPARE(fl->spacing(), 5);
|
|
|
|
fl->setHorizontalSpacing(20);
|
|
//QCOMPARE(fl->spacing(), -1);
|
|
style->vspacing = 20;
|
|
QCOMPARE(fl->horizontalSpacing(), 20);
|
|
QCOMPARE(fl->verticalSpacing(), 20);
|
|
//QCOMPARE(fl->spacing(), 20);
|
|
fl->setHorizontalSpacing(-1);
|
|
//QCOMPARE(fl->spacing(), -1);
|
|
style->hspacing = 20;
|
|
//QCOMPARE(fl->spacing(), 20);
|
|
|
|
delete w;
|
|
delete style;
|
|
}
|
|
|
|
void tst_QFormLayout::contentsRect()
|
|
{
|
|
QWidget w;
|
|
QFormLayout form;
|
|
w.setLayout(&form);
|
|
form.addRow("Label", new QPushButton(&w));
|
|
w.show();
|
|
/*#if defined(Q_WS_X11)
|
|
qt_x11_wait_for_window_manager(&w); // wait for the show
|
|
#endif*/
|
|
int l, t, r, b;
|
|
form.getContentsMargins(&l, &t, &r, &b);
|
|
QRect geom = form.geometry();
|
|
|
|
QCOMPARE(geom.adjusted(+l, +t, -r, -b), form.contentsRect());
|
|
}
|
|
|
|
|
|
class DummyMacStyle : public QCommonStyle
|
|
{
|
|
public:
|
|
virtual int styleHint ( StyleHint hint, const QStyleOption * option = 0, const QWidget * widget = 0, QStyleHintReturn * returnData = 0 ) const
|
|
{
|
|
switch(hint) {
|
|
case SH_FormLayoutFormAlignment:
|
|
return Qt::AlignHCenter | Qt::AlignTop;
|
|
case SH_FormLayoutLabelAlignment:
|
|
return Qt::AlignRight;
|
|
case SH_FormLayoutWrapPolicy:
|
|
return QFormLayout::DontWrapRows;
|
|
case SH_FormLayoutFieldGrowthPolicy:
|
|
return QFormLayout::FieldsStayAtSizeHint;
|
|
default:
|
|
return QCommonStyle::styleHint(hint, option, widget, returnData);
|
|
}
|
|
}
|
|
};
|
|
|
|
class DummyQtopiaStyle : public QCommonStyle
|
|
{
|
|
public:
|
|
virtual int styleHint ( StyleHint hint, const QStyleOption * option = 0, const QWidget * widget = 0, QStyleHintReturn * returnData = 0 ) const
|
|
{
|
|
switch(hint) {
|
|
case SH_FormLayoutFormAlignment:
|
|
return Qt::AlignLeft | Qt::AlignTop;
|
|
case SH_FormLayoutLabelAlignment:
|
|
return Qt::AlignRight;
|
|
case SH_FormLayoutWrapPolicy:
|
|
return QFormLayout::WrapLongRows;
|
|
case SH_FormLayoutFieldGrowthPolicy:
|
|
return QFormLayout::AllNonFixedFieldsGrow;
|
|
default:
|
|
return QCommonStyle::styleHint(hint, option, widget, returnData);
|
|
}
|
|
}
|
|
};
|
|
|
|
void tst_QFormLayout::setFormStyle()
|
|
{
|
|
QWidget widget;
|
|
QFormLayout layout;
|
|
widget.setLayout(&layout);
|
|
|
|
#ifndef QT_NO_STYLE_PLASTIQUE
|
|
widget.setStyle(new QPlastiqueStyle());
|
|
|
|
QVERIFY(layout.labelAlignment() == Qt::AlignRight);
|
|
QVERIFY(layout.formAlignment() == (Qt::AlignLeft | Qt::AlignTop));
|
|
QVERIFY(layout.fieldGrowthPolicy() == QFormLayout::ExpandingFieldsGrow);
|
|
QVERIFY(layout.rowWrapPolicy() == QFormLayout::DontWrapRows);
|
|
#endif
|
|
|
|
widget.setStyle(new QWindowsStyle());
|
|
|
|
QVERIFY(layout.labelAlignment() == Qt::AlignLeft);
|
|
QVERIFY(layout.formAlignment() == (Qt::AlignLeft | Qt::AlignTop));
|
|
QVERIFY(layout.fieldGrowthPolicy() == QFormLayout::AllNonFixedFieldsGrow);
|
|
QVERIFY(layout.rowWrapPolicy() == QFormLayout::DontWrapRows);
|
|
|
|
/* can't directly create mac style or qtopia style, since
|
|
this test is cross platform.. so create dummy styles that
|
|
return all the right stylehints.
|
|
*/
|
|
widget.setStyle(new DummyMacStyle());
|
|
|
|
QVERIFY(layout.labelAlignment() == Qt::AlignRight);
|
|
QVERIFY(layout.formAlignment() == (Qt::AlignHCenter | Qt::AlignTop));
|
|
QVERIFY(layout.fieldGrowthPolicy() == QFormLayout::FieldsStayAtSizeHint);
|
|
QVERIFY(layout.rowWrapPolicy() == QFormLayout::DontWrapRows);
|
|
|
|
widget.setStyle(new DummyQtopiaStyle());
|
|
|
|
QVERIFY(layout.labelAlignment() == Qt::AlignRight);
|
|
QVERIFY(layout.formAlignment() == (Qt::AlignLeft | Qt::AlignTop));
|
|
QVERIFY(layout.fieldGrowthPolicy() == QFormLayout::AllNonFixedFieldsGrow);
|
|
QVERIFY(layout.rowWrapPolicy() == QFormLayout::WrapLongRows);
|
|
}
|
|
|
|
void tst_QFormLayout::setFieldGrowthPolicy()
|
|
{
|
|
QWidget window;
|
|
QLineEdit fld1, fld2, fld3;
|
|
fld1.setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
|
|
fld2.setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
|
|
fld3.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
|
|
|
|
QFormLayout layout;
|
|
layout.addRow("One:", &fld1);
|
|
layout.addRow("Two:", &fld2);
|
|
layout.addRow("Three:", &fld3);
|
|
window.setLayout(&layout);
|
|
window.resize(1000, 200);
|
|
|
|
for (int i = 0; i < 3; ++i) {
|
|
layout.setFieldGrowthPolicy(i == 0 ? QFormLayout::FieldsStayAtSizeHint :
|
|
i == 1 ? QFormLayout::ExpandingFieldsGrow :
|
|
QFormLayout::AllNonFixedFieldsGrow);
|
|
layout.activate();
|
|
|
|
if (i == 0) {
|
|
QVERIFY(fld1.width() == fld2.width());
|
|
QVERIFY(fld2.width() == fld3.width());
|
|
} else if (i == 1) {
|
|
QVERIFY(fld1.width() == fld2.width());
|
|
QVERIFY(fld2.width() < fld3.width());
|
|
} else {
|
|
QVERIFY(fld1.width() < fld2.width());
|
|
QVERIFY(fld2.width() == fld3.width());
|
|
}
|
|
}
|
|
}
|
|
|
|
void tst_QFormLayout::setRowWrapPolicy()
|
|
{
|
|
}
|
|
|
|
void tst_QFormLayout::setLabelAlignment()
|
|
{
|
|
}
|
|
|
|
void tst_QFormLayout::setFormAlignment()
|
|
{
|
|
}
|
|
|
|
void tst_QFormLayout::addRow()
|
|
{
|
|
QFormLayout layout;
|
|
QWidget w1, w2, w3;
|
|
QHBoxLayout l1, l2, l3;
|
|
QLabel lbl1, lbl2;
|
|
|
|
QCOMPARE(layout.rowCount(), 0);
|
|
|
|
layout.addRow(&lbl1, &w1);
|
|
layout.addRow(&lbl2, &l1);
|
|
layout.addRow("Foo:", &w2);
|
|
layout.addRow("Bar:", &l2);
|
|
layout.addRow(&w3);
|
|
layout.addRow(&l3);
|
|
|
|
QCOMPARE(layout.rowCount(), 6);
|
|
|
|
QVERIFY(layout.itemAt(0, QFormLayout::LabelRole)->widget() == &lbl1);
|
|
QVERIFY(layout.itemAt(1, QFormLayout::LabelRole)->widget() == &lbl2);
|
|
QVERIFY(layout.itemAt(2, QFormLayout::LabelRole)->widget()->property("text") == "Foo:");
|
|
QVERIFY(layout.itemAt(3, QFormLayout::LabelRole)->widget()->property("text") == "Bar:");
|
|
QVERIFY(layout.itemAt(4, QFormLayout::LabelRole) == 0);
|
|
QVERIFY(layout.itemAt(5, QFormLayout::LabelRole) == 0);
|
|
|
|
QVERIFY(layout.itemAt(0, QFormLayout::FieldRole)->widget() == &w1);
|
|
QVERIFY(layout.itemAt(1, QFormLayout::FieldRole)->layout() == &l1);
|
|
QVERIFY(layout.itemAt(2, QFormLayout::FieldRole)->widget() == &w2);
|
|
QVERIFY(layout.itemAt(3, QFormLayout::FieldRole)->layout() == &l2);
|
|
// ### should have a third role, FullRowRole?
|
|
// QVERIFY(layout.itemAt(4, QFormLayout::FieldRole) == 0);
|
|
// QVERIFY(layout.itemAt(5, QFormLayout::FieldRole) == 0);
|
|
}
|
|
|
|
void tst_QFormLayout::insertRow_QWidget_QWidget()
|
|
{
|
|
QFormLayout layout;
|
|
QLabel lbl1, lbl2, lbl3, lbl4;
|
|
QLineEdit fld1, fld2, fld3, fld4;
|
|
|
|
layout.insertRow(0, &lbl1, &fld1);
|
|
QCOMPARE(layout.rowCount(), 1);
|
|
|
|
{
|
|
int row = -1;
|
|
QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
|
|
layout.getWidgetPosition(&lbl1, &row, &role);
|
|
QCOMPARE(row, 0);
|
|
QCOMPARE(int(role), int(QFormLayout::LabelRole));
|
|
}
|
|
|
|
{
|
|
int row = -1;
|
|
QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
|
|
layout.getWidgetPosition(&fld1, &row, &role);
|
|
QCOMPARE(row, 0);
|
|
QCOMPARE(int(role), int(QFormLayout::FieldRole));
|
|
}
|
|
|
|
// check that negative values append
|
|
layout.insertRow(-2, &lbl2, &fld2);
|
|
QCOMPARE(layout.rowCount(), 2);
|
|
|
|
QVERIFY(layout.itemAt(0, QFormLayout::LabelRole)->widget() == &lbl1);
|
|
QVERIFY(layout.itemAt(1, QFormLayout::LabelRole)->widget() == &lbl2);
|
|
|
|
// check that too large values append
|
|
layout.insertRow(100, &lbl3, &fld3);
|
|
QCOMPARE(layout.rowCount(), 3);
|
|
QCOMPARE(layout.count(), 6);
|
|
|
|
layout.insertRow(3, (QWidget *)0, (QWidget *)0);
|
|
QCOMPARE(layout.rowCount(), 4);
|
|
QCOMPARE(layout.count(), 6);
|
|
|
|
layout.insertRow(4, (QWidget *)0, &fld4);
|
|
QCOMPARE(layout.rowCount(), 5);
|
|
QCOMPARE(layout.count(), 7);
|
|
|
|
layout.insertRow(5, &lbl4, (QWidget *)0);
|
|
QCOMPARE(layout.rowCount(), 6);
|
|
QCOMPARE(layout.count(), 8);
|
|
|
|
QVERIFY(layout.itemAt(0, QFormLayout::LabelRole)->widget() == &lbl1);
|
|
QVERIFY(layout.itemAt(1, QFormLayout::LabelRole)->widget() == &lbl2);
|
|
QVERIFY(layout.itemAt(2, QFormLayout::LabelRole)->widget() == &lbl3);
|
|
QVERIFY(layout.itemAt(3, QFormLayout::LabelRole) == 0);
|
|
QVERIFY(layout.itemAt(4, QFormLayout::LabelRole) == 0);
|
|
QVERIFY(layout.itemAt(5, QFormLayout::LabelRole)->widget() == &lbl4);
|
|
|
|
QVERIFY(layout.itemAt(0, QFormLayout::FieldRole)->widget() == &fld1);
|
|
QVERIFY(layout.itemAt(1, QFormLayout::FieldRole)->widget() == &fld2);
|
|
QVERIFY(layout.itemAt(2, QFormLayout::FieldRole)->widget() == &fld3);
|
|
QVERIFY(layout.itemAt(3, QFormLayout::FieldRole) == 0);
|
|
QVERIFY(layout.itemAt(4, QFormLayout::FieldRole)->widget() == &fld4);
|
|
QVERIFY(layout.itemAt(5, QFormLayout::FieldRole) == 0);
|
|
}
|
|
|
|
void tst_QFormLayout::insertRow_QWidget_QLayout()
|
|
{
|
|
QFormLayout layout;
|
|
QLabel lbl1, lbl2, lbl3, lbl4;
|
|
QHBoxLayout fld1, fld2, fld3, fld4;
|
|
|
|
layout.insertRow(0, &lbl1, &fld1);
|
|
QCOMPARE(layout.rowCount(), 1);
|
|
|
|
{
|
|
int row = -1;
|
|
QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
|
|
layout.getWidgetPosition(&lbl1, &row, &role);
|
|
QCOMPARE(row, 0);
|
|
QCOMPARE(int(role), int(QFormLayout::LabelRole));
|
|
}
|
|
|
|
{
|
|
int row = -1;
|
|
QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
|
|
layout.getLayoutPosition(&fld1, &row, &role);
|
|
QCOMPARE(row, 0);
|
|
QCOMPARE(int(role), int(QFormLayout::FieldRole));
|
|
}
|
|
|
|
// check that negative values append
|
|
layout.insertRow(-2, &lbl2, &fld2);
|
|
QCOMPARE(layout.rowCount(), 2);
|
|
|
|
QVERIFY(layout.itemAt(0, QFormLayout::LabelRole)->widget() == &lbl1);
|
|
QVERIFY(layout.itemAt(1, QFormLayout::LabelRole)->widget() == &lbl2);
|
|
|
|
// check that too large values append
|
|
layout.insertRow(100, &lbl3, &fld3);
|
|
QCOMPARE(layout.rowCount(), 3);
|
|
|
|
QVERIFY(layout.itemAt(0, QFormLayout::LabelRole)->widget() == &lbl1);
|
|
QVERIFY(layout.itemAt(1, QFormLayout::LabelRole)->widget() == &lbl2);
|
|
QVERIFY(layout.itemAt(2, QFormLayout::LabelRole)->widget() == &lbl3);
|
|
|
|
QVERIFY(layout.itemAt(0, QFormLayout::FieldRole)->layout() == &fld1);
|
|
QVERIFY(layout.itemAt(1, QFormLayout::FieldRole)->layout() == &fld2);
|
|
QVERIFY(layout.itemAt(2, QFormLayout::FieldRole)->layout() == &fld3);
|
|
}
|
|
|
|
void tst_QFormLayout::insertRow_QString_QWidget()
|
|
{
|
|
QFormLayout layout;
|
|
QLineEdit fld1, fld2, fld3;
|
|
|
|
layout.insertRow(-5, "&Name:", &fld1);
|
|
QLabel *label1 = qobject_cast<QLabel *>(layout.itemAt(0, QFormLayout::LabelRole)->widget());
|
|
QVERIFY(label1 != 0);
|
|
QVERIFY(label1->buddy() == &fld1);
|
|
|
|
layout.insertRow(0, "&Email:", &fld2);
|
|
QLabel *label2 = qobject_cast<QLabel *>(layout.itemAt(0, QFormLayout::LabelRole)->widget());
|
|
QVERIFY(label2 != 0);
|
|
QVERIFY(label2->buddy() == &fld2);
|
|
|
|
layout.insertRow(5, "&Age:", &fld3);
|
|
QLabel *label3 = qobject_cast<QLabel *>(layout.itemAt(2, QFormLayout::LabelRole)->widget());
|
|
QVERIFY(label3 != 0);
|
|
QVERIFY(label3->buddy() == &fld3);
|
|
}
|
|
|
|
void tst_QFormLayout::insertRow_QString_QLayout()
|
|
{
|
|
QFormLayout layout;
|
|
QHBoxLayout fld1, fld2, fld3;
|
|
|
|
layout.insertRow(-5, "&Name:", &fld1);
|
|
QLabel *label1 = qobject_cast<QLabel *>(layout.itemAt(0, QFormLayout::LabelRole)->widget());
|
|
QVERIFY(label1 != 0);
|
|
QVERIFY(label1->buddy() == 0);
|
|
|
|
QCOMPARE(layout.rowCount(), 1);
|
|
|
|
layout.insertRow(0, "&Email:", &fld2);
|
|
QLabel *label2 = qobject_cast<QLabel *>(layout.itemAt(0, QFormLayout::LabelRole)->widget());
|
|
QVERIFY(label2 != 0);
|
|
QVERIFY(label2->buddy() == 0);
|
|
|
|
QCOMPARE(layout.rowCount(), 2);
|
|
|
|
layout.insertRow(5, "&Age:", &fld3);
|
|
QLabel *label3 = qobject_cast<QLabel *>(layout.itemAt(2, QFormLayout::LabelRole)->widget());
|
|
QVERIFY(label3 != 0);
|
|
QVERIFY(label3->buddy() == 0);
|
|
|
|
QCOMPARE(layout.rowCount(), 3);
|
|
}
|
|
|
|
void tst_QFormLayout::insertRow_QWidget()
|
|
{
|
|
// ### come back to this later
|
|
}
|
|
|
|
void tst_QFormLayout::insertRow_QLayout()
|
|
{
|
|
// ### come back to this later
|
|
}
|
|
|
|
void tst_QFormLayout::setWidget()
|
|
{
|
|
QFormLayout layout;
|
|
|
|
QWidget w1;
|
|
QWidget w2;
|
|
QWidget w3;
|
|
QWidget w4;
|
|
|
|
QCOMPARE(layout.count(), 0);
|
|
QCOMPARE(layout.rowCount(), 0);
|
|
|
|
layout.setWidget(5, QFormLayout::LabelRole, &w1);
|
|
QCOMPARE(layout.count(), 1);
|
|
QCOMPARE(layout.rowCount(), 6);
|
|
|
|
layout.setWidget(3, QFormLayout::FieldRole, &w2);
|
|
layout.setWidget(3, QFormLayout::LabelRole, &w3);
|
|
QCOMPARE(layout.count(), 3);
|
|
QCOMPARE(layout.rowCount(), 6);
|
|
|
|
// should be ignored and generate warnings
|
|
layout.setWidget(3, QFormLayout::FieldRole, &w4);
|
|
layout.setWidget(-1, QFormLayout::FieldRole, &w4);
|
|
|
|
{
|
|
int row = -1;
|
|
QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
|
|
layout.getWidgetPosition(&w1, &row, &role);
|
|
QCOMPARE(row, 5);
|
|
QCOMPARE(int(role), int(QFormLayout::LabelRole));
|
|
}
|
|
|
|
{
|
|
int row = -1;
|
|
QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
|
|
layout.getWidgetPosition(&w2, &row, &role);
|
|
QCOMPARE(row, 3);
|
|
QCOMPARE(int(role), int(QFormLayout::FieldRole));
|
|
}
|
|
|
|
{
|
|
int row = -1;
|
|
QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
|
|
layout.getWidgetPosition(&w3, &row, &role);
|
|
QCOMPARE(row, 3);
|
|
QCOMPARE(int(role), int(QFormLayout::LabelRole));
|
|
}
|
|
|
|
{
|
|
int row = -1;
|
|
QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
|
|
layout.getWidgetPosition(&w4, &row, &role);
|
|
QCOMPARE(row, -1);
|
|
QCOMPARE(int(role), -123);
|
|
}
|
|
|
|
{
|
|
int row = -1;
|
|
QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
|
|
layout.getWidgetPosition(0, &row, &role);
|
|
QCOMPARE(row, -1);
|
|
QCOMPARE(int(role), -123);
|
|
}
|
|
}
|
|
|
|
void tst_QFormLayout::setLayout()
|
|
{
|
|
QFormLayout layout;
|
|
|
|
QHBoxLayout l1;
|
|
QHBoxLayout l2;
|
|
QHBoxLayout l3;
|
|
QHBoxLayout l4;
|
|
|
|
QCOMPARE(layout.count(), 0);
|
|
QCOMPARE(layout.rowCount(), 0);
|
|
|
|
layout.setLayout(5, QFormLayout::LabelRole, &l1);
|
|
QCOMPARE(layout.count(), 1);
|
|
QCOMPARE(layout.rowCount(), 6);
|
|
|
|
layout.setLayout(3, QFormLayout::FieldRole, &l2);
|
|
layout.setLayout(3, QFormLayout::LabelRole, &l3);
|
|
QCOMPARE(layout.count(), 3);
|
|
QCOMPARE(layout.rowCount(), 6);
|
|
|
|
// should be ignored and generate warnings
|
|
layout.setLayout(3, QFormLayout::FieldRole, &l4);
|
|
layout.setLayout(-1, QFormLayout::FieldRole, &l4);
|
|
QCOMPARE(layout.count(), 3);
|
|
QCOMPARE(layout.rowCount(), 6);
|
|
|
|
{
|
|
int row = -1;
|
|
QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
|
|
layout.getLayoutPosition(&l1, &row, &role);
|
|
QCOMPARE(row, 5);
|
|
QCOMPARE(int(role), int(QFormLayout::LabelRole));
|
|
}
|
|
|
|
{
|
|
int row = -1;
|
|
QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
|
|
layout.getLayoutPosition(&l2, &row, &role);
|
|
QCOMPARE(row, 3);
|
|
QCOMPARE(int(role), int(QFormLayout::FieldRole));
|
|
}
|
|
|
|
{
|
|
int row = -1;
|
|
QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
|
|
layout.getLayoutPosition(&l3, &row, &role);
|
|
QCOMPARE(row, 3);
|
|
QCOMPARE(int(role), int(QFormLayout::LabelRole));
|
|
}
|
|
|
|
{
|
|
int row = -1;
|
|
QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
|
|
layout.getLayoutPosition(&l4, &row, &role);
|
|
QCOMPARE(row, -1);
|
|
QCOMPARE(int(role), -123);
|
|
}
|
|
|
|
{
|
|
int row = -1;
|
|
QFormLayout::ItemRole role = QFormLayout::ItemRole(-123);
|
|
layout.getLayoutPosition(0, &row, &role);
|
|
QCOMPARE(row, -1);
|
|
QCOMPARE(int(role), -123);
|
|
}
|
|
}
|
|
|
|
void tst_QFormLayout::itemAt()
|
|
{
|
|
QFormLayout layout;
|
|
|
|
QWidget w1;
|
|
QWidget w2;
|
|
QWidget w3;
|
|
QWidget w4;
|
|
QWidget w5;
|
|
QHBoxLayout l6;
|
|
|
|
layout.setWidget(5, QFormLayout::LabelRole, &w1);
|
|
layout.setWidget(3, QFormLayout::FieldRole, &w2);
|
|
layout.setWidget(3, QFormLayout::LabelRole, &w3);
|
|
layout.addRow(&w4, &w5);
|
|
layout.addRow("Foo:", &l6);
|
|
|
|
QCOMPARE(layout.count(), 7);
|
|
|
|
QBitArray scoreBoard(7);
|
|
for (int i = 0; i < 7; ++i) {
|
|
QLayoutItem *item = layout.itemAt(i);
|
|
QVERIFY(item != 0);
|
|
|
|
if (item->widget() == &w1) {
|
|
scoreBoard[0] = true;
|
|
} else if (item->widget() == &w2) {
|
|
scoreBoard[1] = true;
|
|
} else if (item->widget() == &w3) {
|
|
scoreBoard[2] = true;
|
|
} else if (item->widget() == &w4) {
|
|
scoreBoard[3] = true;
|
|
} else if (item->widget() == &w5) {
|
|
scoreBoard[4] = true;
|
|
} else if (item->layout() == &l6) {
|
|
scoreBoard[5] = true;
|
|
} else if (qobject_cast<QLabel *>(item->widget())) {
|
|
scoreBoard[6] = true;
|
|
}
|
|
}
|
|
QCOMPARE(scoreBoard.count(false), 0);
|
|
}
|
|
|
|
void tst_QFormLayout::takeAt()
|
|
{
|
|
QFormLayout layout;
|
|
|
|
QWidget w1;
|
|
QWidget w2;
|
|
QWidget w3;
|
|
QWidget w4;
|
|
QWidget w5;
|
|
QHBoxLayout l6;
|
|
|
|
layout.setWidget(5, QFormLayout::LabelRole, &w1);
|
|
layout.setWidget(3, QFormLayout::FieldRole, &w2);
|
|
layout.setWidget(3, QFormLayout::LabelRole, &w3);
|
|
layout.addRow(&w4, &w5);
|
|
layout.addRow("Foo:", &l6);
|
|
|
|
QCOMPARE(layout.count(), 7);
|
|
|
|
for (int i = 6; i >= 0; --i) {
|
|
layout.takeAt(0);
|
|
QCOMPARE(layout.count(), i);
|
|
}
|
|
}
|
|
|
|
void tst_QFormLayout::layoutAlone()
|
|
{
|
|
QWidget w;
|
|
QFormLayout layout;
|
|
layout.setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
|
|
w.setLayout(&layout);
|
|
QLabel label("Here is a strange test case");
|
|
layout.setWidget(0, QFormLayout::LabelRole, &label);
|
|
QHBoxLayout hlay;
|
|
layout.setLayout(1, QFormLayout::LabelRole, &hlay);
|
|
QCOMPARE(layout.count(), 2);
|
|
w.show();
|
|
layout.activate();
|
|
QTest::qWait(500);
|
|
}
|
|
|
|
QTEST_MAIN(tst_QFormLayout)
|
|
|
|
#include "tst_qformlayout.moc"
|