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
682 lines
24 KiB
C++
682 lines
24 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 Qt Designer 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 "properties_p.h"
|
|
#include "ui4_p.h"
|
|
#include "abstractformbuilder.h"
|
|
#include "formbuilderextra_p.h"
|
|
#include "resourcebuilder_p.h"
|
|
|
|
#include <QtCore/QDateTime>
|
|
#include <QtCore/QUrl>
|
|
#include <QtCore/qdebug.h>
|
|
|
|
#include <QtWidgets/QIcon>
|
|
#include <QtGui/QPixmap>
|
|
#include <QtGui/QFont>
|
|
#include <QtWidgets/QFrame>
|
|
#include <QtWidgets/QAbstractScrollArea>
|
|
|
|
QT_BEGIN_NAMESPACE
|
|
|
|
#ifdef QFORMINTERNAL_NAMESPACE
|
|
namespace QFormInternal
|
|
{
|
|
#endif
|
|
|
|
static inline void fixEnum(QString &s)
|
|
{
|
|
int qualifierIndex = s.lastIndexOf(QLatin1Char(':'));
|
|
if (qualifierIndex == -1)
|
|
qualifierIndex = s.lastIndexOf(QLatin1Char('.'));
|
|
if (qualifierIndex != -1)
|
|
s.remove(0, qualifierIndex + 1);
|
|
}
|
|
// Convert complex DOM types with the help of QAbstractFormBuilder
|
|
QVariant domPropertyToVariant(QAbstractFormBuilder *afb,const QMetaObject *meta,const DomProperty *p)
|
|
{
|
|
// Complex types that need functions from QAbstractFormBuilder
|
|
switch(p->kind()) {
|
|
case DomProperty::String: {
|
|
const int index = meta->indexOfProperty(p->attributeName().toUtf8());
|
|
if (index != -1 && meta->property(index).type() == QVariant::KeySequence)
|
|
return QVariant::fromValue(QKeySequence(p->elementString()->text()));
|
|
}
|
|
break;
|
|
|
|
case DomProperty::Palette: {
|
|
const DomPalette *dom = p->elementPalette();
|
|
QPalette palette;
|
|
|
|
if (dom->elementActive())
|
|
afb->setupColorGroup(palette, QPalette::Active, dom->elementActive());
|
|
|
|
if (dom->elementInactive())
|
|
afb->setupColorGroup(palette, QPalette::Inactive, dom->elementInactive());
|
|
|
|
if (dom->elementDisabled())
|
|
afb->setupColorGroup(palette, QPalette::Disabled, dom->elementDisabled());
|
|
|
|
palette.setCurrentColorGroup(QPalette::Active);
|
|
return QVariant::fromValue(palette);
|
|
}
|
|
|
|
case DomProperty::Set: {
|
|
const QByteArray pname = p->attributeName().toUtf8();
|
|
const int index = meta->indexOfProperty(pname);
|
|
if (index == -1) {
|
|
uiLibWarning(QCoreApplication::translate("QFormBuilder", "The set-type property %1 could not be read.").arg(p->attributeName()));
|
|
return QVariant();
|
|
}
|
|
|
|
const QMetaEnum e = meta->property(index).enumerator();
|
|
Q_ASSERT(e.isFlag() == true);
|
|
return QVariant(e.keysToValue(p->elementSet().toUtf8()));
|
|
}
|
|
|
|
case DomProperty::Enum: {
|
|
const QByteArray pname = p->attributeName().toUtf8();
|
|
const int index = meta->indexOfProperty(pname);
|
|
QString enumValue = p->elementEnum();
|
|
// Triggers in case of objects in Designer like Spacer/Line for which properties
|
|
// are serialized using language introspection. On preview, however, these objects are
|
|
// emulated by hacks in the formbuilder (size policy/orientation)
|
|
fixEnum(enumValue);
|
|
if (index == -1) {
|
|
// ### special-casing for Line (QFrame) -- fix for 4.2. Jambi hack for enumerations
|
|
if (!qstrcmp(meta->className(), "QFrame")
|
|
&& (pname == QByteArray("orientation"))) {
|
|
return QVariant(enumValue == QFormBuilderStrings::instance().horizontalPostFix ? QFrame::HLine : QFrame::VLine);
|
|
} else {
|
|
uiLibWarning(QCoreApplication::translate("QFormBuilder", "The enumeration-type property %1 could not be read.").arg(p->attributeName()));
|
|
return QVariant();
|
|
}
|
|
}
|
|
|
|
const QMetaEnum e = meta->property(index).enumerator();
|
|
return QVariant(e.keyToValue(enumValue.toUtf8()));
|
|
}
|
|
case DomProperty::Brush:
|
|
return QVariant::fromValue(afb->setupBrush(p->elementBrush()));
|
|
default:
|
|
if (afb->resourceBuilder()->isResourceProperty(p)) {
|
|
return afb->resourceBuilder()->loadResource(afb->workingDirectory(), p);
|
|
}
|
|
|
|
break;
|
|
}
|
|
|
|
// simple type
|
|
return domPropertyToVariant(p);
|
|
}
|
|
|
|
// Convert simple DOM types
|
|
QVariant domPropertyToVariant(const DomProperty *p)
|
|
{
|
|
// requires non-const virtual nameToIcon, etc.
|
|
switch(p->kind()) {
|
|
case DomProperty::Bool:
|
|
return QVariant(p->elementBool() == QFormBuilderStrings::instance().trueValue);
|
|
|
|
case DomProperty::Cstring:
|
|
return QVariant(p->elementCstring().toUtf8());
|
|
|
|
case DomProperty::Point: {
|
|
const DomPoint *point = p->elementPoint();
|
|
return QVariant(QPoint(point->elementX(), point->elementY()));
|
|
}
|
|
|
|
case DomProperty::PointF: {
|
|
const DomPointF *pointf = p->elementPointF();
|
|
return QVariant(QPointF(pointf->elementX(), pointf->elementY()));
|
|
}
|
|
|
|
case DomProperty::Size: {
|
|
const DomSize *size = p->elementSize();
|
|
return QVariant(QSize(size->elementWidth(), size->elementHeight()));
|
|
}
|
|
|
|
case DomProperty::SizeF: {
|
|
const DomSizeF *sizef = p->elementSizeF();
|
|
return QVariant(QSizeF(sizef->elementWidth(), sizef->elementHeight()));
|
|
}
|
|
|
|
case DomProperty::Rect: {
|
|
const DomRect *rc = p->elementRect();
|
|
const QRect g(rc->elementX(), rc->elementY(), rc->elementWidth(), rc->elementHeight());
|
|
return QVariant(g);
|
|
}
|
|
|
|
case DomProperty::RectF: {
|
|
const DomRectF *rcf = p->elementRectF();
|
|
const QRectF g(rcf->elementX(), rcf->elementY(), rcf->elementWidth(), rcf->elementHeight());
|
|
return QVariant(g);
|
|
}
|
|
|
|
case DomProperty::String:
|
|
return QVariant(p->elementString()->text());
|
|
|
|
case DomProperty::Number:
|
|
return QVariant(p->elementNumber());
|
|
|
|
case DomProperty::UInt:
|
|
return QVariant(p->elementUInt());
|
|
|
|
case DomProperty::LongLong:
|
|
return QVariant(p->elementLongLong());
|
|
|
|
case DomProperty::ULongLong:
|
|
return QVariant(p->elementULongLong());
|
|
|
|
case DomProperty::Double:
|
|
return QVariant(p->elementDouble());
|
|
|
|
case DomProperty::Char: {
|
|
const DomChar *character = p->elementChar();
|
|
const QChar c(character->elementUnicode());
|
|
return QVariant::fromValue(c);
|
|
}
|
|
|
|
case DomProperty::Color: {
|
|
const DomColor *color = p->elementColor();
|
|
QColor c(color->elementRed(), color->elementGreen(), color->elementBlue());
|
|
if (color->hasAttributeAlpha())
|
|
c.setAlpha(color->attributeAlpha());
|
|
return QVariant::fromValue(c);
|
|
}
|
|
|
|
case DomProperty::Font: {
|
|
const DomFont *font = p->elementFont();
|
|
|
|
QFont f;
|
|
if (font->hasElementFamily() && !font->elementFamily().isEmpty())
|
|
f.setFamily(font->elementFamily());
|
|
if (font->hasElementPointSize() && font->elementPointSize() > 0)
|
|
f.setPointSize(font->elementPointSize());
|
|
if (font->hasElementWeight() && font->elementWeight() > 0)
|
|
f.setWeight(font->elementWeight());
|
|
if (font->hasElementItalic())
|
|
f.setItalic(font->elementItalic());
|
|
if (font->hasElementBold())
|
|
f.setBold(font->elementBold());
|
|
if (font->hasElementUnderline())
|
|
f.setUnderline(font->elementUnderline());
|
|
if (font->hasElementStrikeOut())
|
|
f.setStrikeOut(font->elementStrikeOut());
|
|
if (font->hasElementKerning())
|
|
f.setKerning(font->elementKerning());
|
|
if (font->hasElementAntialiasing())
|
|
f.setStyleStrategy(font->elementAntialiasing() ? QFont::PreferDefault : QFont::NoAntialias);
|
|
if (font->hasElementStyleStrategy()) {
|
|
f.setStyleStrategy(enumKeyOfObjectToValue<QAbstractFormBuilderGadget, QFont::StyleStrategy>("styleStrategy", font->elementStyleStrategy().toLatin1()));
|
|
}
|
|
return QVariant::fromValue(f);
|
|
}
|
|
|
|
case DomProperty::Date: {
|
|
const DomDate *date = p->elementDate();
|
|
return QVariant(QDate(date->elementYear(), date->elementMonth(), date->elementDay()));
|
|
}
|
|
|
|
case DomProperty::Time: {
|
|
const DomTime *t = p->elementTime();
|
|
return QVariant(QTime(t->elementHour(), t->elementMinute(), t->elementSecond()));
|
|
}
|
|
|
|
case DomProperty::DateTime: {
|
|
const DomDateTime *dateTime = p->elementDateTime();
|
|
const QDate d(dateTime->elementYear(), dateTime->elementMonth(), dateTime->elementDay());
|
|
const QTime tm(dateTime->elementHour(), dateTime->elementMinute(), dateTime->elementSecond());
|
|
return QVariant(QDateTime(d, tm));
|
|
}
|
|
|
|
case DomProperty::Url: {
|
|
const DomUrl *url = p->elementUrl();
|
|
return QVariant(QUrl(url->elementString()->text()));
|
|
}
|
|
|
|
#ifndef QT_NO_CURSOR
|
|
case DomProperty::Cursor:
|
|
return QVariant::fromValue(QCursor(static_cast<Qt::CursorShape>(p->elementCursor())));
|
|
|
|
case DomProperty::CursorShape:
|
|
return QVariant::fromValue(QCursor(enumKeyOfObjectToValue<QAbstractFormBuilderGadget, Qt::CursorShape>("cursorShape", p->elementCursorShape().toLatin1())));
|
|
#endif
|
|
|
|
case DomProperty::Locale: {
|
|
const DomLocale *locale = p->elementLocale();
|
|
return QVariant::fromValue(QLocale(enumKeyOfObjectToValue<QAbstractFormBuilderGadget, QLocale::Language>("language", locale->attributeLanguage().toLatin1()),
|
|
enumKeyOfObjectToValue<QAbstractFormBuilderGadget, QLocale::Country>("country", locale->attributeCountry().toLatin1())));
|
|
}
|
|
case DomProperty::SizePolicy: {
|
|
const DomSizePolicy *sizep = p->elementSizePolicy();
|
|
|
|
QSizePolicy sizePolicy;
|
|
sizePolicy.setHorizontalStretch(sizep->elementHorStretch());
|
|
sizePolicy.setVerticalStretch(sizep->elementVerStretch());
|
|
|
|
const QMetaEnum sizeType_enum = metaEnum<QAbstractFormBuilderGadget>("sizeType");
|
|
|
|
if (sizep->hasElementHSizeType()) {
|
|
sizePolicy.setHorizontalPolicy((QSizePolicy::Policy) sizep->elementHSizeType());
|
|
} else if (sizep->hasAttributeHSizeType()) {
|
|
const QSizePolicy::Policy sp = enumKeyToValue<QSizePolicy::Policy>(sizeType_enum, sizep->attributeHSizeType().toLatin1());
|
|
sizePolicy.setHorizontalPolicy(sp);
|
|
}
|
|
|
|
if (sizep->hasElementVSizeType()) {
|
|
sizePolicy.setVerticalPolicy((QSizePolicy::Policy) sizep->elementVSizeType());
|
|
} else if (sizep->hasAttributeVSizeType()) {
|
|
const QSizePolicy::Policy sp = enumKeyToValue<QSizePolicy::Policy>(sizeType_enum, sizep->attributeVSizeType().toLatin1());
|
|
sizePolicy.setVerticalPolicy(sp);
|
|
}
|
|
|
|
return QVariant::fromValue(sizePolicy);
|
|
}
|
|
|
|
case DomProperty::StringList:
|
|
return QVariant(p->elementStringList()->elementString());
|
|
|
|
default:
|
|
uiLibWarning(QCoreApplication::translate("QFormBuilder", "Reading properties of the type %1 is not supported yet.").arg(p->kind()));
|
|
break;
|
|
}
|
|
|
|
return QVariant();
|
|
}
|
|
|
|
// Apply a simple variant type to a DOM property
|
|
static bool applySimpleProperty(const QVariant &v, bool translateString, DomProperty *dom_prop)
|
|
{
|
|
switch (v.type()) {
|
|
case QVariant::String: {
|
|
DomString *str = new DomString();
|
|
str->setText(v.toString());
|
|
if (!translateString)
|
|
str->setAttributeNotr(QLatin1String("true"));
|
|
dom_prop->setElementString(str);
|
|
}
|
|
return true;
|
|
|
|
case QVariant::ByteArray:
|
|
dom_prop->setElementCstring(QString::fromUtf8(v.toByteArray()));
|
|
return true;
|
|
|
|
case QVariant::Int:
|
|
dom_prop->setElementNumber(v.toInt());
|
|
return true;
|
|
|
|
case QVariant::UInt:
|
|
dom_prop->setElementUInt(v.toUInt());
|
|
return true;
|
|
|
|
case QVariant::LongLong:
|
|
dom_prop->setElementLongLong(v.toLongLong());
|
|
return true;
|
|
|
|
case QVariant::ULongLong:
|
|
dom_prop->setElementULongLong(v.toULongLong());
|
|
return true;
|
|
|
|
case QVariant::Double:
|
|
dom_prop->setElementDouble(v.toDouble());
|
|
return true;
|
|
|
|
case QVariant::Bool:
|
|
dom_prop->setElementBool(v.toBool() ? QFormBuilderStrings::instance().trueValue : QFormBuilderStrings::instance().falseValue);
|
|
return true;
|
|
|
|
case QVariant::Char: {
|
|
DomChar *ch = new DomChar();
|
|
const QChar character = v.toChar();
|
|
ch->setElementUnicode(character.unicode());
|
|
dom_prop->setElementChar(ch);
|
|
}
|
|
return true;
|
|
|
|
case QVariant::Point: {
|
|
DomPoint *pt = new DomPoint();
|
|
const QPoint point = v.toPoint();
|
|
pt->setElementX(point.x());
|
|
pt->setElementY(point.y());
|
|
dom_prop->setElementPoint(pt);
|
|
}
|
|
return true;
|
|
|
|
case QVariant::PointF: {
|
|
DomPointF *ptf = new DomPointF();
|
|
const QPointF pointf = v.toPointF();
|
|
ptf->setElementX(pointf.x());
|
|
ptf->setElementY(pointf.y());
|
|
dom_prop->setElementPointF(ptf);
|
|
}
|
|
return true;
|
|
|
|
case QVariant::Color: {
|
|
DomColor *clr = new DomColor();
|
|
const QColor color = qvariant_cast<QColor>(v);
|
|
clr->setElementRed(color.red());
|
|
clr->setElementGreen(color.green());
|
|
clr->setElementBlue(color.blue());
|
|
const int alphaChannel = color.alpha();
|
|
if (alphaChannel != 255)
|
|
clr->setAttributeAlpha(alphaChannel);
|
|
dom_prop->setElementColor(clr);
|
|
}
|
|
return true;
|
|
|
|
case QVariant::Size: {
|
|
DomSize *sz = new DomSize();
|
|
const QSize size = v.toSize();
|
|
sz->setElementWidth(size.width());
|
|
sz->setElementHeight(size.height());
|
|
dom_prop->setElementSize(sz);
|
|
}
|
|
return true;
|
|
|
|
case QVariant::SizeF: {
|
|
DomSizeF *szf = new DomSizeF();
|
|
const QSizeF sizef = v.toSizeF();
|
|
szf->setElementWidth(sizef.width());
|
|
szf->setElementHeight(sizef.height());
|
|
dom_prop->setElementSizeF(szf);
|
|
}
|
|
return true;
|
|
|
|
case QVariant::Rect: {
|
|
DomRect *rc = new DomRect();
|
|
const QRect rect = v.toRect();
|
|
rc->setElementX(rect.x());
|
|
rc->setElementY(rect.y());
|
|
rc->setElementWidth(rect.width());
|
|
rc->setElementHeight(rect.height());
|
|
dom_prop->setElementRect(rc);
|
|
}
|
|
return true;
|
|
|
|
case QVariant::RectF: {
|
|
DomRectF *rcf = new DomRectF();
|
|
const QRectF rectf = v.toRectF();
|
|
rcf->setElementX(rectf.x());
|
|
rcf->setElementY(rectf.y());
|
|
rcf->setElementWidth(rectf.width());
|
|
rcf->setElementHeight(rectf.height());
|
|
dom_prop->setElementRectF(rcf);
|
|
}
|
|
return true;
|
|
|
|
case QVariant::Font: {
|
|
DomFont *fnt = new DomFont();
|
|
const QFont font = qvariant_cast<QFont>(v);
|
|
const uint mask = font.resolve();
|
|
if (mask & QFont::WeightResolved) {
|
|
fnt->setElementBold(font.bold());
|
|
fnt->setElementWeight(font.weight());
|
|
}
|
|
if (mask & QFont::FamilyResolved)
|
|
fnt->setElementFamily(font.family());
|
|
if (mask & QFont::StyleResolved)
|
|
fnt->setElementItalic(font.italic());
|
|
if (mask & QFont::SizeResolved)
|
|
fnt->setElementPointSize(font.pointSize());
|
|
if (mask & QFont::StrikeOutResolved)
|
|
fnt->setElementStrikeOut(font.strikeOut());
|
|
if (mask & QFont::UnderlineResolved)
|
|
fnt->setElementUnderline(font.underline());
|
|
if (mask & QFont::KerningResolved)
|
|
fnt->setElementKerning(font.kerning());
|
|
if (mask & QFont::StyleStrategyResolved) {
|
|
const QMetaEnum styleStrategy_enum = metaEnum<QAbstractFormBuilderGadget>("styleStrategy");
|
|
fnt->setElementStyleStrategy(QLatin1String(styleStrategy_enum.valueToKey(font.styleStrategy())));
|
|
}
|
|
dom_prop->setElementFont(fnt);
|
|
}
|
|
return true;
|
|
|
|
#ifndef QT_NO_CURSOR
|
|
case QVariant::Cursor: {
|
|
const QMetaEnum cursorShape_enum = metaEnum<QAbstractFormBuilderGadget>("cursorShape");
|
|
dom_prop->setElementCursorShape(QLatin1String(cursorShape_enum.valueToKey(qvariant_cast<QCursor>(v).shape())));
|
|
}
|
|
return true;
|
|
#endif
|
|
|
|
case QVariant::KeySequence: {
|
|
DomString *s = new DomString();
|
|
s->setText(qvariant_cast<QKeySequence>(v).toString(QKeySequence::PortableText));
|
|
dom_prop->setElementString(s);
|
|
}
|
|
return true;
|
|
|
|
case QVariant::Locale: {
|
|
DomLocale *dom = new DomLocale();
|
|
const QLocale locale = qvariant_cast<QLocale>(v);
|
|
|
|
const QMetaEnum language_enum = metaEnum<QAbstractFormBuilderGadget>("language");
|
|
const QMetaEnum country_enum = metaEnum<QAbstractFormBuilderGadget>("country");
|
|
|
|
dom->setAttributeLanguage(QLatin1String(language_enum.valueToKey(locale.language())));
|
|
dom->setAttributeCountry(QLatin1String(country_enum.valueToKey(locale.country())));
|
|
|
|
dom_prop->setElementLocale(dom);
|
|
}
|
|
return true;
|
|
|
|
case QVariant::SizePolicy: {
|
|
DomSizePolicy *dom = new DomSizePolicy();
|
|
const QSizePolicy sizePolicy = qvariant_cast<QSizePolicy>(v);
|
|
|
|
dom->setElementHorStretch(sizePolicy.horizontalStretch());
|
|
dom->setElementVerStretch(sizePolicy.verticalStretch());
|
|
|
|
const QMetaEnum sizeType_enum = metaEnum<QAbstractFormBuilderGadget>("sizeType");
|
|
|
|
dom->setAttributeHSizeType(QLatin1String(sizeType_enum.valueToKey(sizePolicy.horizontalPolicy())));
|
|
dom->setAttributeVSizeType(QLatin1String(sizeType_enum.valueToKey(sizePolicy.verticalPolicy())));
|
|
|
|
dom_prop->setElementSizePolicy(dom);
|
|
}
|
|
return true;
|
|
|
|
case QVariant::Date: {
|
|
DomDate *dom = new DomDate();
|
|
const QDate date = qvariant_cast<QDate>(v);
|
|
|
|
dom->setElementYear(date.year());
|
|
dom->setElementMonth(date.month());
|
|
dom->setElementDay(date.day());
|
|
|
|
dom_prop->setElementDate(dom);
|
|
}
|
|
return true;
|
|
|
|
case QVariant::Time: {
|
|
DomTime *dom = new DomTime();
|
|
const QTime time = qvariant_cast<QTime>(v);
|
|
|
|
dom->setElementHour(time.hour());
|
|
dom->setElementMinute(time.minute());
|
|
dom->setElementSecond(time.second());
|
|
|
|
dom_prop->setElementTime(dom);
|
|
}
|
|
return true;
|
|
|
|
case QVariant::DateTime: {
|
|
DomDateTime *dom = new DomDateTime();
|
|
const QDateTime dateTime = qvariant_cast<QDateTime>(v);
|
|
|
|
dom->setElementHour(dateTime.time().hour());
|
|
dom->setElementMinute(dateTime.time().minute());
|
|
dom->setElementSecond(dateTime.time().second());
|
|
dom->setElementYear(dateTime.date().year());
|
|
dom->setElementMonth(dateTime.date().month());
|
|
dom->setElementDay(dateTime.date().day());
|
|
|
|
dom_prop->setElementDateTime(dom);
|
|
}
|
|
return true;
|
|
|
|
case QVariant::Url: {
|
|
DomUrl *dom = new DomUrl();
|
|
const QUrl url = v.toUrl();
|
|
|
|
DomString *str = new DomString();
|
|
str->setText(url.toString());
|
|
dom->setElementString(str);
|
|
|
|
dom_prop->setElementUrl(dom);
|
|
}
|
|
return true;
|
|
|
|
case QVariant::StringList: {
|
|
DomStringList *sl = new DomStringList;
|
|
sl->setElementString(qvariant_cast<QStringList>(v));
|
|
dom_prop->setElementStringList(sl);
|
|
}
|
|
return true;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
static QString msgCannotWriteProperty(const QString &pname, const QVariant &v)
|
|
{
|
|
return QCoreApplication::translate("QFormBuilder", "The property %1 could not be written. The type %2 is not supported yet.").
|
|
arg(pname).arg(QLatin1String(v.typeName()));
|
|
|
|
}
|
|
|
|
static bool isOfType(const QMetaObject *what, const QMetaObject *type)
|
|
{
|
|
do {
|
|
if (what == type)
|
|
return true;
|
|
} while ((what = what->superClass()));
|
|
return false;
|
|
}
|
|
|
|
static bool isTranslatable(const QString &pname, const QVariant &v, const QMetaObject *meta)
|
|
{
|
|
const QFormBuilderStrings &strings = QFormBuilderStrings::instance();
|
|
if (pname == strings.objectNameProperty)
|
|
return false;
|
|
if (pname == strings.styleSheetProperty && v.type() == QVariant::String && isOfType(meta, &QWidget::staticMetaObject))
|
|
return false;
|
|
return true;
|
|
}
|
|
|
|
// Convert complex variant types to DOM properties with the help of QAbstractFormBuilder
|
|
// Does not perform a check using QAbstractFormBuilder::checkProperty().
|
|
DomProperty *variantToDomProperty(QAbstractFormBuilder *afb, const QMetaObject *meta,
|
|
const QString &pname, const QVariant &v)
|
|
{
|
|
const QFormBuilderStrings &strings = QFormBuilderStrings::instance();
|
|
|
|
DomProperty *dom_prop = new DomProperty();
|
|
dom_prop->setAttributeName(pname);
|
|
|
|
const int pindex = meta->indexOfProperty(pname.toLatin1());
|
|
if (pindex != -1) {
|
|
QMetaProperty meta_property = meta->property(pindex);
|
|
if ((v.type() == QVariant::Int || v.type() == QVariant::UInt) && meta_property.isEnumType()) {
|
|
const QMetaEnum e = meta_property.enumerator();
|
|
if (e.isFlag())
|
|
dom_prop->setElementSet(QString::fromAscii(e.valueToKeys(v.toInt())));
|
|
else
|
|
dom_prop->setElementEnum(QString::fromAscii(e.valueToKey(v.toInt())));
|
|
return dom_prop;
|
|
}
|
|
if (!meta_property.hasStdCppSet() || (isOfType(meta, &QAbstractScrollArea::staticMetaObject) && pname == strings.cursorProperty))
|
|
dom_prop->setAttributeStdset(0);
|
|
}
|
|
|
|
// Try simple properties
|
|
if (applySimpleProperty(v, isTranslatable(pname, v, meta), dom_prop))
|
|
return dom_prop;
|
|
|
|
// Complex properties
|
|
switch (v.type()) {
|
|
case QVariant::Palette: {
|
|
DomPalette *dom = new DomPalette();
|
|
QPalette palette = qvariant_cast<QPalette>(v);
|
|
|
|
palette.setCurrentColorGroup(QPalette::Active);
|
|
dom->setElementActive(afb->saveColorGroup(palette));
|
|
|
|
palette.setCurrentColorGroup(QPalette::Inactive);
|
|
dom->setElementInactive(afb->saveColorGroup(palette));
|
|
|
|
palette.setCurrentColorGroup(QPalette::Disabled);
|
|
dom->setElementDisabled(afb->saveColorGroup(palette));
|
|
|
|
dom_prop->setElementPalette(dom);
|
|
} break;
|
|
case QVariant::Brush:
|
|
dom_prop->setElementBrush(afb->saveBrush(qvariant_cast<QBrush>(v)));
|
|
break;
|
|
default: {
|
|
const bool hadAttributeStdset = dom_prop->hasAttributeStdset();
|
|
const bool attributeStdset = dom_prop->attributeStdset();
|
|
delete dom_prop;
|
|
if (afb->resourceBuilder()->isResourceType(v)) {
|
|
dom_prop = afb->resourceBuilder()->saveResource(afb->workingDirectory(), v);
|
|
if (dom_prop) {
|
|
dom_prop->setAttributeName(pname);
|
|
if (hadAttributeStdset)
|
|
dom_prop->setAttributeStdset(attributeStdset);
|
|
}
|
|
break;
|
|
}
|
|
uiLibWarning(msgCannotWriteProperty(pname, v));
|
|
} return 0;
|
|
}
|
|
return dom_prop;
|
|
}
|
|
|
|
#ifdef QFORMINTERNAL_NAMESPACE
|
|
}
|
|
#endif
|
|
|
|
QT_END_NAMESPACE
|