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
403 lines
15 KiB
C++
403 lines
15 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 examples of the Qt Toolkit.
|
|
**
|
|
** $QT_BEGIN_LICENSE:BSD$
|
|
** You may use this file under the terms of the BSD license as follows:
|
|
**
|
|
** "Redistribution and use in source and binary forms, with or without
|
|
** modification, are permitted provided that the following conditions are
|
|
** met:
|
|
** * Redistributions of source code must retain the above copyright
|
|
** notice, this list of conditions and the following disclaimer.
|
|
** * Redistributions in binary form must reproduce the above copyright
|
|
** notice, this list of conditions and the following disclaimer in
|
|
** the documentation and/or other materials provided with the
|
|
** distribution.
|
|
** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
|
|
** the names of its contributors may be used to endorse or promote
|
|
** products derived from this software without specific prior written
|
|
** permission.
|
|
**
|
|
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
|
|
** $QT_END_LICENSE$
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include <QtWidgets>
|
|
|
|
#include "dialog.h"
|
|
|
|
#define MESSAGE \
|
|
Dialog::tr("<p>Message boxes have a caption, a text, " \
|
|
"and any number of buttons, each with standard or custom texts." \
|
|
"<p>Click a button to close the message box. Pressing the Esc button " \
|
|
"will activate the detected escape button (if any).")
|
|
|
|
Dialog::Dialog(QWidget *parent)
|
|
: QWidget(parent)
|
|
{
|
|
errorMessageDialog = new QErrorMessage(this);
|
|
|
|
int frameStyle = QFrame::Sunken | QFrame::Panel;
|
|
|
|
integerLabel = new QLabel;
|
|
integerLabel->setFrameStyle(frameStyle);
|
|
QPushButton *integerButton =
|
|
new QPushButton(tr("QInputDialog::get&Int()"));
|
|
|
|
doubleLabel = new QLabel;
|
|
doubleLabel->setFrameStyle(frameStyle);
|
|
QPushButton *doubleButton =
|
|
new QPushButton(tr("QInputDialog::get&Double()"));
|
|
|
|
itemLabel = new QLabel;
|
|
itemLabel->setFrameStyle(frameStyle);
|
|
QPushButton *itemButton = new QPushButton(tr("QInputDialog::getIte&m()"));
|
|
|
|
textLabel = new QLabel;
|
|
textLabel->setFrameStyle(frameStyle);
|
|
QPushButton *textButton = new QPushButton(tr("QInputDialog::get&Text()"));
|
|
|
|
colorLabel = new QLabel;
|
|
colorLabel->setFrameStyle(frameStyle);
|
|
QPushButton *colorButton = new QPushButton(tr("QColorDialog::get&Color()"));
|
|
|
|
fontLabel = new QLabel;
|
|
fontLabel->setFrameStyle(frameStyle);
|
|
QPushButton *fontButton = new QPushButton(tr("QFontDialog::get&Font()"));
|
|
|
|
directoryLabel = new QLabel;
|
|
directoryLabel->setFrameStyle(frameStyle);
|
|
QPushButton *directoryButton =
|
|
new QPushButton(tr("QFileDialog::getE&xistingDirectory()"));
|
|
|
|
openFileNameLabel = new QLabel;
|
|
openFileNameLabel->setFrameStyle(frameStyle);
|
|
QPushButton *openFileNameButton =
|
|
new QPushButton(tr("QFileDialog::get&OpenFileName()"));
|
|
|
|
openFileNamesLabel = new QLabel;
|
|
openFileNamesLabel->setFrameStyle(frameStyle);
|
|
QPushButton *openFileNamesButton =
|
|
new QPushButton(tr("QFileDialog::&getOpenFileNames()"));
|
|
|
|
saveFileNameLabel = new QLabel;
|
|
saveFileNameLabel->setFrameStyle(frameStyle);
|
|
QPushButton *saveFileNameButton =
|
|
new QPushButton(tr("QFileDialog::get&SaveFileName()"));
|
|
|
|
criticalLabel = new QLabel;
|
|
criticalLabel->setFrameStyle(frameStyle);
|
|
QPushButton *criticalButton =
|
|
new QPushButton(tr("QMessageBox::critica&l()"));
|
|
|
|
informationLabel = new QLabel;
|
|
informationLabel->setFrameStyle(frameStyle);
|
|
QPushButton *informationButton =
|
|
new QPushButton(tr("QMessageBox::i&nformation()"));
|
|
|
|
questionLabel = new QLabel;
|
|
questionLabel->setFrameStyle(frameStyle);
|
|
QPushButton *questionButton =
|
|
new QPushButton(tr("QMessageBox::&question()"));
|
|
|
|
warningLabel = new QLabel;
|
|
warningLabel->setFrameStyle(frameStyle);
|
|
QPushButton *warningButton = new QPushButton(tr("QMessageBox::&warning()"));
|
|
|
|
errorLabel = new QLabel;
|
|
errorLabel->setFrameStyle(frameStyle);
|
|
QPushButton *errorButton =
|
|
new QPushButton(tr("QErrorMessage::showM&essage()"));
|
|
|
|
connect(integerButton, SIGNAL(clicked()), this, SLOT(setInteger()));
|
|
connect(doubleButton, SIGNAL(clicked()), this, SLOT(setDouble()));
|
|
connect(itemButton, SIGNAL(clicked()), this, SLOT(setItem()));
|
|
connect(textButton, SIGNAL(clicked()), this, SLOT(setText()));
|
|
connect(colorButton, SIGNAL(clicked()), this, SLOT(setColor()));
|
|
connect(fontButton, SIGNAL(clicked()), this, SLOT(setFont()));
|
|
connect(directoryButton, SIGNAL(clicked()),
|
|
this, SLOT(setExistingDirectory()));
|
|
connect(openFileNameButton, SIGNAL(clicked()),
|
|
this, SLOT(setOpenFileName()));
|
|
connect(openFileNamesButton, SIGNAL(clicked()),
|
|
this, SLOT(setOpenFileNames()));
|
|
connect(saveFileNameButton, SIGNAL(clicked()),
|
|
this, SLOT(setSaveFileName()));
|
|
connect(criticalButton, SIGNAL(clicked()), this, SLOT(criticalMessage()));
|
|
connect(informationButton, SIGNAL(clicked()),
|
|
this, SLOT(informationMessage()));
|
|
connect(questionButton, SIGNAL(clicked()), this, SLOT(questionMessage()));
|
|
connect(warningButton, SIGNAL(clicked()), this, SLOT(warningMessage()));
|
|
connect(errorButton, SIGNAL(clicked()), this, SLOT(errorMessage()));
|
|
|
|
native = new QCheckBox(this);
|
|
native->setText("Use native file dialog.");
|
|
native->setChecked(true);
|
|
|
|
QGridLayout *layout = new QGridLayout;
|
|
layout->setColumnStretch(1, 1);
|
|
layout->setColumnMinimumWidth(1, 250);
|
|
layout->addWidget(integerButton, 0, 0);
|
|
layout->addWidget(integerLabel, 0, 1);
|
|
layout->addWidget(doubleButton, 1, 0);
|
|
layout->addWidget(doubleLabel, 1, 1);
|
|
layout->addWidget(itemButton, 2, 0);
|
|
layout->addWidget(itemLabel, 2, 1);
|
|
layout->addWidget(textButton, 3, 0);
|
|
layout->addWidget(textLabel, 3, 1);
|
|
layout->addWidget(colorButton, 4, 0);
|
|
layout->addWidget(colorLabel, 4, 1);
|
|
layout->addWidget(fontButton, 5, 0);
|
|
layout->addWidget(fontLabel, 5, 1);
|
|
layout->addWidget(directoryButton, 6, 0);
|
|
layout->addWidget(directoryLabel, 6, 1);
|
|
layout->addWidget(openFileNameButton, 7, 0);
|
|
layout->addWidget(openFileNameLabel, 7, 1);
|
|
layout->addWidget(openFileNamesButton, 8, 0);
|
|
layout->addWidget(openFileNamesLabel, 8, 1);
|
|
layout->addWidget(saveFileNameButton, 9, 0);
|
|
layout->addWidget(saveFileNameLabel, 9, 1);
|
|
layout->addWidget(criticalButton, 10, 0);
|
|
layout->addWidget(criticalLabel, 10, 1);
|
|
layout->addWidget(informationButton, 11, 0);
|
|
layout->addWidget(informationLabel, 11, 1);
|
|
layout->addWidget(questionButton, 12, 0);
|
|
layout->addWidget(questionLabel, 12, 1);
|
|
layout->addWidget(warningButton, 13, 0);
|
|
layout->addWidget(warningLabel, 13, 1);
|
|
layout->addWidget(errorButton, 14, 0);
|
|
layout->addWidget(errorLabel, 14, 1);
|
|
layout->addWidget(native, 15, 0);
|
|
#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
|
|
QWidget *widget = new QWidget;
|
|
widget->setLayout(layout);
|
|
|
|
QScrollArea *scrollArea = new QScrollArea(this);
|
|
scrollArea->setWidget(widget);
|
|
|
|
QHBoxLayout *mainLayout = new QHBoxLayout;
|
|
mainLayout->addWidget(scrollArea);
|
|
setLayout(mainLayout);
|
|
#else
|
|
setLayout(layout);
|
|
#endif
|
|
|
|
setWindowTitle(tr("Standard Dialogs"));
|
|
}
|
|
|
|
void Dialog::setInteger()
|
|
{
|
|
//! [0]
|
|
bool ok;
|
|
int i = QInputDialog::getInt(this, tr("QInputDialog::getInteger()"),
|
|
tr("Percentage:"), 25, 0, 100, 1, &ok);
|
|
if (ok)
|
|
integerLabel->setText(tr("%1%").arg(i));
|
|
//! [0]
|
|
}
|
|
|
|
void Dialog::setDouble()
|
|
{
|
|
//! [1]
|
|
bool ok;
|
|
double d = QInputDialog::getDouble(this, tr("QInputDialog::getDouble()"),
|
|
tr("Amount:"), 37.56, -10000, 10000, 2, &ok);
|
|
if (ok)
|
|
doubleLabel->setText(QString("$%1").arg(d));
|
|
//! [1]
|
|
}
|
|
|
|
void Dialog::setItem()
|
|
{
|
|
//! [2]
|
|
QStringList items;
|
|
items << tr("Spring") << tr("Summer") << tr("Fall") << tr("Winter");
|
|
|
|
bool ok;
|
|
QString item = QInputDialog::getItem(this, tr("QInputDialog::getItem()"),
|
|
tr("Season:"), items, 0, false, &ok);
|
|
if (ok && !item.isEmpty())
|
|
itemLabel->setText(item);
|
|
//! [2]
|
|
}
|
|
|
|
void Dialog::setText()
|
|
{
|
|
//! [3]
|
|
bool ok;
|
|
QString text = QInputDialog::getText(this, tr("QInputDialog::getText()"),
|
|
tr("User name:"), QLineEdit::Normal,
|
|
QDir::home().dirName(), &ok);
|
|
if (ok && !text.isEmpty())
|
|
textLabel->setText(text);
|
|
//! [3]
|
|
}
|
|
|
|
void Dialog::setColor()
|
|
{
|
|
QColor color;
|
|
if (native->isChecked())
|
|
color = QColorDialog::getColor(Qt::green, this);
|
|
else
|
|
color = QColorDialog::getColor(Qt::green, this, "Select Color", QColorDialog::DontUseNativeDialog);
|
|
|
|
if (color.isValid()) {
|
|
colorLabel->setText(color.name());
|
|
colorLabel->setPalette(QPalette(color));
|
|
colorLabel->setAutoFillBackground(true);
|
|
}
|
|
}
|
|
|
|
void Dialog::setFont()
|
|
{
|
|
bool ok;
|
|
QFont font = QFontDialog::getFont(&ok, QFont(fontLabel->text()), this);
|
|
if (ok) {
|
|
fontLabel->setText(font.key());
|
|
fontLabel->setFont(font);
|
|
}
|
|
}
|
|
|
|
void Dialog::setExistingDirectory()
|
|
{
|
|
QFileDialog::Options options = QFileDialog::DontResolveSymlinks | QFileDialog::ShowDirsOnly;
|
|
if (!native->isChecked())
|
|
options |= QFileDialog::DontUseNativeDialog;
|
|
QString directory = QFileDialog::getExistingDirectory(this,
|
|
tr("QFileDialog::getExistingDirectory()"),
|
|
directoryLabel->text(),
|
|
options);
|
|
if (!directory.isEmpty())
|
|
directoryLabel->setText(directory);
|
|
}
|
|
|
|
void Dialog::setOpenFileName()
|
|
{
|
|
QFileDialog::Options options;
|
|
if (!native->isChecked())
|
|
options |= QFileDialog::DontUseNativeDialog;
|
|
QString selectedFilter;
|
|
QString fileName = QFileDialog::getOpenFileName(this,
|
|
tr("QFileDialog::getOpenFileName()"),
|
|
openFileNameLabel->text(),
|
|
tr("All Files (*);;Text Files (*.txt)"),
|
|
&selectedFilter,
|
|
options);
|
|
if (!fileName.isEmpty())
|
|
openFileNameLabel->setText(fileName);
|
|
}
|
|
|
|
void Dialog::setOpenFileNames()
|
|
{
|
|
QFileDialog::Options options;
|
|
if (!native->isChecked())
|
|
options |= QFileDialog::DontUseNativeDialog;
|
|
QString selectedFilter;
|
|
QStringList files = QFileDialog::getOpenFileNames(
|
|
this, tr("QFileDialog::getOpenFileNames()"),
|
|
openFilesPath,
|
|
tr("All Files (*);;Text Files (*.txt)"),
|
|
&selectedFilter,
|
|
options);
|
|
if (files.count()) {
|
|
openFilesPath = files[0];
|
|
openFileNamesLabel->setText(QString("[%1]").arg(files.join(", ")));
|
|
}
|
|
}
|
|
|
|
void Dialog::setSaveFileName()
|
|
{
|
|
QFileDialog::Options options;
|
|
if (!native->isChecked())
|
|
options |= QFileDialog::DontUseNativeDialog;
|
|
QString selectedFilter;
|
|
QString fileName = QFileDialog::getSaveFileName(this,
|
|
tr("QFileDialog::getSaveFileName()"),
|
|
saveFileNameLabel->text(),
|
|
tr("All Files (*);;Text Files (*.txt)"),
|
|
&selectedFilter,
|
|
options);
|
|
if (!fileName.isEmpty())
|
|
saveFileNameLabel->setText(fileName);
|
|
}
|
|
|
|
void Dialog::criticalMessage()
|
|
{
|
|
QMessageBox::StandardButton reply;
|
|
reply = QMessageBox::critical(this, tr("QMessageBox::critical()"),
|
|
MESSAGE,
|
|
QMessageBox::Abort | QMessageBox::Retry | QMessageBox::Ignore);
|
|
if (reply == QMessageBox::Abort)
|
|
criticalLabel->setText(tr("Abort"));
|
|
else if (reply == QMessageBox::Retry)
|
|
criticalLabel->setText(tr("Retry"));
|
|
else
|
|
criticalLabel->setText(tr("Ignore"));
|
|
}
|
|
|
|
void Dialog::informationMessage()
|
|
{
|
|
QMessageBox::StandardButton reply;
|
|
reply = QMessageBox::information(this, tr("QMessageBox::information()"), MESSAGE);
|
|
if (reply == QMessageBox::Ok)
|
|
informationLabel->setText(tr("OK"));
|
|
else
|
|
informationLabel->setText(tr("Escape"));
|
|
}
|
|
|
|
void Dialog::questionMessage()
|
|
{
|
|
QMessageBox::StandardButton reply;
|
|
reply = QMessageBox::question(this, tr("QMessageBox::question()"),
|
|
MESSAGE,
|
|
QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
|
|
if (reply == QMessageBox::Yes)
|
|
questionLabel->setText(tr("Yes"));
|
|
else if (reply == QMessageBox::No)
|
|
questionLabel->setText(tr("No"));
|
|
else
|
|
questionLabel->setText(tr("Cancel"));
|
|
}
|
|
|
|
void Dialog::warningMessage()
|
|
{
|
|
QMessageBox msgBox(QMessageBox::Warning, tr("QMessageBox::warning()"),
|
|
MESSAGE, 0, this);
|
|
msgBox.addButton(tr("Save &Again"), QMessageBox::AcceptRole);
|
|
msgBox.addButton(tr("&Continue"), QMessageBox::RejectRole);
|
|
if (msgBox.exec() == QMessageBox::AcceptRole)
|
|
warningLabel->setText(tr("Save Again"));
|
|
else
|
|
warningLabel->setText(tr("Continue"));
|
|
|
|
}
|
|
|
|
void Dialog::errorMessage()
|
|
{
|
|
errorMessageDialog->showMessage(
|
|
tr("This dialog shows and remembers error messages. "
|
|
"If the checkbox is checked (as it is by default), "
|
|
"the shown message will be shown again, "
|
|
"but if the user unchecks the box the message "
|
|
"will not appear again if QErrorMessage::showMessage() "
|
|
"is called with the same message."));
|
|
errorLabel->setText(tr("If the box is unchecked, the message "
|
|
"won't appear again."));
|
|
}
|