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
414 lines
13 KiB
C++
414 lines
13 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 <QtNetwork>
|
|
|
|
#include "ftpwindow.h"
|
|
|
|
FtpWindow::FtpWindow(QWidget *parent)
|
|
: QDialog(parent), ftp(0), networkSession(0)
|
|
{
|
|
ftpServerLabel = new QLabel(tr("Ftp &server:"));
|
|
ftpServerLineEdit = new QLineEdit("ftp.qt.nokia.com");
|
|
ftpServerLabel->setBuddy(ftpServerLineEdit);
|
|
|
|
statusLabel = new QLabel(tr("Please enter the name of an FTP server."));
|
|
#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
|
|
// Use word wrapping to fit the text on screen
|
|
statusLabel->setWordWrap( true );
|
|
#endif
|
|
|
|
fileList = new QTreeWidget;
|
|
fileList->setEnabled(false);
|
|
fileList->setRootIsDecorated(false);
|
|
fileList->setHeaderLabels(QStringList() << tr("Name") << tr("Size") << tr("Owner") << tr("Group") << tr("Time"));
|
|
fileList->header()->setStretchLastSection(false);
|
|
|
|
connectButton = new QPushButton(tr("Connect"));
|
|
connectButton->setDefault(true);
|
|
|
|
cdToParentButton = new QPushButton;
|
|
cdToParentButton->setIcon(QPixmap(":/images/cdtoparent.png"));
|
|
cdToParentButton->setEnabled(false);
|
|
|
|
downloadButton = new QPushButton(tr("Download"));
|
|
downloadButton->setEnabled(false);
|
|
|
|
quitButton = new QPushButton(tr("Quit"));
|
|
|
|
buttonBox = new QDialogButtonBox;
|
|
buttonBox->addButton(downloadButton, QDialogButtonBox::ActionRole);
|
|
buttonBox->addButton(quitButton, QDialogButtonBox::RejectRole);
|
|
|
|
progressDialog = new QProgressDialog(this);
|
|
|
|
connect(fileList, SIGNAL(itemActivated(QTreeWidgetItem*,int)),
|
|
this, SLOT(processItem(QTreeWidgetItem*,int)));
|
|
connect(fileList, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),
|
|
this, SLOT(enableDownloadButton()));
|
|
connect(progressDialog, SIGNAL(canceled()), this, SLOT(cancelDownload()));
|
|
connect(connectButton, SIGNAL(clicked()), this, SLOT(connectOrDisconnect()));
|
|
connect(cdToParentButton, SIGNAL(clicked()), this, SLOT(cdToParent()));
|
|
connect(downloadButton, SIGNAL(clicked()), this, SLOT(downloadFile()));
|
|
connect(quitButton, SIGNAL(clicked()), this, SLOT(close()));
|
|
|
|
QHBoxLayout *topLayout = new QHBoxLayout;
|
|
topLayout->addWidget(ftpServerLabel);
|
|
topLayout->addWidget(ftpServerLineEdit);
|
|
#ifndef Q_OS_SYMBIAN
|
|
topLayout->addWidget(cdToParentButton);
|
|
topLayout->addWidget(connectButton);
|
|
#else
|
|
// Make app better lookin on small screen
|
|
QHBoxLayout *topLayout2 = new QHBoxLayout;
|
|
topLayout2->addWidget(cdToParentButton);
|
|
topLayout2->addWidget(connectButton);
|
|
#endif
|
|
|
|
QVBoxLayout *mainLayout = new QVBoxLayout;
|
|
mainLayout->addLayout(topLayout);
|
|
#ifdef Q_OS_SYMBIAN
|
|
// Make app better lookin on small screen
|
|
mainLayout->addLayout(topLayout2);
|
|
#endif
|
|
mainLayout->addWidget(fileList);
|
|
mainLayout->addWidget(statusLabel);
|
|
mainLayout->addWidget(buttonBox);
|
|
setLayout(mainLayout);
|
|
|
|
QNetworkConfigurationManager manager;
|
|
if (manager.capabilities() & QNetworkConfigurationManager::NetworkSessionRequired) {
|
|
// Get saved network configuration
|
|
QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
|
|
settings.beginGroup(QLatin1String("QtNetwork"));
|
|
const QString id = settings.value(QLatin1String("DefaultNetworkConfiguration")).toString();
|
|
settings.endGroup();
|
|
|
|
// If the saved network configuration is not currently discovered use the system default
|
|
QNetworkConfiguration config = manager.configurationFromIdentifier(id);
|
|
if ((config.state() & QNetworkConfiguration::Discovered) !=
|
|
QNetworkConfiguration::Discovered) {
|
|
config = manager.defaultConfiguration();
|
|
}
|
|
|
|
networkSession = new QNetworkSession(config, this);
|
|
connect(networkSession, SIGNAL(opened()), this, SLOT(enableConnectButton()));
|
|
|
|
connectButton->setEnabled(false);
|
|
statusLabel->setText(tr("Opening network session."));
|
|
networkSession->open();
|
|
}
|
|
|
|
setWindowTitle(tr("FTP"));
|
|
}
|
|
|
|
QSize FtpWindow::sizeHint() const
|
|
{
|
|
return QSize(500, 300);
|
|
}
|
|
|
|
//![0]
|
|
void FtpWindow::connectOrDisconnect()
|
|
{
|
|
if (ftp) {
|
|
ftp->abort();
|
|
ftp->deleteLater();
|
|
ftp = 0;
|
|
//![0]
|
|
fileList->setEnabled(false);
|
|
cdToParentButton->setEnabled(false);
|
|
downloadButton->setEnabled(false);
|
|
connectButton->setEnabled(true);
|
|
connectButton->setText(tr("Connect"));
|
|
#ifndef QT_NO_CURSOR
|
|
setCursor(Qt::ArrowCursor);
|
|
#endif
|
|
statusLabel->setText(tr("Please enter the name of an FTP server."));
|
|
return;
|
|
}
|
|
|
|
#ifndef QT_NO_CURSOR
|
|
setCursor(Qt::WaitCursor);
|
|
#endif
|
|
|
|
//![1]
|
|
ftp = new QFtp(this);
|
|
connect(ftp, SIGNAL(commandFinished(int,bool)),
|
|
this, SLOT(ftpCommandFinished(int,bool)));
|
|
connect(ftp, SIGNAL(listInfo(QUrlInfo)),
|
|
this, SLOT(addToList(QUrlInfo)));
|
|
connect(ftp, SIGNAL(dataTransferProgress(qint64,qint64)),
|
|
this, SLOT(updateDataTransferProgress(qint64,qint64)));
|
|
|
|
fileList->clear();
|
|
currentPath.clear();
|
|
isDirectory.clear();
|
|
//![1]
|
|
|
|
//![2]
|
|
QUrl url(ftpServerLineEdit->text());
|
|
if (!url.isValid() || url.scheme().toLower() != QLatin1String("ftp")) {
|
|
ftp->connectToHost(ftpServerLineEdit->text(), 21);
|
|
ftp->login();
|
|
} else {
|
|
ftp->connectToHost(url.host(), url.port(21));
|
|
|
|
if (!url.userName().isEmpty())
|
|
ftp->login(QUrl::fromPercentEncoding(url.userName().toLatin1()), url.password());
|
|
else
|
|
ftp->login();
|
|
if (!url.path().isEmpty())
|
|
ftp->cd(url.path());
|
|
}
|
|
//![2]
|
|
|
|
fileList->setEnabled(true);
|
|
connectButton->setEnabled(false);
|
|
connectButton->setText(tr("Disconnect"));
|
|
statusLabel->setText(tr("Connecting to FTP server %1...")
|
|
.arg(ftpServerLineEdit->text()));
|
|
}
|
|
|
|
//![3]
|
|
void FtpWindow::downloadFile()
|
|
{
|
|
QString fileName = fileList->currentItem()->text(0);
|
|
//![3]
|
|
//
|
|
if (QFile::exists(fileName)) {
|
|
QMessageBox::information(this, tr("FTP"),
|
|
tr("There already exists a file called %1 in "
|
|
"the current directory.")
|
|
.arg(fileName));
|
|
return;
|
|
}
|
|
|
|
//![4]
|
|
file = new QFile(fileName);
|
|
if (!file->open(QIODevice::WriteOnly)) {
|
|
QMessageBox::information(this, tr("FTP"),
|
|
tr("Unable to save the file %1: %2.")
|
|
.arg(fileName).arg(file->errorString()));
|
|
delete file;
|
|
return;
|
|
}
|
|
|
|
ftp->get(fileList->currentItem()->text(0), file);
|
|
|
|
progressDialog->setLabelText(tr("Downloading %1...").arg(fileName));
|
|
downloadButton->setEnabled(false);
|
|
progressDialog->exec();
|
|
}
|
|
//![4]
|
|
|
|
//![5]
|
|
void FtpWindow::cancelDownload()
|
|
{
|
|
ftp->abort();
|
|
|
|
if (file->exists()) {
|
|
file->close();
|
|
file->remove();
|
|
}
|
|
delete file;
|
|
}
|
|
//![5]
|
|
|
|
//![6]
|
|
void FtpWindow::ftpCommandFinished(int, bool error)
|
|
{
|
|
#ifndef QT_NO_CURSOR
|
|
setCursor(Qt::ArrowCursor);
|
|
#endif
|
|
|
|
if (ftp->currentCommand() == QFtp::ConnectToHost) {
|
|
if (error) {
|
|
QMessageBox::information(this, tr("FTP"),
|
|
tr("Unable to connect to the FTP server "
|
|
"at %1. Please check that the host "
|
|
"name is correct.")
|
|
.arg(ftpServerLineEdit->text()));
|
|
connectOrDisconnect();
|
|
return;
|
|
}
|
|
statusLabel->setText(tr("Logged onto %1.")
|
|
.arg(ftpServerLineEdit->text()));
|
|
fileList->setFocus();
|
|
downloadButton->setDefault(true);
|
|
connectButton->setEnabled(true);
|
|
return;
|
|
}
|
|
//![6]
|
|
|
|
//![7]
|
|
if (ftp->currentCommand() == QFtp::Login)
|
|
ftp->list();
|
|
//![7]
|
|
|
|
//![8]
|
|
if (ftp->currentCommand() == QFtp::Get) {
|
|
if (error) {
|
|
statusLabel->setText(tr("Canceled download of %1.")
|
|
.arg(file->fileName()));
|
|
file->close();
|
|
file->remove();
|
|
} else {
|
|
statusLabel->setText(tr("Downloaded %1 to current directory.")
|
|
.arg(file->fileName()));
|
|
file->close();
|
|
}
|
|
delete file;
|
|
enableDownloadButton();
|
|
progressDialog->hide();
|
|
//![8]
|
|
//![9]
|
|
} else if (ftp->currentCommand() == QFtp::List) {
|
|
if (isDirectory.isEmpty()) {
|
|
fileList->addTopLevelItem(new QTreeWidgetItem(QStringList() << tr("<empty>")));
|
|
fileList->setEnabled(false);
|
|
}
|
|
}
|
|
//![9]
|
|
}
|
|
|
|
//![10]
|
|
void FtpWindow::addToList(const QUrlInfo &urlInfo)
|
|
{
|
|
QTreeWidgetItem *item = new QTreeWidgetItem;
|
|
item->setText(0, urlInfo.name());
|
|
item->setText(1, QString::number(urlInfo.size()));
|
|
item->setText(2, urlInfo.owner());
|
|
item->setText(3, urlInfo.group());
|
|
item->setText(4, urlInfo.lastModified().toString("MMM dd yyyy"));
|
|
|
|
QPixmap pixmap(urlInfo.isDir() ? ":/images/dir.png" : ":/images/file.png");
|
|
item->setIcon(0, pixmap);
|
|
|
|
isDirectory[urlInfo.name()] = urlInfo.isDir();
|
|
fileList->addTopLevelItem(item);
|
|
if (!fileList->currentItem()) {
|
|
fileList->setCurrentItem(fileList->topLevelItem(0));
|
|
fileList->setEnabled(true);
|
|
}
|
|
}
|
|
//![10]
|
|
|
|
//![11]
|
|
void FtpWindow::processItem(QTreeWidgetItem *item, int /*column*/)
|
|
{
|
|
QString name = item->text(0);
|
|
if (isDirectory.value(name)) {
|
|
fileList->clear();
|
|
isDirectory.clear();
|
|
currentPath += '/';
|
|
currentPath += name;
|
|
ftp->cd(name);
|
|
ftp->list();
|
|
cdToParentButton->setEnabled(true);
|
|
#ifndef QT_NO_CURSOR
|
|
setCursor(Qt::WaitCursor);
|
|
#endif
|
|
return;
|
|
}
|
|
}
|
|
//![11]
|
|
|
|
//![12]
|
|
void FtpWindow::cdToParent()
|
|
{
|
|
#ifndef QT_NO_CURSOR
|
|
setCursor(Qt::WaitCursor);
|
|
#endif
|
|
fileList->clear();
|
|
isDirectory.clear();
|
|
currentPath = currentPath.left(currentPath.lastIndexOf('/'));
|
|
if (currentPath.isEmpty()) {
|
|
cdToParentButton->setEnabled(false);
|
|
ftp->cd("/");
|
|
} else {
|
|
ftp->cd(currentPath);
|
|
}
|
|
ftp->list();
|
|
}
|
|
//![12]
|
|
|
|
//![13]
|
|
void FtpWindow::updateDataTransferProgress(qint64 readBytes,
|
|
qint64 totalBytes)
|
|
{
|
|
progressDialog->setMaximum(totalBytes);
|
|
progressDialog->setValue(readBytes);
|
|
}
|
|
//![13]
|
|
|
|
//![14]
|
|
void FtpWindow::enableDownloadButton()
|
|
{
|
|
QTreeWidgetItem *current = fileList->currentItem();
|
|
if (current) {
|
|
QString currentFile = current->text(0);
|
|
downloadButton->setEnabled(!isDirectory.value(currentFile));
|
|
} else {
|
|
downloadButton->setEnabled(false);
|
|
}
|
|
}
|
|
//![14]
|
|
|
|
void FtpWindow::enableConnectButton()
|
|
{
|
|
// Save the used configuration
|
|
QNetworkConfiguration config = networkSession->configuration();
|
|
QString id;
|
|
if (config.type() == QNetworkConfiguration::UserChoice)
|
|
id = networkSession->sessionProperty(QLatin1String("UserChoiceConfiguration")).toString();
|
|
else
|
|
id = config.identifier();
|
|
|
|
QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
|
|
settings.beginGroup(QLatin1String("QtNetwork"));
|
|
settings.setValue(QLatin1String("DefaultNetworkConfiguration"), id);
|
|
settings.endGroup();
|
|
|
|
connectButton->setEnabled(networkSession->isOpen());
|
|
statusLabel->setText(tr("Please enter the name of an FTP server."));
|
|
}
|
|
|