summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/src/snippets/code/src_gui_embedded_qcopchannel_qws.cpp66
-rw-r--r--doc/src/snippets/code/src_gui_embedded_qmouse_qws.cpp44
-rw-r--r--doc/src/snippets/code/src_gui_embedded_qwindowsystem_qws.cpp85
-rw-r--r--examples/examples.pro2
-rw-r--r--mkspecs/features/default_post.prf27
-rw-r--r--src/concurrent/concurrent.pro3
-rw-r--r--src/concurrent/doc/qtconcurrent.qdocconf92
-rw-r--r--src/concurrent/doc/snippets/code/src_concurrent_qfuture.cpp (renamed from doc/src/snippets/code/src_corelib_concurrent_qfuture.cpp)0
-rw-r--r--src/concurrent/doc/snippets/code/src_concurrent_qfuturesynchronizer.cpp (renamed from doc/src/snippets/code/src_corelib_concurrent_qfuturesynchronizer.cpp)0
-rw-r--r--src/concurrent/doc/snippets/code/src_concurrent_qfuturewatcher.cpp (renamed from doc/src/snippets/code/src_corelib_concurrent_qfuturewatcher.cpp)0
-rw-r--r--src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentexception.cpp (renamed from doc/src/snippets/code/src_corelib_concurrent_qtconcurrentexception.cpp)0
-rw-r--r--src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentfilter.cpp (renamed from doc/src/snippets/code/src_corelib_concurrent_qtconcurrentfilter.cpp)0
-rw-r--r--src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentmap.cpp (renamed from doc/src/snippets/code/src_corelib_concurrent_qtconcurrentmap.cpp)0
-rw-r--r--src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentrun.cpp (renamed from doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp)0
-rw-r--r--src/concurrent/qfuture.cpp6
-rw-r--r--src/concurrent/qfuturesynchronizer.cpp2
-rw-r--r--src/concurrent/qfuturewatcher.cpp2
-rw-r--r--src/concurrent/qtconcurrentexception.cpp8
-rw-r--r--src/concurrent/qtconcurrentfilter.cpp28
-rw-r--r--src/concurrent/qtconcurrentmap.cpp32
-rw-r--r--src/concurrent/qtconcurrentrun.cpp14
-rw-r--r--src/corelib/corelib.pro4
-rw-r--r--src/corelib/doc/doc.pri3
-rw-r--r--src/corelib/doc/images/resources.png (renamed from doc/src/images/resources.png)bin49998 -> 49998 bytes
-rw-r--r--src/corelib/doc/snippets/code/doc_src_resources.cpp (renamed from doc/src/snippets/code/doc_src_resources.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/doc_src_resources.qdoc (renamed from doc/src/snippets/code/doc_src_resources.qdoc)0
-rw-r--r--src/corelib/doc/src/io.qdoc39
-rw-r--r--src/corelib/doc/src/resource-system.qdoc (renamed from doc/src/network/files-and-resources/resources.qdoc)28
-rw-r--r--src/corelib/global/qlogging.cpp6
-rw-r--r--src/corelib/io/qfiledevice.cpp4
-rw-r--r--src/corelib/io/qurlquery.cpp2
-rw-r--r--src/corelib/tools/qhash.cpp2
-rw-r--r--src/corelib/tools/qstringlist.cpp8
-rw-r--r--src/dbus/dbus.pro3
-rw-r--r--src/dbus/doc/qtdbus.qdocconf92
-rw-r--r--src/dbus/doc/snippets/code/doc_src_introtodbus.qdoc (renamed from doc/src/snippets/code/src_gui_embedded_qscreen_qws.cpp)10
-rw-r--r--src/dbus/doc/snippets/code/doc_src_qdbusadaptors.cpp293
-rw-r--r--src/dbus/doc/snippets/code/doc_src_qtdbus.cpp43
-rw-r--r--src/dbus/doc/snippets/code/doc_src_qtdbus.pro3
-rw-r--r--src/dbus/doc/snippets/code/src_qdbus_qdbusabstractinterface.cpp (renamed from doc/src/snippets/code/src_qdbus_qdbusabstractinterface.cpp)0
-rw-r--r--src/dbus/doc/snippets/code/src_qdbus_qdbusargument.cpp (renamed from doc/src/snippets/code/src_qdbus_qdbusargument.cpp)0
-rw-r--r--src/dbus/doc/snippets/code/src_qdbus_qdbuscontext.cpp (renamed from doc/src/snippets/code/src_qdbus_qdbuscontext.cpp)0
-rw-r--r--src/dbus/doc/snippets/code/src_qdbus_qdbusinterface.cpp (renamed from doc/src/snippets/code/src_qdbus_qdbusinterface.cpp)0
-rw-r--r--src/dbus/doc/snippets/code/src_qdbus_qdbusmetatype.cpp (renamed from doc/src/snippets/code/src_qdbus_qdbusmetatype.cpp)0
-rw-r--r--src/dbus/doc/snippets/code/src_qdbus_qdbuspendingcall.cpp (renamed from doc/src/snippets/code/src.qdbus.qdbuspendingcall.cpp)0
-rw-r--r--src/dbus/doc/snippets/code/src_qdbus_qdbuspendingreply.cpp (renamed from doc/src/snippets/code/src.qdbus.qdbuspendingreply.cpp)0
-rw-r--r--src/dbus/doc/snippets/code/src_qdbus_qdbusreply.cpp (renamed from doc/src/snippets/code/src_qdbus_qdbusreply.cpp)0
-rw-r--r--src/dbus/doc/snippets/qdbusextratypes/qdbusextratypes.cpp (renamed from doc/src/snippets/qdbusextratypes/qdbusextratypes.cpp)0
-rw-r--r--src/dbus/doc/src/dbus-adaptors.qdoc481
-rw-r--r--src/dbus/doc/src/dbus-intro.qdoc215
-rw-r--r--src/dbus/doc/src/qdbusxml2cpp.qdoc49
-rw-r--r--src/dbus/doc/src/qtdbus.qdoc (renamed from doc/src/dbus/qtdbus.qdoc)6
-rw-r--r--src/dbus/qdbusabstractinterface.cpp4
-rw-r--r--src/dbus/qdbusargument.cpp22
-rw-r--r--src/dbus/qdbuscontext.cpp2
-rw-r--r--src/dbus/qdbusextratypes.cpp4
-rw-r--r--src/dbus/qdbusinterface.cpp2
-rw-r--r--src/dbus/qdbusmetatype.cpp2
-rw-r--r--src/dbus/qdbuspendingcall.cpp4
-rw-r--r--src/dbus/qdbuspendingreply.cpp8
-rw-r--r--src/dbus/qdbusreply.cpp4
-rw-r--r--src/gui/accessible/qaccessible.cpp2
-rw-r--r--src/gui/doc/images/brush-outline.png (renamed from doc/src/images/brush-outline.png)bin452 -> 452 bytes
-rw-r--r--src/gui/doc/images/brush-styles.pngbin0 -> 13980 bytes
-rw-r--r--src/gui/doc/images/coordinatesystem-analogclock.png (renamed from doc/src/images/coordinatesystem-analogclock.png)bin9762 -> 9762 bytes
-rw-r--r--src/gui/doc/images/coordinatesystem-line-antialias.png (renamed from doc/src/images/coordinatesystem-line-antialias.png)bin17979 -> 17979 bytes
-rw-r--r--src/gui/doc/images/coordinatesystem-line-raster.png (renamed from doc/src/images/coordinatesystem-line-raster.png)bin18152 -> 18152 bytes
-rw-r--r--src/gui/doc/images/coordinatesystem-line.png (renamed from doc/src/images/coordinatesystem-line.png)bin26694 -> 26694 bytes
-rw-r--r--src/gui/doc/images/coordinatesystem-rect-antialias.png (renamed from doc/src/images/coordinatesystem-rect-antialias.png)bin19058 -> 19058 bytes
-rw-r--r--src/gui/doc/images/coordinatesystem-rect-raster.png (renamed from doc/src/images/coordinatesystem-rect-raster.png)bin18455 -> 18455 bytes
-rw-r--r--src/gui/doc/images/coordinatesystem-rect.png (renamed from doc/src/images/coordinatesystem-rect.png)bin32307 -> 32307 bytes
-rw-r--r--src/gui/doc/images/coordinatesystem-transformations.png (renamed from doc/src/images/coordinatesystem-transformations.png)bin59180 -> 59180 bytes
-rw-r--r--src/gui/doc/images/cursor-arrow.pngbin0 -> 171 bytes
-rw-r--r--src/gui/doc/images/cursor-busy.pngbin0 -> 201 bytes
-rw-r--r--src/gui/doc/images/cursor-closedhand.pngbin0 -> 147 bytes
-rw-r--r--src/gui/doc/images/cursor-cross.pngbin0 -> 130 bytes
-rw-r--r--src/gui/doc/images/cursor-forbidden.pngbin0 -> 199 bytes
-rw-r--r--src/gui/doc/images/cursor-hand.pngbin0 -> 159 bytes
-rw-r--r--src/gui/doc/images/cursor-hsplit.pngbin0 -> 155 bytes
-rw-r--r--src/gui/doc/images/cursor-ibeam.pngbin0 -> 124 bytes
-rw-r--r--src/gui/doc/images/cursor-openhand.pngbin0 -> 160 bytes
-rw-r--r--src/gui/doc/images/cursor-sizeall.pngbin0 -> 174 bytes
-rw-r--r--src/gui/doc/images/cursor-sizeb.pngbin0 -> 161 bytes
-rw-r--r--src/gui/doc/images/cursor-sizef.pngbin0 -> 161 bytes
-rw-r--r--src/gui/doc/images/cursor-sizeh.pngbin0 -> 145 bytes
-rw-r--r--src/gui/doc/images/cursor-sizev.pngbin0 -> 141 bytes
-rw-r--r--src/gui/doc/images/cursor-uparrow.pngbin0 -> 132 bytes
-rw-r--r--src/gui/doc/images/cursor-vsplit.pngbin0 -> 161 bytes
-rw-r--r--src/gui/doc/images/cursor-wait.pngbin0 -> 172 bytes
-rw-r--r--src/gui/doc/images/cursor-whatsthis.pngbin0 -> 191 bytes
-rw-r--r--src/gui/doc/images/hoverevents.png (renamed from doc/src/images/hoverevents.png)bin3210 -> 3210 bytes
-rw-r--r--src/gui/doc/images/paintsystem-antialiasing.png (renamed from doc/src/images/paintsystem-antialiasing.png)bin995 -> 995 bytes
-rw-r--r--src/gui/doc/images/paintsystem-core.png (renamed from doc/src/images/paintsystem-core.png)bin22101 -> 22101 bytes
-rw-r--r--src/gui/doc/images/paintsystem-devices.png (renamed from doc/src/images/paintsystem-devices.png)bin47404 -> 47404 bytes
-rw-r--r--src/gui/doc/images/paintsystem-fancygradient.png (renamed from doc/src/images/paintsystem-fancygradient.png)bin39213 -> 39213 bytes
-rw-r--r--src/gui/doc/images/paintsystem-gradients.png (renamed from doc/src/images/paintsystem-gradients.png)bin16931 -> 16931 bytes
-rw-r--r--src/gui/doc/images/paintsystem-icon.png (renamed from doc/src/images/paintsystem-icon.png)bin5458 -> 5458 bytes
-rw-r--r--src/gui/doc/images/paintsystem-movie.png (renamed from doc/src/images/paintsystem-movie.png)bin4992 -> 4992 bytes
-rw-r--r--src/gui/doc/images/paintsystem-painterpath.png (renamed from doc/src/images/paintsystem-painterpath.png)bin7503 -> 7503 bytes
-rw-r--r--src/gui/doc/images/paintsystem-stylepainter.png (renamed from doc/src/images/paintsystem-stylepainter.png)bin16572 -> 16572 bytes
-rw-r--r--src/gui/doc/images/paintsystem-svg.png (renamed from doc/src/images/paintsystem-svg.png)bin66692 -> 66692 bytes
-rw-r--r--src/gui/doc/images/qcolor-cmyk.png (renamed from doc/src/images/qcolor-cmyk.png)bin18878 -> 18878 bytes
-rw-r--r--src/gui/doc/images/qcolor-hsv.png (renamed from doc/src/images/qcolor-hsv.png)bin21046 -> 21046 bytes
-rw-r--r--src/gui/doc/images/qcolor-hue.png (renamed from doc/src/images/qcolor-hue.png)bin26820 -> 26820 bytes
-rw-r--r--src/gui/doc/images/qcolor-rgb.png (renamed from doc/src/images/qcolor-rgb.png)bin17798 -> 17798 bytes
-rw-r--r--src/gui/doc/images/qcolor-saturation.png (renamed from doc/src/images/qcolor-saturation.png)bin2150 -> 2150 bytes
-rw-r--r--src/gui/doc/images/qcolor-value.png (renamed from doc/src/images/qcolor-value.png)bin1241 -> 1241 bytes
-rw-r--r--src/gui/doc/images/qconicalgradient.png (renamed from doc/src/images/qconicalgradient.png)bin52823 -> 52823 bytes
-rw-r--r--src/gui/doc/images/qgradient-conical.png (renamed from doc/src/images/qgradient-conical.png)bin3995 -> 3995 bytes
-rw-r--r--src/gui/doc/images/qgradient-linear.png (renamed from doc/src/images/qgradient-linear.png)bin714 -> 714 bytes
-rw-r--r--src/gui/doc/images/qgradient-radial.png (renamed from doc/src/images/qgradient-radial.png)bin2352 -> 2352 bytes
-rw-r--r--src/gui/doc/images/qimage-32bit_scaled.png (renamed from doc/src/images/qimage-32bit_scaled.png)bin25098 -> 25098 bytes
-rw-r--r--src/gui/doc/images/qimage-8bit_scaled.png (renamed from doc/src/images/qimage-8bit_scaled.png)bin24761 -> 24761 bytes
-rw-r--r--src/gui/doc/images/qimage-scaling.pngbin0 -> 34785 bytes
-rw-r--r--src/gui/doc/images/qlineargradient-pad.png (renamed from doc/src/images/qlineargradient-pad.png)bin2260 -> 2260 bytes
-rw-r--r--src/gui/doc/images/qlineargradient-reflect.png (renamed from doc/src/images/qlineargradient-reflect.png)bin2746 -> 2746 bytes
-rw-r--r--src/gui/doc/images/qlineargradient-repeat.png (renamed from doc/src/images/qlineargradient-repeat.png)bin2590 -> 2590 bytes
-rw-r--r--src/gui/doc/images/qmatrix-combinedtransformation.png (renamed from doc/src/images/qmatrix-combinedtransformation.png)bin1707 -> 1707 bytes
-rw-r--r--src/gui/doc/images/qmatrix-representation.png (renamed from doc/src/images/qmatrix-representation.png)bin10410 -> 10410 bytes
-rw-r--r--src/gui/doc/images/qmatrix-simpletransformation.png (renamed from doc/src/images/qmatrix-simpletransformation.png)bin2047 -> 2047 bytes
-rw-r--r--src/gui/doc/images/qpainter-affinetransformations.png (renamed from doc/src/images/qpainter-affinetransformations.png)bin66241 -> 66241 bytes
-rw-r--r--src/gui/doc/images/qpainter-arc.png (renamed from doc/src/images/qpainter-arc.png)bin635 -> 635 bytes
-rw-r--r--src/gui/doc/images/qpainter-basicdrawing.png (renamed from doc/src/images/qpainter-basicdrawing.png)bin18164 -> 18164 bytes
-rw-r--r--src/gui/doc/images/qpainter-chord.png (renamed from doc/src/images/qpainter-chord.png)bin632 -> 632 bytes
-rw-r--r--src/gui/doc/images/qpainter-clock.png (renamed from doc/src/images/qpainter-clock.png)bin3128 -> 3128 bytes
-rw-r--r--src/gui/doc/images/qpainter-compositiondemo.png (renamed from doc/src/images/qpainter-compositiondemo.png)bin61015 -> 61015 bytes
-rw-r--r--src/gui/doc/images/qpainter-compositionmode1.png (renamed from doc/src/images/qpainter-compositionmode1.png)bin2418 -> 2418 bytes
-rw-r--r--src/gui/doc/images/qpainter-compositionmode2.png (renamed from doc/src/images/qpainter-compositionmode2.png)bin2131 -> 2131 bytes
-rw-r--r--src/gui/doc/images/qpainter-concentriccircles.png (renamed from doc/src/images/qpainter-concentriccircles.png)bin31294 -> 31294 bytes
-rw-r--r--src/gui/doc/images/qpainter-ellipse.png (renamed from doc/src/images/qpainter-ellipse.png)bin1022 -> 1022 bytes
-rw-r--r--src/gui/doc/images/qpainter-gradients.png (renamed from doc/src/images/qpainter-gradients.png)bin24231 -> 24231 bytes
-rw-r--r--src/gui/doc/images/qpainter-line.png (renamed from doc/src/images/qpainter-line.png)bin759 -> 759 bytes
-rw-r--r--src/gui/doc/images/qpainter-painterpaths.png (renamed from doc/src/images/qpainter-painterpaths.png)bin31985 -> 31985 bytes
-rw-r--r--src/gui/doc/images/qpainter-path.png (renamed from doc/src/images/qpainter-path.png)bin963 -> 963 bytes
-rw-r--r--src/gui/doc/images/qpainter-pathstroking.png (renamed from doc/src/images/qpainter-pathstroking.png)bin30794 -> 30794 bytes
-rw-r--r--src/gui/doc/images/qpainter-pie.png (renamed from doc/src/images/qpainter-pie.png)bin1018 -> 1018 bytes
-rw-r--r--src/gui/doc/images/qpainter-polygon.png (renamed from doc/src/images/qpainter-polygon.png)bin699 -> 699 bytes
-rw-r--r--src/gui/doc/images/qpainter-rectangle.png (renamed from doc/src/images/qpainter-rectangle.png)bin194 -> 194 bytes
-rw-r--r--src/gui/doc/images/qpainter-rotation.png (renamed from doc/src/images/qpainter-rotation.png)bin3768 -> 3768 bytes
-rw-r--r--src/gui/doc/images/qpainter-roundrect.png (renamed from doc/src/images/qpainter-roundrect.png)bin433 -> 433 bytes
-rw-r--r--src/gui/doc/images/qpainter-scale.png (renamed from doc/src/images/qpainter-scale.png)bin2828 -> 2828 bytes
-rw-r--r--src/gui/doc/images/qpainter-text.png (renamed from doc/src/images/qpainter-text.png)bin1391 -> 1391 bytes
-rw-r--r--src/gui/doc/images/qpainter-translation.png (renamed from doc/src/images/qpainter-translation.png)bin3909 -> 3909 bytes
-rw-r--r--src/gui/doc/images/qpainter-vectordeformation.png (renamed from doc/src/images/qpainter-vectordeformation.png)bin30591 -> 30591 bytes
-rw-r--r--src/gui/doc/images/qpainterpath-addellipse.png (renamed from doc/src/images/qpainterpath-addellipse.png)bin3509 -> 3509 bytes
-rw-r--r--src/gui/doc/images/qpainterpath-addpolygon.png (renamed from doc/src/images/qpainterpath-addpolygon.png)bin7625 -> 7625 bytes
-rw-r--r--src/gui/doc/images/qpainterpath-addrectangle.png (renamed from doc/src/images/qpainterpath-addrectangle.png)bin1839 -> 1839 bytes
-rw-r--r--src/gui/doc/images/qpainterpath-addtext.png (renamed from doc/src/images/qpainterpath-addtext.png)bin7406 -> 7406 bytes
-rw-r--r--src/gui/doc/images/qpainterpath-arcto.png (renamed from doc/src/images/qpainterpath-arcto.png)bin5063 -> 5063 bytes
-rw-r--r--src/gui/doc/images/qpainterpath-construction.png (renamed from doc/src/images/qpainterpath-construction.png)bin2523 -> 2523 bytes
-rw-r--r--src/gui/doc/images/qpainterpath-cubicto.png (renamed from doc/src/images/qpainterpath-cubicto.png)bin4749 -> 4749 bytes
-rw-r--r--src/gui/doc/images/qpainterpath-demo.png (renamed from doc/src/images/qpainterpath-demo.png)bin51334 -> 51334 bytes
-rw-r--r--src/gui/doc/images/qpainterpath-example.png (renamed from doc/src/images/qpainterpath-example.png)bin38746 -> 38746 bytes
-rw-r--r--src/gui/doc/images/qpen-bevel.pngbin0 -> 11527 bytes
-rw-r--r--src/gui/doc/images/qpen-custom.pngbin0 -> 6254 bytes
-rw-r--r--src/gui/doc/images/qpen-dash.pngbin0 -> 8221 bytes
-rw-r--r--src/gui/doc/images/qpen-dashdot.pngbin0 -> 5961 bytes
-rw-r--r--src/gui/doc/images/qpen-dashdotdot.pngbin0 -> 5999 bytes
-rw-r--r--src/gui/doc/images/qpen-dashpattern.png (renamed from doc/src/images/qpen-dashpattern.png)bin1605 -> 1605 bytes
-rw-r--r--src/gui/doc/images/qpen-demo.png (renamed from doc/src/images/qpen-demo.png)bin49784 -> 49784 bytes
-rw-r--r--src/gui/doc/images/qpen-dot.pngbin0 -> 5386 bytes
-rw-r--r--src/gui/doc/images/qpen-flat.pngbin0 -> 1885 bytes
-rw-r--r--src/gui/doc/images/qpen-miter.pngbin0 -> 11734 bytes
-rw-r--r--src/gui/doc/images/qpen-miterlimit.png (renamed from doc/src/images/qpen-miterlimit.png)bin24816 -> 24816 bytes
-rw-r--r--src/gui/doc/images/qpen-roundcap.pngbin0 -> 1920 bytes
-rw-r--r--src/gui/doc/images/qpen-roundjoin.pngbin0 -> 11878 bytes
-rw-r--r--src/gui/doc/images/qpen-solid.pngbin0 -> 7416 bytes
-rw-r--r--src/gui/doc/images/qpen-square.pngbin0 -> 2651 bytes
-rw-r--r--src/gui/doc/images/qradialgradient-pad.png (renamed from doc/src/images/qradialgradient-pad.png)bin11385 -> 11385 bytes
-rw-r--r--src/gui/doc/images/qradialgradient-reflect.png (renamed from doc/src/images/qradialgradient-reflect.png)bin33668 -> 33668 bytes
-rw-r--r--src/gui/doc/images/qradialgradient-repeat.png (renamed from doc/src/images/qradialgradient-repeat.png)bin40528 -> 40528 bytes
-rw-r--r--src/gui/doc/images/qrect-diagram-zero.pngbin0 -> 5198 bytes
-rw-r--r--src/gui/doc/images/qrectf-diagram-one.pngbin0 -> 9594 bytes
-rw-r--r--src/gui/doc/images/qrectf-diagram-three.pngbin0 -> 9392 bytes
-rw-r--r--src/gui/doc/images/qrectf-diagram-two.pngbin0 -> 9387 bytes
-rw-r--r--src/gui/doc/images/qstatustipevent-action.png (renamed from doc/src/images/qstatustipevent-action.png)bin10741 -> 10741 bytes
-rw-r--r--src/gui/doc/images/qstatustipevent-widget.png (renamed from doc/src/images/qstatustipevent-widget.png)bin9417 -> 9417 bytes
-rw-r--r--src/gui/doc/images/qt-fillrule-oddeven.png (renamed from doc/src/images/qt-fillrule-oddeven.png)bin7057 -> 7057 bytes
-rw-r--r--src/gui/doc/images/qt-fillrule-winding.png (renamed from doc/src/images/qt-fillrule-winding.png)bin7205 -> 7205 bytes
-rw-r--r--src/gui/doc/images/qtexttableformat-cell.png (renamed from doc/src/images/qtexttableformat-cell.png)bin24454 -> 24454 bytes
-rw-r--r--src/gui/doc/images/qtransform-combinedtransformation.png (renamed from doc/src/images/qtransform-combinedtransformation.png)bin935 -> 935 bytes
-rw-r--r--src/gui/doc/images/qtransform-combinedtransformation2.png (renamed from doc/src/images/qtransform-combinedtransformation2.png)bin930 -> 930 bytes
-rw-r--r--src/gui/doc/images/qtransform-representation.png (renamed from doc/src/images/qtransform-representation.png)bin17385 -> 17385 bytes
-rw-r--r--src/gui/doc/images/qtransform-simpletransformation.png (renamed from doc/src/images/qtransform-simpletransformation.png)bin1201 -> 1201 bytes
-rw-r--r--src/gui/doc/images/texttable-merge.png (renamed from doc/src/images/texttable-merge.png)bin746 -> 746 bytes
-rw-r--r--src/gui/doc/images/texttable-split.png (renamed from doc/src/images/texttable-split.png)bin753 -> 753 bytes
-rw-r--r--src/gui/doc/qtgui.qdocconf92
-rw-r--r--src/gui/doc/snippets/brush/brush.cpp (renamed from doc/src/snippets/brush/brush.cpp)0
-rw-r--r--src/gui/doc/snippets/brush/gradientcreationsnippet.cpp (renamed from doc/src/snippets/brush/gradientcreationsnippet.cpp)0
-rw-r--r--src/gui/doc/snippets/code/doc_src_coordsys.cpp (renamed from doc/src/snippets/code/doc_src_coordsys.cpp)0
-rw-r--r--src/gui/doc/snippets/code/doc_src_qtgui.pro (renamed from doc/src/snippets/code/doc_src_qtgui.pro)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_accessible_qaccessible.cpp (renamed from doc/src/snippets/code/src_gui_accessible_qaccessible.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_image_qimage.cpp (renamed from doc/src/snippets/code/src_gui_image_qimage.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_image_qimagereader.cpp (renamed from doc/src/snippets/code/src_gui_image_qimagereader.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_image_qimagewriter.cpp (renamed from doc/src/snippets/code/src_gui_image_qimagewriter.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_image_qmovie.cpp (renamed from doc/src/snippets/code/src_gui_image_qmovie.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_image_qpixmap.cpp (renamed from doc/src/snippets/code/src_gui_image_qpixmap.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_image_qpixmapcache.cpp (renamed from doc/src/snippets/code/src_gui_image_qpixmapcache.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_kernel_qapplication.cpp (renamed from doc/src/snippets/code/src_gui_kernel_qapplication.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_kernel_qapplication_x11.cpp (renamed from doc/src/snippets/code/src_gui_kernel_qapplication_x11.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_kernel_qclipboard.cpp (renamed from doc/src/snippets/code/src_gui_kernel_qclipboard.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_kernel_qevent.cpp (renamed from doc/src/snippets/code/src_gui_kernel_qevent.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_kernel_qkeysequence.cpp (renamed from doc/src/snippets/code/src_gui_kernel_qkeysequence.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_kernel_qshortcutmap.cpp (renamed from doc/src/snippets/code/src_gui_kernel_qshortcutmap.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_painting_qbrush.cpp (renamed from doc/src/snippets/code/src_gui_painting_qbrush.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_painting_qcolor.cpp (renamed from doc/src/snippets/code/src_gui_painting_qcolor.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_painting_qmatrix.cpp (renamed from doc/src/snippets/code/src_gui_painting_qmatrix.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_painting_qpainter.cpp (renamed from doc/src/snippets/code/src_gui_painting_qpainter.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_painting_qpainterpath.cpp (renamed from doc/src/snippets/code/src_gui_painting_qpainterpath.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_painting_qpen.cpp (renamed from doc/src/snippets/code/src_gui_painting_qpen.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_painting_qregion.cpp (renamed from doc/src/snippets/code/src_gui_painting_qregion.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_painting_qregion_unix.cpp (renamed from doc/src/snippets/code/src_gui_painting_qregion_unix.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_painting_qtransform.cpp (renamed from doc/src/snippets/code/src_gui_painting_qtransform.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_qopenglshaderprogram.cpp (renamed from doc/src/snippets/code/src_gui_qopenglshaderprogram.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_text_qfont.cpp (renamed from doc/src/snippets/code/src_gui_text_qfont.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_text_qfontmetrics.cpp (renamed from doc/src/snippets/code/src_gui_text_qfontmetrics.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_text_qsyntaxhighlighter.cpp (renamed from doc/src/snippets/code/src_gui_text_qsyntaxhighlighter.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_text_qtextcursor.cpp (renamed from doc/src/snippets/code/src_gui_text_qtextcursor.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_text_qtextdocument.cpp (renamed from doc/src/snippets/code/src_gui_text_qtextdocument.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_text_qtextdocumentwriter.cpp (renamed from doc/src/snippets/code/src.gui.text.qtextdocumentwriter.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_text_qtextlayout.cpp (renamed from doc/src/snippets/code/src_gui_text_qtextlayout.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_util_qdesktopservices.cpp (renamed from doc/src/snippets/code/src_gui_util_qdesktopservices.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_util_qvalidator.cpp (renamed from doc/src/snippets/code/src_gui_widgets_qvalidator.cpp)0
-rw-r--r--src/gui/doc/snippets/dragging/mainwindow.cpp (renamed from doc/src/snippets/dragging/mainwindow.cpp)0
-rw-r--r--src/gui/doc/snippets/droparea.cpp (renamed from doc/src/snippets/droparea.cpp)0
-rw-r--r--src/gui/doc/snippets/image/image.cpp (renamed from doc/src/snippets/image/image.cpp)0
-rw-r--r--src/gui/doc/snippets/image/supportedformat.cpp (renamed from doc/src/snippets/image/supportedformat.cpp)0
-rw-r--r--src/gui/doc/snippets/matrix/matrix.cpp (renamed from doc/src/snippets/matrix/matrix.cpp)0
-rw-r--r--src/gui/doc/snippets/picture/picture.cpp (renamed from doc/src/snippets/picture/picture.cpp)0
-rw-r--r--src/gui/doc/snippets/polygon/polygon.cpp (renamed from doc/src/snippets/polygon/polygon.cpp)0
-rw-r--r--src/gui/doc/snippets/qfontdatabase/main.cpp (renamed from doc/src/snippets/qfontdatabase/main.cpp)0
-rw-r--r--src/gui/doc/snippets/qstatustipevent/main.cpp (renamed from doc/src/snippets/qstatustipevent/main.cpp)0
-rw-r--r--src/gui/doc/snippets/separations/finalwidget.cpp (renamed from doc/src/snippets/separations/finalwidget.cpp)0
-rw-r--r--src/gui/doc/snippets/textblock-fragments/xmlwriter.cpp (renamed from doc/src/snippets/textblock-fragments/xmlwriter.cpp)0
-rw-r--r--src/gui/doc/snippets/textdocument-css/main.cpp (renamed from doc/src/snippets/textdocument-css/main.cpp)0
-rw-r--r--src/gui/doc/snippets/textdocument-listitemstyles/main.cpp (renamed from doc/src/snippets/textdocument-listitemstyles/main.cpp)0
-rw-r--r--src/gui/doc/snippets/textdocument-listitemstyles/mainwindow.cpp (renamed from doc/src/snippets/textdocument-listitemstyles/mainwindow.cpp)0
-rw-r--r--src/gui/doc/snippets/textdocument-listitemstyles/mainwindow.h (renamed from doc/src/snippets/textdocument-listitemstyles/mainwindow.h)0
-rw-r--r--src/gui/doc/snippets/textdocument-listitemstyles/textdocument-listitemstyles.pro (renamed from doc/src/snippets/textdocument-listitemstyles/textdocument-listitemstyles.pro)0
-rw-r--r--src/gui/doc/snippets/textdocument-lists/mainwindow.cpp (renamed from doc/src/snippets/textdocument-lists/mainwindow.cpp)0
-rw-r--r--src/gui/doc/snippets/textdocument-resources/main.cpp (renamed from doc/src/snippets/textdocument-resources/main.cpp)0
-rw-r--r--src/gui/doc/snippets/textdocument-resources/textdocument-resources.pro (renamed from doc/src/snippets/textdocument-resources/textdocument-resources.pro)0
-rw-r--r--src/gui/doc/snippets/textdocument-tables/mainwindow.cpp (renamed from doc/src/snippets/textdocument-tables/mainwindow.cpp)0
-rw-r--r--src/gui/doc/snippets/textdocument-texttable/main.cpp (renamed from doc/src/snippets/textdocument-texttable/main.cpp)0
-rw-r--r--src/gui/doc/snippets/textdocumentendsnippet.cpp (renamed from doc/src/snippets/textdocumentendsnippet.cpp)0
-rw-r--r--src/gui/doc/snippets/transform/main.cpp (renamed from doc/src/snippets/transform/main.cpp)0
-rw-r--r--src/gui/doc/src/coordsys.qdoc (renamed from doc/src/gui/coordsys.qdoc)20
-rw-r--r--src/gui/doc/src/paintsystem.qdoc (renamed from doc/src/gui/paintsystem.qdoc)0
-rw-r--r--src/gui/doc/src/qtgui.qdoc (renamed from doc/src/gui/qtgui.qdoc)2
-rw-r--r--src/gui/gui.pro3
-rw-r--r--src/gui/image/qimage.cpp10
-rw-r--r--src/gui/image/qimagereader.cpp8
-rw-r--r--src/gui/image/qimagewriter.cpp6
-rw-r--r--src/gui/image/qmovie.cpp4
-rw-r--r--src/gui/image/qpicture.cpp18
-rw-r--r--src/gui/image/qpixmap.cpp8
-rw-r--r--src/gui/image/qpixmapcache.cpp4
-rw-r--r--src/gui/kernel/qclipboard.cpp6
-rw-r--r--src/gui/kernel/qdrag.cpp4
-rw-r--r--src/gui/kernel/qevent.cpp14
-rw-r--r--src/gui/kernel/qguiapplication.cpp4
-rw-r--r--src/gui/kernel/qkeysequence.cpp44
-rw-r--r--src/gui/kernel/qpalette.cpp2
-rw-r--r--src/gui/kernel/qshortcutmap.cpp2
-rw-r--r--src/gui/opengl/qopenglshaderprogram.cpp6
-rw-r--r--src/gui/painting/qbrush.cpp8
-rw-r--r--src/gui/painting/qcolor.cpp2
-rw-r--r--src/gui/painting/qmatrix.cpp14
-rw-r--r--src/gui/painting/qpainter.cpp44
-rw-r--r--src/gui/painting/qpainterpath.cpp14
-rw-r--r--src/gui/painting/qpen.cpp8
-rw-r--r--src/gui/painting/qpolygon.cpp14
-rw-r--r--src/gui/painting/qregion.cpp4
-rw-r--r--src/gui/painting/qtransform.cpp14
-rw-r--r--src/gui/text/qabstracttextdocumentlayout.cpp2
-rw-r--r--src/gui/text/qfont.cpp10
-rw-r--r--src/gui/text/qfontdatabase.cpp4
-rw-r--r--src/gui/text/qfontmetrics.cpp4
-rw-r--r--src/gui/text/qsyntaxhighlighter.cpp10
-rw-r--r--src/gui/text/qtextcursor.cpp10
-rw-r--r--src/gui/text/qtextdocument.cpp10
-rw-r--r--src/gui/text/qtextdocumentwriter.cpp2
-rw-r--r--src/gui/text/qtextformat.cpp2
-rw-r--r--src/gui/text/qtextlayout.cpp4
-rw-r--r--src/gui/text/qtextlist.cpp2
-rw-r--r--src/gui/text/qtextobject.cpp4
-rw-r--r--src/gui/text/qtexttable.cpp8
-rw-r--r--src/gui/util/qdesktopservices.cpp6
-rw-r--r--src/gui/util/qvalidator.cpp10
-rw-r--r--src/network/access/qftp.cpp8
-rw-r--r--src/network/access/qhttpmultipart.cpp8
-rw-r--r--src/network/access/qnetworkaccessmanager.cpp12
-rw-r--r--src/network/access/qnetworkdiskcache.cpp6
-rw-r--r--src/network/access/qnetworkreply.cpp2
-rw-r--r--src/network/access/qnetworkrequest.cpp2
-rw-r--r--src/network/bearer/qnetworkconfigmanager.cpp2
-rw-r--r--src/network/doc/doc.pri3
-rw-r--r--src/network/doc/images/roaming-states.png (renamed from doc/src/images/roaming-states.png)bin9527 -> 9527 bytes
-rw-r--r--src/network/doc/images/tcpstream.png (renamed from doc/src/images/tcpstream.png)bin11470 -> 11470 bytes
-rw-r--r--src/network/doc/images/udppackets.png (renamed from doc/src/images/udppackets.png)bin24707 -> 24707 bytes
-rw-r--r--src/network/doc/qtnetwork.qdocconf2
-rw-r--r--src/network/doc/snippets/code/doc_src_qtnetwork.cpp (renamed from doc/src/snippets/code/doc_src_qtnetwork.cpp)0
-rw-r--r--src/network/doc/snippets/code/doc_src_qtnetwork.pro (renamed from doc/src/snippets/code/doc_src_qtnetwork.pro)0
-rw-r--r--src/network/doc/snippets/code/src_network_access_qftp.cpp (renamed from doc/src/snippets/code/src_network_access_qftp.cpp)0
-rw-r--r--src/network/doc/snippets/code/src_network_access_qhttpmultipart.cpp (renamed from doc/src/snippets/code/src_network_access_qhttpmultipart.cpp)0
-rw-r--r--src/network/doc/snippets/code/src_network_access_qhttppart.cpp (renamed from doc/src/snippets/code/src_network_access_qhttppart.cpp)0
-rw-r--r--src/network/doc/snippets/code/src_network_access_qnetworkaccessmanager.cpp (renamed from doc/src/snippets/code/src_network_access_qnetworkaccessmanager.cpp)0
-rw-r--r--src/network/doc/snippets/code/src_network_access_qnetworkdiskcache.cpp (renamed from doc/src/snippets/code/src_network_access_qnetworkdiskcache.cpp)0
-rw-r--r--src/network/doc/snippets/code/src_network_access_qnetworkreply.cpp (renamed from doc/src/snippets/code/src_network_access_qnetworkreply.cpp)0
-rw-r--r--src/network/doc/snippets/code/src_network_access_qnetworkrequest.cpp (renamed from doc/src/snippets/code/src_network_access_qnetworkrequest.cpp)0
-rw-r--r--src/network/doc/snippets/code/src_network_bearer_qnetworkconfigmanager.cpp (renamed from doc/src/snippets/code/src_network_bearer_qnetworkconfigmanager.cpp)0
-rw-r--r--src/network/doc/snippets/code/src_network_kernel_qdnslookup.cpp (renamed from doc/src/snippets/code/src_network_kernel_qdnslookup.cpp)0
-rw-r--r--src/network/doc/snippets/code/src_network_kernel_qhostaddress.cpp (renamed from doc/src/snippets/code/src_network_kernel_qhostaddress.cpp)0
-rw-r--r--src/network/doc/snippets/code/src_network_kernel_qhostinfo.cpp (renamed from doc/src/snippets/code/src_network_kernel_qhostinfo.cpp)0
-rw-r--r--src/network/doc/snippets/code/src_network_kernel_qnetworkproxy.cpp (renamed from doc/src/snippets/code/src_network_kernel_qnetworkproxy.cpp)0
-rw-r--r--src/network/doc/snippets/code/src_network_socket_qabstractsocket.cpp (renamed from doc/src/snippets/code/src_network_socket_qabstractsocket.cpp)0
-rw-r--r--src/network/doc/snippets/code/src_network_socket_qlocalsocket_unix.cpp (renamed from doc/src/snippets/code/src_network_socket_qlocalsocket_unix.cpp)0
-rw-r--r--src/network/doc/snippets/code/src_network_socket_qnativesocketengine.cpp (renamed from doc/src/snippets/code/src_network_socket_qnativesocketengine.cpp)0
-rw-r--r--src/network/doc/snippets/code/src_network_socket_qtcpserver.cpp (renamed from doc/src/snippets/code/src_network_socket_qtcpserver.cpp)0
-rw-r--r--src/network/doc/snippets/code/src_network_socket_qudpsocket.cpp (renamed from doc/src/snippets/code/src_network_socket_qudpsocket.cpp)0
-rw-r--r--src/network/doc/snippets/code/src_network_ssl_qsslcertificate.cpp (renamed from doc/src/snippets/code/src_network_ssl_qsslcertificate.cpp)0
-rw-r--r--src/network/doc/snippets/code/src_network_ssl_qsslconfiguration.cpp (renamed from doc/src/snippets/code/src_network_ssl_qsslconfiguration.cpp)0
-rw-r--r--src/network/doc/snippets/code/src_network_ssl_qsslsocket.cpp (renamed from doc/src/snippets/code/src_network_ssl_qsslsocket.cpp)0
-rw-r--r--src/network/doc/snippets/network/tcpwait.cpp (renamed from doc/src/snippets/network/tcpwait.cpp)0
-rw-r--r--src/network/doc/src/bearermanagement.qdoc (renamed from doc/src/network/network-programming/bearermanagement.qdoc)0
-rw-r--r--src/network/doc/src/network-programming.qdoc (renamed from doc/src/network/network-programming/qtnetwork.qdoc)0
-rw-r--r--src/network/doc/src/qtnetwork.qdoc (renamed from doc/src/network/qtnetwork.qdoc)4
-rw-r--r--src/network/doc/src/ssl.qdoc (renamed from doc/src/network/network-programming/ssl.qdoc)0
-rw-r--r--src/network/kernel/qdnslookup.cpp4
-rw-r--r--src/network/kernel/qhostaddress.cpp2
-rw-r--r--src/network/kernel/qhostinfo.cpp12
-rw-r--r--src/network/kernel/qnetworkproxy.cpp6
-rw-r--r--src/network/network.pro4
-rw-r--r--src/network/socket/qabstractsocket.cpp10
-rw-r--r--src/network/socket/qlocalsocket.cpp4
-rw-r--r--src/network/socket/qnativesocketengine.cpp4
-rw-r--r--src/network/socket/qtcpserver.cpp2
-rw-r--r--src/network/socket/qudpsocket.cpp2
-rw-r--r--src/network/ssl/qsslcertificate.cpp2
-rw-r--r--src/network/ssl/qsslconfiguration.cpp2
-rw-r--r--src/network/ssl/qsslsocket.cpp14
-rw-r--r--src/opengl/doc/qtopengl.qdocconf92
-rw-r--r--src/opengl/doc/snippets/code/doc_src_qtopengl.cpp43
-rw-r--r--src/opengl/doc/snippets/code/doc_src_qtopengl.pro3
-rw-r--r--src/opengl/doc/snippets/code/src_opengl_qgl.cpp (renamed from doc/src/snippets/code/src_opengl_qgl.cpp)0
-rw-r--r--src/opengl/doc/snippets/code/src_opengl_qglcolormap.cpp (renamed from doc/src/snippets/code/src_opengl_qglcolormap.cpp)0
-rw-r--r--src/opengl/doc/snippets/code/src_opengl_qglpixelbuffer.cpp (renamed from doc/src/snippets/code/src_opengl_qglpixelbuffer.cpp)0
-rw-r--r--src/opengl/doc/snippets/code/src_opengl_qglshaderprogram.cpp (renamed from doc/src/snippets/code/src_opengl_qglshaderprogram.cpp)0
-rw-r--r--src/opengl/doc/src/qtopengl.qdoc70
-rw-r--r--src/opengl/opengl.pro3
-rw-r--r--src/opengl/qgl.cpp18
-rw-r--r--src/opengl/qglcolormap.cpp2
-rw-r--r--src/opengl/qglpixelbuffer.cpp4
-rw-r--r--src/opengl/qglshaderprogram.cpp6
-rw-r--r--src/printsupport/dialogs/qabstractprintdialog.cpp2
-rw-r--r--src/printsupport/doc/images/plastique-printdialog-properties.pngbin0 -> 27720 bytes
-rw-r--r--src/printsupport/doc/images/plastique-printdialog.pngbin0 -> 44150 bytes
-rw-r--r--src/printsupport/doc/images/printer-rects.pngbin0 -> 30319 bytes
-rw-r--r--src/printsupport/doc/qtprintsupport.qdocconf92
-rw-r--r--src/printsupport/doc/snippets/code/doc_src_qtprintsupport.cpp43
-rw-r--r--src/printsupport/doc/snippets/code/doc_src_qtprintsupport.pro3
-rw-r--r--src/printsupport/doc/snippets/code/src_gui_dialogs_qabstractprintdialog.cpp (renamed from doc/src/snippets/code/src_gui_dialogs_qabstractprintdialog.cpp)0
-rw-r--r--src/printsupport/doc/snippets/printing-qprinter/errors.cpp (renamed from doc/src/snippets/printing-qprinter/errors.cpp)0
-rw-r--r--src/printsupport/doc/snippets/printing-qprinter/object.cpp (renamed from doc/src/snippets/printing-qprinter/object.cpp)0
-rw-r--r--src/printsupport/doc/snippets/widgetprinting.cpp (renamed from doc/src/snippets/widgetprinting.cpp)0
-rw-r--r--src/printsupport/doc/src/printing.qdoc (renamed from doc/src/printsupport/printing.qdoc)6
-rw-r--r--src/printsupport/doc/src/qtprintsupport.qdoc (renamed from doc/src/printsupport/qtprintsupport.qdoc)4
-rw-r--r--src/printsupport/kernel/qprinter.cpp2
-rw-r--r--src/printsupport/printsupport.pro3
-rw-r--r--src/sql/doc/doc.pri3
-rw-r--r--src/sql/sql.pro4
-rw-r--r--src/testlib/doc/qttest.qdocconf92
-rw-r--r--src/testlib/doc/snippets/code/doc_src_qsignalspy.cpp (renamed from doc/src/snippets/code/doc_src_qsignalspy.cpp)0
-rw-r--r--src/testlib/doc/snippets/code/doc_src_qtestevent.cpp (renamed from doc/src/snippets/code/doc_src_qtestevent.cpp)0
-rw-r--r--src/testlib/doc/snippets/code/doc_src_qtestlib.cpp88
-rw-r--r--src/testlib/doc/snippets/code/doc_src_qtestlib.pro7
-rw-r--r--src/testlib/doc/snippets/code/doc_src_qtestlib.qdoc87
-rw-r--r--src/testlib/doc/snippets/code/doc_src_qttest.cpp43
-rw-r--r--src/testlib/doc/snippets/code/doc_src_qttest.pro3
-rw-r--r--src/testlib/doc/snippets/code/src_qtestlib_qtestcase.cpp (renamed from doc/src/snippets/code/src_qtestlib_qtestcase.cpp)0
-rw-r--r--src/testlib/doc/src/qttest.qdoc54
-rw-r--r--src/testlib/doc/src/qttestlib-manual.qdoc840
-rw-r--r--src/testlib/qsignalspy.qdoc10
-rw-r--r--src/testlib/qtestcase.cpp54
-rw-r--r--src/testlib/qtestevent.qdoc2
-rw-r--r--src/testlib/testlib.pro3
-rw-r--r--src/tools/bootstrap/bootstrap.pro3
-rw-r--r--src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp21
-rw-r--r--src/tools/qdoc/qdoc.pro6
-rw-r--r--src/widgets/dialogs/qcolordialog.cpp8
-rw-r--r--src/widgets/dialogs/qdialog.cpp14
-rw-r--r--src/widgets/dialogs/qfiledialog.cpp28
-rw-r--r--src/widgets/dialogs/qfilesystemmodel.cpp6
-rw-r--r--src/widgets/dialogs/qfontdialog.cpp30
-rw-r--r--src/widgets/dialogs/qinputdialog.cpp32
-rw-r--r--src/widgets/dialogs/qmessagebox.cpp24
-rw-r--r--src/widgets/dialogs/qprogressdialog.cpp8
-rw-r--r--src/widgets/dialogs/qwizard.cpp208
-rw-r--r--src/widgets/doc/images/addressbook-tutorial-part1-labeled-layout.png (renamed from doc/src/images/addressbook-tutorial-part1-labeled-layout.png)bin19114 -> 19114 bytes
-rw-r--r--src/widgets/doc/images/addressbook-tutorial-part1-labeled-screenshot.png (renamed from doc/src/images/addressbook-tutorial-part1-labeled-screenshot.png)bin23223 -> 23223 bytes
-rw-r--r--src/widgets/doc/images/addressbook-tutorial-part1-screenshot.png (renamed from doc/src/images/addressbook-tutorial-part1-screenshot.png)bin9872 -> 9872 bytes
-rw-r--r--src/widgets/doc/images/addressbook-tutorial-part2-add-contact.png (renamed from doc/src/images/addressbook-tutorial-part2-add-contact.png)bin12936 -> 12936 bytes
-rw-r--r--src/widgets/doc/images/addressbook-tutorial-part2-add-flowchart.png (renamed from doc/src/images/addressbook-tutorial-part2-add-flowchart.png)bin23533 -> 23533 bytes
-rw-r--r--src/widgets/doc/images/addressbook-tutorial-part2-add-successful.png (renamed from doc/src/images/addressbook-tutorial-part2-add-successful.png)bin10825 -> 10825 bytes
-rw-r--r--src/widgets/doc/images/addressbook-tutorial-part2-labeled-layout.png (renamed from doc/src/images/addressbook-tutorial-part2-labeled-layout.png)bin27103 -> 27103 bytes
-rw-r--r--src/widgets/doc/images/addressbook-tutorial-part2-signals-and-slots.png (renamed from doc/src/images/addressbook-tutorial-part2-signals-and-slots.png)bin9968 -> 9968 bytes
-rw-r--r--src/widgets/doc/images/addressbook-tutorial-part2-stretch-effects.png (renamed from doc/src/images/addressbook-tutorial-part2-stretch-effects.png)bin12268 -> 12268 bytes
-rw-r--r--src/widgets/doc/images/addressbook-tutorial-part3-labeled-layout.png (renamed from doc/src/images/addressbook-tutorial-part3-labeled-layout.png)bin27467 -> 27467 bytes
-rw-r--r--src/widgets/doc/images/addressbook-tutorial-part3-linkedlist.png (renamed from doc/src/images/addressbook-tutorial-part3-linkedlist.png)bin10209 -> 10209 bytes
-rw-r--r--src/widgets/doc/images/addressbook-tutorial-part3-screenshot.png (renamed from doc/src/images/addressbook-tutorial-part3-screenshot.png)bin14041 -> 14041 bytes
-rw-r--r--src/widgets/doc/images/addressbook-tutorial-part4-remove.png (renamed from doc/src/images/addressbook-tutorial-part4-remove.png)bin22248 -> 22248 bytes
-rw-r--r--src/widgets/doc/images/addressbook-tutorial-part5-finddialog.png (renamed from doc/src/images/addressbook-tutorial-part5-finddialog.png)bin10046 -> 10046 bytes
-rw-r--r--src/widgets/doc/images/addressbook-tutorial-part5-notfound.png (renamed from doc/src/images/addressbook-tutorial-part5-notfound.png)bin10789 -> 10789 bytes
-rw-r--r--src/widgets/doc/images/addressbook-tutorial-part5-screenshot.png (renamed from doc/src/images/addressbook-tutorial-part5-screenshot.png)bin15849 -> 15849 bytes
-rw-r--r--src/widgets/doc/images/addressbook-tutorial-part5-signals-and-slots.png (renamed from doc/src/images/addressbook-tutorial-part5-signals-and-slots.png)bin5542 -> 5542 bytes
-rw-r--r--src/widgets/doc/images/addressbook-tutorial-part6-load.png (renamed from doc/src/images/addressbook-tutorial-part6-load.png)bin24797 -> 24797 bytes
-rw-r--r--src/widgets/doc/images/addressbook-tutorial-part6-save.png (renamed from doc/src/images/addressbook-tutorial-part6-save.png)bin24747 -> 24747 bytes
-rw-r--r--src/widgets/doc/images/addressbook-tutorial-part6-screenshot.png (renamed from doc/src/images/addressbook-tutorial-part6-screenshot.png)bin16819 -> 16819 bytes
-rw-r--r--src/widgets/doc/images/addressbook-tutorial-part7-screenshot.png (renamed from doc/src/images/addressbook-tutorial-part7-screenshot.png)bin18369 -> 18369 bytes
-rw-r--r--src/widgets/doc/images/addressbook-tutorial-screenshot.png (renamed from doc/src/images/addressbook-tutorial-screenshot.png)bin15275 -> 15275 bytes
-rw-r--r--src/widgets/doc/images/assistant-toolbar.pngbin0 -> 6532 bytes
-rw-r--r--src/widgets/doc/images/buttonbox-gnomelayout-horizontal.pngbin0 -> 4188 bytes
-rw-r--r--src/widgets/doc/images/buttonbox-gnomelayout-vertical.pngbin0 -> 5027 bytes
-rw-r--r--src/widgets/doc/images/buttonbox-kdelayout-horizontal.pngbin0 -> 2862 bytes
-rw-r--r--src/widgets/doc/images/buttonbox-kdelayout-vertical.pngbin0 -> 3298 bytes
-rw-r--r--src/widgets/doc/images/buttonbox-mac-modeless-horizontal.pngbin0 -> 4123 bytes
-rw-r--r--src/widgets/doc/images/buttonbox-mac-modeless-vertical.pngbin0 -> 5177 bytes
-rw-r--r--src/widgets/doc/images/buttonbox-maclayout-horizontal.pngbin0 -> 5409 bytes
-rw-r--r--src/widgets/doc/images/buttonbox-maclayout-vertical.pngbin0 -> 7340 bytes
-rw-r--r--src/widgets/doc/images/buttonbox-winlayout-horizontal.pngbin0 -> 2780 bytes
-rw-r--r--src/widgets/doc/images/buttonbox-winlayout-vertical.pngbin0 -> 3184 bytes
-rw-r--r--src/widgets/doc/images/cde-calendarwidget.png (renamed from doc/src/images/cde-calendarwidget.png)bin10187 -> 10187 bytes
-rw-r--r--src/widgets/doc/images/cde-checkbox.png (renamed from doc/src/images/cde-checkbox.png)bin1331 -> 1331 bytes
-rw-r--r--src/widgets/doc/images/cde-combobox.png (renamed from doc/src/images/cde-combobox.png)bin1269 -> 1269 bytes
-rw-r--r--src/widgets/doc/images/cde-dateedit.png (renamed from doc/src/images/cde-dateedit.png)bin1183 -> 1183 bytes
-rw-r--r--src/widgets/doc/images/cde-datetimeedit.png (renamed from doc/src/images/cde-datetimeedit.png)bin1701 -> 1701 bytes
-rw-r--r--src/widgets/doc/images/cde-dial.png (renamed from doc/src/images/cde-dial.png)bin4481 -> 4481 bytes
-rw-r--r--src/widgets/doc/images/cde-doublespinbox.png (renamed from doc/src/images/cde-doublespinbox.png)bin1007 -> 1007 bytes
-rw-r--r--src/widgets/doc/images/cde-fontcombobox.png (renamed from doc/src/images/cde-fontcombobox.png)bin1603 -> 1603 bytes
-rw-r--r--src/widgets/doc/images/cde-frame.png (renamed from doc/src/images/cde-frame.png)bin2976 -> 2976 bytes
-rw-r--r--src/widgets/doc/images/cde-groupbox.png (renamed from doc/src/images/cde-groupbox.png)bin2592 -> 2592 bytes
-rw-r--r--src/widgets/doc/images/cde-horizontalscrollbar.png (renamed from doc/src/images/cde-horizontalscrollbar.png)bin569 -> 569 bytes
-rw-r--r--src/widgets/doc/images/cde-label.png (renamed from doc/src/images/cde-label.png)bin1043 -> 1043 bytes
-rw-r--r--src/widgets/doc/images/cde-lcdnumber.png (renamed from doc/src/images/cde-lcdnumber.png)bin538 -> 538 bytes
-rw-r--r--src/widgets/doc/images/cde-lineedit.png (renamed from doc/src/images/cde-lineedit.png)bin1355 -> 1355 bytes
-rw-r--r--src/widgets/doc/images/cde-listview.png (renamed from doc/src/images/cde-listview.png)bin5166 -> 5166 bytes
-rw-r--r--src/widgets/doc/images/cde-progressbar.png (renamed from doc/src/images/cde-progressbar.png)bin934 -> 934 bytes
-rw-r--r--src/widgets/doc/images/cde-pushbutton.png (renamed from doc/src/images/cde-pushbutton.png)bin1099 -> 1099 bytes
-rw-r--r--src/widgets/doc/images/cde-radiobutton.png (renamed from doc/src/images/cde-radiobutton.png)bin1562 -> 1562 bytes
-rw-r--r--src/widgets/doc/images/cde-slider.png (renamed from doc/src/images/cde-slider.png)bin526 -> 526 bytes
-rw-r--r--src/widgets/doc/images/cde-spinbox.png (renamed from doc/src/images/cde-spinbox.png)bin863 -> 863 bytes
-rw-r--r--src/widgets/doc/images/cde-tableview.png (renamed from doc/src/images/cde-tableview.png)bin2467 -> 2467 bytes
-rw-r--r--src/widgets/doc/images/cde-tabwidget.png (renamed from doc/src/images/cde-tabwidget.png)bin2483 -> 2483 bytes
-rw-r--r--src/widgets/doc/images/cde-textedit.png (renamed from doc/src/images/cde-textedit.png)bin7374 -> 7374 bytes
-rw-r--r--src/widgets/doc/images/cde-timeedit.png (renamed from doc/src/images/cde-timeedit.png)bin1248 -> 1248 bytes
-rw-r--r--src/widgets/doc/images/cde-toolbox.png (renamed from doc/src/images/cde-toolbox.png)bin1813 -> 1813 bytes
-rw-r--r--src/widgets/doc/images/cde-toolbutton.png (renamed from doc/src/images/cde-toolbutton.png)bin1169 -> 1169 bytes
-rw-r--r--src/widgets/doc/images/cde-treeview.png (renamed from doc/src/images/cde-treeview.png)bin6703 -> 6703 bytes
-rw-r--r--src/widgets/doc/images/checkboxes-exclusive.pngbin0 -> 5079 bytes
-rw-r--r--src/widgets/doc/images/checkboxes-non-exclusive.pngbin0 -> 5614 bytes
-rw-r--r--src/widgets/doc/images/cleanlooks-calendarwidget.png (renamed from doc/src/images/cleanlooks-calendarwidget.png)bin9748 -> 9748 bytes
-rw-r--r--src/widgets/doc/images/cleanlooks-checkbox.png (renamed from doc/src/images/cleanlooks-checkbox.png)bin1416 -> 1416 bytes
-rw-r--r--src/widgets/doc/images/cleanlooks-combobox.png (renamed from doc/src/images/cleanlooks-combobox.png)bin2348 -> 2348 bytes
-rw-r--r--src/widgets/doc/images/cleanlooks-dateedit.png (renamed from doc/src/images/cleanlooks-dateedit.png)bin1369 -> 1369 bytes
-rw-r--r--src/widgets/doc/images/cleanlooks-datetimeedit.png (renamed from doc/src/images/cleanlooks-datetimeedit.png)bin1892 -> 1892 bytes
-rw-r--r--src/widgets/doc/images/cleanlooks-dial.png (renamed from doc/src/images/cleanlooks-dial.png)bin4297 -> 4297 bytes
-rw-r--r--src/widgets/doc/images/cleanlooks-doublespinbox.png (renamed from doc/src/images/cleanlooks-doublespinbox.png)bin1141 -> 1141 bytes
-rw-r--r--src/widgets/doc/images/cleanlooks-fontcombobox.png (renamed from doc/src/images/cleanlooks-fontcombobox.png)bin1835 -> 1835 bytes
-rw-r--r--src/widgets/doc/images/cleanlooks-frame.png (renamed from doc/src/images/cleanlooks-frame.png)bin2989 -> 2989 bytes
-rw-r--r--src/widgets/doc/images/cleanlooks-groupbox.png (renamed from doc/src/images/cleanlooks-groupbox.png)bin2630 -> 2630 bytes
-rw-r--r--src/widgets/doc/images/cleanlooks-horizontalscrollbar.png (renamed from doc/src/images/cleanlooks-horizontalscrollbar.png)bin837 -> 837 bytes
-rw-r--r--src/widgets/doc/images/cleanlooks-label.png (renamed from doc/src/images/cleanlooks-label.png)bin1043 -> 1043 bytes
-rw-r--r--src/widgets/doc/images/cleanlooks-lcdnumber.png (renamed from doc/src/images/cleanlooks-lcdnumber.png)bin538 -> 538 bytes
-rw-r--r--src/widgets/doc/images/cleanlooks-lineedit.png (renamed from doc/src/images/cleanlooks-lineedit.png)bin1406 -> 1406 bytes
-rw-r--r--src/widgets/doc/images/cleanlooks-listview.png (renamed from doc/src/images/cleanlooks-listview.png)bin5559 -> 5559 bytes
-rw-r--r--src/widgets/doc/images/cleanlooks-progressbar.png (renamed from doc/src/images/cleanlooks-progressbar.png)bin1292 -> 1292 bytes
-rw-r--r--src/widgets/doc/images/cleanlooks-pushbutton-menu.pngbin0 -> 3177 bytes
-rw-r--r--src/widgets/doc/images/cleanlooks-pushbutton.png (renamed from doc/src/images/cleanlooks-pushbutton.png)bin1332 -> 1332 bytes
-rw-r--r--src/widgets/doc/images/cleanlooks-radiobutton.png (renamed from doc/src/images/cleanlooks-radiobutton.png)bin1782 -> 1782 bytes
-rw-r--r--src/widgets/doc/images/cleanlooks-slider.png (renamed from doc/src/images/cleanlooks-slider.png)bin671 -> 671 bytes
-rw-r--r--src/widgets/doc/images/cleanlooks-spinbox.png (renamed from doc/src/images/cleanlooks-spinbox.png)bin983 -> 983 bytes
-rw-r--r--src/widgets/doc/images/cleanlooks-tableview.png (renamed from doc/src/images/cleanlooks-tableview.png)bin2465 -> 2465 bytes
-rw-r--r--src/widgets/doc/images/cleanlooks-tabwidget.png (renamed from doc/src/images/cleanlooks-tabwidget.png)bin5007 -> 5007 bytes
-rw-r--r--src/widgets/doc/images/cleanlooks-textedit.png (renamed from doc/src/images/cleanlooks-textedit.png)bin7560 -> 7560 bytes
-rw-r--r--src/widgets/doc/images/cleanlooks-timeedit.png (renamed from doc/src/images/cleanlooks-timeedit.png)bin1388 -> 1388 bytes
-rw-r--r--src/widgets/doc/images/cleanlooks-toolbox.png (renamed from doc/src/images/cleanlooks-toolbox.png)bin1445 -> 1445 bytes
-rw-r--r--src/widgets/doc/images/cleanlooks-toolbutton.png (renamed from doc/src/images/cleanlooks-toolbutton.png)bin1469 -> 1469 bytes
-rw-r--r--src/widgets/doc/images/cleanlooks-treeview.png (renamed from doc/src/images/cleanlooks-treeview.png)bin6981 -> 6981 bytes
-rw-r--r--src/widgets/doc/images/clock.png (renamed from doc/src/images/clock.png)bin16514 -> 16514 bytes
-rw-r--r--src/widgets/doc/images/columnview.pngbin0 -> 3480 bytes
-rw-r--r--src/widgets/doc/images/designer-stylesheet-options.png (renamed from doc/src/images/designer-stylesheet-options.png)bin18914 -> 18914 bytes
-rw-r--r--src/widgets/doc/images/designer-stylesheet-usage.png (renamed from doc/src/images/designer-stylesheet-usage.png)bin8128 -> 8128 bytes
-rw-r--r--src/widgets/doc/images/designer-validator-highlighter.png (renamed from doc/src/images/designer-validator-highlighter.png)bin27153 -> 27153 bytes
-rw-r--r--src/widgets/doc/images/dummy_tree.png (renamed from doc/src/images/dummy_tree.png)bin20189 -> 20189 bytes
-rw-r--r--src/widgets/doc/images/example_model.png (renamed from doc/src/images/example_model.png)bin16577 -> 16577 bytes
-rw-r--r--src/widgets/doc/images/filedialogurls.png (renamed from doc/src/images/filedialogurls.png)bin29132 -> 29132 bytes
-rw-r--r--src/widgets/doc/images/frames.png (renamed from doc/src/images/frames.png)bin25735 -> 25735 bytes
-rw-r--r--src/widgets/doc/images/graphicsview-ellipseitem-pie.pngbin0 -> 6683 bytes
-rw-r--r--src/widgets/doc/images/graphicsview-ellipseitem.pngbin0 -> 5801 bytes
-rw-r--r--src/widgets/doc/images/graphicsview-items.png (renamed from doc/src/images/graphicsview-items.png)bin62593 -> 62593 bytes
-rw-r--r--src/widgets/doc/images/graphicsview-pathitem.png (renamed from doc/src/images/graphicsview-pathitem.png)bin5710 -> 5710 bytes
-rw-r--r--src/widgets/doc/images/graphicsview-pixmapitem.png (renamed from doc/src/images/graphicsview-pixmapitem.png)bin10764 -> 10764 bytes
-rw-r--r--src/widgets/doc/images/graphicsview-polygonitem.png (renamed from doc/src/images/graphicsview-polygonitem.png)bin5829 -> 5829 bytes
-rw-r--r--src/widgets/doc/images/graphicsview-rectitem.png (renamed from doc/src/images/graphicsview-rectitem.png)bin3305 -> 3305 bytes
-rw-r--r--src/widgets/doc/images/graphicsview-zorder.png (renamed from doc/src/images/graphicsview-zorder.png)bin6724 -> 6724 bytes
-rw-r--r--src/widgets/doc/images/gridlayout.png (renamed from doc/src/images/gridlayout.png)bin1445 -> 1445 bytes
-rw-r--r--src/widgets/doc/images/gtk-calendarwidget.png (renamed from doc/src/images/gtk-calendarwidget.png)bin16761 -> 16761 bytes
-rw-r--r--src/widgets/doc/images/gtk-checkbox.png (renamed from doc/src/images/gtk-checkbox.png)bin2323 -> 2323 bytes
-rw-r--r--src/widgets/doc/images/gtk-combobox.png (renamed from doc/src/images/gtk-combobox.png)bin2730 -> 2730 bytes
-rw-r--r--src/widgets/doc/images/gtk-dateedit.png (renamed from doc/src/images/gtk-dateedit.png)bin2163 -> 2163 bytes
-rw-r--r--src/widgets/doc/images/gtk-datetimeedit.png (renamed from doc/src/images/gtk-datetimeedit.png)bin2923 -> 2923 bytes
-rw-r--r--src/widgets/doc/images/gtk-dial.png (renamed from doc/src/images/gtk-dial.png)bin7221 -> 7221 bytes
-rw-r--r--src/widgets/doc/images/gtk-doublespinbox.png (renamed from doc/src/images/gtk-doublespinbox.png)bin2325 -> 2325 bytes
-rw-r--r--src/widgets/doc/images/gtk-fontcombobox.png (renamed from doc/src/images/gtk-fontcombobox.png)bin3022 -> 3022 bytes
-rw-r--r--src/widgets/doc/images/gtk-frame.png (renamed from doc/src/images/gtk-frame.png)bin2340 -> 2340 bytes
-rw-r--r--src/widgets/doc/images/gtk-groupbox.png (renamed from doc/src/images/gtk-groupbox.png)bin6650 -> 6650 bytes
-rw-r--r--src/widgets/doc/images/gtk-horizontalscrollbar.png (renamed from doc/src/images/gtk-horizontalscrollbar.png)bin1701 -> 1701 bytes
-rw-r--r--src/widgets/doc/images/gtk-label.png (renamed from doc/src/images/gtk-label.png)bin1582 -> 1582 bytes
-rw-r--r--src/widgets/doc/images/gtk-lcdnumber.png (renamed from doc/src/images/gtk-lcdnumber.png)bin1193 -> 1193 bytes
-rw-r--r--src/widgets/doc/images/gtk-lineedit.png (renamed from doc/src/images/gtk-lineedit.png)bin2528 -> 2528 bytes
-rw-r--r--src/widgets/doc/images/gtk-listview.png (renamed from doc/src/images/gtk-listview.png)bin8493 -> 8493 bytes
-rw-r--r--src/widgets/doc/images/gtk-progressbar.png (renamed from doc/src/images/gtk-progressbar.png)bin2228 -> 2228 bytes
-rw-r--r--src/widgets/doc/images/gtk-pushbutton.png (renamed from doc/src/images/gtk-pushbutton.png)bin2153 -> 2153 bytes
-rw-r--r--src/widgets/doc/images/gtk-radiobutton.png (renamed from doc/src/images/gtk-radiobutton.png)bin3142 -> 3142 bytes
-rw-r--r--src/widgets/doc/images/gtk-slider.png (renamed from doc/src/images/gtk-slider.png)bin1359 -> 1359 bytes
-rw-r--r--src/widgets/doc/images/gtk-spinbox.png (renamed from doc/src/images/gtk-spinbox.png)bin2078 -> 2078 bytes
-rw-r--r--src/widgets/doc/images/gtk-tableview.png (renamed from doc/src/images/gtk-tableview.png)bin8364 -> 8364 bytes
-rw-r--r--src/widgets/doc/images/gtk-tabwidget.png (renamed from doc/src/images/gtk-tabwidget.png)bin8179 -> 8179 bytes
-rw-r--r--src/widgets/doc/images/gtk-textedit.png (renamed from doc/src/images/gtk-textedit.png)bin12641 -> 12641 bytes
-rw-r--r--src/widgets/doc/images/gtk-timeedit.png (renamed from doc/src/images/gtk-timeedit.png)bin2621 -> 2621 bytes
-rw-r--r--src/widgets/doc/images/gtk-toolbox.png (renamed from doc/src/images/gtk-toolbox.png)bin4240 -> 4240 bytes
-rw-r--r--src/widgets/doc/images/gtk-toolbutton.png (renamed from doc/src/images/gtk-toolbutton.png)bin2260 -> 2260 bytes
-rw-r--r--src/widgets/doc/images/gtk-treeview.png (renamed from doc/src/images/gtk-treeview.png)bin9722 -> 9722 bytes
-rw-r--r--src/widgets/doc/images/javastyle/branchindicatorimage.png (renamed from doc/src/images/javastyle/branchindicatorimage.png)bin18867 -> 18867 bytes
-rw-r--r--src/widgets/doc/images/javastyle/button.png (renamed from doc/src/images/javastyle/button.png)bin5475 -> 5475 bytes
-rw-r--r--src/widgets/doc/images/javastyle/checkbox.png (renamed from doc/src/images/javastyle/checkbox.png)bin3634 -> 3634 bytes
-rw-r--r--src/widgets/doc/images/javastyle/checkboxexample.png (renamed from doc/src/images/javastyle/checkboxexample.png)bin911 -> 911 bytes
-rw-r--r--src/widgets/doc/images/javastyle/combobox.png (renamed from doc/src/images/javastyle/combobox.png)bin3537 -> 3537 bytes
-rw-r--r--src/widgets/doc/images/javastyle/comboboximage.png (renamed from doc/src/images/javastyle/comboboximage.png)bin6527 -> 6527 bytes
-rw-r--r--src/widgets/doc/images/javastyle/conceptualpushbuttontree.png (renamed from doc/src/images/javastyle/conceptualpushbuttontree.png)bin3590 -> 3590 bytes
-rw-r--r--src/widgets/doc/images/javastyle/dockwidget.png (renamed from doc/src/images/javastyle/dockwidget.png)bin7181 -> 7181 bytes
-rw-r--r--src/widgets/doc/images/javastyle/dockwidgetimage.png (renamed from doc/src/images/javastyle/dockwidgetimage.png)bin21774 -> 21774 bytes
-rw-r--r--src/widgets/doc/images/javastyle/groupbox.png (renamed from doc/src/images/javastyle/groupbox.png)bin2010 -> 2010 bytes
-rw-r--r--src/widgets/doc/images/javastyle/groupboximage.png (renamed from doc/src/images/javastyle/groupboximage.png)bin7067 -> 7067 bytes
-rw-r--r--src/widgets/doc/images/javastyle/header.png (renamed from doc/src/images/javastyle/header.png)bin4399 -> 4399 bytes
-rw-r--r--src/widgets/doc/images/javastyle/headerimage.png (renamed from doc/src/images/javastyle/headerimage.png)bin6474 -> 6474 bytes
-rw-r--r--src/widgets/doc/images/javastyle/menu.png (renamed from doc/src/images/javastyle/menu.png)bin6508 -> 6508 bytes
-rw-r--r--src/widgets/doc/images/javastyle/menubar.png (renamed from doc/src/images/javastyle/menubar.png)bin4315 -> 4315 bytes
-rw-r--r--src/widgets/doc/images/javastyle/menubarimage.png (renamed from doc/src/images/javastyle/menubarimage.png)bin4487 -> 4487 bytes
-rw-r--r--src/widgets/doc/images/javastyle/menuimage.png (renamed from doc/src/images/javastyle/menuimage.png)bin5584 -> 5584 bytes
-rw-r--r--src/widgets/doc/images/javastyle/progressbar.png (renamed from doc/src/images/javastyle/progressbar.png)bin4493 -> 4493 bytes
-rw-r--r--src/widgets/doc/images/javastyle/progressbarimage.png (renamed from doc/src/images/javastyle/progressbarimage.png)bin6921 -> 6921 bytes
-rw-r--r--src/widgets/doc/images/javastyle/pushbutton.png (renamed from doc/src/images/javastyle/pushbutton.png)bin6820 -> 6820 bytes
-rw-r--r--src/widgets/doc/images/javastyle/rubberband.png (renamed from doc/src/images/javastyle/rubberband.png)bin765 -> 765 bytes
-rw-r--r--src/widgets/doc/images/javastyle/rubberbandimage.png (renamed from doc/src/images/javastyle/rubberbandimage.png)bin6452 -> 6452 bytes
-rw-r--r--src/widgets/doc/images/javastyle/scrollbar.png (renamed from doc/src/images/javastyle/scrollbar.png)bin7199 -> 7199 bytes
-rw-r--r--src/widgets/doc/images/javastyle/scrollbarimage.png (renamed from doc/src/images/javastyle/scrollbarimage.png)bin6196 -> 6196 bytes
-rw-r--r--src/widgets/doc/images/javastyle/sizegrip.png (renamed from doc/src/images/javastyle/sizegrip.png)bin708 -> 708 bytes
-rw-r--r--src/widgets/doc/images/javastyle/sizegripimage.png (renamed from doc/src/images/javastyle/sizegripimage.png)bin1793 -> 1793 bytes
-rw-r--r--src/widgets/doc/images/javastyle/slider.png (renamed from doc/src/images/javastyle/slider.png)bin2844 -> 2844 bytes
-rw-r--r--src/widgets/doc/images/javastyle/sliderimage.png (renamed from doc/src/images/javastyle/sliderimage.png)bin3442 -> 3442 bytes
-rw-r--r--src/widgets/doc/images/javastyle/spinbox.png (renamed from doc/src/images/javastyle/spinbox.png)bin2864 -> 2864 bytes
-rw-r--r--src/widgets/doc/images/javastyle/spinboximage.png (renamed from doc/src/images/javastyle/spinboximage.png)bin4544 -> 4544 bytes
-rw-r--r--src/widgets/doc/images/javastyle/tab.png (renamed from doc/src/images/javastyle/tab.png)bin12176 -> 12176 bytes
-rw-r--r--src/widgets/doc/images/javastyle/tabwidget.png (renamed from doc/src/images/javastyle/tabwidget.png)bin4725 -> 4725 bytes
-rw-r--r--src/widgets/doc/images/javastyle/titlebar.png (renamed from doc/src/images/javastyle/titlebar.png)bin2609 -> 2609 bytes
-rw-r--r--src/widgets/doc/images/javastyle/titlebarimage.png (renamed from doc/src/images/javastyle/titlebarimage.png)bin6882 -> 6882 bytes
-rw-r--r--src/widgets/doc/images/javastyle/toolbar.png (renamed from doc/src/images/javastyle/toolbar.png)bin6303 -> 6303 bytes
-rw-r--r--src/widgets/doc/images/javastyle/toolbarimage.png (renamed from doc/src/images/javastyle/toolbarimage.png)bin8245 -> 8245 bytes
-rw-r--r--src/widgets/doc/images/javastyle/toolbox.png (renamed from doc/src/images/javastyle/toolbox.png)bin3211 -> 3211 bytes
-rw-r--r--src/widgets/doc/images/javastyle/toolboximage.png (renamed from doc/src/images/javastyle/toolboximage.png)bin5580 -> 5580 bytes
-rw-r--r--src/widgets/doc/images/javastyle/toolbutton.png (renamed from doc/src/images/javastyle/toolbutton.png)bin4487 -> 4487 bytes
-rw-r--r--src/widgets/doc/images/javastyle/toolbuttonimage.png (renamed from doc/src/images/javastyle/toolbuttonimage.png)bin5124 -> 5124 bytes
-rw-r--r--src/widgets/doc/images/javastyle/windowstabimage.png (renamed from doc/src/images/javastyle/windowstabimage.png)bin6898 -> 6898 bytes
-rw-r--r--src/widgets/doc/images/licensewizard-flow.png (renamed from doc/src/images/licensewizard-flow.png)bin15306 -> 15306 bytes
-rw-r--r--src/widgets/doc/images/list_table_tree.png (renamed from doc/src/images/list_table_tree.png)bin85530 -> 85530 bytes
-rwxr-xr-xsrc/widgets/doc/images/listview.pngbin0 -> 9695 bytes
-rw-r--r--src/widgets/doc/images/macintosh-calendarwidget.png (renamed from doc/src/images/macintosh-calendarwidget.png)bin13560 -> 13560 bytes
-rw-r--r--src/widgets/doc/images/macintosh-checkbox.png (renamed from doc/src/images/macintosh-checkbox.png)bin2473 -> 2473 bytes
-rw-r--r--src/widgets/doc/images/macintosh-combobox.png (renamed from doc/src/images/macintosh-combobox.png)bin3273 -> 3273 bytes
-rw-r--r--src/widgets/doc/images/macintosh-dateedit.png (renamed from doc/src/images/macintosh-dateedit.png)bin1703 -> 1703 bytes
-rw-r--r--src/widgets/doc/images/macintosh-datetimeedit.png (renamed from doc/src/images/macintosh-datetimeedit.png)bin2633 -> 2633 bytes
-rw-r--r--src/widgets/doc/images/macintosh-dial.png (renamed from doc/src/images/macintosh-dial.png)bin2563 -> 2563 bytes
-rw-r--r--src/widgets/doc/images/macintosh-doublespinbox.png (renamed from doc/src/images/macintosh-doublespinbox.png)bin2306 -> 2306 bytes
-rw-r--r--src/widgets/doc/images/macintosh-fontcombobox.png (renamed from doc/src/images/macintosh-fontcombobox.png)bin2967 -> 2967 bytes
-rw-r--r--src/widgets/doc/images/macintosh-frame.png (renamed from doc/src/images/macintosh-frame.png)bin6187 -> 6187 bytes
-rw-r--r--src/widgets/doc/images/macintosh-groupbox.png (renamed from doc/src/images/macintosh-groupbox.png)bin6469 -> 6469 bytes
-rw-r--r--src/widgets/doc/images/macintosh-horizontalscrollbar.png (renamed from doc/src/images/macintosh-horizontalscrollbar.png)bin2242 -> 2242 bytes
-rw-r--r--src/widgets/doc/images/macintosh-label.png (renamed from doc/src/images/macintosh-label.png)bin1450 -> 1450 bytes
-rw-r--r--src/widgets/doc/images/macintosh-lcdnumber.png (renamed from doc/src/images/macintosh-lcdnumber.png)bin492 -> 492 bytes
-rw-r--r--src/widgets/doc/images/macintosh-lineedit.png (renamed from doc/src/images/macintosh-lineedit.png)bin1854 -> 1854 bytes
-rw-r--r--src/widgets/doc/images/macintosh-listview.png (renamed from doc/src/images/macintosh-listview.png)bin9987 -> 9987 bytes
-rw-r--r--src/widgets/doc/images/macintosh-menu.pngbin0 -> 6891 bytes
-rw-r--r--src/widgets/doc/images/macintosh-progressbar.png (renamed from doc/src/images/macintosh-progressbar.png)bin1127 -> 1127 bytes
-rw-r--r--src/widgets/doc/images/macintosh-pushbutton.png (renamed from doc/src/images/macintosh-pushbutton.png)bin2966 -> 2966 bytes
-rw-r--r--src/widgets/doc/images/macintosh-radiobutton.png (renamed from doc/src/images/macintosh-radiobutton.png)bin2914 -> 2914 bytes
-rw-r--r--src/widgets/doc/images/macintosh-slider.png (renamed from doc/src/images/macintosh-slider.png)bin1694 -> 1694 bytes
-rw-r--r--src/widgets/doc/images/macintosh-spinbox.png (renamed from doc/src/images/macintosh-spinbox.png)bin1964 -> 1964 bytes
-rw-r--r--src/widgets/doc/images/macintosh-tableview.png (renamed from doc/src/images/macintosh-tableview.png)bin10024 -> 10024 bytes
-rw-r--r--src/widgets/doc/images/macintosh-tabwidget.png (renamed from doc/src/images/macintosh-tabwidget.png)bin9562 -> 9562 bytes
-rw-r--r--src/widgets/doc/images/macintosh-textedit.png (renamed from doc/src/images/macintosh-textedit.png)bin7845 -> 7845 bytes
-rw-r--r--src/widgets/doc/images/macintosh-timeedit.png (renamed from doc/src/images/macintosh-timeedit.png)bin2244 -> 2244 bytes
-rw-r--r--src/widgets/doc/images/macintosh-toolbox.png (renamed from doc/src/images/macintosh-toolbox.png)bin2576 -> 2576 bytes
-rw-r--r--src/widgets/doc/images/macintosh-toolbutton.png (renamed from doc/src/images/macintosh-toolbutton.png)bin2003 -> 2003 bytes
-rw-r--r--src/widgets/doc/images/macintosh-treeview.png (renamed from doc/src/images/macintosh-treeview.png)bin11728 -> 11728 bytes
-rw-r--r--src/widgets/doc/images/mainwindow-docks-example.png (renamed from doc/src/images/mainwindow-docks-example.png)bin14427 -> 14427 bytes
-rw-r--r--src/widgets/doc/images/mainwindow-docks.png (renamed from doc/src/images/mainwindow-docks.png)bin37240 -> 37240 bytes
-rw-r--r--src/widgets/doc/images/mainwindowlayout.png (renamed from doc/src/images/mainwindowlayout.png)bin6782 -> 6782 bytes
-rw-r--r--src/widgets/doc/images/mdi-cascade.pngbin0 -> 14590 bytes
-rw-r--r--src/widgets/doc/images/mdi-tile.pngbin0 -> 31624 bytes
-rwxr-xr-xsrc/widgets/doc/images/modelview-combobox.pngbin0 -> 5022 bytes
-rw-r--r--src/widgets/doc/images/modelview-header.png (renamed from doc/src/images/modelview-header.png)bin30302 -> 30302 bytes
-rw-r--r--src/widgets/doc/images/modelview-models.pngbin0 -> 20540 bytes
-rw-r--r--src/widgets/doc/images/modelview-overview.pngbin0 -> 15042 bytes
-rw-r--r--src/widgets/doc/images/modelview-roles.pngbin0 -> 24954 bytes
-rw-r--r--src/widgets/doc/images/modelview-tablemodel.pngbin0 -> 12256 bytes
-rw-r--r--src/widgets/doc/images/modelview-treemodel.pngbin0 -> 9193 bytes
-rw-r--r--src/widgets/doc/images/modelview.png (renamed from doc/src/images/modelview.png)bin2887 -> 2887 bytes
-rw-r--r--src/widgets/doc/images/motif-calendarwidget.png (renamed from doc/src/images/motif-calendarwidget.png)bin9989 -> 9989 bytes
-rw-r--r--src/widgets/doc/images/motif-checkbox.png (renamed from doc/src/images/motif-checkbox.png)bin1284 -> 1284 bytes
-rw-r--r--src/widgets/doc/images/motif-combobox.png (renamed from doc/src/images/motif-combobox.png)bin1276 -> 1276 bytes
-rw-r--r--src/widgets/doc/images/motif-dateedit.png (renamed from doc/src/images/motif-dateedit.png)bin1214 -> 1214 bytes
-rw-r--r--src/widgets/doc/images/motif-datetimeedit.png (renamed from doc/src/images/motif-datetimeedit.png)bin1730 -> 1730 bytes
-rw-r--r--src/widgets/doc/images/motif-dial.png (renamed from doc/src/images/motif-dial.png)bin2017 -> 2017 bytes
-rw-r--r--src/widgets/doc/images/motif-doublespinbox.png (renamed from doc/src/images/motif-doublespinbox.png)bin1019 -> 1019 bytes
-rw-r--r--src/widgets/doc/images/motif-fontcombobox.png (renamed from doc/src/images/motif-fontcombobox.png)bin1633 -> 1633 bytes
-rw-r--r--src/widgets/doc/images/motif-frame.png (renamed from doc/src/images/motif-frame.png)bin5631 -> 5631 bytes
-rw-r--r--src/widgets/doc/images/motif-groupbox.png (renamed from doc/src/images/motif-groupbox.png)bin2514 -> 2514 bytes
-rw-r--r--src/widgets/doc/images/motif-horizontalscrollbar.png (renamed from doc/src/images/motif-horizontalscrollbar.png)bin628 -> 628 bytes
-rw-r--r--src/widgets/doc/images/motif-label.png (renamed from doc/src/images/motif-label.png)bin699 -> 699 bytes
-rw-r--r--src/widgets/doc/images/motif-lcdnumber.png (renamed from doc/src/images/motif-lcdnumber.png)bin538 -> 538 bytes
-rw-r--r--src/widgets/doc/images/motif-lineedit.png (renamed from doc/src/images/motif-lineedit.png)bin1360 -> 1360 bytes
-rw-r--r--src/widgets/doc/images/motif-listview.png (renamed from doc/src/images/motif-listview.png)bin5189 -> 5189 bytes
-rw-r--r--src/widgets/doc/images/motif-menubar.pngbin0 -> 1350 bytes
-rw-r--r--src/widgets/doc/images/motif-progressbar.png (renamed from doc/src/images/motif-progressbar.png)bin927 -> 927 bytes
-rw-r--r--src/widgets/doc/images/motif-pushbutton.png (renamed from doc/src/images/motif-pushbutton.png)bin1045 -> 1045 bytes
-rw-r--r--src/widgets/doc/images/motif-radiobutton.png (renamed from doc/src/images/motif-radiobutton.png)bin1545 -> 1545 bytes
-rw-r--r--src/widgets/doc/images/motif-slider.png (renamed from doc/src/images/motif-slider.png)bin543 -> 543 bytes
-rw-r--r--src/widgets/doc/images/motif-spinbox.png (renamed from doc/src/images/motif-spinbox.png)bin875 -> 875 bytes
-rw-r--r--src/widgets/doc/images/motif-tableview.png (renamed from doc/src/images/motif-tableview.png)bin3102 -> 3102 bytes
-rw-r--r--src/widgets/doc/images/motif-tabwidget.png (renamed from doc/src/images/motif-tabwidget.png)bin2490 -> 2490 bytes
-rw-r--r--src/widgets/doc/images/motif-textedit.png (renamed from doc/src/images/motif-textedit.png)bin7378 -> 7378 bytes
-rw-r--r--src/widgets/doc/images/motif-timeedit.png (renamed from doc/src/images/motif-timeedit.png)bin1280 -> 1280 bytes
-rw-r--r--src/widgets/doc/images/motif-toolbox.png (renamed from doc/src/images/motif-toolbox.png)bin1667 -> 1667 bytes
-rw-r--r--src/widgets/doc/images/motif-toolbutton.png (renamed from doc/src/images/motif-toolbutton.png)bin1152 -> 1152 bytes
-rw-r--r--src/widgets/doc/images/motif-treeview.png (renamed from doc/src/images/motif-treeview.png)bin6386 -> 6386 bytes
-rw-r--r--src/widgets/doc/images/msgbox1.png (renamed from doc/src/images/msgbox1.png)bin4529 -> 4529 bytes
-rw-r--r--src/widgets/doc/images/msgbox2.png (renamed from doc/src/images/msgbox2.png)bin9175 -> 9175 bytes
-rw-r--r--src/widgets/doc/images/msgbox3.png (renamed from doc/src/images/msgbox3.png)bin9589 -> 9589 bytes
-rw-r--r--src/widgets/doc/images/msgbox4.png (renamed from doc/src/images/msgbox4.png)bin17520 -> 17520 bytes
-rw-r--r--src/widgets/doc/images/pangesture.png (renamed from doc/src/images/pangesture.png)bin7153 -> 7153 bytes
-rw-r--r--src/widgets/doc/images/parent-child-widgets.png (renamed from doc/src/images/parent-child-widgets.png)bin47824 -> 47824 bytes
-rw-r--r--src/widgets/doc/images/pinchgesture.png (renamed from doc/src/images/pinchgesture.png)bin10094 -> 10094 bytes
-rw-r--r--src/widgets/doc/images/plastique-calendarwidget.png (renamed from doc/src/images/plastique-calendarwidget.png)bin9629 -> 9629 bytes
-rw-r--r--src/widgets/doc/images/plastique-checkbox.png (renamed from doc/src/images/plastique-checkbox.png)bin1069 -> 1069 bytes
-rw-r--r--src/widgets/doc/images/plastique-colordialog.png (renamed from doc/src/images/plastique-colordialog.png)bin22595 -> 22595 bytes
-rw-r--r--src/widgets/doc/images/plastique-combobox.png (renamed from doc/src/images/plastique-combobox.png)bin1714 -> 1714 bytes
-rw-r--r--src/widgets/doc/images/plastique-dateedit.png (renamed from doc/src/images/plastique-dateedit.png)bin1271 -> 1271 bytes
-rw-r--r--src/widgets/doc/images/plastique-datetimeedit.png (renamed from doc/src/images/plastique-datetimeedit.png)bin1771 -> 1771 bytes
-rw-r--r--src/widgets/doc/images/plastique-dial.png (renamed from doc/src/images/plastique-dial.png)bin2995 -> 2995 bytes
-rw-r--r--src/widgets/doc/images/plastique-doublespinbox.png (renamed from doc/src/images/plastique-doublespinbox.png)bin1102 -> 1102 bytes
-rw-r--r--src/widgets/doc/images/plastique-fontcombobox.png (renamed from doc/src/images/plastique-fontcombobox.png)bin1904 -> 1904 bytes
-rw-r--r--src/widgets/doc/images/plastique-fontdialog.png (renamed from doc/src/images/plastique-fontdialog.png)bin23835 -> 23835 bytes
-rw-r--r--src/widgets/doc/images/plastique-frame.png (renamed from doc/src/images/plastique-frame.png)bin5616 -> 5616 bytes
-rw-r--r--src/widgets/doc/images/plastique-groupbox.png (renamed from doc/src/images/plastique-groupbox.png)bin2704 -> 2704 bytes
-rw-r--r--src/widgets/doc/images/plastique-horizontalscrollbar.png (renamed from doc/src/images/plastique-horizontalscrollbar.png)bin868 -> 868 bytes
-rw-r--r--src/widgets/doc/images/plastique-label.png (renamed from doc/src/images/plastique-label.png)bin696 -> 696 bytes
-rw-r--r--src/widgets/doc/images/plastique-lcdnumber.png (renamed from doc/src/images/plastique-lcdnumber.png)bin470 -> 470 bytes
-rw-r--r--src/widgets/doc/images/plastique-lineedit.png (renamed from doc/src/images/plastique-lineedit.png)bin1015 -> 1015 bytes
-rw-r--r--src/widgets/doc/images/plastique-listview.png (renamed from doc/src/images/plastique-listview.png)bin4895 -> 4895 bytes
-rw-r--r--src/widgets/doc/images/plastique-menu.pngbin0 -> 3867 bytes
-rw-r--r--src/widgets/doc/images/plastique-menubar.pngbin0 -> 1030 bytes
-rw-r--r--src/widgets/doc/images/plastique-progressbar.png (renamed from doc/src/images/plastique-progressbar.png)bin1044 -> 1044 bytes
-rw-r--r--src/widgets/doc/images/plastique-progressdialog.png (renamed from doc/src/images/plastique-progressdialog.png)bin6311 -> 6311 bytes
-rw-r--r--src/widgets/doc/images/plastique-pushbutton-menu.pngbin0 -> 3354 bytes
-rw-r--r--src/widgets/doc/images/plastique-pushbutton.png (renamed from doc/src/images/plastique-pushbutton.png)bin1409 -> 1409 bytes
-rw-r--r--src/widgets/doc/images/plastique-radiobutton.png (renamed from doc/src/images/plastique-radiobutton.png)bin1667 -> 1667 bytes
-rw-r--r--src/widgets/doc/images/plastique-sizegrip.pngbin0 -> 8168 bytes
-rw-r--r--src/widgets/doc/images/plastique-slider.png (renamed from doc/src/images/plastique-slider.png)bin632 -> 632 bytes
-rw-r--r--src/widgets/doc/images/plastique-spinbox.png (renamed from doc/src/images/plastique-spinbox.png)bin968 -> 968 bytes
-rw-r--r--src/widgets/doc/images/plastique-statusbar.png (renamed from doc/src/images/plastique-statusbar.png)bin878 -> 878 bytes
-rw-r--r--src/widgets/doc/images/plastique-tabbar-truncated.pngbin0 -> 2986 bytes
-rw-r--r--src/widgets/doc/images/plastique-tabbar.pngbin0 -> 2721 bytes
-rw-r--r--src/widgets/doc/images/plastique-tableview.png (renamed from doc/src/images/plastique-tableview.png)bin6052 -> 6052 bytes
-rw-r--r--src/widgets/doc/images/plastique-tabwidget.png (renamed from doc/src/images/plastique-tabwidget.png)bin4705 -> 4705 bytes
-rw-r--r--src/widgets/doc/images/plastique-textedit.png (renamed from doc/src/images/plastique-textedit.png)bin5141 -> 5141 bytes
-rw-r--r--src/widgets/doc/images/plastique-timeedit.png (renamed from doc/src/images/plastique-timeedit.png)bin1336 -> 1336 bytes
-rw-r--r--src/widgets/doc/images/plastique-toolbox.png (renamed from doc/src/images/plastique-toolbox.png)bin1858 -> 1858 bytes
-rw-r--r--src/widgets/doc/images/plastique-toolbutton.png (renamed from doc/src/images/plastique-toolbutton.png)bin1254 -> 1254 bytes
-rw-r--r--src/widgets/doc/images/plastique-treeview.png (renamed from doc/src/images/plastique-treeview.png)bin8453 -> 8453 bytes
-rw-r--r--src/widgets/doc/images/progressBar-stylesheet.png (renamed from doc/src/images/progressBar-stylesheet.png)bin455 -> 455 bytes
-rw-r--r--src/widgets/doc/images/progressBar2-stylesheet.png (renamed from doc/src/images/progressBar2-stylesheet.png)bin494 -> 494 bytes
-rw-r--r--src/widgets/doc/images/propagation-custom.png (renamed from doc/src/images/propagation-custom.png)bin163413 -> 163413 bytes
-rw-r--r--src/widgets/doc/images/propagation-standard.png (renamed from doc/src/images/propagation-standard.png)bin83382 -> 83382 bytes
-rw-r--r--src/widgets/doc/images/qcalendarwidget-grid.png (renamed from doc/src/images/qcalendarwidget-grid.png)bin9601 -> 9601 bytes
-rw-r--r--src/widgets/doc/images/qcalendarwidget-maximum.png (renamed from doc/src/images/qcalendarwidget-maximum.png)bin9709 -> 9709 bytes
-rw-r--r--src/widgets/doc/images/qcalendarwidget-minimum.png (renamed from doc/src/images/qcalendarwidget-minimum.png)bin9770 -> 9770 bytes
-rw-r--r--src/widgets/doc/images/qcolumnview.png (renamed from doc/src/images/qcolumnview.png)bin3075 -> 3075 bytes
-rw-r--r--src/widgets/doc/images/qcompleter.png (renamed from doc/src/images/qcompleter.png)bin17017 -> 17017 bytes
-rw-r--r--src/widgets/doc/images/qdesktopwidget.png (renamed from doc/src/images/qdesktopwidget.png)bin42328 -> 42328 bytes
-rw-r--r--src/widgets/doc/images/qformlayout-kde.pngbin0 -> 1703 bytes
-rw-r--r--src/widgets/doc/images/qformlayout-mac.pngbin0 -> 1706 bytes
-rw-r--r--src/widgets/doc/images/qformlayout-qpe.pngbin0 -> 1764 bytes
-rw-r--r--src/widgets/doc/images/qformlayout-win.pngbin0 -> 1743 bytes
-rw-r--r--src/widgets/doc/images/qformlayout-with-6-children.png (renamed from doc/src/images/qformlayout-with-6-children.png)bin3264 -> 3264 bytes
-rw-r--r--src/widgets/doc/images/qgraphicsproxywidget-embed.png (renamed from doc/src/images/qgraphicsproxywidget-embed.png)bin2199 -> 2199 bytes
-rw-r--r--src/widgets/doc/images/qgridlayout-with-5-children.png (renamed from doc/src/images/qgridlayout-with-5-children.png)bin3201 -> 3201 bytes
-rw-r--r--src/widgets/doc/images/qhboxlayout-with-5-children.png (renamed from doc/src/images/qhboxlayout-with-5-children.png)bin2652 -> 2652 bytes
-rw-r--r--src/widgets/doc/images/qmdisubwindowlayout.png (renamed from doc/src/images/qmdisubwindowlayout.png)bin3153 -> 3153 bytes
-rw-r--r--src/widgets/doc/images/qscrollarea-noscrollbars.pngbin0 -> 54671 bytes
-rw-r--r--src/widgets/doc/images/qscrollarea-onescrollbar.pngbin0 -> 77476 bytes
-rw-r--r--src/widgets/doc/images/qscrollarea-twoscrollbars.pngbin0 -> 78046 bytes
-rw-r--r--src/widgets/doc/images/qscrollbar-picture.png (renamed from doc/src/images/qscrollbar-picture.png)bin6568 -> 6568 bytes
-rw-r--r--src/widgets/doc/images/qscrollbar-values.pngbin0 -> 15902 bytes
-rw-r--r--src/widgets/doc/images/qspinbox-plusminus.pngbin0 -> 375 bytes
-rw-r--r--src/widgets/doc/images/qspinbox-updown.pngbin0 -> 402 bytes
-rw-r--r--src/widgets/doc/images/qstyle-comboboxes.png (renamed from doc/src/images/qstyle-comboboxes.png)bin19437 -> 19437 bytes
-rw-r--r--src/widgets/doc/images/qstyleoptiontoolbar-position.png (renamed from doc/src/images/qstyleoptiontoolbar-position.png)bin13707 -> 13707 bytes
-rw-r--r--src/widgets/doc/images/qtableview-resized.pngbin0 -> 42232 bytes
-rw-r--r--src/widgets/doc/images/qtwizard-aero1.pngbin0 -> 11749 bytes
-rw-r--r--src/widgets/doc/images/qtwizard-aero2.pngbin0 -> 16560 bytes
-rw-r--r--src/widgets/doc/images/qtwizard-classic1.pngbin0 -> 39640 bytes
-rw-r--r--src/widgets/doc/images/qtwizard-classic2.pngbin0 -> 8616 bytes
-rw-r--r--src/widgets/doc/images/qtwizard-mac1.pngbin0 -> 25478 bytes
-rw-r--r--src/widgets/doc/images/qtwizard-mac2.pngbin0 -> 29591 bytes
-rw-r--r--src/widgets/doc/images/qtwizard-macpage.png (renamed from doc/src/images/qtwizard-macpage.png)bin23095 -> 23095 bytes
-rw-r--r--src/widgets/doc/images/qtwizard-modern1.pngbin0 -> 45093 bytes
-rw-r--r--src/widgets/doc/images/qtwizard-modern2.pngbin0 -> 15081 bytes
-rw-r--r--src/widgets/doc/images/qtwizard-nonmacpage.png (renamed from doc/src/images/qtwizard-nonmacpage.png)bin26557 -> 26557 bytes
-rw-r--r--src/widgets/doc/images/qundoview.png (renamed from doc/src/images/qundoview.png)bin5993 -> 5993 bytes
-rw-r--r--src/widgets/doc/images/qvboxlayout-with-5-children.png (renamed from doc/src/images/qvboxlayout-with-5-children.png)bin2974 -> 2974 bytes
-rw-r--r--src/widgets/doc/images/readonlytable_role.png (renamed from doc/src/images/readonlytable_role.png)bin27467 -> 27467 bytes
-rw-r--r--src/widgets/doc/images/selected-items1.pngbin0 -> 31870 bytes
-rw-r--r--src/widgets/doc/images/selected-items2.pngbin0 -> 32025 bytes
-rw-r--r--src/widgets/doc/images/selected-items3.pngbin0 -> 32100 bytes
-rw-r--r--src/widgets/doc/images/selection-extended.pngbin0 -> 11401 bytes
-rw-r--r--src/widgets/doc/images/selection-multi.pngbin0 -> 13058 bytes
-rw-r--r--src/widgets/doc/images/selection-single.pngbin0 -> 7849 bytes
-rw-r--r--src/widgets/doc/images/selection2.png (renamed from doc/src/images/selection2.png)bin23784 -> 23784 bytes
-rw-r--r--src/widgets/doc/images/shareddirmodel.pngbin0 -> 45891 bytes
-rw-r--r--src/widgets/doc/images/sharedmodel-tableviews.pngbin0 -> 16811 bytes
-rw-r--r--src/widgets/doc/images/sharedselection-tableviews.pngbin0 -> 14212 bytes
-rw-r--r--src/widgets/doc/images/simpleanchorlayout-example.pngbin0 -> 13463 bytes
-rw-r--r--src/widgets/doc/images/spinboxdelegate-example.png (renamed from doc/src/images/spinboxdelegate-example.png)bin4762 -> 4762 bytes
-rw-r--r--src/widgets/doc/images/standard-views.pngbin0 -> 44495 bytes
-rw-r--r--src/widgets/doc/images/standardwidget.png (renamed from doc/src/images/standardwidget.png)bin1466 -> 1466 bytes
-rw-r--r--src/widgets/doc/images/stardelegate.png (renamed from doc/src/images/stardelegate.png)bin12230 -> 12230 bytes
-rw-r--r--src/widgets/doc/images/stringlistmodel.pngbin0 -> 4849 bytes
-rw-r--r--src/widgets/doc/images/stylesheet-border-image-normal.png (renamed from doc/src/images/stylesheet-border-image-normal.png)bin5769 -> 5769 bytes
-rw-r--r--src/widgets/doc/images/stylesheet-border-image-stretched.pngbin0 -> 12170 bytes
-rw-r--r--src/widgets/doc/images/stylesheet-border-image-wrong.pngbin0 -> 12887 bytes
-rw-r--r--src/widgets/doc/images/stylesheet-boxmodel.png (renamed from doc/src/images/stylesheet-boxmodel.png)bin18144 -> 18144 bytes
-rw-r--r--src/widgets/doc/images/stylesheet-branch-closed.pngbin0 -> 334 bytes
-rw-r--r--src/widgets/doc/images/stylesheet-branch-end.pngbin0 -> 182 bytes
-rw-r--r--src/widgets/doc/images/stylesheet-branch-more.pngbin0 -> 136 bytes
-rw-r--r--src/widgets/doc/images/stylesheet-branch-open.pngbin0 -> 346 bytes
-rw-r--r--src/widgets/doc/images/stylesheet-coffee-cleanlooks.pngbin0 -> 14820 bytes
-rw-r--r--src/widgets/doc/images/stylesheet-coffee-xp.pngbin0 -> 14200 bytes
-rw-r--r--src/widgets/doc/images/stylesheet-pagefold-mac.pngbin0 -> 20618 bytes
-rw-r--r--src/widgets/doc/images/stylesheet-pagefold.png (renamed from doc/src/images/stylesheet-pagefold.png)bin15989 -> 15989 bytes
-rw-r--r--src/widgets/doc/images/stylesheet-redbutton1.png (renamed from doc/src/images/stylesheet-redbutton1.png)bin378 -> 378 bytes
-rw-r--r--src/widgets/doc/images/stylesheet-redbutton2.png (renamed from doc/src/images/stylesheet-redbutton2.png)bin410 -> 410 bytes
-rw-r--r--src/widgets/doc/images/stylesheet-redbutton3.png (renamed from doc/src/images/stylesheet-redbutton3.png)bin664 -> 664 bytes
-rw-r--r--src/widgets/doc/images/stylesheet-scrollbar1.png (renamed from doc/src/images/stylesheet-scrollbar1.png)bin150 -> 150 bytes
-rw-r--r--src/widgets/doc/images/stylesheet-scrollbar2.png (renamed from doc/src/images/stylesheet-scrollbar2.png)bin169 -> 169 bytes
-rw-r--r--src/widgets/doc/images/stylesheet-treeview.png (renamed from doc/src/images/stylesheet-treeview.png)bin2412 -> 2412 bytes
-rw-r--r--src/widgets/doc/images/stylesheet-vline.pngbin0 -> 124 bytes
-rw-r--r--src/widgets/doc/images/swipegesture.png (renamed from doc/src/images/swipegesture.png)bin6864 -> 6864 bytes
-rw-r--r--src/widgets/doc/images/system-tray.png (renamed from doc/src/images/system-tray.png)bin6326 -> 6326 bytes
-rw-r--r--src/widgets/doc/images/tabWidget-stylesheet1.png (renamed from doc/src/images/tabWidget-stylesheet1.png)bin1321 -> 1321 bytes
-rw-r--r--src/widgets/doc/images/tabWidget-stylesheet2.png (renamed from doc/src/images/tabWidget-stylesheet2.png)bin1434 -> 1434 bytes
-rw-r--r--src/widgets/doc/images/tabWidget-stylesheet3.png (renamed from doc/src/images/tabWidget-stylesheet3.png)bin1206 -> 1206 bytes
-rw-r--r--src/widgets/doc/images/tableWidget-stylesheet.png (renamed from doc/src/images/tableWidget-stylesheet.png)bin3478 -> 3478 bytes
-rwxr-xr-xsrc/widgets/doc/images/tableview.pngbin0 -> 10102 bytes
-rw-r--r--src/widgets/doc/images/tree_2_with_algorithm.png (renamed from doc/src/images/tree_2_with_algorithm.png)bin16921 -> 16921 bytes
-rw-r--r--src/widgets/doc/images/treeview.png (renamed from doc/src/images/treeview.png)bin17173 -> 17173 bytes
-rw-r--r--src/widgets/doc/images/widgetdelegate.png (renamed from doc/src/images/widgetdelegate.png)bin7449 -> 7449 bytes
-rw-r--r--src/widgets/doc/images/widgetmapper.png (renamed from doc/src/images/widgetmapper.png)bin20145 -> 20145 bytes
-rw-r--r--src/widgets/doc/images/widgets-tutorial-childwidget.pngbin0 -> 8547 bytes
-rw-r--r--src/widgets/doc/images/widgets-tutorial-nestedlayouts.pngbin0 -> 23287 bytes
-rw-r--r--src/widgets/doc/images/widgets-tutorial-toplevel.pngbin0 -> 6087 bytes
-rw-r--r--src/widgets/doc/images/widgets-tutorial-windowlayout.pngbin0 -> 5849 bytes
-rw-r--r--src/widgets/doc/images/windows-calendarwidget.png (renamed from doc/src/images/windows-calendarwidget.png)bin5055 -> 5055 bytes
-rw-r--r--src/widgets/doc/images/windows-checkbox.png (renamed from doc/src/images/windows-checkbox.png)bin929 -> 929 bytes
-rw-r--r--src/widgets/doc/images/windows-combobox.png (renamed from doc/src/images/windows-combobox.png)bin1002 -> 1002 bytes
-rw-r--r--src/widgets/doc/images/windows-dateedit.png (renamed from doc/src/images/windows-dateedit.png)bin817 -> 817 bytes
-rw-r--r--src/widgets/doc/images/windows-datetimeedit.png (renamed from doc/src/images/windows-datetimeedit.png)bin1026 -> 1026 bytes
-rw-r--r--src/widgets/doc/images/windows-dial.png (renamed from doc/src/images/windows-dial.png)bin4598 -> 4598 bytes
-rw-r--r--src/widgets/doc/images/windows-doublespinbox.png (renamed from doc/src/images/windows-doublespinbox.png)bin762 -> 762 bytes
-rw-r--r--src/widgets/doc/images/windows-fontcombobox.png (renamed from doc/src/images/windows-fontcombobox.png)bin1022 -> 1022 bytes
-rw-r--r--src/widgets/doc/images/windows-frame.png (renamed from doc/src/images/windows-frame.png)bin1837 -> 1837 bytes
-rw-r--r--src/widgets/doc/images/windows-groupbox.png (renamed from doc/src/images/windows-groupbox.png)bin1617 -> 1617 bytes
-rw-r--r--src/widgets/doc/images/windows-horizontalscrollbar.png (renamed from doc/src/images/windows-horizontalscrollbar.png)bin566 -> 566 bytes
-rw-r--r--src/widgets/doc/images/windows-label.png (renamed from doc/src/images/windows-label.png)bin696 -> 696 bytes
-rw-r--r--src/widgets/doc/images/windows-lcdnumber.png (renamed from doc/src/images/windows-lcdnumber.png)bin491 -> 491 bytes
-rw-r--r--src/widgets/doc/images/windows-lineedit.png (renamed from doc/src/images/windows-lineedit.png)bin884 -> 884 bytes
-rw-r--r--src/widgets/doc/images/windows-listview.png (renamed from doc/src/images/windows-listview.png)bin2781 -> 2781 bytes
-rw-r--r--src/widgets/doc/images/windows-progressbar.png (renamed from doc/src/images/windows-progressbar.png)bin674 -> 674 bytes
-rw-r--r--src/widgets/doc/images/windows-pushbutton.png (renamed from doc/src/images/windows-pushbutton.png)bin722 -> 722 bytes
-rw-r--r--src/widgets/doc/images/windows-radiobutton.png (renamed from doc/src/images/windows-radiobutton.png)bin1005 -> 1005 bytes
-rw-r--r--src/widgets/doc/images/windows-slider.png (renamed from doc/src/images/windows-slider.png)bin485 -> 485 bytes
-rw-r--r--src/widgets/doc/images/windows-spinbox.png (renamed from doc/src/images/windows-spinbox.png)bin667 -> 667 bytes
-rw-r--r--src/widgets/doc/images/windows-tableview.png (renamed from doc/src/images/windows-tableview.png)bin1738 -> 1738 bytes
-rw-r--r--src/widgets/doc/images/windows-tabwidget.png (renamed from doc/src/images/windows-tabwidget.png)bin1707 -> 1707 bytes
-rw-r--r--src/widgets/doc/images/windows-textedit.png (renamed from doc/src/images/windows-textedit.png)bin3192 -> 3192 bytes
-rw-r--r--src/widgets/doc/images/windows-timeedit.png (renamed from doc/src/images/windows-timeedit.png)bin873 -> 873 bytes
-rw-r--r--src/widgets/doc/images/windows-toolbox.png (renamed from doc/src/images/windows-toolbox.png)bin925 -> 925 bytes
-rw-r--r--src/widgets/doc/images/windows-toolbutton.png (renamed from doc/src/images/windows-toolbutton.png)bin771 -> 771 bytes
-rw-r--r--src/widgets/doc/images/windows-treeview.png (renamed from doc/src/images/windows-treeview.png)bin2723 -> 2723 bytes
-rw-r--r--src/widgets/doc/images/windowsvista-calendarwidget.png (renamed from doc/src/images/windowsvista-calendarwidget.png)bin5144 -> 5144 bytes
-rw-r--r--src/widgets/doc/images/windowsvista-checkbox.png (renamed from doc/src/images/windowsvista-checkbox.png)bin1115 -> 1115 bytes
-rw-r--r--src/widgets/doc/images/windowsvista-combobox.png (renamed from doc/src/images/windowsvista-combobox.png)bin1457 -> 1457 bytes
-rw-r--r--src/widgets/doc/images/windowsvista-dateedit.png (renamed from doc/src/images/windowsvista-dateedit.png)bin855 -> 855 bytes
-rw-r--r--src/widgets/doc/images/windowsvista-datetimeedit.png (renamed from doc/src/images/windowsvista-datetimeedit.png)bin1034 -> 1034 bytes
-rw-r--r--src/widgets/doc/images/windowsvista-dial.png (renamed from doc/src/images/windowsvista-dial.png)bin2431 -> 2431 bytes
-rw-r--r--src/widgets/doc/images/windowsvista-doublespinbox.png (renamed from doc/src/images/windowsvista-doublespinbox.png)bin852 -> 852 bytes
-rw-r--r--src/widgets/doc/images/windowsvista-fontcombobox.png (renamed from doc/src/images/windowsvista-fontcombobox.png)bin919 -> 919 bytes
-rw-r--r--src/widgets/doc/images/windowsvista-frame.png (renamed from doc/src/images/windowsvista-frame.png)bin1800 -> 1800 bytes
-rw-r--r--src/widgets/doc/images/windowsvista-groupbox.png (renamed from doc/src/images/windowsvista-groupbox.png)bin1991 -> 1991 bytes
-rw-r--r--src/widgets/doc/images/windowsvista-horizontalscrollbar.png (renamed from doc/src/images/windowsvista-horizontalscrollbar.png)bin1049 -> 1049 bytes
-rw-r--r--src/widgets/doc/images/windowsvista-label.png (renamed from doc/src/images/windowsvista-label.png)bin599 -> 599 bytes
-rw-r--r--src/widgets/doc/images/windowsvista-lcdnumber.png (renamed from doc/src/images/windowsvista-lcdnumber.png)bin491 -> 491 bytes
-rw-r--r--src/widgets/doc/images/windowsvista-lineedit.png (renamed from doc/src/images/windowsvista-lineedit.png)bin873 -> 873 bytes
-rw-r--r--src/widgets/doc/images/windowsvista-listview.png (renamed from doc/src/images/windowsvista-listview.png)bin6872 -> 6872 bytes
-rw-r--r--src/widgets/doc/images/windowsvista-progressbar.png (renamed from doc/src/images/windowsvista-progressbar.png)bin1437 -> 1437 bytes
-rw-r--r--src/widgets/doc/images/windowsvista-pushbutton.png (renamed from doc/src/images/windowsvista-pushbutton.png)bin1085 -> 1085 bytes
-rw-r--r--src/widgets/doc/images/windowsvista-radiobutton.png (renamed from doc/src/images/windowsvista-radiobutton.png)bin1266 -> 1266 bytes
-rw-r--r--src/widgets/doc/images/windowsvista-slider.png (renamed from doc/src/images/windowsvista-slider.png)bin624 -> 624 bytes
-rw-r--r--src/widgets/doc/images/windowsvista-spinbox.png (renamed from doc/src/images/windowsvista-spinbox.png)bin767 -> 767 bytes
-rw-r--r--src/widgets/doc/images/windowsvista-tableview.png (renamed from doc/src/images/windowsvista-tableview.png)bin3941 -> 3941 bytes
-rw-r--r--src/widgets/doc/images/windowsvista-tabwidget.png (renamed from doc/src/images/windowsvista-tabwidget.png)bin3286 -> 3286 bytes
-rw-r--r--src/widgets/doc/images/windowsvista-textedit.png (renamed from doc/src/images/windowsvista-textedit.png)bin3122 -> 3122 bytes
-rw-r--r--src/widgets/doc/images/windowsvista-timeedit.png (renamed from doc/src/images/windowsvista-timeedit.png)bin764 -> 764 bytes
-rw-r--r--src/widgets/doc/images/windowsvista-toolbox.png (renamed from doc/src/images/windowsvista-toolbox.png)bin891 -> 891 bytes
-rw-r--r--src/widgets/doc/images/windowsvista-toolbutton.png (renamed from doc/src/images/windowsvista-toolbutton.png)bin981 -> 981 bytes
-rw-r--r--src/widgets/doc/images/windowsvista-treeview.png (renamed from doc/src/images/windowsvista-treeview.png)bin5760 -> 5760 bytes
-rw-r--r--src/widgets/doc/images/windowsxp-calendarwidget.png (renamed from doc/src/images/windowsxp-calendarwidget.png)bin5009 -> 5009 bytes
-rw-r--r--src/widgets/doc/images/windowsxp-checkbox.png (renamed from doc/src/images/windowsxp-checkbox.png)bin1006 -> 1006 bytes
-rw-r--r--src/widgets/doc/images/windowsxp-combobox.png (renamed from doc/src/images/windowsxp-combobox.png)bin1450 -> 1450 bytes
-rw-r--r--src/widgets/doc/images/windowsxp-dateedit.png (renamed from doc/src/images/windowsxp-dateedit.png)bin1107 -> 1107 bytes
-rw-r--r--src/widgets/doc/images/windowsxp-datetimeedit.png (renamed from doc/src/images/windowsxp-datetimeedit.png)bin1321 -> 1321 bytes
-rw-r--r--src/widgets/doc/images/windowsxp-dial.png (renamed from doc/src/images/windowsxp-dial.png)bin4598 -> 4598 bytes
-rw-r--r--src/widgets/doc/images/windowsxp-doublespinbox.png (renamed from doc/src/images/windowsxp-doublespinbox.png)bin1065 -> 1065 bytes
-rw-r--r--src/widgets/doc/images/windowsxp-fontcombobox.png (renamed from doc/src/images/windowsxp-fontcombobox.png)bin1408 -> 1408 bytes
-rw-r--r--src/widgets/doc/images/windowsxp-frame.png (renamed from doc/src/images/windowsxp-frame.png)bin1837 -> 1837 bytes
-rw-r--r--src/widgets/doc/images/windowsxp-groupbox.png (renamed from doc/src/images/windowsxp-groupbox.png)bin2016 -> 2016 bytes
-rw-r--r--src/widgets/doc/images/windowsxp-horizontalscrollbar.png (renamed from doc/src/images/windowsxp-horizontalscrollbar.png)bin1498 -> 1498 bytes
-rw-r--r--src/widgets/doc/images/windowsxp-label.png (renamed from doc/src/images/windowsxp-label.png)bin696 -> 696 bytes
-rw-r--r--src/widgets/doc/images/windowsxp-lcdnumber.png (renamed from doc/src/images/windowsxp-lcdnumber.png)bin493 -> 493 bytes
-rw-r--r--src/widgets/doc/images/windowsxp-lineedit.png (renamed from doc/src/images/windowsxp-lineedit.png)bin861 -> 861 bytes
-rw-r--r--src/widgets/doc/images/windowsxp-listview.png (renamed from doc/src/images/windowsxp-listview.png)bin5391 -> 5391 bytes
-rw-r--r--src/widgets/doc/images/windowsxp-menu.pngbin0 -> 1442 bytes
-rw-r--r--src/widgets/doc/images/windowsxp-progressbar.png (renamed from doc/src/images/windowsxp-progressbar.png)bin1007 -> 1007 bytes
-rw-r--r--src/widgets/doc/images/windowsxp-pushbutton.png (renamed from doc/src/images/windowsxp-pushbutton.png)bin1462 -> 1462 bytes
-rw-r--r--src/widgets/doc/images/windowsxp-radiobutton.png (renamed from doc/src/images/windowsxp-radiobutton.png)bin1270 -> 1270 bytes
-rw-r--r--src/widgets/doc/images/windowsxp-slider.png (renamed from doc/src/images/windowsxp-slider.png)bin732 -> 732 bytes
-rw-r--r--src/widgets/doc/images/windowsxp-spinbox.png (renamed from doc/src/images/windowsxp-spinbox.png)bin974 -> 974 bytes
-rw-r--r--src/widgets/doc/images/windowsxp-tableview.png (renamed from doc/src/images/windowsxp-tableview.png)bin3204 -> 3204 bytes
-rw-r--r--src/widgets/doc/images/windowsxp-tabwidget.png (renamed from doc/src/images/windowsxp-tabwidget.png)bin5220 -> 5220 bytes
-rw-r--r--src/widgets/doc/images/windowsxp-textedit.png (renamed from doc/src/images/windowsxp-textedit.png)bin3159 -> 3159 bytes
-rw-r--r--src/widgets/doc/images/windowsxp-timeedit.png (renamed from doc/src/images/windowsxp-timeedit.png)bin1172 -> 1172 bytes
-rw-r--r--src/widgets/doc/images/windowsxp-toolbox.png (renamed from doc/src/images/windowsxp-toolbox.png)bin925 -> 925 bytes
-rw-r--r--src/widgets/doc/images/windowsxp-toolbutton.png (renamed from doc/src/images/windowsxp-toolbutton.png)bin1549 -> 1549 bytes
-rw-r--r--src/widgets/doc/images/windowsxp-treeview.png (renamed from doc/src/images/windowsxp-treeview.png)bin5795 -> 5795 bytes
-rw-r--r--src/widgets/doc/qtwidgets.qdocconf92
-rw-r--r--src/widgets/doc/snippets/code/doc_src_layout.cpp (renamed from doc/src/snippets/code/doc_src_layout.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/doc_src_model-view-programming.cpp76
-rw-r--r--src/widgets/doc/snippets/code/doc_src_qt4-mainwindow.cpp (renamed from doc/src/snippets/code/doc_src_qt4-mainwindow.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/doc_src_qt4-styles.cpp (renamed from doc/src/snippets/code/doc_src_qt4-styles.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/doc_src_qtwidgets.cpp43
-rw-r--r--src/widgets/doc/snippets/code/doc_src_qtwidgets.pro3
-rw-r--r--src/widgets/doc/snippets/code/doc_src_styles.cpp (renamed from doc/src/snippets/code/doc_src_styles.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/doc_src_stylesheet.cpp (renamed from doc/src/snippets/code/doc_src_stylesheet.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/doc_src_stylesheet.qdoc (renamed from doc/src/snippets/code/doc_src_stylesheet.qdoc)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_dialogs_qfiledialog.cpp (renamed from doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_dialogs_qfontdialog.cpp (renamed from doc/src/snippets/code/src_gui_dialogs_qfontdialog.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_dialogs_qmessagebox.cpp148
-rw-r--r--src/widgets/doc/snippets/code/src_gui_dialogs_qwizard.cpp (renamed from doc/src/snippets/code/src_gui_dialogs_qwizard.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_effects_qgraphicseffect.cpp (renamed from doc/src/snippets/code/src_gui_effects_qgraphicseffect.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsgridlayout.cpp (renamed from doc/src/snippets/code/src_gui_graphicsview_qgraphicsgridlayout.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp (renamed from doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicslinearlayout.cpp (renamed from doc/src/snippets/code/src_gui_graphicsview_qgraphicslinearlayout.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsproxywidget.cpp (renamed from doc/src/snippets/code/src_gui_graphicsview_qgraphicsproxywidget.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsscene.cpp (renamed from doc/src/snippets/code/src_gui_graphicsview_qgraphicsscene.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicssceneevent.cpp (renamed from doc/src/snippets/code/src_gui_graphicsview_qgraphicssceneevent.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsview.cpp (renamed from doc/src/snippets/code/src_gui_graphicsview_qgraphicsview.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicswidget.cpp (renamed from doc/src/snippets/code/src_gui_graphicsview_qgraphicswidget.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_image_qicon.cpp (renamed from doc/src/snippets/code/src_gui_image_qicon.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_image_qpixmapfilter.cpp (renamed from doc/src/snippets/code/src_gui_image_qpixmapfilter.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_itemviews_qabstractitemview.cpp (renamed from doc/src/snippets/code/src_gui_itemviews_qabstractitemview.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_itemviews_qdatawidgetmapper.cpp (renamed from doc/src/snippets/code/src_gui_itemviews_qdatawidgetmapper.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_itemviews_qitemeditorfactory.cpp (renamed from doc/src/snippets/code/src_gui_itemviews_qitemeditorfactory.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_itemviews_qstandarditemmodel.cpp (renamed from doc/src/snippets/code/src_gui_itemviews_qstandarditemmodel.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_itemviews_qtablewidget.cpp (renamed from doc/src/snippets/code/src_gui_itemviews_qtablewidget.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_itemviews_qtreewidget.cpp (renamed from doc/src/snippets/code/src_gui_itemviews_qtreewidget.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_kernel_qaction.cpp (renamed from doc/src/snippets/code/src_gui_kernel_qaction.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_kernel_qapplication.cpp183
-rw-r--r--src/widgets/doc/snippets/code/src_gui_kernel_qformlayout.cpp (renamed from doc/src/snippets/code/src_gui_kernel_qformlayout.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_kernel_qlayout.cpp (renamed from doc/src/snippets/code/src_gui_kernel_qlayout.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_kernel_qlayoutitem.cpp (renamed from doc/src/snippets/code/src_gui_kernel_qlayoutitem.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_kernel_qshortcut.cpp (renamed from doc/src/snippets/code/src_gui_kernel_qshortcut.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_kernel_qwidget.cpp (renamed from doc/src/snippets/code/src_gui_kernel_qwidget.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_painting_qdrawutil.cpp (renamed from doc/src/snippets/code/src_gui_painting_qdrawutil.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_qproxystyle.cpp (renamed from doc/src/snippets/code/src_gui_qproxystyle.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_styles_qstyle.cpp (renamed from doc/src/snippets/code/src_gui_styles_qstyle.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_styles_qstyleoption.cpp (renamed from doc/src/snippets/code/src_gui_styles_qstyleoption.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_util_qcompleter.cpp (renamed from doc/src/snippets/code/src_gui_util_qcompleter.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_util_qundostack.cpp (renamed from doc/src/snippets/code/src_gui_util_qundostack.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_widgets_qabstractbutton.cpp (renamed from doc/src/snippets/code/src_gui_widgets_qabstractbutton.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_widgets_qabstractspinbox.cpp (renamed from doc/src/snippets/code/src_gui_widgets_qabstractspinbox.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_widgets_qcalendarwidget.cpp (renamed from doc/src/snippets/code/src_gui_widgets_qcalendarwidget.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_widgets_qcheckbox.cpp (renamed from doc/src/snippets/code/src_gui_widgets_qcheckbox.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_widgets_qdatetimeedit.cpp (renamed from doc/src/snippets/code/src_gui_widgets_qdatetimeedit.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_widgets_qdockwidget.cpp (renamed from doc/src/snippets/code/src_gui_widgets_qdockwidget.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_widgets_qframe.cpp (renamed from doc/src/snippets/code/src_gui_widgets_qframe.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_widgets_qgroupbox.cpp (renamed from doc/src/snippets/code/src_gui_widgets_qgroupbox.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_widgets_qlabel.cpp (renamed from doc/src/snippets/code/src_gui_widgets_qlabel.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_widgets_qlineedit.cpp (renamed from doc/src/snippets/code/src_gui_widgets_qlineedit.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_widgets_qmainwindow.cpp (renamed from doc/src/snippets/code/src_gui_widgets_qmainwindow.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_widgets_qmenu.cpp (renamed from doc/src/snippets/code/src_gui_widgets_qmenu.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_widgets_qmenubar.cpp (renamed from doc/src/snippets/code/src_gui_widgets_qmenubar.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_widgets_qplaintextedit.cpp (renamed from doc/src/snippets/code/src_gui_widgets_qplaintextedit.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_widgets_qpushbutton.cpp (renamed from doc/src/snippets/code/src_gui_widgets_qpushbutton.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_widgets_qradiobutton.cpp (renamed from doc/src/snippets/code/src_gui_widgets_qradiobutton.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_widgets_qrubberband.cpp (renamed from doc/src/snippets/code/src_gui_widgets_qrubberband.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_widgets_qscrollarea.cpp (renamed from doc/src/snippets/code/src_gui_widgets_qscrollarea.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_widgets_qspinbox.cpp (renamed from doc/src/snippets/code/src_gui_widgets_qspinbox.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_widgets_qsplashscreen.cpp (renamed from doc/src/snippets/code/src_gui_widgets_qsplashscreen.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_widgets_qsplitter.cpp (renamed from doc/src/snippets/code/src_gui_widgets_qsplitter.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_widgets_qstatusbar.cpp (renamed from doc/src/snippets/code/src_gui_widgets_qstatusbar.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_widgets_qtextbrowser.cpp (renamed from doc/src/snippets/code/src_gui_widgets_qtextbrowser.cpp)0
-rw-r--r--src/widgets/doc/snippets/code/src_gui_widgets_qtextedit.cpp (renamed from doc/src/snippets/code/src_gui_widgets_qtextedit.cpp)0
-rw-r--r--src/widgets/doc/snippets/customstyle/customstyle.cpp (renamed from doc/src/snippets/customstyle/customstyle.cpp)0
-rw-r--r--src/widgets/doc/snippets/customstyle/customstyle.h (renamed from doc/src/snippets/customstyle/customstyle.h)0
-rw-r--r--src/widgets/doc/snippets/customstyle/customstyle.pro2
-rw-r--r--src/widgets/doc/snippets/customstyle/main.cpp54
-rw-r--r--src/widgets/doc/snippets/customviewstyle.cpp (renamed from doc/src/snippets/customviewstyle.cpp)0
-rw-r--r--src/widgets/doc/snippets/dialogs/dialogs.cpp (renamed from doc/src/snippets/dialogs/dialogs.cpp)0
-rw-r--r--src/widgets/doc/snippets/dockwidgets/mainwindow.cpp (renamed from doc/src/snippets/dockwidgets/mainwindow.cpp)0
-rw-r--r--src/widgets/doc/snippets/filedialogurls.cpp (renamed from doc/src/snippets/filedialogurls.cpp)0
-rw-r--r--src/widgets/doc/snippets/graphicssceneadditemsnippet.cpp (renamed from doc/src/snippets/graphicssceneadditemsnippet.cpp)0
-rw-r--r--src/widgets/doc/snippets/itemselection/itemselection.pro3
-rw-r--r--src/widgets/doc/snippets/itemselection/main.cpp115
-rw-r--r--src/widgets/doc/snippets/itemselection/model.cpp238
-rw-r--r--src/widgets/doc/snippets/itemselection/model.h74
-rw-r--r--src/widgets/doc/snippets/javastyle.cpp (renamed from doc/src/snippets/javastyle.cpp)0
-rw-r--r--src/widgets/doc/snippets/layouts/layouts.cpp (renamed from doc/src/snippets/layouts/layouts.cpp)0
-rw-r--r--src/widgets/doc/snippets/mainwindowsnippet.cpp (renamed from doc/src/snippets/mainwindowsnippet.cpp)0
-rw-r--r--src/widgets/doc/snippets/mdiareasnippets.cpp (renamed from doc/src/snippets/mdiareasnippets.cpp)0
-rw-r--r--src/widgets/doc/snippets/myscrollarea.cpp (renamed from doc/src/snippets/myscrollarea.cpp)0
-rw-r--r--src/widgets/doc/snippets/qlistview-dnd/main.cpp51
-rw-r--r--src/widgets/doc/snippets/qlistview-dnd/mainwindow.cpp83
-rw-r--r--src/widgets/doc/snippets/qlistview-dnd/mainwindow.h (renamed from doc/src/snippets/code/src_gui_embedded_qmousetslib_qws.cpp)26
-rw-r--r--src/widgets/doc/snippets/qlistview-dnd/model.cpp167
-rw-r--r--src/widgets/doc/snippets/qlistview-dnd/model.h73
-rw-r--r--src/widgets/doc/snippets/qlistview-dnd/qlistview-dnd.pro5
-rw-r--r--src/widgets/doc/snippets/qlistwidget-dnd/main.cpp51
-rw-r--r--src/widgets/doc/snippets/qlistwidget-dnd/mainwindow.cpp87
-rw-r--r--src/widgets/doc/snippets/qlistwidget-dnd/mainwindow.h62
-rw-r--r--src/widgets/doc/snippets/qlistwidget-dnd/qlistwidget-dnd.pro3
-rw-r--r--src/widgets/doc/snippets/qlistwidget-using/mainwindow.cpp (renamed from doc/src/snippets/qlistwidget-using/mainwindow.cpp)0
-rw-r--r--src/widgets/doc/snippets/qmacnativewidget/main.mm (renamed from doc/src/snippets/qmacnativewidget/main.mm)0
-rw-r--r--src/widgets/doc/snippets/qsortfilterproxymodel/main.cpp77
-rw-r--r--src/widgets/doc/snippets/qsortfilterproxymodel/qsortfilterproxymodel.pro1
-rw-r--r--src/widgets/doc/snippets/qsplashscreen/main.cpp (renamed from doc/src/snippets/qsplashscreen/main.cpp)0
-rw-r--r--src/widgets/doc/snippets/qstackedlayout/main.cpp (renamed from doc/src/snippets/qstackedlayout/main.cpp)0
-rw-r--r--src/widgets/doc/snippets/qstackedwidget/main.cpp (renamed from doc/src/snippets/qstackedwidget/main.cpp)0
-rw-r--r--src/widgets/doc/snippets/qstyleoption/main.cpp (renamed from doc/src/snippets/qstyleoption/main.cpp)0
-rw-r--r--src/widgets/doc/snippets/qstyleplugin/main.cpp (renamed from doc/src/snippets/qstyleplugin/main.cpp)0
-rw-r--r--src/widgets/doc/snippets/qtablewidget-resizing/mainwindow.cpp (renamed from doc/src/snippets/qtablewidget-resizing/mainwindow.cpp)0
-rw-r--r--src/widgets/doc/snippets/qtablewidget-using/Images/cubed.pngbin0 -> 437 bytes
-rw-r--r--src/widgets/doc/snippets/qtablewidget-using/Images/squared.pngbin0 -> 440 bytes
-rw-r--r--src/widgets/doc/snippets/qtablewidget-using/images.qrc6
-rw-r--r--src/widgets/doc/snippets/qtablewidget-using/main.cpp51
-rw-r--r--src/widgets/doc/snippets/qtablewidget-using/mainwindow.cpp (renamed from doc/src/snippets/qtablewidget-using/mainwindow.cpp)0
-rw-r--r--src/widgets/doc/snippets/qtablewidget-using/mainwindow.h70
-rw-r--r--src/widgets/doc/snippets/qtablewidget-using/qtablewidget-using.pro4
-rw-r--r--src/widgets/doc/snippets/qtreewidget-using/mainwindow.cpp (renamed from doc/src/snippets/qtreewidget-using/mainwindow.cpp)0
-rw-r--r--src/widgets/doc/snippets/qtreewidgetitemiterator-using/mainwindow.cpp (renamed from doc/src/snippets/qtreewidgetitemiterator-using/mainwindow.cpp)0
-rw-r--r--src/widgets/doc/snippets/reading-selections/main.cpp59
-rw-r--r--src/widgets/doc/snippets/reading-selections/model.cpp238
-rw-r--r--src/widgets/doc/snippets/reading-selections/model.h74
-rw-r--r--src/widgets/doc/snippets/reading-selections/reading-selections.pro2
-rw-r--r--src/widgets/doc/snippets/reading-selections/window.cpp120
-rw-r--r--src/widgets/doc/snippets/reading-selections/window.h67
-rw-r--r--src/widgets/doc/snippets/shareddirmodel/main.cpp (renamed from doc/src/snippets/shareddirmodel/main.cpp)0
-rw-r--r--src/widgets/doc/snippets/sharedtablemodel/main.cpp89
-rw-r--r--src/widgets/doc/snippets/sharedtablemodel/model.cpp236
-rw-r--r--src/widgets/doc/snippets/sharedtablemodel/model.h74
-rw-r--r--src/widgets/doc/snippets/sharedtablemodel/sharedtablemodel.pro2
-rw-r--r--src/widgets/doc/snippets/simplemodel-use/main.cpp95
-rw-r--r--src/widgets/doc/snippets/simplemodel-use/simplemodel-use.pro1
-rw-r--r--src/widgets/doc/snippets/splitter/splitter.cpp (renamed from doc/src/snippets/splitter/splitter.cpp)0
-rw-r--r--src/widgets/doc/snippets/splitterhandle/splitter.cpp (renamed from doc/src/snippets/splitterhandle/splitter.cpp)0
-rw-r--r--src/widgets/doc/snippets/splitterhandle/splitter.h (renamed from doc/src/snippets/splitterhandle/splitter.h)0
-rw-r--r--src/widgets/doc/snippets/stringlistmodel/main.cpp83
-rw-r--r--src/widgets/doc/snippets/stringlistmodel/model.cpp211
-rw-r--r--src/widgets/doc/snippets/stringlistmodel/model.h (renamed from doc/src/snippets/code/src_gui_embedded_qtransportauth_qws.cpp)57
-rw-r--r--src/widgets/doc/snippets/stringlistmodel/stringlistmodel.pro3
-rw-r--r--src/widgets/doc/snippets/styles/styles.cpp (renamed from doc/src/snippets/styles/styles.cpp)0
-rw-r--r--src/widgets/doc/snippets/stylesheet/common-mistakes.cpp (renamed from doc/src/snippets/stylesheet/common-mistakes.cpp)0
-rw-r--r--src/widgets/doc/snippets/textdocument-imagedrop/textedit.cpp (renamed from doc/src/snippets/textdocument-imagedrop/textedit.cpp)0
-rw-r--r--src/widgets/doc/snippets/timeline/main.cpp (renamed from doc/src/snippets/timeline/main.cpp)0
-rw-r--r--src/widgets/doc/snippets/updating-selections/main.cpp59
-rw-r--r--src/widgets/doc/snippets/updating-selections/model.cpp236
-rw-r--r--src/widgets/doc/snippets/updating-selections/model.h74
-rw-r--r--src/widgets/doc/snippets/updating-selections/updating-selections.pro2
-rw-r--r--src/widgets/doc/snippets/updating-selections/window.cpp109
-rw-r--r--src/widgets/doc/snippets/updating-selections/window.h67
-rw-r--r--src/widgets/doc/snippets/whatsthis/whatsthis.cpp (renamed from doc/src/snippets/whatsthis/whatsthis.cpp)0
-rw-r--r--src/widgets/doc/snippets/widget-mask/main.cpp (renamed from doc/src/snippets/widget-mask/main.cpp)0
-rw-r--r--src/widgets/doc/snippets/widgetdelegate.cpp (renamed from doc/src/snippets/widgetdelegate.cpp)0
-rw-r--r--src/widgets/doc/snippets/widgets-tutorial/template.cpp (renamed from doc/src/snippets/widgets-tutorial/template.cpp)0
-rw-r--r--src/widgets/doc/src/addressbook-fr.qdoc (renamed from doc/src/widgets/addressbook-fr.qdoc)0
-rw-r--r--src/widgets/doc/src/addressbook.qdoc (renamed from doc/src/widgets/addressbook.qdoc)0
-rw-r--r--src/widgets/doc/src/model-view-programming.qdoc2339
-rw-r--r--src/widgets/doc/src/modelview.qdoc (renamed from doc/src/widgets/modelview.qdoc)30
-rw-r--r--src/widgets/doc/src/qtwidgets.qdoc (renamed from doc/src/widgets/qtwidgets.qdoc)4
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/focus.qdoc (renamed from doc/src/widgets/widgets-and-layouts/focus.qdoc)0
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/gallery-cde.qdoc (renamed from doc/src/widgets/widgets-and-layouts/gallery-cde.qdoc)0
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/gallery-cleanlooks.qdoc (renamed from doc/src/widgets/widgets-and-layouts/gallery-cleanlooks.qdoc)0
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/gallery-gtk.qdoc (renamed from doc/src/widgets/widgets-and-layouts/gallery-gtk.qdoc)0
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/gallery-macintosh.qdoc (renamed from doc/src/widgets/widgets-and-layouts/gallery-macintosh.qdoc)0
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/gallery-motif.qdoc (renamed from doc/src/widgets/widgets-and-layouts/gallery-motif.qdoc)0
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/gallery-plastique.qdoc (renamed from doc/src/widgets/widgets-and-layouts/gallery-plastique.qdoc)0
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/gallery-windows.qdoc (renamed from doc/src/widgets/widgets-and-layouts/gallery-windows.qdoc)0
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/gallery-windowsvista.qdoc (renamed from doc/src/widgets/widgets-and-layouts/gallery-windowsvista.qdoc)0
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/gallery-windowsxp.qdoc (renamed from doc/src/widgets/widgets-and-layouts/gallery-windowsxp.qdoc)0
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/gallery.qdoc (renamed from doc/src/widgets/widgets-and-layouts/gallery.qdoc)0
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/layout.qdoc (renamed from doc/src/widgets/widgets-and-layouts/layout.qdoc)52
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/styles.qdoc (renamed from doc/src/widgets/widgets-and-layouts/styles.qdoc)26
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc (renamed from doc/src/widgets/widgets-and-layouts/stylesheet.qdoc)320
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/widgets.qdoc (renamed from doc/src/widgets/widgets-and-layouts/widgets.qdoc)0
-rw-r--r--src/widgets/doc/src/widgets-tutorial.qdoc (renamed from doc/src/widgets/widgets-tutorial.qdoc)2
-rw-r--r--src/widgets/doc/src/windows-and-dialogs/dialogs.qdoc (renamed from doc/src/widgets/windows-and-dialogs/dialogs.qdoc)0
-rw-r--r--src/widgets/doc/src/windows-and-dialogs/mainwindow.qdoc (renamed from doc/src/widgets/windows-and-dialogs/mainwindow.qdoc)18
-rw-r--r--src/widgets/effects/qgraphicseffect.cpp6
-rw-r--r--src/widgets/effects/qpixmapfilter.cpp6
-rw-r--r--src/widgets/graphicsview/qgraphicsanchorlayout.cpp12
-rw-r--r--src/widgets/graphicsview/qgraphicsgridlayout.cpp2
-rw-r--r--src/widgets/graphicsview/qgraphicsitem.cpp48
-rw-r--r--src/widgets/graphicsview/qgraphicsitemanimation.cpp2
-rw-r--r--src/widgets/graphicsview/qgraphicslinearlayout.cpp2
-rw-r--r--src/widgets/graphicsview/qgraphicsproxywidget.cpp6
-rw-r--r--src/widgets/graphicsview/qgraphicsscene.cpp14
-rw-r--r--src/widgets/graphicsview/qgraphicssceneevent.cpp2
-rw-r--r--src/widgets/graphicsview/qgraphicsview.cpp16
-rw-r--r--src/widgets/graphicsview/qgraphicswidget.cpp6
-rw-r--r--src/widgets/itemviews/qabstractitemdelegate.cpp2
-rw-r--r--src/widgets/itemviews/qabstractitemview.cpp6
-rw-r--r--src/widgets/itemviews/qdatawidgetmapper.cpp6
-rw-r--r--src/widgets/itemviews/qitemdelegate.cpp20
-rw-r--r--src/widgets/itemviews/qitemeditorfactory.cpp8
-rw-r--r--src/widgets/itemviews/qlistwidget.cpp12
-rw-r--r--src/widgets/itemviews/qstandarditemmodel.cpp10
-rw-r--r--src/widgets/itemviews/qstyleditemdelegate.cpp18
-rw-r--r--src/widgets/itemviews/qtablewidget.cpp14
-rw-r--r--src/widgets/itemviews/qtreeview.cpp4
-rw-r--r--src/widgets/itemviews/qtreewidget.cpp6
-rw-r--r--src/widgets/itemviews/qtreewidgetitemiterator.cpp2
-rw-r--r--src/widgets/kernel/qaction.cpp10
-rw-r--r--src/widgets/kernel/qactiongroup.cpp6
-rw-r--r--src/widgets/kernel/qapplication.cpp36
-rw-r--r--src/widgets/kernel/qboxlayout.cpp24
-rw-r--r--src/widgets/kernel/qformlayout.cpp6
-rw-r--r--src/widgets/kernel/qicon.cpp10
-rw-r--r--src/widgets/kernel/qlayout.cpp4
-rw-r--r--src/widgets/kernel/qlayoutitem.cpp2
-rw-r--r--src/widgets/kernel/qshortcut.cpp10
-rw-r--r--src/widgets/kernel/qstackedlayout.cpp8
-rw-r--r--src/widgets/kernel/qwhatsthis.cpp2
-rw-r--r--src/widgets/kernel/qwidget.cpp30
-rw-r--r--src/widgets/styles/qdrawutil.cpp20
-rw-r--r--src/widgets/styles/qproxystyle.cpp2
-rw-r--r--src/widgets/styles/qstyle.cpp30
-rw-r--r--src/widgets/styles/qstyleoption.cpp8
-rw-r--r--src/widgets/styles/qstylepainter.cpp8
-rw-r--r--src/widgets/styles/qstyleplugin.cpp6
-rw-r--r--src/widgets/util/qcompleter.cpp6
-rw-r--r--src/widgets/util/qundostack.cpp12
-rw-r--r--src/widgets/widgets.pro3
-rw-r--r--src/widgets/widgets/qabstractbutton.cpp6
-rw-r--r--src/widgets/widgets/qabstractscrollarea.cpp4
-rw-r--r--src/widgets/widgets/qabstractspinbox.cpp4
-rw-r--r--src/widgets/widgets/qcalendarwidget.cpp12
-rw-r--r--src/widgets/widgets/qcheckbox.cpp2
-rw-r--r--src/widgets/widgets/qdatetimeedit.cpp14
-rw-r--r--src/widgets/widgets/qdialogbuttonbox.cpp8
-rw-r--r--src/widgets/widgets/qdockwidget.cpp2
-rw-r--r--src/widgets/widgets/qframe.cpp2
-rw-r--r--src/widgets/widgets/qgroupbox.cpp4
-rw-r--r--src/widgets/widgets/qlabel.cpp6
-rw-r--r--src/widgets/widgets/qlineedit.cpp2
-rw-r--r--src/widgets/widgets/qmaccocoaviewcontainer_mac.mm2
-rw-r--r--src/widgets/widgets/qmacnativewidget_mac.mm4
-rw-r--r--src/widgets/widgets/qmainwindow.cpp12
-rw-r--r--src/widgets/widgets/qmdiarea.cpp4
-rw-r--r--src/widgets/widgets/qmenu.cpp14
-rw-r--r--src/widgets/widgets/qmenubar.cpp12
-rw-r--r--src/widgets/widgets/qplaintextedit.cpp8
-rw-r--r--src/widgets/widgets/qpushbutton.cpp2
-rw-r--r--src/widgets/widgets/qradiobutton.cpp2
-rw-r--r--src/widgets/widgets/qrubberband.cpp2
-rw-r--r--src/widgets/widgets/qscrollarea.cpp2
-rw-r--r--src/widgets/widgets/qspinbox.cpp20
-rw-r--r--src/widgets/widgets/qsplashscreen.cpp6
-rw-r--r--src/widgets/widgets/qsplitter.cpp14
-rw-r--r--src/widgets/widgets/qstackedwidget.cpp8
-rw-r--r--src/widgets/widgets/qstatusbar.cpp6
-rw-r--r--src/widgets/widgets/qtextbrowser.cpp2
-rw-r--r--src/widgets/widgets/qtextedit.cpp14
-rw-r--r--src/xml/doc/doc.pri3
-rw-r--r--src/xml/xml.pro4
-rw-r--r--tests/tests.pro1
1114 files changed, 10274 insertions, 1418 deletions
diff --git a/doc/src/snippets/code/src_gui_embedded_qcopchannel_qws.cpp b/doc/src/snippets/code/src_gui_embedded_qcopchannel_qws.cpp
deleted file mode 100644
index 76b958dda3..0000000000
--- a/doc/src/snippets/code/src_gui_embedded_qcopchannel_qws.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the documentation 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$
-**
-****************************************************************************/
-
-//! [0]
-void MyClass::receive(const QString &message, const QByteArray &data)
-{
- QDataStream in(data);
- if (message == "execute(QString,QString)") {
- QString cmd;
- QString arg;
- in >> cmd >> arg;
- ...
- } else if (message == "delete(QString)") {
- QString fileName;
- in >> fileName;
- ...
- } else {
- ...
- }
-}
-//! [0]
-
-
-//! [1]
-QByteArray data;
-QDataStream out(&data, QIODevice::WriteOnly);
-out << QString("cat") << QString("file.txt");
-QCopChannel::send("System/Shell", "execute(QString,QString)", data);
-//! [1]
diff --git a/doc/src/snippets/code/src_gui_embedded_qmouse_qws.cpp b/doc/src/snippets/code/src_gui_embedded_qmouse_qws.cpp
deleted file mode 100644
index 8fc6140075..0000000000
--- a/doc/src/snippets/code/src_gui_embedded_qmouse_qws.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the documentation 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$
-**
-****************************************************************************/
-
-//! [0]
-s*Xs = a*Xd + b*Yd + c
-s*Ys = d*Xd + e*Yd + f
-//! [0]
diff --git a/doc/src/snippets/code/src_gui_embedded_qwindowsystem_qws.cpp b/doc/src/snippets/code/src_gui_embedded_qwindowsystem_qws.cpp
deleted file mode 100644
index 66308f3405..0000000000
--- a/doc/src/snippets/code/src_gui_embedded_qwindowsystem_qws.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the documentation 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$
-**
-****************************************************************************/
-
-//! [0]
-bool MyScreenSaver::save( int level )
-{
- switch ( level ) {
- case 0:
- if ( dim_enabled ) {
- // dim the screen
- }
- return true;
- case 1:
- if ( screenoff_enabled ) {
- // turn off the screen
- }
- return true;
- case 2:
- if ( suspend_enabled ) {
- // suspend
- }
- return true;
- default:
- return false;
- }
-}
-
-...
-
-int timings[4];
-timings[0] = 5000; // dim after 5 seconds
-timings[1] = 10000; // light off after 15 seconds
-timings[2] = 45000; // suspend after 60 seconds
-timings[3] = 0;
-QWSServer::setScreenSaverIntervals( timings );
-
-// ignore the key/mouse event that turns on the screen
-int blocklevel = 1;
-if ( !screenoff_enabled ) {
- // screenoff is disabled, ignore the key/mouse event that wakes from suspend
- blocklevel = 2;
- if ( !suspend_enabled ) {
- // suspend is disabled, never ignore events
- blocklevel = -1;
- }
-}
-QWSServer::setScreenSaverBlockLevel( blocklevel );
-//! [0]
diff --git a/examples/examples.pro b/examples/examples.pro
index 2180d18587..7ce42d7fe7 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,4 +1,6 @@
TEMPLATE = subdirs
+CONFIG += no_docs_target
+
SUBDIRS = \
network \
statemachine \
diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
index 874b4bf424..0a0fd8dfa8 100644
--- a/mkspecs/features/default_post.prf
+++ b/mkspecs/features/default_post.prf
@@ -64,3 +64,30 @@ QMAKE_LIBDIR += $$QMAKE_LIBDIR_POST
QMAKE_EXTRA_TARGETS += check
}
+# Let every project have a 'docs' target
+!contains(QMAKE_EXTRA_TARGETS, docs) {
+ contains(TEMPLATE, subdirs) {
+ # `make docs' should iterate through all subdirs
+ # (except those with no_default_target or no_docs_target)
+ !contains(CONFIG, no_docs_target):for(subdir, SUBDIRS) {
+ subdir_config = $$eval($${subdir}.CONFIG)
+ !contains(subdir_config, no_docs_target):!contains(subdir_config, no_default_target):docs.recurse += $$subdir
+ unset(subdir_config)
+ }
+ !isEmpty(docs.recurse) {
+ # setup the recurse target only when there is something to recurse into
+ docs.CONFIG = recursive
+ docs.recurse_target = docs
+ }
+ } else {
+ # apps and libs only generate docs if QMAKE_DOCS is set
+ !isEmpty(QMAKE_DOCS) {
+ !exists($$QMAKE_DOCS):error("Cannot find documentation specification file $$QMAKE_DOCS")
+ exists($$[QT_INSTALL_DOCS]):QMAKE_DOCS_INDEX *= $$[QT_INSTALL_DOCS]
+ qtPrepareTool(QDOC, qdoc)
+ for(index, QMAKE_DOCS_INDEX):QDOC_INDEX += -indexdir $$index
+ docs.commands += $$QDOC $$QMAKE_DOCS_OPTIONS $$QDOC_INDEX $$QMAKE_DOCS
+ }
+ }
+ QMAKE_EXTRA_TARGETS += docs
+}
diff --git a/src/concurrent/concurrent.pro b/src/concurrent/concurrent.pro
index 6bf16e6a0a..54359f7d3b 100644
--- a/src/concurrent/concurrent.pro
+++ b/src/concurrent/concurrent.pro
@@ -57,6 +57,9 @@ HEADERS += \
qfutureinterface_p.h \
qfuturewatcher_p.h
+QMAKE_DOCS = $$PWD/doc/qtconcurrent.qdocconf
+QMAKE_DOCS_INDEX = ../../doc
+
contains(QT_CONFIG, clock-gettime) {
linux-*|hpux-*|solaris-*:LIBS *= -lrt
}
diff --git a/src/concurrent/doc/qtconcurrent.qdocconf b/src/concurrent/doc/qtconcurrent.qdocconf
new file mode 100644
index 0000000000..d8d66a92c9
--- /dev/null
+++ b/src/concurrent/doc/qtconcurrent.qdocconf
@@ -0,0 +1,92 @@
+include(../../../doc/global/qt-cpp-ignore.qdocconf)
+
+project = QtConcurrent
+description = Qt Concurrent Reference Documentation
+url = http://qt-project.org/doc/qt-5.0/qtconcurrent
+version = 5.0.0
+
+sourceencoding = UTF-8
+outputencoding = UTF-8
+naturallanguage = en_US
+qhp.projects = QtConcurrent
+
+qhp.QtConcurrent.file = qtconcurrent.qhp
+qhp.QtConcurrent.namespace = org.qt-project.qtconcurrent.500
+qhp.QtConcurrent.virtualFolder = qdoc
+qhp.QtConcurrent.indexTitle = Qt Concurrent Reference Documentation
+qhp.QtConcurrent.indexRoot =
+
+qhp.QtConcurrent.filterAttributes = qtconcurrent 5.0.0 qtrefdoc
+qhp.QtConcurrent.customFilters.Qt.name = QtConcurrent 5.0.0
+qhp.QtConcurrent.customFilters.Qt.filterAttributes = qtconcurrent 5.0.0
+qhp.QtConcurrent.subprojects = classes overviews examples
+qhp.QtConcurrent.subprojects.classes.title = Classes
+qhp.QtConcurrent.subprojects.classes.indexTitle = Qt Concurrent's Classes
+qhp.QtConcurrent.subprojects.classes.selectors = class fake:headerfile
+qhp.QtConcurrent.subprojects.classes.sortPages = true
+qhp.QtConcurrent.subprojects.overviews.title = Overviews
+qhp.QtConcurrent.subprojects.overviews.indexTitle = All Overviews and HOWTOs
+qhp.QtConcurrent.subprojects.overviews.selectors = fake:page,group,module
+qhp.QtConcurrent.subprojects.examples.title = Qt Concurrent Examples
+qhp.QtConcurrent.subprojects.examples.indexTitle = Qt Concurrent Examples
+qhp.QtConcurrent.subprojects.examples.selectors = fake:example
+
+dita.metadata.default.author = Qt Project
+dita.metadata.default.permissions = all
+dita.metadata.default.publisher = Qt Project
+dita.metadata.default.copyryear = 2012
+dita.metadata.default.copyrholder = Nokia
+dita.metadata.default.audience = programmer
+
+sources.fileextensions = "*.c++ *.cc *.cpp *.cxx *.mm *.qml *.qdoc"
+headers.fileextensions = "*.ch *.h *.h++ *.hh *.hpp *.hxx"
+
+examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml *.css"
+examples.imageextensions = "*.png"
+
+outputdir = ../../../doc/qtconcurrent
+tagfile = ../../../doc/qtconcurrent/qtconcurrent.tags
+
+HTML.generatemacrefs = "true"
+HTML.nobreadcrumbs = "true"
+
+HTML.templatedir = .
+
+HTML.stylesheets = ../../../doc/global/style/offline.css
+
+HTML.headerstyles = \
+ " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n"
+
+HTML.endheader = \
+ "</head>\n" \
+
+defines = Q_QDOC \
+ QT_.*_SUPPORT \
+ QT_.*_LIB \
+ QT_COMPAT \
+ QT_KEYPAD_NAVIGATION \
+ QT_NO_EGL \
+ Q_WS_.* \
+ Q_OS_.* \
+ Q_BYTE_ORDER \
+ QT_DEPRECATED \
+ QT_DEPRECATED_* \
+ Q_NO_USING_KEYWORD \
+ __cplusplus \
+ Q_COMPILER_INITIALIZER_LISTS
+
+versionsym = QT_VERSION_STR
+
+codeindent = 1
+
+depends += qtcore
+
+headerdirs += ..
+
+sourcedirs += ..
+
+exampledirs += ../../../examples \
+ ../ \
+ snippets
+
+imagedirs += images
diff --git a/doc/src/snippets/code/src_corelib_concurrent_qfuture.cpp b/src/concurrent/doc/snippets/code/src_concurrent_qfuture.cpp
index ddf075b6ca..ddf075b6ca 100644
--- a/doc/src/snippets/code/src_corelib_concurrent_qfuture.cpp
+++ b/src/concurrent/doc/snippets/code/src_concurrent_qfuture.cpp
diff --git a/doc/src/snippets/code/src_corelib_concurrent_qfuturesynchronizer.cpp b/src/concurrent/doc/snippets/code/src_concurrent_qfuturesynchronizer.cpp
index 77003791e9..77003791e9 100644
--- a/doc/src/snippets/code/src_corelib_concurrent_qfuturesynchronizer.cpp
+++ b/src/concurrent/doc/snippets/code/src_concurrent_qfuturesynchronizer.cpp
diff --git a/doc/src/snippets/code/src_corelib_concurrent_qfuturewatcher.cpp b/src/concurrent/doc/snippets/code/src_concurrent_qfuturewatcher.cpp
index 703275bc7a..703275bc7a 100644
--- a/doc/src/snippets/code/src_corelib_concurrent_qfuturewatcher.cpp
+++ b/src/concurrent/doc/snippets/code/src_concurrent_qfuturewatcher.cpp
diff --git a/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentexception.cpp b/src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentexception.cpp
index cf0257c45b..cf0257c45b 100644
--- a/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentexception.cpp
+++ b/src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentexception.cpp
diff --git a/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentfilter.cpp b/src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentfilter.cpp
index 2acf467e9a..2acf467e9a 100644
--- a/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentfilter.cpp
+++ b/src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentfilter.cpp
diff --git a/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentmap.cpp b/src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentmap.cpp
index 9b83ad5bef..9b83ad5bef 100644
--- a/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentmap.cpp
+++ b/src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentmap.cpp
diff --git a/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp b/src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentrun.cpp
index 362f084092..362f084092 100644
--- a/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp
+++ b/src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentrun.cpp
diff --git a/src/concurrent/qfuture.cpp b/src/concurrent/qfuture.cpp
index 9805454cb2..f8151f3228 100644
--- a/src/concurrent/qfuture.cpp
+++ b/src/concurrent/qfuture.cpp
@@ -374,7 +374,7 @@
QFuture::constBegin() or QFuture::constEnd() before you start iterating.
Here's a typical loop that prints all the results available in a future:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qfuture.cpp 0
+ \snippet code/src_concurrent_qfuture.cpp 0
\sa QFutureIterator, QFuture
*/
@@ -555,7 +555,7 @@
list (i.e. before the first result). Here's how to iterate over all the
results sequentially:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qfuture.cpp 1
+ \snippet code/src_concurrent_qfuture.cpp 1
The next() function returns the next result (waiting for it to become
available, if necessary) from the future and advances the iterator. Unlike
@@ -570,7 +570,7 @@
Here's how to iterate over the elements in reverse order:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qfuture.cpp 2
+ \snippet code/src_concurrent_qfuture.cpp 2
If you want to find all occurrences of a particular value, use findNext()
or findPrevious() in a loop.
diff --git a/src/concurrent/qfuturesynchronizer.cpp b/src/concurrent/qfuturesynchronizer.cpp
index 34b00daf4f..3bb81e06c4 100644
--- a/src/concurrent/qfuturesynchronizer.cpp
+++ b/src/concurrent/qfuturesynchronizer.cpp
@@ -57,7 +57,7 @@
an easy way to ensure that all futures have finished before returning from
a function:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qfuturesynchronizer.cpp 0
+ \snippet code/src_concurrent_qfuturesynchronizer.cpp 0
The behavior of waitForFinished() can be changed using the
setCancelOnWait() function. Calling setCancelOnWait(true) will cause
diff --git a/src/concurrent/qfuturewatcher.cpp b/src/concurrent/qfuturewatcher.cpp
index 9153fe5d40..eb5fb0e18d 100644
--- a/src/concurrent/qfuturewatcher.cpp
+++ b/src/concurrent/qfuturewatcher.cpp
@@ -86,7 +86,7 @@ QT_BEGIN_NAMESPACE
Example: Starting a computation and getting a slot callback when it's
finished:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qfuturewatcher.cpp 0
+ \snippet code/src_concurrent_qfuturewatcher.cpp 0
Be aware that not all asynchronous computations can be canceled or paused.
For example, the future returned by QtConcurrent::run() cannot be
diff --git a/src/concurrent/qtconcurrentexception.cpp b/src/concurrent/qtconcurrentexception.cpp
index 57eb604d39..a13ddb3173 100644
--- a/src/concurrent/qtconcurrentexception.cpp
+++ b/src/concurrent/qtconcurrentexception.cpp
@@ -56,12 +56,12 @@ QT_BEGIN_NAMESPACE
boundaries, provided that the exception inherit from QtConcurrent::Exception
and implement two helper functions:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentexception.cpp 0
+ \snippet code/src_concurrent_qtconcurrentexception.cpp 0
QtConcurrent::Exception subclasses must be thrown by value and
caught by reference:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentexception.cpp 1
+ \snippet code/src_concurrent_qtconcurrentexception.cpp 1
If you throw an exception that is not a subclass of QtConcurrent::Exception,
the Qt Concurrent functions will throw a QtConcurrent::UnhandledException
@@ -80,14 +80,14 @@ QT_BEGIN_NAMESPACE
\fn QtConcurrent::Exception::raise() const
In your QtConcurrent::Exception subclass, reimplement raise() like this:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentexception.cpp 2
+ \snippet code/src_concurrent_qtconcurrentexception.cpp 2
*/
/*!
\fn QtConcurrent::Exception::clone() const
In your QtConcurrent::Exception subclass, reimplement clone() like this:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentexception.cpp 3
+ \snippet code/src_concurrent_qtconcurrentexception.cpp 3
*/
/*!
diff --git a/src/concurrent/qtconcurrentfilter.cpp b/src/concurrent/qtconcurrentfilter.cpp
index 76ce8ca659..8a87af2868 100644
--- a/src/concurrent/qtconcurrentfilter.cpp
+++ b/src/concurrent/qtconcurrentfilter.cpp
@@ -60,7 +60,7 @@
result instead of a QFuture. You use them in the same way as the
asynchronous variants.
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentfilter.cpp 6
+ \snippet code/src_concurrent_qtconcurrentfilter.cpp 6
Note that the result types above are not QFuture objects, but real result
types (in this case, QStringList and QSet<QString>).
@@ -73,7 +73,7 @@
The filter function must be of the form:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentfilter.cpp 0
+ \snippet code/src_concurrent_qtconcurrentfilter.cpp 0
T must match the type stored in the sequence. The function returns true if
the item should be kept, false if it should be discarded.
@@ -81,7 +81,7 @@
This example shows how to keep strings that are all lower-case from a
QStringList:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentfilter.cpp 1
+ \snippet code/src_concurrent_qtconcurrentfilter.cpp 1
The results of the filter are made available through QFuture. See the
QFuture and QFutureWatcher documentation for more information on how to
@@ -89,7 +89,7 @@
If you want to modify a sequence in-place, use QtConcurrent::filter():
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentfilter.cpp 2
+ \snippet code/src_concurrent_qtconcurrentfilter.cpp 2
Since the sequence is modified in place, QtConcurrent::filter() does not
return any results via QFuture. However, you can still use QFuture and
@@ -103,7 +103,7 @@
The reduce function must be of the form:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentfilter.cpp 3
+ \snippet code/src_concurrent_qtconcurrentfilter.cpp 3
T is the type of the final result, U is the type of items being filtered.
Note that the return value and return type of the reduce function are not
@@ -111,7 +111,7 @@
Call QtConcurrent::filteredReduced() like this:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentfilter.cpp 4
+ \snippet code/src_concurrent_qtconcurrentfilter.cpp 4
The reduce function will be called once for each result kept by the filter
function, and should merge the \e{intermediate} into the \e{result}
@@ -128,7 +128,7 @@
instead of a sequence. You use them in the same way as the sequence
variants:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentfilter.cpp 5
+ \snippet code/src_concurrent_qtconcurrentfilter.cpp 5
\section2 Using Member Functions
@@ -137,12 +137,12 @@
QtConcurrent::filteredReduced() accept pointers to member functions.
The member function class type must match the type stored in the sequence:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentfilter.cpp 7
+ \snippet code/src_concurrent_qtconcurrentfilter.cpp 7
Note that when using QtConcurrent::filteredReduced(), you can mix the use of
normal and member functions freely:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentfilter.cpp 8
+ \snippet code/src_concurrent_qtconcurrentfilter.cpp 8
\section2 Using Function Objects
@@ -151,7 +151,7 @@
add state to a function call. The result_type typedef must define the
result type of the function call operator:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentfilter.cpp 13
+ \snippet code/src_concurrent_qtconcurrentfilter.cpp 13
\section2 Using Bound Function Arguments
@@ -167,7 +167,7 @@
As an example, we use QString::contains():
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentfilter.cpp 9
+ \snippet code/src_concurrent_qtconcurrentfilter.cpp 9
QString::contains() takes 2 arguments (including the "this" pointer) and
can't be used with QtConcurrent::filtered() directly, because
@@ -175,17 +175,17 @@
use QString::contains() with QtConcurrent::filtered() we have to provide a
value for the \e regexp argument:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentfilter.cpp 10
+ \snippet code/src_concurrent_qtconcurrentfilter.cpp 10
The return value from boost::bind() is a function object (functor) with
the following signature:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentfilter.cpp 11
+ \snippet code/src_concurrent_qtconcurrentfilter.cpp 11
This matches what QtConcurrent::filtered() expects, and the complete
example becomes:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentfilter.cpp 12
+ \snippet code/src_concurrent_qtconcurrentfilter.cpp 12
*/
/*!
diff --git a/src/concurrent/qtconcurrentmap.cpp b/src/concurrent/qtconcurrentmap.cpp
index 1758cb9e95..c446064327 100644
--- a/src/concurrent/qtconcurrentmap.cpp
+++ b/src/concurrent/qtconcurrentmap.cpp
@@ -95,7 +95,7 @@
the final result instead of a QFuture. You use them in the same
way as the asynchronous variants.
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentmap.cpp 7
+ \snippet code/src_concurrent_qtconcurrentmap.cpp 7
Note that the result types above are not QFuture objects, but real result
types (in this case, QList<QImage> and QImage).
@@ -108,7 +108,7 @@
The map function must be of the form:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentmap.cpp 0
+ \snippet code/src_concurrent_qtconcurrentmap.cpp 0
T and U can be any type (and they can even be the same type), but T must
match the type stored in the sequence. The function returns the modified
@@ -117,7 +117,7 @@
This example shows how to apply a scale function to all the items
in a sequence:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentmap.cpp 1
+ \snippet code/src_concurrent_qtconcurrentmap.cpp 1
The results of the map are made available through QFuture. See the
QFuture and QFutureWatcher documentation for more information on how to
@@ -126,14 +126,14 @@
If you want to modify a sequence in-place, use QtConcurrent::map(). The
map function must then be of the form:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentmap.cpp 2
+ \snippet code/src_concurrent_qtconcurrentmap.cpp 2
Note that the return value and return type of the map function are not
used.
Using QtConcurrent::map() is similar to using QtConcurrent::mapped():
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentmap.cpp 3
+ \snippet code/src_concurrent_qtconcurrentmap.cpp 3
Since the sequence is modified in place, QtConcurrent::map() does not
return any results via QFuture. However, you can still use QFuture and
@@ -147,7 +147,7 @@
The reduce function must be of the form:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentmap.cpp 4
+ \snippet code/src_concurrent_qtconcurrentmap.cpp 4
T is the type of the final result, U is the return type of the map
function. Note that the return value and return type of the reduce
@@ -155,7 +155,7 @@
Call QtConcurrent::mappedReduced() like this:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentmap.cpp 5
+ \snippet code/src_concurrent_qtconcurrentmap.cpp 5
The reduce function will be called once for each result returned by the map
function, and should merge the \e{intermediate} into the \e{result}
@@ -175,7 +175,7 @@
instead of a sequence. You use them in the same way as the sequence
variants:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentmap.cpp 6
+ \snippet code/src_concurrent_qtconcurrentmap.cpp 6
\section2 Blocking Variants
@@ -183,7 +183,7 @@
the final result instead of a QFuture. You use them in the same
way as the asynchronous variants.
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentmap.cpp 7
+ \snippet code/src_concurrent_qtconcurrentmap.cpp 7
Note that the result types above are not QFuture objects, but real result
types (in this case, QList<QImage> and QImage).
@@ -194,12 +194,12 @@
QtConcurrent::mappedReduced() accept pointers to member functions.
The member function class type must match the type stored in the sequence:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentmap.cpp 8
+ \snippet code/src_concurrent_qtconcurrentmap.cpp 8
Note that when using QtConcurrent::mappedReduced(), you can mix the use of
normal and member functions freely:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentmap.cpp 9
+ \snippet code/src_concurrent_qtconcurrentmap.cpp 9
\section2 Using Function Objects
@@ -208,7 +208,7 @@
add state to a function call. The result_type typedef must define the
result type of the function call operator:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentmap.cpp 14
+ \snippet code/src_concurrent_qtconcurrentmap.cpp 14
\section2 Using Bound Function Arguments
@@ -224,7 +224,7 @@
As an example, we'll use QImage::scaledToWidth():
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentmap.cpp 10
+ \snippet code/src_concurrent_qtconcurrentmap.cpp 10
scaledToWidth takes three arguments (including the "this" pointer) and
can't be used with QtConcurrent::mapped() directly, because
@@ -232,17 +232,17 @@
QImage::scaledToWidth() with QtConcurrent::mapped() we have to provide a
value for the \e{width} and the \e{transformation mode}:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentmap.cpp 11
+ \snippet code/src_concurrent_qtconcurrentmap.cpp 11
The return value from boost::bind() is a function object (functor) with
the following signature:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentmap.cpp 12
+ \snippet code/src_concurrent_qtconcurrentmap.cpp 12
This matches what QtConcurrent::mapped() expects, and the complete example
becomes:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentmap.cpp 13
+ \snippet code/src_concurrent_qtconcurrentmap.cpp 13
*/
/*!
diff --git a/src/concurrent/qtconcurrentrun.cpp b/src/concurrent/qtconcurrentrun.cpp
index 656ecf7370..2cf46ac5a1 100644
--- a/src/concurrent/qtconcurrentrun.cpp
+++ b/src/concurrent/qtconcurrentrun.cpp
@@ -57,7 +57,7 @@
To run a function in another thread, use QtConcurrent::run():
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp 0
+ \snippet code/src_concurrent_qtconcurrentrun.cpp 0
This will run \e aFunction in a separate thread obtained from the default
QThreadPool. You can use the QFuture and QFutureWatcher classes to monitor
@@ -68,7 +68,7 @@
Passing arguments to the function is done by adding them to the
QtConcurrent::run() call immediately after the function name. For example:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp 1
+ \snippet code/src_concurrent_qtconcurrentrun.cpp 1
A copy of each argument is made at the point where QtConcurrent::run() is
called, and these values are passed to the thread when it begins executing
@@ -79,11 +79,11 @@
Any return value from the function is available via QFuture:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp 2
+ \snippet code/src_concurrent_qtconcurrentrun.cpp 2
As documented above, passing arguments is done like this:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp 3
+ \snippet code/src_concurrent_qtconcurrentrun.cpp 3
Note that the QFuture::result() function blocks and waits for the result
to become available. Use QFutureWatcher to get notification when the
@@ -102,11 +102,11 @@
For example, calling QByteArray::split() (a const member function) in a
separate thread is done like this:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp 4
+ \snippet code/src_concurrent_qtconcurrentrun.cpp 4
Calling a non-const member function is done like this:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp 5
+ \snippet code/src_concurrent_qtconcurrentrun.cpp 5
\section2 Using Bound Function Arguments
@@ -131,7 +131,7 @@
Calling a bound function is done like this:
- \snippet doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp 6
+ \snippet code/src_concurrent_qtconcurrentrun.cpp 6
*/
/*!
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro
index d98cebb672..4856c1b5fb 100644
--- a/src/corelib/corelib.pro
+++ b/src/corelib/corelib.pro
@@ -16,6 +16,9 @@ load(qt_module_config)
HEADERS += $$QT_SOURCE_TREE/src/corelib/qtcoreversion.h
+QMAKE_DOCS = $$PWD/doc/qtcore.qdocconf
+QMAKE_DOCS_INDEX = ../../doc
+
include(animation/animation.pri)
include(arch/arch.pri)
include(global/global.pri)
@@ -30,7 +33,6 @@ include(codecs/codecs.pri)
include(statemachine/statemachine.pri)
include(mimetypes/mimetypes.pri)
include(xml/xml.pri)
-include(doc/doc.pri)
mac|darwin {
!ios {
diff --git a/src/corelib/doc/doc.pri b/src/corelib/doc/doc.pri
deleted file mode 100644
index ed970d7592..0000000000
--- a/src/corelib/doc/doc.pri
+++ /dev/null
@@ -1,3 +0,0 @@
-qtPrepareTool(QDOC, qdoc)
-docs.commands += $$QDOC $$QT.core.sources/doc/qtcore.qdocconf
-QMAKE_EXTRA_TARGETS += docs
diff --git a/doc/src/images/resources.png b/src/corelib/doc/images/resources.png
index eb7af96d77..eb7af96d77 100644
--- a/doc/src/images/resources.png
+++ b/src/corelib/doc/images/resources.png
Binary files differ
diff --git a/doc/src/snippets/code/doc_src_resources.cpp b/src/corelib/doc/snippets/code/doc_src_resources.cpp
index f401add728..f401add728 100644
--- a/doc/src/snippets/code/doc_src_resources.cpp
+++ b/src/corelib/doc/snippets/code/doc_src_resources.cpp
diff --git a/doc/src/snippets/code/doc_src_resources.qdoc b/src/corelib/doc/snippets/code/doc_src_resources.qdoc
index c51dbbcbf3..c51dbbcbf3 100644
--- a/doc/src/snippets/code/doc_src_resources.qdoc
+++ b/src/corelib/doc/snippets/code/doc_src_resources.qdoc
diff --git a/src/corelib/doc/src/io.qdoc b/src/corelib/doc/src/io.qdoc
new file mode 100644
index 0000000000..dfe9be2b3c
--- /dev/null
+++ b/src/corelib/doc/src/io.qdoc
@@ -0,0 +1,39 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** 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$
+**
+****************************************************************************/
+
+/*!
+ \group io
+ \title Input/Output and Networking
+ \ingroup groups
+
+ \brief Classes providing file input and output along with directory and
+ network handling.
+
+ These classes are used to handle input and output to and from external
+ devices, processes, files etc. as well as manipulating files and directories.
+*/
+
diff --git a/doc/src/network/files-and-resources/resources.qdoc b/src/corelib/doc/src/resource-system.qdoc
index 1d0fc51631..89a099a1c1 100644
--- a/doc/src/network/files-and-resources/resources.qdoc
+++ b/src/corelib/doc/src/resource-system.qdoc
@@ -26,18 +26,6 @@
****************************************************************************/
/*!
- \group io
- \title Input/Output and Networking
- \ingroup groups
-
- \brief Classes providing file input and output along with directory and
- network handling.
-
- These classes are used to handle input and output to and from external
- devices, processes, files etc. as well as manipulating files and directories.
-*/
-
-/*!
\page resources.html
\title The Qt Resource System
\ingroup qt-network
@@ -89,14 +77,14 @@
is \c images/cut.png. This can be changed using the \c file tag's
\c alias attribute:
- \snippet doc/src/snippets/code/doc_src_resources.qdoc 0
+ \snippet code/doc_src_resources.qdoc 0
The file is then accessible as \c :/cut-img.png from the
application. It is also possible to specify a path prefix for all
files in the \c .qrc file using the \c qresource tag's \c prefix
attribute:
- \snippet doc/src/snippets/code/doc_src_resources.qdoc 1
+ \snippet code/doc_src_resources.qdoc 1
In this case, the file is accessible as \c
:/myresources/cut-img.png.
@@ -106,7 +94,7 @@
attribute to the \c qresource tag, specifying a suitable locale
string. For example:
- \snippet doc/src/snippets/code/doc_src_resources.qdoc 2
+ \snippet code/doc_src_resources.qdoc 2
If the user's locale is French (i.e., QLocale::system().name() returns
"fr_FR"), \c :/cut.jpg becomes a reference to the \c cut_fr.jpg
@@ -126,11 +114,11 @@
For example, a set of resource data specified in a \c .qrc file can be
compiled in the following way:
- \snippet doc/src/snippets/code/doc_src_resources.qdoc 3
+ \snippet code/doc_src_resources.qdoc 3
In the application, this resource would be registered with code like this:
- \snippet doc/src/snippets/code/doc_src_resources.cpp 4
+ \snippet code/doc_src_resources.cpp 4
\section2 Compiled-In Resources
@@ -138,7 +126,7 @@
mentioned in the application's \c .pro file so that \c qmake knows
about it. For example:
- \snippet examples/mainwindows/application/application.pro 0
+ \snippet mainwindows/application/application.pro 0
\c qmake will produce make rules to generate a file called \c
qrc_application.cpp that is linked into the application. This
@@ -183,7 +171,7 @@
pass a resource path instead of a file name to the QIcon, QImage,
or QPixmap constructor:
- \snippet examples/mainwindows/application/mainwindow.cpp 21
+ \snippet mainwindows/application/mainwindow.cpp 21
See the \l{mainwindows/application}{Application} example for an
actual application that uses Qt's resource system to store its
@@ -205,7 +193,7 @@
Q_INIT_RESOURCE() with the base name of the \c .qrc file. For
example:
- \snippet doc/src/snippets/code/doc_src_resources.cpp 5
+ \snippet code/doc_src_resources.cpp 5
Similarly, if you must unload a set of resources explicitly
(because a plugin is being unloaded or the resources are not valid
diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp
index 52ffae5f98..ed845745be 100644
--- a/src/corelib/global/qlogging.cpp
+++ b/src/corelib/global/qlogging.cpp
@@ -737,7 +737,7 @@ void qWinMessageHandler2(QtMsgType t, const QMessageLogContext &context,
This is a typedef for a pointer to a function with the following
signature:
- \snippet doc/src/snippets/code/src_corelib_global_qglobal.cpp 7
+ \snippet code/src_corelib_global_qglobal.cpp 7
This typedef is deprecated, you should use QtMessageHandler instead.
\sa QtMsgType, QtMessageHandler, qInstallMsgHandler(), qInstallMessageHandler()
@@ -751,7 +751,7 @@ void qWinMessageHandler2(QtMsgType t, const QMessageLogContext &context,
This is a typedef for a pointer to a function with the following
signature:
- \snippet doc/src/snippets/code/src_corelib_global_qglobal.cpp 49
+ \snippet code/src_corelib_global_qglobal.cpp 49
\sa QtMsgType, qInstallMessageHandler()
*/
@@ -785,7 +785,7 @@ void qWinMessageHandler2(QtMsgType t, const QMessageLogContext &context,
Example:
- \snippet doc/src/snippets/code/src_corelib_global_qglobal.cpp 23
+ \snippet code/src_corelib_global_qglobal.cpp 23
\sa QtMessageHandler, QtMsgType, qDebug(), qWarning(), qCritical(), qFatal(),
{Debugging Techniques}
diff --git a/src/corelib/io/qfiledevice.cpp b/src/corelib/io/qfiledevice.cpp
index 17eedb0bdd..e1f1db9ead 100644
--- a/src/corelib/io/qfiledevice.cpp
+++ b/src/corelib/io/qfiledevice.cpp
@@ -146,12 +146,12 @@ void QFileDevicePrivate::setError(QFileDevice::FileError err, int errNum)
handling considerably. It is possible to force permission checking
on NTFS by including the following code in your source:
- \snippet doc/src/snippets/ntfsp.cpp 0
+ \snippet ntfsp.cpp 0
Permission checking is then turned on and off by incrementing and
decrementing \c qt_ntfs_permission_lookup by 1.
- \snippet doc/src/snippets/ntfsp.cpp 1
+ \snippet ntfsp.cpp 1
*/
//************* QFileDevice
diff --git a/src/corelib/io/qurlquery.cpp b/src/corelib/io/qurlquery.cpp
index 2e2db11558..5625aebd3c 100644
--- a/src/corelib/io/qurlquery.cpp
+++ b/src/corelib/io/qurlquery.cpp
@@ -511,7 +511,7 @@ QString QUrlQuery::query(QUrl::ComponentFormattingOptions encoding) const
If \a valueDelimiter is set to '(' and \a pairDelimiter is ')',
the above query string would instead be represented like this:
- \snippet doc/src/snippets/code/src_corelib_io_qurl.cpp 4
+ \snippet code/src_corelib_io_qurl.cpp 4
\note Non-standard delimiters should be chosen from among what RFC 3986 calls
"sub-delimiters". They are:
diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp
index 10dcff92c7..3172014363 100644
--- a/src/corelib/tools/qhash.cpp
+++ b/src/corelib/tools/qhash.cpp
@@ -838,7 +838,7 @@ void QHashData::checkSanity()
operator==() and a qHash() implementation.
Example:
- \snippet doc/src/snippets/code/src_corelib_tools_qhash.cpp 13
+ \snippet code/src_corelib_tools_qhash.cpp 13
In the example above, we've relied on Qt's global qHash(const
QString &, uint) to give us a hash value for the employee's name, and
diff --git a/src/corelib/tools/qstringlist.cpp b/src/corelib/tools/qstringlist.cpp
index c25d326b9d..0b0aeb50c0 100644
--- a/src/corelib/tools/qstringlist.cpp
+++ b/src/corelib/tools/qstringlist.cpp
@@ -404,8 +404,8 @@ void QtPrivate::QStringList_replaceInStrings(QStringList *that, const QRegExp &r
For example:
- \snippet doc/src/snippets/qstringlist/main.cpp 5
- \snippet doc/src/snippets/qstringlist/main.cpp 16
+ \snippet qstringlist/main.cpp 5
+ \snippet qstringlist/main.cpp 16
For regular expressions that contain capturing groups,
occurrences of \b{\\1}, \b{\\2}, ..., in \a after are
@@ -413,8 +413,8 @@ void QtPrivate::QStringList_replaceInStrings(QStringList *that, const QRegExp &r
For example:
- \snippet doc/src/snippets/qstringlist/main.cpp 5
- \snippet doc/src/snippets/qstringlist/main.cpp 17
+ \snippet qstringlist/main.cpp 5
+ \snippet qstringlist/main.cpp 17
*/
void QtPrivate::QStringList_replaceInStrings(QStringList *that, const QRegularExpression &re, const QString &after)
{
diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro
index 100736252e..b1a3e12e1f 100644
--- a/src/dbus/dbus.pro
+++ b/src/dbus/dbus.pro
@@ -35,6 +35,9 @@ load(qt_module_config)
HEADERS += $$QT_SOURCE_TREE/src/dbus/qtdbusversion.h
+QMAKE_DOCS = $$PWD/doc/qtdbus.qdocconf
+QMAKE_DOCS_INDEX = ../../doc
+
PUB_HEADERS = qdbusargument.h \
qdbusconnectioninterface.h \
qdbusmacros.h \
diff --git a/src/dbus/doc/qtdbus.qdocconf b/src/dbus/doc/qtdbus.qdocconf
new file mode 100644
index 0000000000..d33c4370a3
--- /dev/null
+++ b/src/dbus/doc/qtdbus.qdocconf
@@ -0,0 +1,92 @@
+include(../../../doc/global/qt-cpp-ignore.qdocconf)
+
+project = QtDBus
+description = Qt DBus Reference Documentation
+url = http://qt-project.org/doc/qt-5.0/qtdbus
+version = 5.0.0
+
+sourceencoding = UTF-8
+outputencoding = UTF-8
+naturallanguage = en_US
+qhp.projects = QtDBus
+
+qhp.QtDBus.file = qtdbus.qhp
+qhp.QtDBus.namespace = org.qt-project.qtdbus.500
+qhp.QtDBus.virtualFolder = qdoc
+qhp.QtDBus.indexTitle = Qt DBus Reference Documentation
+qhp.QtDBus.indexRoot =
+
+qhp.QtDBus.filterAttributes = qtdbus 5.0.0 qtrefdoc
+qhp.QtDBus.customFilters.Qt.name = QtDBus 5.0.0
+qhp.QtDBus.customFilters.Qt.filterAttributes = qtdbus 5.0.0
+qhp.QtDBus.subprojects = classes overviews examples
+qhp.QtDBus.subprojects.classes.title = Classes
+qhp.QtDBus.subprojects.classes.indexTitle = Qt DBus' Classes
+qhp.QtDBus.subprojects.classes.selectors = class fake:headerfile
+qhp.QtDBus.subprojects.classes.sortPages = true
+qhp.QtDBus.subprojects.overviews.title = Overviews
+qhp.QtDBus.subprojects.overviews.indexTitle = All Overviews and HOWTOs
+qhp.QtDBus.subprojects.overviews.selectors = fake:page,group,module
+qhp.QtDBus.subprojects.examples.title = Qt DBus Examples
+qhp.QtDBus.subprojects.examples.indexTitle = Qt DBus Examples
+qhp.QtDBus.subprojects.examples.selectors = fake:example
+
+dita.metadata.default.author = Qt Project
+dita.metadata.default.permissions = all
+dita.metadata.default.publisher = Qt Project
+dita.metadata.default.copyryear = 2012
+dita.metadata.default.copyrholder = Nokia
+dita.metadata.default.audience = programmer
+
+sources.fileextensions = "*.c++ *.cc *.cpp *.cxx *.mm *.qml *.qdoc"
+headers.fileextensions = "*.ch *.h *.h++ *.hh *.hpp *.hxx"
+
+examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml *.css"
+examples.imageextensions = "*.png"
+
+outputdir = ../../../doc/qtdbus
+tagfile = ../../../doc/qtdbus/qtdbus.tags
+
+HTML.generatemacrefs = "true"
+HTML.nobreadcrumbs = "true"
+
+HTML.templatedir = .
+
+HTML.stylesheets = ../../../doc/global/style/offline.css
+
+HTML.headerstyles = \
+ " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n"
+
+HTML.endheader = \
+ "</head>\n" \
+
+defines = Q_QDOC \
+ QT_.*_SUPPORT \
+ QT_.*_LIB \
+ QT_COMPAT \
+ QT_KEYPAD_NAVIGATION \
+ QT_NO_EGL \
+ Q_WS_.* \
+ Q_OS_.* \
+ Q_BYTE_ORDER \
+ QT_DEPRECATED \
+ QT_DEPRECATED_* \
+ Q_NO_USING_KEYWORD \
+ __cplusplus \
+ Q_COMPILER_INITIALIZER_LISTS
+
+versionsym = QT_VERSION_STR
+
+codeindent = 1
+
+depends += qtcore
+
+headerdirs += ..
+
+sourcedirs += ..
+
+exampledirs += ../../../examples \
+ ../ \
+ snippets
+
+imagedirs += images
diff --git a/doc/src/snippets/code/src_gui_embedded_qscreen_qws.cpp b/src/dbus/doc/snippets/code/doc_src_introtodbus.qdoc
index 99be26133e..5d8833cb16 100644
--- a/doc/src/snippets/code/src_gui_embedded_qscreen_qws.cpp
+++ b/src/dbus/doc/snippets/code/doc_src_introtodbus.qdoc
@@ -39,10 +39,10 @@
****************************************************************************/
//! [0]
-[screen driver][:driver specific options][:display number]
+org.freedesktop.DBus
//! [0]
-
-//! [1]
-Mach64:/dev/fb1:2
-//! [1]
+//! [QDBUS_DEBUG]
+examples/dbus/remotecontrolledcar/controller/controller &
+QDBUS_DEBUG=1 examples/dbus/remotecontrolledcar/car/car &
+//! [QDBUS_DEBUG]
diff --git a/src/dbus/doc/snippets/code/doc_src_qdbusadaptors.cpp b/src/dbus/doc/snippets/code/doc_src_qdbusadaptors.cpp
new file mode 100644
index 0000000000..279c10f1e6
--- /dev/null
+++ b/src/dbus/doc/snippets/code/doc_src_qdbusadaptors.cpp
@@ -0,0 +1,293 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation 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$
+**
+****************************************************************************/
+
+//! [0]
+class MainApplicationAdaptor: public QDBusAbstractAdaptor
+{
+ Q_OBJECT
+ Q_CLASSINFO("D-Bus Interface", "org.kde.DBus.MainApplication")
+ Q_PROPERTY(QString caption READ caption WRITE setCaption)
+ Q_PROPERTY(QString organizationName READ organizationName)
+ Q_PROPERTY(QString organizationDomain READ organizationDomain)
+
+private:
+ QApplication *app;
+
+public:
+ MainApplicationAdaptor(QApplication *application)
+ : QDBusAbstractAdaptor(application), app(application)
+ {
+ connect(application, SIGNAL(aboutToQuit()), SIGNAL(aboutToQuit()));
+ connect(application, SIGNAL(focusChanged(QWidget*, QWidget*)),
+ SLOT(focusChangedSlot(QWidget*, QWidget*)));
+ }
+
+ QString caption()
+ {
+ if (app->hasMainWindow())
+ return app->mainWindow()->caption();
+ return QString(""); // must not return a null QString
+ }
+
+ void setCaption(const QString &newCaption)
+ {
+ if (app->hasMainWindow())
+ app->mainWindow()->setCaption(newCaption);
+ }
+
+ QString organizationName()
+ {
+ return app->organizationName();
+ }
+
+ QString organizationDomain()
+ {
+ return app->organizationDomain();
+ }
+
+public slots:
+ Q_NOREPLY void quit()
+ { app->quit(); }
+
+ void reparseConfiguration()
+ { app->reparseConfiguration(); }
+
+ QString mainWindowObject()
+ {
+ if (app->hasMainWindow())
+ return QString("/%1/mainwindow").arg(app->applicationName());
+ return QString();
+ }
+
+ void setSessionManagement(bool enable)
+ {
+ if (enable)
+ app->enableSessionManagement();
+ else
+ app->disableSessionManagement();
+ }
+
+private slots:
+ void focusChangedSlot(QWidget *, QWidget *now)
+ {
+ if (now == app->mainWindow())
+ emit mainWindowHasFocus();
+ }
+
+signals:
+ void aboutToQuit();
+ void mainWindowHasFocus();
+};
+//! [0]
+
+
+//! [1]
+interface org.kde.DBus.MainApplication
+{
+ property readwrite STRING caption
+ property read STRING organizationName
+ property read STRING organizationDomain
+
+ method quit() annotation("org.freedesktop.DBus.Method.NoReply", "true")
+ method reparseConfiguration()
+ method mainWindowObject(out STRING)
+ method disableSessionManagement(in BOOLEAN enable)
+
+ signal aboutToQuit()
+ signal mainWindowHasFocus()
+}
+//! [1]
+
+
+//! [2]
+int main(int argc, char **argv)
+{
+ // create the QApplication object
+ QApplication app(argc, argv);
+
+ // create the MainApplication adaptor:
+ new MainApplicationAdaptor(app);
+
+ // connect to D-Bus and register as an object:
+ QDBusConnection::sessionBus().registerObject("/MainApplication", app);
+
+ // add main window, etc.
+ [...]
+
+ app.exec();
+}
+//! [2]
+
+
+//! [3]
+class MainApplicationAdaptor: public QDBusAbstractAdaptor
+{
+ Q_OBJECT
+ Q_CLASSINFO("D-Bus Interface", "org.kde.DBus.MainApplication")
+//! [3]
+
+
+//! [4]
+ Q_PROPERTY(QString caption READ caption WRITE setCaption)
+ Q_PROPERTY(QString organizationName READ organizationName)
+ Q_PROPERTY(QString organizationDomain READ organizationDomain)
+//! [4]
+
+
+//! [5]
+QString caption()
+{
+ if (app->hasMainWindow())
+ return app->mainWindow()->caption();
+ return QString();
+}
+
+void setCaption(const QString &newCaption)
+{
+ if (app->hasMainWindow())
+ app->mainWindow()->setCaption(newCaption);
+}
+
+QString organizationName()
+{
+ return app->organizationName();
+}
+
+QString organizationDomain()
+{
+ return app->organizationDomain();
+}
+//! [5]
+
+
+//! [6]
+MyInterfaceAdaptor(QApplication *application)
+ : QDBusAbstractAdaptor(application), app(application)
+{
+ connect(application, SIGNAL(aboutToQuit()), SIGNAL(aboutToQuit());
+ connect(application, SIGNAL(focusChanged(QWidget*, QWidget*)),
+ SLOT(focusChangedSlot(QWidget*, QWidget*)));
+}
+//! [6]
+
+
+//! [7]
+public slots:
+ Q_NOREPLY void quit()
+ { app->quit(); }
+
+ void reparseConfiguration()
+ { app->reparseConfiguration(); }
+
+ QString mainWindowObject()
+ {
+ if (app->hasMainWindow())
+ return QString("/%1/mainwindow").arg(app->applicationName());
+ return QString();
+ }
+
+ void setSessionManagement(bool enable)
+ {
+ if (enable)
+ app->enableSessionManagement();
+ else
+ app->disableSessionManagement();
+ }
+//! [7]
+
+
+//! [8]
+signals:
+ void aboutToQuit();
+ void mainWindowHasFocus();
+//! [8]
+
+
+//! [9]
+private slots:
+ void focusChangedSlot(QWidget *, QWidget *now)
+ {
+ if (now == app->mainWindow())
+ emit mainWindowHasFocus();
+ }
+//! [9]
+
+
+//! [10]
+struct RequestData
+{
+ QString request;
+ QString processedData;
+ QDBusMessage reply;
+};
+
+QString processRequest(const QString &request, const QDBusMessage &message)
+{
+ RequestData *data = new RequestData;
+ data->request = request;
+ message.setDelayedReply(true);
+ data->reply = message.createReply();
+ QDBusConnection::sessionBus().send(data->reply);
+
+ appendRequest(data);
+ return QString();
+}
+//! [10]
+
+
+//! [11]
+void sendReply(RequestData *data)
+{
+ // data->processedData has been initialized with the request's reply
+ QDBusMessage &reply = &data->reply;
+
+ // send the reply over D-Bus:
+ reply << data->processedData;
+ QDBusConnection::sessionBus().send(reply);
+
+ // dispose of the transaction data
+ delete data;
+}
+//! [11]
+
+
+//! [12]
+Q_NOREPLY void myMethod();
+//! [12]
diff --git a/src/dbus/doc/snippets/code/doc_src_qtdbus.cpp b/src/dbus/doc/snippets/code/doc_src_qtdbus.cpp
new file mode 100644
index 0000000000..65fc2e716b
--- /dev/null
+++ b/src/dbus/doc/snippets/code/doc_src_qtdbus.cpp
@@ -0,0 +1,43 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation 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$
+**
+****************************************************************************/
+
+//! [0]
+#include <QtDBus>
+//! [0]
diff --git a/src/dbus/doc/snippets/code/doc_src_qtdbus.pro b/src/dbus/doc/snippets/code/doc_src_qtdbus.pro
new file mode 100644
index 0000000000..a1ba138a85
--- /dev/null
+++ b/src/dbus/doc/snippets/code/doc_src_qtdbus.pro
@@ -0,0 +1,3 @@
+#! [1]
+QT += dbus
+#! [1]
diff --git a/doc/src/snippets/code/src_qdbus_qdbusabstractinterface.cpp b/src/dbus/doc/snippets/code/src_qdbus_qdbusabstractinterface.cpp
index c16380f569..c16380f569 100644
--- a/doc/src/snippets/code/src_qdbus_qdbusabstractinterface.cpp
+++ b/src/dbus/doc/snippets/code/src_qdbus_qdbusabstractinterface.cpp
diff --git a/doc/src/snippets/code/src_qdbus_qdbusargument.cpp b/src/dbus/doc/snippets/code/src_qdbus_qdbusargument.cpp
index 6fa0ec5fa3..6fa0ec5fa3 100644
--- a/doc/src/snippets/code/src_qdbus_qdbusargument.cpp
+++ b/src/dbus/doc/snippets/code/src_qdbus_qdbusargument.cpp
diff --git a/doc/src/snippets/code/src_qdbus_qdbuscontext.cpp b/src/dbus/doc/snippets/code/src_qdbus_qdbuscontext.cpp
index 9ea2038aab..9ea2038aab 100644
--- a/doc/src/snippets/code/src_qdbus_qdbuscontext.cpp
+++ b/src/dbus/doc/snippets/code/src_qdbus_qdbuscontext.cpp
diff --git a/doc/src/snippets/code/src_qdbus_qdbusinterface.cpp b/src/dbus/doc/snippets/code/src_qdbus_qdbusinterface.cpp
index 0bcc3deff3..0bcc3deff3 100644
--- a/doc/src/snippets/code/src_qdbus_qdbusinterface.cpp
+++ b/src/dbus/doc/snippets/code/src_qdbus_qdbusinterface.cpp
diff --git a/doc/src/snippets/code/src_qdbus_qdbusmetatype.cpp b/src/dbus/doc/snippets/code/src_qdbus_qdbusmetatype.cpp
index 6c12464b78..6c12464b78 100644
--- a/doc/src/snippets/code/src_qdbus_qdbusmetatype.cpp
+++ b/src/dbus/doc/snippets/code/src_qdbus_qdbusmetatype.cpp
diff --git a/doc/src/snippets/code/src.qdbus.qdbuspendingcall.cpp b/src/dbus/doc/snippets/code/src_qdbus_qdbuspendingcall.cpp
index a5d46dccfe..a5d46dccfe 100644
--- a/doc/src/snippets/code/src.qdbus.qdbuspendingcall.cpp
+++ b/src/dbus/doc/snippets/code/src_qdbus_qdbuspendingcall.cpp
diff --git a/doc/src/snippets/code/src.qdbus.qdbuspendingreply.cpp b/src/dbus/doc/snippets/code/src_qdbus_qdbuspendingreply.cpp
index eac955a798..eac955a798 100644
--- a/doc/src/snippets/code/src.qdbus.qdbuspendingreply.cpp
+++ b/src/dbus/doc/snippets/code/src_qdbus_qdbuspendingreply.cpp
diff --git a/doc/src/snippets/code/src_qdbus_qdbusreply.cpp b/src/dbus/doc/snippets/code/src_qdbus_qdbusreply.cpp
index 326f395058..326f395058 100644
--- a/doc/src/snippets/code/src_qdbus_qdbusreply.cpp
+++ b/src/dbus/doc/snippets/code/src_qdbus_qdbusreply.cpp
diff --git a/doc/src/snippets/qdbusextratypes/qdbusextratypes.cpp b/src/dbus/doc/snippets/qdbusextratypes/qdbusextratypes.cpp
index 69c1d05cd5..69c1d05cd5 100644
--- a/doc/src/snippets/qdbusextratypes/qdbusextratypes.cpp
+++ b/src/dbus/doc/snippets/qdbusextratypes/qdbusextratypes.cpp
diff --git a/src/dbus/doc/src/dbus-adaptors.qdoc b/src/dbus/doc/src/dbus-adaptors.qdoc
new file mode 100644
index 0000000000..a41c874c8c
--- /dev/null
+++ b/src/dbus/doc/src/dbus-adaptors.qdoc
@@ -0,0 +1,481 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** 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$
+**
+****************************************************************************/
+
+/*!
+ \page usingadaptors.html
+ \title Using QtDBus Adaptors
+ \brief How to create and use DBus adaptors in Qt.
+
+ \ingroup best-practices
+
+ Adaptors are special classes that are attached to any QObject-derived class
+ and provide the interface to the external world using D-Bus. Adaptors are
+ intended to be lightweight classes whose main purpose is to relay calls to
+ and from the real object, possibly validating or converting the input from
+ the external world and, thus, protecting the real object.
+
+ Unlike multiple inheritance, adaptors can be added at any time to any object
+ (but not removed), which allows for greater flexibility when exporting
+ existing classes. Another advantage of adaptors is to provide similar but not
+ identical functionality in methods of the same name in different interfaces,
+ a case which can be quite common when adding a new version of a standard
+ interface to an object.
+
+ In order to use an adaptor, one must create a class which inherits
+ QDBusAbstractAdaptor. Since that is a standard QObject-derived class, the
+ Q_OBJECT macro must appear in the declaration and the source file must be
+ processed with the \l {moc} tool. The class must also contain one
+ Q_CLASSINFO entry with the \c {"D-Bus Interface"} name, declaring which
+ interface it is exporting. Only one entry per class is supported.
+
+ Any public slot in the class will be accessible through the bus over messages
+ of the MethodCall type. (See \l {Declaring Slots in D-Bus Adaptors} for more
+ information). Signals in the class will be automatically relayed over D-Bus.
+ However, not all types are allowed signals or slots' parameter lists: see
+ \l {The QtDBus Type System} for more information.
+
+ Also, any property declared with Q_PROPERTY will be automatically exposed
+ over the Properties interface on D-Bus. Since the QObject property system
+ does not allow for non-readable properties, it is not possible to declare
+ write-only properties using adaptors.
+
+ More information:
+ \list
+ \li \l{Declaring Slots in D-Bus Adaptors}
+ \li \l{Declaring Signals in D-Bus Adaptors}
+ \li \l{The QtDBus Type System}
+ \li \l{D-Bus Adaptor Example}
+ \endlist
+
+ \sa QDBusAbstractAdaptor
+*/
+
+/*!
+ \page qdbusadaptorexample.html
+ \title D-Bus Adaptor Example
+
+ \previouspage The QtDBus Type System
+ \contentspage Using QtDBus Adaptors
+
+ The following example code shows how a D-Bus interface can be implemented
+ using an adaptor.
+
+ A sample usage of QDBusAbstractAdaptor is as follows:
+ \snippet code/doc_src_qdbusadaptors.cpp 0
+
+ The code above would create an interface that could be represented more or less in the following
+ canonical representation:
+ \snippet code/doc_src_qdbusadaptors.cpp 1
+
+ This adaptor could be used in the application's main function as follows
+ \snippet code/doc_src_qdbusadaptors.cpp 2
+
+ Break-down analysis:
+ \tableofcontents
+
+ \section1 The header
+
+ The header of the example is:
+ \snippet code/doc_src_qdbusadaptors.cpp 3
+
+ The code does the following:
+ \list
+ \li it declares the adaptor MainApplicationAdaptor, which descends from QDBusAbstractAdaptor
+ \li it declares the Qt meta-object data using the Q_OBJECT macro
+ \li it declares the name of the D-Bus interface it implements.
+ \endlist
+
+ \section1 The properties
+
+ The properties are declared as follows:
+ \snippet code/doc_src_qdbusadaptors.cpp 4
+
+ And are implemented as follows:
+ \snippet code/doc_src_qdbusadaptors.cpp 5
+
+ The code declares three properties: one of them is a read-write property called "caption" of
+ string type. The other two are read-only, also of the string type.
+
+ The properties organizationName and organizationDomain are simple relays of the app object's
+ organizationName and organizationDomain properties. However, the caption property requires
+ verifying if the application has a main window associated with it: if there isn't any, the
+ caption property is empty. Note how it is possible to access data defined in other objects
+ through the getter/setter functions.
+
+ \section1 The constructor
+
+ The constructor:
+ \snippet code/doc_src_qdbusadaptors.cpp 6
+
+ The constructor does the following:
+ \list
+ \li it initialises its base class (QDBusAbstractAdaptor) with the parent object it is related to.
+ \li it stores the app pointer in a member variable. Note that it would be possible to access the
+ same object using the QDBusAbstractAdaptor::object() function, but it would be necessary to
+ use \a static_cast<> to properly access the methods in QApplication that are not part of
+ QObject.
+ \li it connects the application's signal \a aboutToQuit to its own signal \a aboutToQuit.
+ \li it connects the application's signal \a focusChanged to a private slot to do some further
+ processing before emitting a D-Bus signal.
+ \endlist
+
+ Note that there is no destructor in the example. An eventual destructor could be used to emit
+ one last signal before the object is destroyed, for instance.
+
+ \section1 Slots/methods
+
+ The public slots in the example (which will be exported as D-Bus methods) are the following:
+ \snippet code/doc_src_qdbusadaptors.cpp 7
+
+ This snippet of code defines 4 methods with different properties each:
+ \list 1
+ \li \c quit: this method takes no parameters and is defined to be asynchronous. That is, callers
+ are expected to use "fire-and-forget" mechanism when calling this method, since it provides no
+ useful reply. This is represented in D-Bus by the use of the
+ org.freedesktop.DBus.Method.NoReply annotation. See \l Q_NOREPLY for more information on
+ asynchronous methods
+
+ \li \c reparseConfiguration: this simple method, with no input or output arguments simply relays
+ the call to the application's reparseConfiguration member function.
+
+ \li \c mainWindowObject: this method takes no input parameter, but returns one string output
+ argument, containing the path to the main window object (if the application has a main
+ window), or an empty string if it has no main window. Note that this method could have also
+ been written: void mainWindowObject(QString &path).
+
+ \li \c setSessionManagement: this method takes one input argument (a boolean) and, depending on
+ its value, it calls one function or another in the application.
+ \endlist
+
+ See also: \l Q_NOREPLY.
+
+ \section1 Signals
+
+ The signals in this example are defined as follows:
+ \snippet code/doc_src_qdbusadaptors.cpp 8
+
+ However, signal definition isn't enough: signals have to be emitted. One simple way of emitting
+ signals is to connect another signal to them, so that Qt's signal handling system chains them
+ automatically. This is what is done for the \a aboutToQuit signal.
+
+ When this is the case, one can use the QDBusAbstractAdaptor::setAutoRelaySignals to
+ automatically connect every signal from the real object to the adaptor.
+
+ When simple signal-to-signal connection isn't enough, one can use a private slot do do some
+ work. This is what was done for the mainWindowHasFocus signal:
+ \snippet code/doc_src_qdbusadaptors.cpp 9
+
+ This private slot (which will not be exported as a method via D-Bus) was connected to the
+ \c focusChanged signal in the adaptor's constructor. It is therefore able to shape the
+ application's signal into what the interface expects it to be.
+*/
+
+/*!
+ \page qdbusdeclaringslots.html
+ \title Declaring Slots in D-Bus Adaptors
+
+ \contentspage Using QtDBus Adaptors
+ \nextpage Declaring Signals in D-Bus Adaptors
+
+ Slots in D-Bus adaptors are declared just like normal, public slots, but their
+ parameters must follow certain rules (see \l{The QtDBus Type System} for more
+ information). Slots whose parameters do not follow those rules or that are not
+ public will not be accessible via D-Bus.
+
+ Slots can have one parameter of type \c{const QDBusMessage &}, which must
+ appear at the end of the input parameter list, before any output parameters.
+ This parameter, if present, will be initialized with a copy of the
+ current message being processed, which allows the callee to obtain
+ information about the caller, such as its connection name.
+
+ Slots can be of three kinds:
+ \list 1
+ \li Asynchronous
+ \li Input-only
+ \li Input-and-output
+ \endlist
+
+ \section1 Asynchronous Slots
+ Asynchronous slots are those that do not normally return any reply to the
+ caller. For that reason, they cannot take any output parameters. In most
+ cases, by the time the first line of the slot is run, the caller function
+ has already resumed working.
+
+ However, slots must not rely on that behavior. Scheduling and message-dispatching
+ issues could change the order in which the slot is run. Code intending to
+ synchronize with the caller should provide its own method of synchronization.
+
+ Asynchronous slots are marked by the keyword \l Q_NOREPLY in the method
+ signature, before the \c void return type and the slot name. (See the
+ \c quit() slot in the \l{D-Bus Adaptor Example}).
+
+ \section1 Input-Only Slots
+
+ Input-only slots are normal slots that take parameters passed by value or
+ by constant reference. However, unlike asynchronous slots, the caller is
+ usually waiting for completion of the callee before resuming operation.
+ Therefore, non-asynchronous slots should not block or should state it its
+ documentation that they may do so.
+
+ Input-only slots have no special marking in their signature, except that
+ they take only parameters passed by value or by constant reference.
+ Optionally, slots can take a QDBusMessage parameter as a last parameter,
+ which can be used to perform additional analysis of the method call message.
+
+ \section1 Input and Output Slots
+
+ Like input-only slots, input-and-output slots are those that the caller is
+ waiting for a reply. Unlike input-only ones, though, this reply will contain
+ data. Slots that output data may contain non-constant references and may
+ return a value as well. However, the output parameters must all appear at
+ the end of the argument list and may not have input arguments interleaved.
+ Optionally, a QDBusMessage argument may appear between the input and the
+ output arguments.
+
+ \section1 Automatic Replies
+
+ Method replies are generated automatically with the contents of the output
+ parameters (if there were any) by the QtDBus implementation. Slots need not
+ worry about constructing proper QDBusMessage objects and sending them over
+ the connection.
+
+ However, the possibility of doing so remains there. Should the slot find out
+ it needs to send a special reply or even an error, it can do so by using
+ QDBusMessage::createReply() or QDBusMessage::createErrorReply() on the
+ QDBusMessage parameter and send it with QDBusConnection::send(). The
+ QtDBus implementation will not generate any reply if the slot did so.
+
+ \warning When a caller places a method call and waits for a reply, it will
+ only wait for a limited amount of time. Slots intending to take a long time
+ to complete should make that fact clear in documentation so that callers
+ properly set higher timeouts.
+
+ \section1 Delayed Replies
+
+ In some circumstances, the called slot may not be able to process
+ the request immediately. This is frequently the case when the
+ request involves an I/O or networking operation which may block.
+
+ If this is the case, the slot should return control to the
+ application's main loop to avoid freezing the user interface, and
+ resume the process later. To accomplish this, it should make use
+ of the extra \c QDBusMessage parameter at the end of the input
+ parameter list and request a delayed reply.
+
+ We do this by writing a slot that stores the request data in a
+ persistent structure, indicating to the caller using
+ \l{QDBusMessage::setDelayedReply()}{QDBusMessage::setDelayedReply(true)}
+ that the response will be sent later.
+
+ \snippet code/doc_src_qdbusadaptors.cpp 10
+
+ The use of
+ \l{QDBusConnection::send()}{QDBusConnection::sessionBus().send(data->reply)}
+ is needed to explicitly inform the caller that the response will be delayed.
+ In this case, the return value is unimportant; we return an arbitrary value
+ to satisfy the compiler.
+
+ When the request is processed and a reply is available, it should be sent
+ using the \c QDBusMessage object that was obtained. In our example, the
+ reply code could be something as follows:
+
+ \snippet code/doc_src_qdbusadaptors.cpp 11
+
+ As can be seen in the example, when a delayed reply is in place,
+ the return value(s) from the slot will be ignored by QtDBus. They
+ are used only to determine the slot's signature when communicating
+ the adaptor's description to remote applications, or in case the
+ code in the slot decides not to use a delayed reply.
+
+ The delayed reply itself is requested from QtDBus by calling
+ QDBusMessage::reply() on the original message. It then becomes the
+ resposibility of the called code to eventually send a reply to the
+ caller.
+
+ \warning When a caller places a method call and waits for a reply, it will
+ only wait for a limited amount of time. Slots intending to take a long time
+ to complete should make that fact clear in documentation so that callers
+ properly set higher timeouts.
+
+ \sa {Using QtDBus Adaptors}, {Declaring Signals in D-Bus Adaptors},
+ {The QtDBus Type System}, QDBusConnection, QDBusMessage
+*/
+
+/*!
+ \page qdbusdeclaringsignals.html
+ \title Declaring Signals in D-Bus Adaptors
+
+ \previouspage Declaring Slots in D-Bus Adaptors
+ \contentspage Using QtDBus Adaptors
+ \nextpage The QtDBus Type System
+
+ Any signal in a class derived from QDBusAbstractAdaptor will be automatically
+ relayed into D-Bus, provided that the signal's parameters conform to certain
+ rules (see \l{The QtDBus Type System} for more information). No special code
+ is necessary to make this relay.
+
+ However, signals must still be emitted. The easiest way to emit an adaptor
+ signal is to connect another signal to it, so that Qt's signals and slots
+ mechanism automatically emits the adaptor signal, too. This can be done in
+ the adaptor's constructor, as has been done in the
+ \l{D-Bus Adaptor Example}{D-Bus Adaptor example}.
+
+ The QDBusAbstractAdaptor::setAutoRelaySignals() convenience function can also
+ be used to make and break connections between signals in the real object and
+ the corresponding signals in the adaptor. It will inspect the list of signals
+ in both classes and connect those whose parameters match exactly.
+
+ \sa {Using QtDBus Adaptors},
+ {Declaring Slots in D-Bus Adaptors},
+ {The QtDBus Type System}, QDBusAbstractAdaptor
+*/
+
+/*!
+ \page qdbustypesystem.html
+ \title The QtDBus Type System
+
+ \previouspage Declaring Signals in D-Bus Adaptors
+ \contentspage Using QtDBus Adaptors
+ \nextpage D-Bus Adaptor Example
+
+ D-Bus has an extensible type system based on a few primitives and
+ composition of the primitives in arrays and structures. QtDBus
+ implements the interface to that type system through the
+ QDBusArgument class, allowing user programs to send and receive
+ practically every C++ type over the bus.
+
+ \section1 Primitive Types
+
+ The primitive types are supported natively by QDBusArgument and
+ need no special customization to be sent or received. They are
+ listed below, along with the C++ class they relate to:
+
+ \table
+ \header
+ \li Qt type
+ \li D-Bus equivalent type
+ \row
+ \li uchar
+ \li BYTE
+ \row
+ \li bool
+ \li BOOLEAN
+ \row
+ \li short
+ \li INT16
+ \row
+ \li ushort
+ \li UINT16
+ \row
+ \li int
+ \li INT32
+ \row
+ \li uint
+ \li UINT32
+ \row
+ \li qlonglong
+ \li INT64
+ \row
+ \li qulonglong
+ \li UINT64
+ \row
+ \li double
+ \li DOUBLE
+ \row
+ \li QString
+ \li STRING
+ \row
+ \li QDBusVariant
+ \li VARIANT
+ \row
+ \li QDBusObjectPath
+ \li OBJECT_PATH
+ \row
+ \li QDBusSignature
+ \li SIGNATURE
+ \endtable
+
+ Aside from the primitive types, QDBusArgument also supports two
+ non-primitive types natively, due to their widespread use in Qt
+ applications: QStringList and QByteArray.
+
+ \section1 Compound Types
+
+ D-Bus specifies three types of aggregations of primitive types
+ that allow one to create compound types. They are \c ARRAY, \c
+ STRUCT and maps/dictionaries.
+
+ Arrays are sets of zero or more elements of the same type, while
+ structures are a set of a fixed number of elements, each of any
+ type. Maps or dictionaries are implemented as arrays of a pair of
+ elements, so there can be zero or more elements in one map.
+
+ \section1 Extending the Type System
+
+ In order to use one's own type with QtDBus, the type has to be
+ declared as a Qt meta-type with the Q_DECLARE_METATYPE() macro and
+ registered with the qDBusRegisterMetaType() function. The
+ streaming operators \c{operator>>} and \c{operator<<} will be
+ automatically found by the registration system.
+
+ QtDBus provides template specializations for arrays and maps for
+ use with Qt's \l{Container classes}{container classes}, such as
+ QMap and QList, so it is not necessary to write the streaming
+ operator functions for those. For other types, and specially for
+ types implementing structures, the operators have to be explicitly
+ implemented.
+
+ See the documentation for QDBusArgument for examples for
+ structures, arrays and maps.
+
+ \section1 The Type System in Use
+
+ All of the QtDBus types (primitives and user-defined alike) can be
+ used to send and receive messages of all types over the bus.
+
+ \warning You may not use any type that is not on the list above,
+ including \a typedefs to the types listed. This also includes
+ QList<QVariant> and QMap<QString,QVariant>.
+*/
+
+/*!
+ \macro Q_NOREPLY
+ \relates QDBusAbstractAdaptor
+ \since 4.2
+
+ The Q_NOREPLY macro can be used to mark a method to be called and not wait for it to finish
+ processing before returning from QDBusInterface::call(). The called method cannot return any
+ output arguments and, if it does, any such arguments will be discarded.
+
+ You can use this macro in your own adaptors by placing it before your method's return value
+ (which must be "void") in the class declaration, as shown in the example:
+ \snippet code/doc_src_qdbusadaptors.cpp 12
+
+ Its presence in the method implementation (outside the class declaration) is optional.
+
+ \sa {Using QtDBus Adaptors}
+*/
diff --git a/src/dbus/doc/src/dbus-intro.qdoc b/src/dbus/doc/src/dbus-intro.qdoc
new file mode 100644
index 0000000000..b3cf29e129
--- /dev/null
+++ b/src/dbus/doc/src/dbus-intro.qdoc
@@ -0,0 +1,215 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** 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$
+**
+****************************************************************************/
+
+/*!
+ \page intro-to-dbus.html
+ \title D-Bus
+ \brief An introduction to Inter-Process Communication and Remote Procedure Calling with D-Bus.
+
+ \keyword QtDBus
+ \ingroup technology-apis
+
+ \section1 Introduction
+
+ D-Bus is an Inter-Process Communication (IPC) and Remote Procedure
+ Calling (RPC) mechanism originally developed for Linux to replace
+ existing and competing IPC solutions with one unified protocol. It
+ has also been designed to allow communication between system-level
+ processes (such as printer and hardware driver services) and
+ normal user processes.
+
+ It uses a fast, binary message-passing protocol, which is suitable
+ for same-machine communication due to its low latency and low
+ overhead. Its specification is currently defined by the
+ \tt{freedesktop.org} project, and is available to all parties.
+
+ Communication in general happens through a central server
+ application, called the "bus" (hence the name), but direct
+ application-to-application communication is also possible. When
+ communicating on a bus, applications can query which other
+ applications and services are available, as well as activate one
+ on demand.
+
+ \section1 The Buses
+
+ D-Bus buses are used to when many-to-many communication is
+ desired. In order to achieve that, a central server is launched
+ before any applications can connect to the bus: this server is
+ responsible for keeping track of the applications that are
+ connected and for properly routing messages from their source to
+ their destination.
+
+ In addition, D-Bus defines two well-known buses, called the
+ system bus and the session bus. These buses are special in the
+ sense that they have well-defined semantics: some services are
+ defined to be found in one or both of these buses.
+
+ For example, an application wishing to query the list of hardware
+ devices attached to the computer will probably communicate to a
+ service available on the system bus, while the service providing
+ opening of the user's web browser will be probably found on the
+ session bus.
+
+ On the system bus, one can also expect to find restrictions on
+ what services each application is allowed to offer. Therefore, one
+ can be reasonably certain that, if a certain service is present,
+ it is being offered by a trusted application.
+
+ \section1 Concepts
+
+ \section2 Messages
+
+ On the low level, applications communicate over D-Bus by sending
+ messages to one another. Messages are used to relay the remote
+ procedure calls as well as the replies and errors associated
+ with them. When used over a bus, messages have a destination,
+ which means they are routed only to the interested parties,
+ avoiding congestion due to "swarming" or broadcasting.
+
+ A special kind of message called a "signal message"
+ (a concept based on Qt's \l {Signals and Slots} mechanism),
+ however, does not have a pre-defined destination. Since its
+ purpose is to be used in a one-to-many context, signal messages
+ are designed to work over an "opt-in" mechanism.
+
+ The QtDBus module fully encapsulates the low-level concept of
+ messages into a simpler, object-oriented approach familiar to Qt
+ developers. In most cases, the developer need not worry about
+ sending or receiving messages.
+
+ \section2 Service Names
+
+ When communicating over a bus, applications obtain what is
+ called a "service name": it is how that application chooses to be
+ known by other applications on the same bus. The service names
+ are brokered by the D-Bus bus daemon and are used to
+ route messages from one application to another. An analogous
+ concept to service names are IP addresses and hostnames: a
+ computer normally has one IP address and may have one or more
+ hostnames associated with it, according to the services that it
+ provides to the network.
+
+ On the other hand, if a bus is not used, service names are also
+ not used. If we compare this to a computer network again, this
+ would equate to a point-to-point network: since the peer is
+ known, there is no need to use hostnames to find it or its IP
+ address.
+
+ The format of a D-Bus service name is in fact very similar to a
+ host name: it is a dot-separated sequence of letters and
+ digits. The common practice is even to name one's service name
+ according to the domain name of the organization that defined
+ that service.
+
+ For example, the D-Bus service is defined by
+ \tt{freedesktop.org} and can be found on the bus under the
+ service name:
+
+ \snippet code/doc_src_introtodbus.qdoc 0
+
+ \section2 Object Paths
+
+ Like network hosts, applications provide specific services to
+ other applications by exporting objects. Those objects are
+ hierarchically organised, much like the parent-child
+ relationship that classes derived from QObject possess. One
+ difference, however, is that there is the concept of "root
+ object", that all objects have as ultimate parent.
+
+ If we continue our analogy with Web services, object paths
+ equate to the path part of a URL:
+
+ \img qurl-ftppath.png
+
+ Like them, object paths in D-Bus are formed resembling path
+ names on the filesystem: they are slash-separated labels, each
+ consisting of letters, digits and the underscore character
+ ("_"). They must always start with a slash and must not end with
+ one.
+
+ \section2 Interfaces
+
+ Interfaces are similar to C++ abstract classes and Java's
+ \c interface keyword and declare the "contract" that is
+ established between caller and callee. That is, they establish
+ the names of the methods, signals and properties that are
+ available as well as the behavior that is expected from either
+ side when communication is established.
+
+ Qt uses a very similar mechanism in its \l {How to Create Qt
+ Plugins}{Plugin system}: Base classes in C++ are associated
+ with a unique identifier by way of the Q_DECLARE_INTERFACE()
+ macro.
+
+ D-Bus interface names are, in fact, named in a manner similar to
+ what is suggested by the Qt Plugin System: an identifier usually
+ constructed from the domain name of the entity that defined that
+ interface.
+
+ \section2 Cheat Sheet
+
+ To facilitate remembering of the naming formats and their
+ purposes, the following table can be used:
+
+ \table 90%
+ \header \li D-Bus Concept \li Analogy \li Name format
+ \row \li Service name \li Network hostnames \li Dot-separated
+ ("looks like a hostname")
+ \row \li Object path \li URL path component \li Slash-separated
+ ("looks like a path")
+ \row \li Interface \li Plugin identifier \li Dot-separated
+ \endtable
+
+ \section1 Debugging
+
+ When developing applications that use D-Bus, it is sometimes useful to be able
+ to see information about the messages that are sent and received across the
+ bus by each application.
+
+ This feature can be enabled on a per-application basis by setting the
+ \c QDBUS_DEBUG environment variable before running each application.
+ For example, we can enable debugging only for the car in the
+ \l{D-Bus Remote Controlled Car Example} by running the controller and the
+ car in the following way:
+
+ \snippet code/doc_src_introtodbus.qdoc QDBUS_DEBUG
+
+ Information about the messages will be written to the console the application
+ was launched from.
+
+ \section1 Further Reading
+
+ The following documents contain information about Qt's D-Bus integration
+ features, and provide details about the mechanisms used to send and receive
+ type information over the bus:
+
+ \list
+ \li \l{Using QtDBus Adaptors}
+ \li \l{The QtDBus Type System}
+ \li \l{QtDBus XML compiler (qdbusxml2cpp)}
+ \endlist
+*/
diff --git a/src/dbus/doc/src/qdbusxml2cpp.qdoc b/src/dbus/doc/src/qdbusxml2cpp.qdoc
new file mode 100644
index 0000000000..996b5c7820
--- /dev/null
+++ b/src/dbus/doc/src/qdbusxml2cpp.qdoc
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** 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$
+**
+****************************************************************************/
+
+/*!
+ \page qdbusxml2cpp.html
+ \title QtDBus XML compiler (qdbusxml2cpp)
+ \keyword qdbusxml2cpp
+
+ The QtDBus XML compiler is a tool that can be used to parse interface descriptions and produce
+ static code representing those interfaces, which can then be used to make calls to remote
+ objects or implement said interfaces.
+
+ \c qdbusxml2cpp has two modes of operation, that correspond to the two possible outputs it can
+ produce: the interface (proxy) class or the adaptor class. The latter consists of both a C++
+ header and a source file, which are meant to be edited and adapted to your needs.
+
+ The \c qdbusxml2cpp tool is not meant to be run every time you compile your
+ application. Instead, it's meant to be used when developing the code or when the interface
+ changes.
+
+ The adaptor classes generated by \c qdbusxml2cpp are just a skeleton that must be completed. It
+ generates, by default, calls to slots with the same name on the object the adaptor is attached
+ to. However, you may modify those slots or the property accessor functions to suit your needs.
+*/
+
diff --git a/doc/src/dbus/qtdbus.qdoc b/src/dbus/doc/src/qtdbus.qdoc
index 8039cc040b..739502e1fc 100644
--- a/doc/src/dbus/qtdbus.qdoc
+++ b/src/dbus/doc/src/qtdbus.qdoc
@@ -48,13 +48,13 @@
To use this module, use the following code in your application:
- \snippet doc/src/snippets/code/doc_src_qtdbus.cpp 0
+ \snippet code/doc_src_qtdbus.cpp 0
If you're using qmake to build your application, you can add this
line to your .pro file to make it link against the QtDBus
libraries:
- \snippet doc/src/snippets/code/doc_src_qtdbus.pro 1
+ \snippet code/doc_src_qtdbus.pro 1
\note The source code for this module is located in the \c{src/qdbus}
directory. When installing Qt from source, this module is built when Qt's
@@ -62,6 +62,4 @@
See the \l {D-Bus} page for detailed information on
how to use this module.
-
- This module is part of all \l{Qt editions}.
*/
diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp
index ea32e6ead6..51b100839c 100644
--- a/src/dbus/qdbusabstractinterface.cpp
+++ b/src/dbus/qdbusabstractinterface.cpp
@@ -650,7 +650,7 @@ void QDBusAbstractInterface::internalPropSet(const char *propname, const QVarian
It can be used the following way:
- \snippet doc/src/snippets/code/src_qdbus_qdbusabstractinterface.cpp 0
+ \snippet code/src_qdbus_qdbusabstractinterface.cpp 0
This example illustrates function calling with 0, 1 and 2 parameters and illustrates different
parameter types passed in each (the first call to \c "ProcessWorkUnicode" will contain one
@@ -742,7 +742,7 @@ QDBusMessage QDBusAbstractInterface::call(QDBus::CallMode mode, const QString &m
It can be used the following way:
- \snippet doc/src/snippets/code/src_qdbus_qdbusabstractinterface.cpp 1
+ \snippet code/src_qdbus_qdbusabstractinterface.cpp 1
This example illustrates function calling with 0, 1 and 2 parameters and illustrates different
parameter types passed in each (the first call to \c "ProcessWorkUnicode" will contain one
diff --git a/src/dbus/qdbusargument.cpp b/src/dbus/qdbusargument.cpp
index 6e6e676dae..0969aef83f 100644
--- a/src/dbus/qdbusargument.cpp
+++ b/src/dbus/qdbusargument.cpp
@@ -190,13 +190,13 @@ bool QDBusArgumentPrivate::checkReadAndDetach(QDBusArgumentPrivate *&d)
integer and a string can be constructed using the \l
{qdbustypesystem.html}{QtDBus type system}:
- \snippet doc/src/snippets/code/src_qdbus_qdbusargument.cpp 0
+ \snippet code/src_qdbus_qdbusargument.cpp 0
The type has to be registered with qDBusRegisterMetaType() before
it can be used with QDBusArgument. Therefore, somewhere in your
program, you should add the following code:
- \snippet doc/src/snippets/code/src_qdbus_qdbusargument.cpp 1
+ \snippet code/src_qdbus_qdbusargument.cpp 1
Once registered, a type can be used in outgoing method calls
(placed with QDBusAbstractInterface::call()), signal emissions
@@ -275,11 +275,11 @@ bool QDBusArgumentPrivate::checkReadAndDetach(QDBusArgumentPrivate *&d)
Attempts to demarshall the contents of \a argument into the type
\c{T}. For example:
- \snippet doc/src/snippets/code/src_qdbus_qdbusargument.cpp 2
+ \snippet code/src_qdbus_qdbusargument.cpp 2
Note that it is equivalent to the following:
- \snippet doc/src/snippets/code/src_qdbus_qdbusargument.cpp 3
+ \snippet code/src_qdbus_qdbusargument.cpp 3
*/
/*!
@@ -817,12 +817,12 @@ const QDBusArgument &QDBusArgument::operator>>(QByteArray &arg) const
This function is used usually in \c{operator<<} streaming
operators, as in the following example:
- \snippet doc/src/snippets/code/src_qdbus_qdbusargument.cpp 4
+ \snippet code/src_qdbus_qdbusargument.cpp 4
Structures can contain other structures, so the following code is
also valid:
- \snippet doc/src/snippets/code/src_qdbus_qdbusargument.cpp 5
+ \snippet code/src_qdbus_qdbusargument.cpp 5
\sa endStructure(), beginArray(), beginMap()
*/
@@ -850,7 +850,7 @@ void QDBusArgument::endStructure()
This function is used usually in \c{operator<<} streaming
operators, as in the following example:
- \snippet doc/src/snippets/code/src_qdbus_qdbusargument.cpp 6
+ \snippet code/src_qdbus_qdbusargument.cpp 6
If the type you want to marshall is a QList, QVector or any of the
Qt's \l {Container Classes} that take one template parameter,
@@ -889,7 +889,7 @@ void QDBusArgument::endArray()
This function is used usually in \c{operator<<} streaming
operators, as in the following example:
- \snippet doc/src/snippets/code/src_qdbus_qdbusargument.cpp 7
+ \snippet code/src_qdbus_qdbusargument.cpp 7
If the type you want to marshall is a QMap or QHash, you need not
declare an \c{operator<<} function for it, since QtDBus provides
@@ -948,7 +948,7 @@ void QDBusArgument::endMapEntry()
This function is used usually in \c{operator>>} streaming
operators, as in the following example:
- \snippet doc/src/snippets/code/src_qdbus_qdbusargument.cpp 8
+ \snippet code/src_qdbus_qdbusargument.cpp 8
\sa endStructure(), beginArray(), beginMap()
*/
@@ -977,7 +977,7 @@ void QDBusArgument::endStructure() const
This function is used usually in \c{operator>>} streaming
operators, as in the following example:
- \snippet doc/src/snippets/code/src_qdbus_qdbusargument.cpp 9
+ \snippet code/src_qdbus_qdbusargument.cpp 9
If the type you want to demarshall is a QList, QVector or any of the
Qt's \l {Container Classes} that take one template parameter, you
@@ -1013,7 +1013,7 @@ void QDBusArgument::endArray() const
This function is used usually in \c{operator>>} streaming
operators, as in the following example:
- \snippet doc/src/snippets/code/src_qdbus_qdbusargument.cpp 10
+ \snippet code/src_qdbus_qdbusargument.cpp 10
If the type you want to demarshall is a QMap or QHash, you need not
declare an \c{operator>>} function for it, since QtDBus provides
diff --git a/src/dbus/qdbuscontext.cpp b/src/dbus/qdbuscontext.cpp
index cc987d1410..0a13fce9ee 100644
--- a/src/dbus/qdbuscontext.cpp
+++ b/src/dbus/qdbuscontext.cpp
@@ -90,7 +90,7 @@ QDBusContextPrivate *QDBusContextPrivate::set(QObject *obj, QDBusContextPrivate
exported using QDBusConnection::registerObject(). The following
example illustrates the usage:
- \snippet doc/src/snippets/code/src_qdbus_qdbuscontext.cpp 0
+ \snippet code/src_qdbus_qdbuscontext.cpp 0
The example illustrates the two typical uses, that of sending
error replies and that of delayed replies.
diff --git a/src/dbus/qdbusextratypes.cpp b/src/dbus/qdbusextratypes.cpp
index 4438e3c65f..4b2730c44a 100644
--- a/src/dbus/qdbusextratypes.cpp
+++ b/src/dbus/qdbusextratypes.cpp
@@ -73,11 +73,11 @@ void QDBusSignature::doCheck()
A D-Bus function that takes an integer, a D-Bus variant and a string as parameters
can be called with the following argument list (see QDBusMessage::setArguments()):
- \snippet doc/src/snippets/qdbusextratypes/qdbusextratypes.cpp 0
+ \snippet qdbusextratypes/qdbusextratypes.cpp 0
When a D-Bus function returns a D-Bus variant, it can be retrieved as follows:
- \snippet doc/src/snippets/qdbusextratypes/qdbusextratypes.cpp 1
+ \snippet qdbusextratypes/qdbusextratypes.cpp 1
The QVariant within a QDBusVariant is required to distinguish between a normal
D-Bus value and a value within a D-Bus variant.
diff --git a/src/dbus/qdbusinterface.cpp b/src/dbus/qdbusinterface.cpp
index f6a84b9980..844b0b7a4c 100644
--- a/src/dbus/qdbusinterface.cpp
+++ b/src/dbus/qdbusinterface.cpp
@@ -196,7 +196,7 @@ QDBusInterfacePrivate::~QDBusInterfacePrivate()
mathematical operation of \tt{"2 + 2"} in a remote application
called \c com.example.Calculator, accessed via the session bus.
- \snippet doc/src/snippets/code/src_qdbus_qdbusinterface.cpp 0
+ \snippet code/src_qdbus_qdbusinterface.cpp 0
\sa {QtDBus XML compiler (qdbusxml2cpp)}
*/
diff --git a/src/dbus/qdbusmetatype.cpp b/src/dbus/qdbusmetatype.cpp
index 0359b4da35..03cad1ee63 100644
--- a/src/dbus/qdbusmetatype.cpp
+++ b/src/dbus/qdbusmetatype.cpp
@@ -200,7 +200,7 @@ Q_GLOBAL_STATIC(QReadWriteLock, customTypesLock)
Q_DECLARE_METATYPE() macro, and then registered as in the
following example:
- \snippet doc/src/snippets/code/src_qdbus_qdbusmetatype.cpp 0
+ \snippet code/src_qdbus_qdbusmetatype.cpp 0
If \c{T} isn't a type derived from one of
Qt's \l{container classes}, the \c{operator<<} and
diff --git a/src/dbus/qdbuspendingcall.cpp b/src/dbus/qdbuspendingcall.cpp
index 3d5dc421d7..9ae68c7abc 100644
--- a/src/dbus/qdbuspendingcall.cpp
+++ b/src/dbus/qdbuspendingcall.cpp
@@ -97,7 +97,7 @@ QT_BEGIN_NAMESPACE
It is usually used like the following example:
- \snippet doc/src/snippets/code/src.qdbus.qdbuspendingcall.cpp 0
+ \snippet code/src_qdbus_qdbuspendingcall.cpp 0
Note that it is not necessary to keep the original QDBusPendingCall
object around since QDBusPendingCallWatcher inherits from that class
@@ -106,7 +106,7 @@ QT_BEGIN_NAMESPACE
The slot connected to by the above code could be something similar
to the following:
- \snippet doc/src/snippets/code/src.qdbus.qdbuspendingcall.cpp 1
+ \snippet code/src_qdbus_qdbuspendingcall.cpp 1
Note the use of QDBusPendingReply to validate the argument types in
the reply. If the reply did not contain exactly two arguments
diff --git a/src/dbus/qdbuspendingreply.cpp b/src/dbus/qdbuspendingreply.cpp
index b9694ca205..2fd219260d 100644
--- a/src/dbus/qdbuspendingreply.cpp
+++ b/src/dbus/qdbuspendingreply.cpp
@@ -69,22 +69,22 @@
Where with QDBusReply you would write:
- \snippet doc/src/snippets/code/src_qdbus_qdbusreply.cpp 0
+ \snippet code/src_qdbus_qdbusreply.cpp 0
with QDBusPendingReply, the equivalent code (including the blocking
wait for the reply) would be:
- \snippet doc/src/snippets/code/src.qdbus.qdbuspendingreply.cpp 0
+ \snippet code/src_qdbus_qdbuspendingreply.cpp 0
For method calls that have more than one output argument, with
QDBusReply, you would write:
- \snippet doc/src/snippets/code/src_qdbus_qdbusreply.cpp 1
+ \snippet code/src_qdbus_qdbusreply.cpp 1
whereas with QDBusPendingReply, all of the output arguments should
be template parameters:
- \snippet doc/src/snippets/code/src.qdbus.qdbuspendingreply.cpp 2
+ \snippet code/src_qdbus_qdbuspendingreply.cpp 2
QDBusPendingReply objects can be associated with
QDBusPendingCallWatcher objects, which emit signals when the reply
diff --git a/src/dbus/qdbusreply.cpp b/src/dbus/qdbusreply.cpp
index c891874d98..9875329a26 100644
--- a/src/dbus/qdbusreply.cpp
+++ b/src/dbus/qdbusreply.cpp
@@ -61,10 +61,10 @@ QT_BEGIN_NAMESPACE
argument.
It can be used in the following manner:
- \snippet doc/src/snippets/code/src_qdbus_qdbusreply.cpp 0
+ \snippet code/src_qdbus_qdbusreply.cpp 0
If the remote method call cannot fail, you can skip the error checking:
- \snippet doc/src/snippets/code/src_qdbus_qdbusreply.cpp 1
+ \snippet code/src_qdbus_qdbusreply.cpp 1
However, if it does fail under those conditions, the value returned by QDBusReply::value() is
a default-constructed value. It may be indistinguishable from a valid return value.
diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp
index b84ecefd73..ec02086d74 100644
--- a/src/gui/accessible/qaccessible.cpp
+++ b/src/gui/accessible/qaccessible.cpp
@@ -460,7 +460,7 @@ static void qAccessibleCleanup()
This is a typedef for a pointer to a function with the following
signature:
- \snippet doc/src/snippets/code/src_gui_accessible_qaccessible.cpp 1
+ \snippet code/src_gui_accessible_qaccessible.cpp 1
The function receives a QString and a QObject pointer, where the
QString is the key identifying the interface. The QObject is used
diff --git a/doc/src/images/brush-outline.png b/src/gui/doc/images/brush-outline.png
index f560c9faf5..f560c9faf5 100644
--- a/doc/src/images/brush-outline.png
+++ b/src/gui/doc/images/brush-outline.png
Binary files differ
diff --git a/src/gui/doc/images/brush-styles.png b/src/gui/doc/images/brush-styles.png
new file mode 100644
index 0000000000..eecb006af1
--- /dev/null
+++ b/src/gui/doc/images/brush-styles.png
Binary files differ
diff --git a/doc/src/images/coordinatesystem-analogclock.png b/src/gui/doc/images/coordinatesystem-analogclock.png
index 16e3091b77..16e3091b77 100644
--- a/doc/src/images/coordinatesystem-analogclock.png
+++ b/src/gui/doc/images/coordinatesystem-analogclock.png
Binary files differ
diff --git a/doc/src/images/coordinatesystem-line-antialias.png b/src/gui/doc/images/coordinatesystem-line-antialias.png
index 90dfa8730e..90dfa8730e 100644
--- a/doc/src/images/coordinatesystem-line-antialias.png
+++ b/src/gui/doc/images/coordinatesystem-line-antialias.png
Binary files differ
diff --git a/doc/src/images/coordinatesystem-line-raster.png b/src/gui/doc/images/coordinatesystem-line-raster.png
index 65201bde9f..65201bde9f 100644
--- a/doc/src/images/coordinatesystem-line-raster.png
+++ b/src/gui/doc/images/coordinatesystem-line-raster.png
Binary files differ
diff --git a/doc/src/images/coordinatesystem-line.png b/src/gui/doc/images/coordinatesystem-line.png
index fbf6873084..fbf6873084 100644
--- a/doc/src/images/coordinatesystem-line.png
+++ b/src/gui/doc/images/coordinatesystem-line.png
Binary files differ
diff --git a/doc/src/images/coordinatesystem-rect-antialias.png b/src/gui/doc/images/coordinatesystem-rect-antialias.png
index 162e1df9cb..162e1df9cb 100644
--- a/doc/src/images/coordinatesystem-rect-antialias.png
+++ b/src/gui/doc/images/coordinatesystem-rect-antialias.png
Binary files differ
diff --git a/doc/src/images/coordinatesystem-rect-raster.png b/src/gui/doc/images/coordinatesystem-rect-raster.png
index be3690d6ad..be3690d6ad 100644
--- a/doc/src/images/coordinatesystem-rect-raster.png
+++ b/src/gui/doc/images/coordinatesystem-rect-raster.png
Binary files differ
diff --git a/doc/src/images/coordinatesystem-rect.png b/src/gui/doc/images/coordinatesystem-rect.png
index 76c06befd6..76c06befd6 100644
--- a/doc/src/images/coordinatesystem-rect.png
+++ b/src/gui/doc/images/coordinatesystem-rect.png
Binary files differ
diff --git a/doc/src/images/coordinatesystem-transformations.png b/src/gui/doc/images/coordinatesystem-transformations.png
index 2736213c07..2736213c07 100644
--- a/doc/src/images/coordinatesystem-transformations.png
+++ b/src/gui/doc/images/coordinatesystem-transformations.png
Binary files differ
diff --git a/src/gui/doc/images/cursor-arrow.png b/src/gui/doc/images/cursor-arrow.png
new file mode 100644
index 0000000000..a69ef4eb61
--- /dev/null
+++ b/src/gui/doc/images/cursor-arrow.png
Binary files differ
diff --git a/src/gui/doc/images/cursor-busy.png b/src/gui/doc/images/cursor-busy.png
new file mode 100644
index 0000000000..53717e4992
--- /dev/null
+++ b/src/gui/doc/images/cursor-busy.png
Binary files differ
diff --git a/src/gui/doc/images/cursor-closedhand.png b/src/gui/doc/images/cursor-closedhand.png
new file mode 100644
index 0000000000..b78dd1dac5
--- /dev/null
+++ b/src/gui/doc/images/cursor-closedhand.png
Binary files differ
diff --git a/src/gui/doc/images/cursor-cross.png b/src/gui/doc/images/cursor-cross.png
new file mode 100644
index 0000000000..fe38e74480
--- /dev/null
+++ b/src/gui/doc/images/cursor-cross.png
Binary files differ
diff --git a/src/gui/doc/images/cursor-forbidden.png b/src/gui/doc/images/cursor-forbidden.png
new file mode 100644
index 0000000000..2b08c4e2a3
--- /dev/null
+++ b/src/gui/doc/images/cursor-forbidden.png
Binary files differ
diff --git a/src/gui/doc/images/cursor-hand.png b/src/gui/doc/images/cursor-hand.png
new file mode 100644
index 0000000000..d2004aefa7
--- /dev/null
+++ b/src/gui/doc/images/cursor-hand.png
Binary files differ
diff --git a/src/gui/doc/images/cursor-hsplit.png b/src/gui/doc/images/cursor-hsplit.png
new file mode 100644
index 0000000000..a5667e3ffb
--- /dev/null
+++ b/src/gui/doc/images/cursor-hsplit.png
Binary files differ
diff --git a/src/gui/doc/images/cursor-ibeam.png b/src/gui/doc/images/cursor-ibeam.png
new file mode 100644
index 0000000000..097fc5fa72
--- /dev/null
+++ b/src/gui/doc/images/cursor-ibeam.png
Binary files differ
diff --git a/src/gui/doc/images/cursor-openhand.png b/src/gui/doc/images/cursor-openhand.png
new file mode 100644
index 0000000000..9181c859ed
--- /dev/null
+++ b/src/gui/doc/images/cursor-openhand.png
Binary files differ
diff --git a/src/gui/doc/images/cursor-sizeall.png b/src/gui/doc/images/cursor-sizeall.png
new file mode 100644
index 0000000000..69f13eb347
--- /dev/null
+++ b/src/gui/doc/images/cursor-sizeall.png
Binary files differ
diff --git a/src/gui/doc/images/cursor-sizeb.png b/src/gui/doc/images/cursor-sizeb.png
new file mode 100644
index 0000000000..f37d7b91e8
--- /dev/null
+++ b/src/gui/doc/images/cursor-sizeb.png
Binary files differ
diff --git a/src/gui/doc/images/cursor-sizef.png b/src/gui/doc/images/cursor-sizef.png
new file mode 100644
index 0000000000..3b127a05d3
--- /dev/null
+++ b/src/gui/doc/images/cursor-sizef.png
Binary files differ
diff --git a/src/gui/doc/images/cursor-sizeh.png b/src/gui/doc/images/cursor-sizeh.png
new file mode 100644
index 0000000000..a9f40cbc3d
--- /dev/null
+++ b/src/gui/doc/images/cursor-sizeh.png
Binary files differ
diff --git a/src/gui/doc/images/cursor-sizev.png b/src/gui/doc/images/cursor-sizev.png
new file mode 100644
index 0000000000..1edbab27a5
--- /dev/null
+++ b/src/gui/doc/images/cursor-sizev.png
Binary files differ
diff --git a/src/gui/doc/images/cursor-uparrow.png b/src/gui/doc/images/cursor-uparrow.png
new file mode 100644
index 0000000000..d3e70ef4c2
--- /dev/null
+++ b/src/gui/doc/images/cursor-uparrow.png
Binary files differ
diff --git a/src/gui/doc/images/cursor-vsplit.png b/src/gui/doc/images/cursor-vsplit.png
new file mode 100644
index 0000000000..1beda2570e
--- /dev/null
+++ b/src/gui/doc/images/cursor-vsplit.png
Binary files differ
diff --git a/src/gui/doc/images/cursor-wait.png b/src/gui/doc/images/cursor-wait.png
new file mode 100644
index 0000000000..69056c479e
--- /dev/null
+++ b/src/gui/doc/images/cursor-wait.png
Binary files differ
diff --git a/src/gui/doc/images/cursor-whatsthis.png b/src/gui/doc/images/cursor-whatsthis.png
new file mode 100644
index 0000000000..b47601c378
--- /dev/null
+++ b/src/gui/doc/images/cursor-whatsthis.png
Binary files differ
diff --git a/doc/src/images/hoverevents.png b/src/gui/doc/images/hoverevents.png
index ccc079bdf1..ccc079bdf1 100644
--- a/doc/src/images/hoverevents.png
+++ b/src/gui/doc/images/hoverevents.png
Binary files differ
diff --git a/doc/src/images/paintsystem-antialiasing.png b/src/gui/doc/images/paintsystem-antialiasing.png
index 1275841b93..1275841b93 100644
--- a/doc/src/images/paintsystem-antialiasing.png
+++ b/src/gui/doc/images/paintsystem-antialiasing.png
Binary files differ
diff --git a/doc/src/images/paintsystem-core.png b/src/gui/doc/images/paintsystem-core.png
index 7d6a8e591b..7d6a8e591b 100644
--- a/doc/src/images/paintsystem-core.png
+++ b/src/gui/doc/images/paintsystem-core.png
Binary files differ
diff --git a/doc/src/images/paintsystem-devices.png b/src/gui/doc/images/paintsystem-devices.png
index 7b81b7cbb8..7b81b7cbb8 100644
--- a/doc/src/images/paintsystem-devices.png
+++ b/src/gui/doc/images/paintsystem-devices.png
Binary files differ
diff --git a/doc/src/images/paintsystem-fancygradient.png b/src/gui/doc/images/paintsystem-fancygradient.png
index 701df29e42..701df29e42 100644
--- a/doc/src/images/paintsystem-fancygradient.png
+++ b/src/gui/doc/images/paintsystem-fancygradient.png
Binary files differ
diff --git a/doc/src/images/paintsystem-gradients.png b/src/gui/doc/images/paintsystem-gradients.png
index 50b2ed3671..50b2ed3671 100644
--- a/doc/src/images/paintsystem-gradients.png
+++ b/src/gui/doc/images/paintsystem-gradients.png
Binary files differ
diff --git a/doc/src/images/paintsystem-icon.png b/src/gui/doc/images/paintsystem-icon.png
index 4623db0761..4623db0761 100644
--- a/doc/src/images/paintsystem-icon.png
+++ b/src/gui/doc/images/paintsystem-icon.png
Binary files differ
diff --git a/doc/src/images/paintsystem-movie.png b/src/gui/doc/images/paintsystem-movie.png
index 992ea9edd4..992ea9edd4 100644
--- a/doc/src/images/paintsystem-movie.png
+++ b/src/gui/doc/images/paintsystem-movie.png
Binary files differ
diff --git a/doc/src/images/paintsystem-painterpath.png b/src/gui/doc/images/paintsystem-painterpath.png
index f8154f2634..f8154f2634 100644
--- a/doc/src/images/paintsystem-painterpath.png
+++ b/src/gui/doc/images/paintsystem-painterpath.png
Binary files differ
diff --git a/doc/src/images/paintsystem-stylepainter.png b/src/gui/doc/images/paintsystem-stylepainter.png
index a67c6c5afc..a67c6c5afc 100644
--- a/doc/src/images/paintsystem-stylepainter.png
+++ b/src/gui/doc/images/paintsystem-stylepainter.png
Binary files differ
diff --git a/doc/src/images/paintsystem-svg.png b/src/gui/doc/images/paintsystem-svg.png
index ecc8ef8f97..ecc8ef8f97 100644
--- a/doc/src/images/paintsystem-svg.png
+++ b/src/gui/doc/images/paintsystem-svg.png
Binary files differ
diff --git a/doc/src/images/qcolor-cmyk.png b/src/gui/doc/images/qcolor-cmyk.png
index dfe8f67a31..dfe8f67a31 100644
--- a/doc/src/images/qcolor-cmyk.png
+++ b/src/gui/doc/images/qcolor-cmyk.png
Binary files differ
diff --git a/doc/src/images/qcolor-hsv.png b/src/gui/doc/images/qcolor-hsv.png
index 49fdf77222..49fdf77222 100644
--- a/doc/src/images/qcolor-hsv.png
+++ b/src/gui/doc/images/qcolor-hsv.png
Binary files differ
diff --git a/doc/src/images/qcolor-hue.png b/src/gui/doc/images/qcolor-hue.png
index 144b27c87a..144b27c87a 100644
--- a/doc/src/images/qcolor-hue.png
+++ b/src/gui/doc/images/qcolor-hue.png
Binary files differ
diff --git a/doc/src/images/qcolor-rgb.png b/src/gui/doc/images/qcolor-rgb.png
index fea4c63fd7..fea4c63fd7 100644
--- a/doc/src/images/qcolor-rgb.png
+++ b/src/gui/doc/images/qcolor-rgb.png
Binary files differ
diff --git a/doc/src/images/qcolor-saturation.png b/src/gui/doc/images/qcolor-saturation.png
index f28776aff5..f28776aff5 100644
--- a/doc/src/images/qcolor-saturation.png
+++ b/src/gui/doc/images/qcolor-saturation.png
Binary files differ
diff --git a/doc/src/images/qcolor-value.png b/src/gui/doc/images/qcolor-value.png
index 0e069123a9..0e069123a9 100644
--- a/doc/src/images/qcolor-value.png
+++ b/src/gui/doc/images/qcolor-value.png
Binary files differ
diff --git a/doc/src/images/qconicalgradient.png b/src/gui/doc/images/qconicalgradient.png
index 82603066fb..82603066fb 100644
--- a/doc/src/images/qconicalgradient.png
+++ b/src/gui/doc/images/qconicalgradient.png
Binary files differ
diff --git a/doc/src/images/qgradient-conical.png b/src/gui/doc/images/qgradient-conical.png
index cf06b70db6..cf06b70db6 100644
--- a/doc/src/images/qgradient-conical.png
+++ b/src/gui/doc/images/qgradient-conical.png
Binary files differ
diff --git a/doc/src/images/qgradient-linear.png b/src/gui/doc/images/qgradient-linear.png
index 5a5e880de7..5a5e880de7 100644
--- a/doc/src/images/qgradient-linear.png
+++ b/src/gui/doc/images/qgradient-linear.png
Binary files differ
diff --git a/doc/src/images/qgradient-radial.png b/src/gui/doc/images/qgradient-radial.png
index 95b9e9c3c9..95b9e9c3c9 100644
--- a/doc/src/images/qgradient-radial.png
+++ b/src/gui/doc/images/qgradient-radial.png
Binary files differ
diff --git a/doc/src/images/qimage-32bit_scaled.png b/src/gui/doc/images/qimage-32bit_scaled.png
index 6932327456..6932327456 100644
--- a/doc/src/images/qimage-32bit_scaled.png
+++ b/src/gui/doc/images/qimage-32bit_scaled.png
Binary files differ
diff --git a/doc/src/images/qimage-8bit_scaled.png b/src/gui/doc/images/qimage-8bit_scaled.png
index 7cbf0f1e29..7cbf0f1e29 100644
--- a/doc/src/images/qimage-8bit_scaled.png
+++ b/src/gui/doc/images/qimage-8bit_scaled.png
Binary files differ
diff --git a/src/gui/doc/images/qimage-scaling.png b/src/gui/doc/images/qimage-scaling.png
new file mode 100644
index 0000000000..fcd71448f0
--- /dev/null
+++ b/src/gui/doc/images/qimage-scaling.png
Binary files differ
diff --git a/doc/src/images/qlineargradient-pad.png b/src/gui/doc/images/qlineargradient-pad.png
index d77eb3dc3d..d77eb3dc3d 100644
--- a/doc/src/images/qlineargradient-pad.png
+++ b/src/gui/doc/images/qlineargradient-pad.png
Binary files differ
diff --git a/doc/src/images/qlineargradient-reflect.png b/src/gui/doc/images/qlineargradient-reflect.png
index dd12665051..dd12665051 100644
--- a/doc/src/images/qlineargradient-reflect.png
+++ b/src/gui/doc/images/qlineargradient-reflect.png
Binary files differ
diff --git a/doc/src/images/qlineargradient-repeat.png b/src/gui/doc/images/qlineargradient-repeat.png
index e38203c438..e38203c438 100644
--- a/doc/src/images/qlineargradient-repeat.png
+++ b/src/gui/doc/images/qlineargradient-repeat.png
Binary files differ
diff --git a/doc/src/images/qmatrix-combinedtransformation.png b/src/gui/doc/images/qmatrix-combinedtransformation.png
index f791bfa917..f791bfa917 100644
--- a/doc/src/images/qmatrix-combinedtransformation.png
+++ b/src/gui/doc/images/qmatrix-combinedtransformation.png
Binary files differ
diff --git a/doc/src/images/qmatrix-representation.png b/src/gui/doc/images/qmatrix-representation.png
index 2e3efd33fc..2e3efd33fc 100644
--- a/doc/src/images/qmatrix-representation.png
+++ b/src/gui/doc/images/qmatrix-representation.png
Binary files differ
diff --git a/doc/src/images/qmatrix-simpletransformation.png b/src/gui/doc/images/qmatrix-simpletransformation.png
index dde8f4bc58..dde8f4bc58 100644
--- a/doc/src/images/qmatrix-simpletransformation.png
+++ b/src/gui/doc/images/qmatrix-simpletransformation.png
Binary files differ
diff --git a/doc/src/images/qpainter-affinetransformations.png b/src/gui/doc/images/qpainter-affinetransformations.png
index fe2f9a072b..fe2f9a072b 100644
--- a/doc/src/images/qpainter-affinetransformations.png
+++ b/src/gui/doc/images/qpainter-affinetransformations.png
Binary files differ
diff --git a/doc/src/images/qpainter-arc.png b/src/gui/doc/images/qpainter-arc.png
index 8cb9cec96b..8cb9cec96b 100644
--- a/doc/src/images/qpainter-arc.png
+++ b/src/gui/doc/images/qpainter-arc.png
Binary files differ
diff --git a/doc/src/images/qpainter-basicdrawing.png b/src/gui/doc/images/qpainter-basicdrawing.png
index 3be48c8737..3be48c8737 100644
--- a/doc/src/images/qpainter-basicdrawing.png
+++ b/src/gui/doc/images/qpainter-basicdrawing.png
Binary files differ
diff --git a/doc/src/images/qpainter-chord.png b/src/gui/doc/images/qpainter-chord.png
index a8090861a0..a8090861a0 100644
--- a/doc/src/images/qpainter-chord.png
+++ b/src/gui/doc/images/qpainter-chord.png
Binary files differ
diff --git a/doc/src/images/qpainter-clock.png b/src/gui/doc/images/qpainter-clock.png
index 3634754161..3634754161 100644
--- a/doc/src/images/qpainter-clock.png
+++ b/src/gui/doc/images/qpainter-clock.png
Binary files differ
diff --git a/doc/src/images/qpainter-compositiondemo.png b/src/gui/doc/images/qpainter-compositiondemo.png
index 40f62c75be..40f62c75be 100644
--- a/doc/src/images/qpainter-compositiondemo.png
+++ b/src/gui/doc/images/qpainter-compositiondemo.png
Binary files differ
diff --git a/doc/src/images/qpainter-compositionmode1.png b/src/gui/doc/images/qpainter-compositionmode1.png
index 6753093521..6753093521 100644
--- a/doc/src/images/qpainter-compositionmode1.png
+++ b/src/gui/doc/images/qpainter-compositionmode1.png
Binary files differ
diff --git a/doc/src/images/qpainter-compositionmode2.png b/src/gui/doc/images/qpainter-compositionmode2.png
index fc05afbd8c..fc05afbd8c 100644
--- a/doc/src/images/qpainter-compositionmode2.png
+++ b/src/gui/doc/images/qpainter-compositionmode2.png
Binary files differ
diff --git a/doc/src/images/qpainter-concentriccircles.png b/src/gui/doc/images/qpainter-concentriccircles.png
index 4889dcd76d..4889dcd76d 100644
--- a/doc/src/images/qpainter-concentriccircles.png
+++ b/src/gui/doc/images/qpainter-concentriccircles.png
Binary files differ
diff --git a/doc/src/images/qpainter-ellipse.png b/src/gui/doc/images/qpainter-ellipse.png
index e7e78c3dac..e7e78c3dac 100644
--- a/doc/src/images/qpainter-ellipse.png
+++ b/src/gui/doc/images/qpainter-ellipse.png
Binary files differ
diff --git a/doc/src/images/qpainter-gradients.png b/src/gui/doc/images/qpainter-gradients.png
index b7bc6a3270..b7bc6a3270 100644
--- a/doc/src/images/qpainter-gradients.png
+++ b/src/gui/doc/images/qpainter-gradients.png
Binary files differ
diff --git a/doc/src/images/qpainter-line.png b/src/gui/doc/images/qpainter-line.png
index 5f1cd97eff..5f1cd97eff 100644
--- a/doc/src/images/qpainter-line.png
+++ b/src/gui/doc/images/qpainter-line.png
Binary files differ
diff --git a/doc/src/images/qpainter-painterpaths.png b/src/gui/doc/images/qpainter-painterpaths.png
index 0762ca93f3..0762ca93f3 100644
--- a/doc/src/images/qpainter-painterpaths.png
+++ b/src/gui/doc/images/qpainter-painterpaths.png
Binary files differ
diff --git a/doc/src/images/qpainter-path.png b/src/gui/doc/images/qpainter-path.png
index 3570b16d7a..3570b16d7a 100644
--- a/doc/src/images/qpainter-path.png
+++ b/src/gui/doc/images/qpainter-path.png
Binary files differ
diff --git a/doc/src/images/qpainter-pathstroking.png b/src/gui/doc/images/qpainter-pathstroking.png
index ab73c6ae01..ab73c6ae01 100644
--- a/doc/src/images/qpainter-pathstroking.png
+++ b/src/gui/doc/images/qpainter-pathstroking.png
Binary files differ
diff --git a/doc/src/images/qpainter-pie.png b/src/gui/doc/images/qpainter-pie.png
index 78039013e0..78039013e0 100644
--- a/doc/src/images/qpainter-pie.png
+++ b/src/gui/doc/images/qpainter-pie.png
Binary files differ
diff --git a/doc/src/images/qpainter-polygon.png b/src/gui/doc/images/qpainter-polygon.png
index 3b6ea3c797..3b6ea3c797 100644
--- a/doc/src/images/qpainter-polygon.png
+++ b/src/gui/doc/images/qpainter-polygon.png
Binary files differ
diff --git a/doc/src/images/qpainter-rectangle.png b/src/gui/doc/images/qpainter-rectangle.png
index 05fdc88300..05fdc88300 100644
--- a/doc/src/images/qpainter-rectangle.png
+++ b/src/gui/doc/images/qpainter-rectangle.png
Binary files differ
diff --git a/doc/src/images/qpainter-rotation.png b/src/gui/doc/images/qpainter-rotation.png
index 6e24a0e040..6e24a0e040 100644
--- a/doc/src/images/qpainter-rotation.png
+++ b/src/gui/doc/images/qpainter-rotation.png
Binary files differ
diff --git a/doc/src/images/qpainter-roundrect.png b/src/gui/doc/images/qpainter-roundrect.png
index 876a277811..876a277811 100644
--- a/doc/src/images/qpainter-roundrect.png
+++ b/src/gui/doc/images/qpainter-roundrect.png
Binary files differ
diff --git a/doc/src/images/qpainter-scale.png b/src/gui/doc/images/qpainter-scale.png
index 4fe582eb13..4fe582eb13 100644
--- a/doc/src/images/qpainter-scale.png
+++ b/src/gui/doc/images/qpainter-scale.png
Binary files differ
diff --git a/doc/src/images/qpainter-text.png b/src/gui/doc/images/qpainter-text.png
index e95c965d7b..e95c965d7b 100644
--- a/doc/src/images/qpainter-text.png
+++ b/src/gui/doc/images/qpainter-text.png
Binary files differ
diff --git a/doc/src/images/qpainter-translation.png b/src/gui/doc/images/qpainter-translation.png
index b3716ca3f6..b3716ca3f6 100644
--- a/doc/src/images/qpainter-translation.png
+++ b/src/gui/doc/images/qpainter-translation.png
Binary files differ
diff --git a/doc/src/images/qpainter-vectordeformation.png b/src/gui/doc/images/qpainter-vectordeformation.png
index aff95f404c..aff95f404c 100644
--- a/doc/src/images/qpainter-vectordeformation.png
+++ b/src/gui/doc/images/qpainter-vectordeformation.png
Binary files differ
diff --git a/doc/src/images/qpainterpath-addellipse.png b/src/gui/doc/images/qpainterpath-addellipse.png
index 98f85174ef..98f85174ef 100644
--- a/doc/src/images/qpainterpath-addellipse.png
+++ b/src/gui/doc/images/qpainterpath-addellipse.png
Binary files differ
diff --git a/doc/src/images/qpainterpath-addpolygon.png b/src/gui/doc/images/qpainterpath-addpolygon.png
index d36bde8ada..d36bde8ada 100644
--- a/doc/src/images/qpainterpath-addpolygon.png
+++ b/src/gui/doc/images/qpainterpath-addpolygon.png
Binary files differ
diff --git a/doc/src/images/qpainterpath-addrectangle.png b/src/gui/doc/images/qpainterpath-addrectangle.png
index be9283e46d..be9283e46d 100644
--- a/doc/src/images/qpainterpath-addrectangle.png
+++ b/src/gui/doc/images/qpainterpath-addrectangle.png
Binary files differ
diff --git a/doc/src/images/qpainterpath-addtext.png b/src/gui/doc/images/qpainterpath-addtext.png
index 803a9581ac..803a9581ac 100644
--- a/doc/src/images/qpainterpath-addtext.png
+++ b/src/gui/doc/images/qpainterpath-addtext.png
Binary files differ
diff --git a/doc/src/images/qpainterpath-arcto.png b/src/gui/doc/images/qpainterpath-arcto.png
index fe60b08d31..fe60b08d31 100644
--- a/doc/src/images/qpainterpath-arcto.png
+++ b/src/gui/doc/images/qpainterpath-arcto.png
Binary files differ
diff --git a/doc/src/images/qpainterpath-construction.png b/src/gui/doc/images/qpainterpath-construction.png
index 4beeba1dd8..4beeba1dd8 100644
--- a/doc/src/images/qpainterpath-construction.png
+++ b/src/gui/doc/images/qpainterpath-construction.png
Binary files differ
diff --git a/doc/src/images/qpainterpath-cubicto.png b/src/gui/doc/images/qpainterpath-cubicto.png
index 465bfeca29..465bfeca29 100644
--- a/doc/src/images/qpainterpath-cubicto.png
+++ b/src/gui/doc/images/qpainterpath-cubicto.png
Binary files differ
diff --git a/doc/src/images/qpainterpath-demo.png b/src/gui/doc/images/qpainterpath-demo.png
index ceeed2f170..ceeed2f170 100644
--- a/doc/src/images/qpainterpath-demo.png
+++ b/src/gui/doc/images/qpainterpath-demo.png
Binary files differ
diff --git a/doc/src/images/qpainterpath-example.png b/src/gui/doc/images/qpainterpath-example.png
index f2bd359aba..f2bd359aba 100644
--- a/doc/src/images/qpainterpath-example.png
+++ b/src/gui/doc/images/qpainterpath-example.png
Binary files differ
diff --git a/src/gui/doc/images/qpen-bevel.png b/src/gui/doc/images/qpen-bevel.png
new file mode 100644
index 0000000000..8a30779e3b
--- /dev/null
+++ b/src/gui/doc/images/qpen-bevel.png
Binary files differ
diff --git a/src/gui/doc/images/qpen-custom.png b/src/gui/doc/images/qpen-custom.png
new file mode 100644
index 0000000000..a2a038abe0
--- /dev/null
+++ b/src/gui/doc/images/qpen-custom.png
Binary files differ
diff --git a/src/gui/doc/images/qpen-dash.png b/src/gui/doc/images/qpen-dash.png
new file mode 100644
index 0000000000..67082c3758
--- /dev/null
+++ b/src/gui/doc/images/qpen-dash.png
Binary files differ
diff --git a/src/gui/doc/images/qpen-dashdot.png b/src/gui/doc/images/qpen-dashdot.png
new file mode 100644
index 0000000000..64b384660f
--- /dev/null
+++ b/src/gui/doc/images/qpen-dashdot.png
Binary files differ
diff --git a/src/gui/doc/images/qpen-dashdotdot.png b/src/gui/doc/images/qpen-dashdotdot.png
new file mode 100644
index 0000000000..ff1b2e69cd
--- /dev/null
+++ b/src/gui/doc/images/qpen-dashdotdot.png
Binary files differ
diff --git a/doc/src/images/qpen-dashpattern.png b/src/gui/doc/images/qpen-dashpattern.png
index e33cf58d49..e33cf58d49 100644
--- a/doc/src/images/qpen-dashpattern.png
+++ b/src/gui/doc/images/qpen-dashpattern.png
Binary files differ
diff --git a/doc/src/images/qpen-demo.png b/src/gui/doc/images/qpen-demo.png
index 3ea5108802..3ea5108802 100644
--- a/doc/src/images/qpen-demo.png
+++ b/src/gui/doc/images/qpen-demo.png
Binary files differ
diff --git a/src/gui/doc/images/qpen-dot.png b/src/gui/doc/images/qpen-dot.png
new file mode 100644
index 0000000000..54e81c9469
--- /dev/null
+++ b/src/gui/doc/images/qpen-dot.png
Binary files differ
diff --git a/src/gui/doc/images/qpen-flat.png b/src/gui/doc/images/qpen-flat.png
new file mode 100644
index 0000000000..06e2195f73
--- /dev/null
+++ b/src/gui/doc/images/qpen-flat.png
Binary files differ
diff --git a/src/gui/doc/images/qpen-miter.png b/src/gui/doc/images/qpen-miter.png
new file mode 100644
index 0000000000..025e003979
--- /dev/null
+++ b/src/gui/doc/images/qpen-miter.png
Binary files differ
diff --git a/doc/src/images/qpen-miterlimit.png b/src/gui/doc/images/qpen-miterlimit.png
index 17a90725fb..17a90725fb 100644
--- a/doc/src/images/qpen-miterlimit.png
+++ b/src/gui/doc/images/qpen-miterlimit.png
Binary files differ
diff --git a/src/gui/doc/images/qpen-roundcap.png b/src/gui/doc/images/qpen-roundcap.png
new file mode 100644
index 0000000000..77b22b2bab
--- /dev/null
+++ b/src/gui/doc/images/qpen-roundcap.png
Binary files differ
diff --git a/src/gui/doc/images/qpen-roundjoin.png b/src/gui/doc/images/qpen-roundjoin.png
new file mode 100644
index 0000000000..155e2aa8cc
--- /dev/null
+++ b/src/gui/doc/images/qpen-roundjoin.png
Binary files differ
diff --git a/src/gui/doc/images/qpen-solid.png b/src/gui/doc/images/qpen-solid.png
new file mode 100644
index 0000000000..e042b18017
--- /dev/null
+++ b/src/gui/doc/images/qpen-solid.png
Binary files differ
diff --git a/src/gui/doc/images/qpen-square.png b/src/gui/doc/images/qpen-square.png
new file mode 100644
index 0000000000..ebc5d1e329
--- /dev/null
+++ b/src/gui/doc/images/qpen-square.png
Binary files differ
diff --git a/doc/src/images/qradialgradient-pad.png b/src/gui/doc/images/qradialgradient-pad.png
index 6c1a6cb268..6c1a6cb268 100644
--- a/doc/src/images/qradialgradient-pad.png
+++ b/src/gui/doc/images/qradialgradient-pad.png
Binary files differ
diff --git a/doc/src/images/qradialgradient-reflect.png b/src/gui/doc/images/qradialgradient-reflect.png
index 5122b180b1..5122b180b1 100644
--- a/doc/src/images/qradialgradient-reflect.png
+++ b/src/gui/doc/images/qradialgradient-reflect.png
Binary files differ
diff --git a/doc/src/images/qradialgradient-repeat.png b/src/gui/doc/images/qradialgradient-repeat.png
index aa639b7779..aa639b7779 100644
--- a/doc/src/images/qradialgradient-repeat.png
+++ b/src/gui/doc/images/qradialgradient-repeat.png
Binary files differ
diff --git a/src/gui/doc/images/qrect-diagram-zero.png b/src/gui/doc/images/qrect-diagram-zero.png
new file mode 100644
index 0000000000..90e3db0c41
--- /dev/null
+++ b/src/gui/doc/images/qrect-diagram-zero.png
Binary files differ
diff --git a/src/gui/doc/images/qrectf-diagram-one.png b/src/gui/doc/images/qrectf-diagram-one.png
new file mode 100644
index 0000000000..842289ce07
--- /dev/null
+++ b/src/gui/doc/images/qrectf-diagram-one.png
Binary files differ
diff --git a/src/gui/doc/images/qrectf-diagram-three.png b/src/gui/doc/images/qrectf-diagram-three.png
new file mode 100644
index 0000000000..e05106a7e1
--- /dev/null
+++ b/src/gui/doc/images/qrectf-diagram-three.png
Binary files differ
diff --git a/src/gui/doc/images/qrectf-diagram-two.png b/src/gui/doc/images/qrectf-diagram-two.png
new file mode 100644
index 0000000000..192d00df79
--- /dev/null
+++ b/src/gui/doc/images/qrectf-diagram-two.png
Binary files differ
diff --git a/doc/src/images/qstatustipevent-action.png b/src/gui/doc/images/qstatustipevent-action.png
index c5dcfd25f5..c5dcfd25f5 100644
--- a/doc/src/images/qstatustipevent-action.png
+++ b/src/gui/doc/images/qstatustipevent-action.png
Binary files differ
diff --git a/doc/src/images/qstatustipevent-widget.png b/src/gui/doc/images/qstatustipevent-widget.png
index 3cc0a1f01b..3cc0a1f01b 100644
--- a/doc/src/images/qstatustipevent-widget.png
+++ b/src/gui/doc/images/qstatustipevent-widget.png
Binary files differ
diff --git a/doc/src/images/qt-fillrule-oddeven.png b/src/gui/doc/images/qt-fillrule-oddeven.png
index f39d1056f5..f39d1056f5 100644
--- a/doc/src/images/qt-fillrule-oddeven.png
+++ b/src/gui/doc/images/qt-fillrule-oddeven.png
Binary files differ
diff --git a/doc/src/images/qt-fillrule-winding.png b/src/gui/doc/images/qt-fillrule-winding.png
index 8018248331..8018248331 100644
--- a/doc/src/images/qt-fillrule-winding.png
+++ b/src/gui/doc/images/qt-fillrule-winding.png
Binary files differ
diff --git a/doc/src/images/qtexttableformat-cell.png b/src/gui/doc/images/qtexttableformat-cell.png
index bbf85ffe46..bbf85ffe46 100644
--- a/doc/src/images/qtexttableformat-cell.png
+++ b/src/gui/doc/images/qtexttableformat-cell.png
Binary files differ
diff --git a/doc/src/images/qtransform-combinedtransformation.png b/src/gui/doc/images/qtransform-combinedtransformation.png
index df1e226746..df1e226746 100644
--- a/doc/src/images/qtransform-combinedtransformation.png
+++ b/src/gui/doc/images/qtransform-combinedtransformation.png
Binary files differ
diff --git a/doc/src/images/qtransform-combinedtransformation2.png b/src/gui/doc/images/qtransform-combinedtransformation2.png
index c037a0d565..c037a0d565 100644
--- a/doc/src/images/qtransform-combinedtransformation2.png
+++ b/src/gui/doc/images/qtransform-combinedtransformation2.png
Binary files differ
diff --git a/doc/src/images/qtransform-representation.png b/src/gui/doc/images/qtransform-representation.png
index 883d5dc487..883d5dc487 100644
--- a/doc/src/images/qtransform-representation.png
+++ b/src/gui/doc/images/qtransform-representation.png
Binary files differ
diff --git a/doc/src/images/qtransform-simpletransformation.png b/src/gui/doc/images/qtransform-simpletransformation.png
index 743e4e3e07..743e4e3e07 100644
--- a/doc/src/images/qtransform-simpletransformation.png
+++ b/src/gui/doc/images/qtransform-simpletransformation.png
Binary files differ
diff --git a/doc/src/images/texttable-merge.png b/src/gui/doc/images/texttable-merge.png
index 3b32239a42..3b32239a42 100644
--- a/doc/src/images/texttable-merge.png
+++ b/src/gui/doc/images/texttable-merge.png
Binary files differ
diff --git a/doc/src/images/texttable-split.png b/src/gui/doc/images/texttable-split.png
index 2fa17b85a3..2fa17b85a3 100644
--- a/doc/src/images/texttable-split.png
+++ b/src/gui/doc/images/texttable-split.png
Binary files differ
diff --git a/src/gui/doc/qtgui.qdocconf b/src/gui/doc/qtgui.qdocconf
new file mode 100644
index 0000000000..85772bbc3e
--- /dev/null
+++ b/src/gui/doc/qtgui.qdocconf
@@ -0,0 +1,92 @@
+include(../../../doc/global/qt-cpp-ignore.qdocconf)
+
+project = QtGui
+description = Qt GUI Reference Documentation
+url = http://qt-project.org/doc/qt-5.0/qtgui
+version = 5.0.0
+
+sourceencoding = UTF-8
+outputencoding = UTF-8
+naturallanguage = en_US
+qhp.projects = QtGui
+
+qhp.QtGui.file = qtgui.qhp
+qhp.QtGui.namespace = org.qt-project.qtgui.500
+qhp.QtGui.virtualFolder = qdoc
+qhp.QtGui.indexTitle = Qt GUI Reference Documentation
+qhp.QtGui.indexRoot =
+
+qhp.QtGui.filterAttributes = qtgui 5.0.0 qtrefdoc
+qhp.QtGui.customFilters.Qt.name = Qtgui 5.0.0
+qhp.QtGui.customFilters.Qt.filterAttributes = qtgui 5.0.0
+qhp.QtGui.subprojects = classes overviews examples
+qhp.QtGui.subprojects.classes.title = Classes
+qhp.QtGui.subprojects.classes.indexTitle = Qt GUI's Classes
+qhp.QtGui.subprojects.classes.selectors = class fake:headerfile
+qhp.QtGui.subprojects.classes.sortPages = true
+qhp.QtGui.subprojects.overviews.title = Overviews
+qhp.QtGui.subprojects.overviews.indexTitle = All Overviews and HOWTOs
+qhp.QtGui.subprojects.overviews.selectors = fake:page,group,module
+qhp.QtGui.subprojects.examples.title = Qt GUI Examples
+qhp.QtGui.subprojects.examples.indexTitle = Qt GUI Examples
+qhp.QtGui.subprojects.examples.selectors = fake:example
+
+dita.metadata.default.author = Qt Project
+dita.metadata.default.permissions = all
+dita.metadata.default.publisher = Qt Project
+dita.metadata.default.copyryear = 2012
+dita.metadata.default.copyrholder = Nokia
+dita.metadata.default.audience = programmer
+
+sources.fileextensions = "*.c++ *.cc *.cpp *.cxx *.mm *.qml *.qdoc"
+headers.fileextensions = "*.ch *.h *.h++ *.hh *.hpp *.hxx"
+
+examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml *.css"
+examples.imageextensions = "*.png"
+
+outputdir = ../../../doc/qtgui
+tagfile = ../../../doc/qtgui/qtgui.tags
+
+HTML.generatemacrefs = "true"
+HTML.nobreadcrumbs = "true"
+
+HTML.templatedir = .
+
+HTML.stylesheets = ../../../doc/global/style/offline.css
+
+HTML.headerstyles = \
+ " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n"
+
+HTML.endheader = \
+ "</head>\n" \
+
+defines = Q_QDOC \
+ QT_.*_SUPPORT \
+ QT_.*_LIB \
+ QT_COMPAT \
+ QT_KEYPAD_NAVIGATION \
+ QT_NO_EGL \
+ Q_WS_.* \
+ Q_OS_.* \
+ Q_BYTE_ORDER \
+ QT_DEPRECATED \
+ QT_DEPRECATED_* \
+ Q_NO_USING_KEYWORD \
+ __cplusplus \
+ Q_COMPILER_INITIALIZER_LISTS
+
+versionsym = QT_VERSION_STR
+
+codeindent = 1
+
+depends += qtcore
+
+headerdirs += ..
+
+sourcedirs += ..
+
+exampledirs += ../../../examples \
+ ../ \
+ snippets
+
+imagedirs += images
diff --git a/doc/src/snippets/brush/brush.cpp b/src/gui/doc/snippets/brush/brush.cpp
index a92223ee93..a92223ee93 100644
--- a/doc/src/snippets/brush/brush.cpp
+++ b/src/gui/doc/snippets/brush/brush.cpp
diff --git a/doc/src/snippets/brush/gradientcreationsnippet.cpp b/src/gui/doc/snippets/brush/gradientcreationsnippet.cpp
index 9ec8c3f07a..9ec8c3f07a 100644
--- a/doc/src/snippets/brush/gradientcreationsnippet.cpp
+++ b/src/gui/doc/snippets/brush/gradientcreationsnippet.cpp
diff --git a/doc/src/snippets/code/doc_src_coordsys.cpp b/src/gui/doc/snippets/code/doc_src_coordsys.cpp
index b677d28a50..b677d28a50 100644
--- a/doc/src/snippets/code/doc_src_coordsys.cpp
+++ b/src/gui/doc/snippets/code/doc_src_coordsys.cpp
diff --git a/doc/src/snippets/code/doc_src_qtgui.pro b/src/gui/doc/snippets/code/doc_src_qtgui.pro
index 51bb6c74ff..51bb6c74ff 100644
--- a/doc/src/snippets/code/doc_src_qtgui.pro
+++ b/src/gui/doc/snippets/code/doc_src_qtgui.pro
diff --git a/doc/src/snippets/code/src_gui_accessible_qaccessible.cpp b/src/gui/doc/snippets/code/src_gui_accessible_qaccessible.cpp
index f12f55051e..f12f55051e 100644
--- a/doc/src/snippets/code/src_gui_accessible_qaccessible.cpp
+++ b/src/gui/doc/snippets/code/src_gui_accessible_qaccessible.cpp
diff --git a/doc/src/snippets/code/src_gui_image_qimage.cpp b/src/gui/doc/snippets/code/src_gui_image_qimage.cpp
index 0c39e22eb6..0c39e22eb6 100644
--- a/doc/src/snippets/code/src_gui_image_qimage.cpp
+++ b/src/gui/doc/snippets/code/src_gui_image_qimage.cpp
diff --git a/doc/src/snippets/code/src_gui_image_qimagereader.cpp b/src/gui/doc/snippets/code/src_gui_image_qimagereader.cpp
index 92f528e6c0..92f528e6c0 100644
--- a/doc/src/snippets/code/src_gui_image_qimagereader.cpp
+++ b/src/gui/doc/snippets/code/src_gui_image_qimagereader.cpp
diff --git a/doc/src/snippets/code/src_gui_image_qimagewriter.cpp b/src/gui/doc/snippets/code/src_gui_image_qimagewriter.cpp
index d0f11929d3..d0f11929d3 100644
--- a/doc/src/snippets/code/src_gui_image_qimagewriter.cpp
+++ b/src/gui/doc/snippets/code/src_gui_image_qimagewriter.cpp
diff --git a/doc/src/snippets/code/src_gui_image_qmovie.cpp b/src/gui/doc/snippets/code/src_gui_image_qmovie.cpp
index 5d57d19204..5d57d19204 100644
--- a/doc/src/snippets/code/src_gui_image_qmovie.cpp
+++ b/src/gui/doc/snippets/code/src_gui_image_qmovie.cpp
diff --git a/doc/src/snippets/code/src_gui_image_qpixmap.cpp b/src/gui/doc/snippets/code/src_gui_image_qpixmap.cpp
index b8c0fcfbd5..b8c0fcfbd5 100644
--- a/doc/src/snippets/code/src_gui_image_qpixmap.cpp
+++ b/src/gui/doc/snippets/code/src_gui_image_qpixmap.cpp
diff --git a/doc/src/snippets/code/src_gui_image_qpixmapcache.cpp b/src/gui/doc/snippets/code/src_gui_image_qpixmapcache.cpp
index 9d42f6b330..9d42f6b330 100644
--- a/doc/src/snippets/code/src_gui_image_qpixmapcache.cpp
+++ b/src/gui/doc/snippets/code/src_gui_image_qpixmapcache.cpp
diff --git a/doc/src/snippets/code/src_gui_kernel_qapplication.cpp b/src/gui/doc/snippets/code/src_gui_kernel_qapplication.cpp
index b32e8c3f39..b32e8c3f39 100644
--- a/doc/src/snippets/code/src_gui_kernel_qapplication.cpp
+++ b/src/gui/doc/snippets/code/src_gui_kernel_qapplication.cpp
diff --git a/doc/src/snippets/code/src_gui_kernel_qapplication_x11.cpp b/src/gui/doc/snippets/code/src_gui_kernel_qapplication_x11.cpp
index 1d37765e3c..1d37765e3c 100644
--- a/doc/src/snippets/code/src_gui_kernel_qapplication_x11.cpp
+++ b/src/gui/doc/snippets/code/src_gui_kernel_qapplication_x11.cpp
diff --git a/doc/src/snippets/code/src_gui_kernel_qclipboard.cpp b/src/gui/doc/snippets/code/src_gui_kernel_qclipboard.cpp
index 4cf8f33c02..4cf8f33c02 100644
--- a/doc/src/snippets/code/src_gui_kernel_qclipboard.cpp
+++ b/src/gui/doc/snippets/code/src_gui_kernel_qclipboard.cpp
diff --git a/doc/src/snippets/code/src_gui_kernel_qevent.cpp b/src/gui/doc/snippets/code/src_gui_kernel_qevent.cpp
index d8bdeebe84..d8bdeebe84 100644
--- a/doc/src/snippets/code/src_gui_kernel_qevent.cpp
+++ b/src/gui/doc/snippets/code/src_gui_kernel_qevent.cpp
diff --git a/doc/src/snippets/code/src_gui_kernel_qkeysequence.cpp b/src/gui/doc/snippets/code/src_gui_kernel_qkeysequence.cpp
index 79dc967cf3..79dc967cf3 100644
--- a/doc/src/snippets/code/src_gui_kernel_qkeysequence.cpp
+++ b/src/gui/doc/snippets/code/src_gui_kernel_qkeysequence.cpp
diff --git a/doc/src/snippets/code/src_gui_kernel_qshortcutmap.cpp b/src/gui/doc/snippets/code/src_gui_kernel_qshortcutmap.cpp
index d761e31d3d..d761e31d3d 100644
--- a/doc/src/snippets/code/src_gui_kernel_qshortcutmap.cpp
+++ b/src/gui/doc/snippets/code/src_gui_kernel_qshortcutmap.cpp
diff --git a/doc/src/snippets/code/src_gui_painting_qbrush.cpp b/src/gui/doc/snippets/code/src_gui_painting_qbrush.cpp
index 8678c48d62..8678c48d62 100644
--- a/doc/src/snippets/code/src_gui_painting_qbrush.cpp
+++ b/src/gui/doc/snippets/code/src_gui_painting_qbrush.cpp
diff --git a/doc/src/snippets/code/src_gui_painting_qcolor.cpp b/src/gui/doc/snippets/code/src_gui_painting_qcolor.cpp
index 8954fed604..8954fed604 100644
--- a/doc/src/snippets/code/src_gui_painting_qcolor.cpp
+++ b/src/gui/doc/snippets/code/src_gui_painting_qcolor.cpp
diff --git a/doc/src/snippets/code/src_gui_painting_qmatrix.cpp b/src/gui/doc/snippets/code/src_gui_painting_qmatrix.cpp
index d4e1b57b3c..d4e1b57b3c 100644
--- a/doc/src/snippets/code/src_gui_painting_qmatrix.cpp
+++ b/src/gui/doc/snippets/code/src_gui_painting_qmatrix.cpp
diff --git a/doc/src/snippets/code/src_gui_painting_qpainter.cpp b/src/gui/doc/snippets/code/src_gui_painting_qpainter.cpp
index 8caffa46f4..8caffa46f4 100644
--- a/doc/src/snippets/code/src_gui_painting_qpainter.cpp
+++ b/src/gui/doc/snippets/code/src_gui_painting_qpainter.cpp
diff --git a/doc/src/snippets/code/src_gui_painting_qpainterpath.cpp b/src/gui/doc/snippets/code/src_gui_painting_qpainterpath.cpp
index b23f8cea23..b23f8cea23 100644
--- a/doc/src/snippets/code/src_gui_painting_qpainterpath.cpp
+++ b/src/gui/doc/snippets/code/src_gui_painting_qpainterpath.cpp
diff --git a/doc/src/snippets/code/src_gui_painting_qpen.cpp b/src/gui/doc/snippets/code/src_gui_painting_qpen.cpp
index 4da729b88d..4da729b88d 100644
--- a/doc/src/snippets/code/src_gui_painting_qpen.cpp
+++ b/src/gui/doc/snippets/code/src_gui_painting_qpen.cpp
diff --git a/doc/src/snippets/code/src_gui_painting_qregion.cpp b/src/gui/doc/snippets/code/src_gui_painting_qregion.cpp
index 8f334c5695..8f334c5695 100644
--- a/doc/src/snippets/code/src_gui_painting_qregion.cpp
+++ b/src/gui/doc/snippets/code/src_gui_painting_qregion.cpp
diff --git a/doc/src/snippets/code/src_gui_painting_qregion_unix.cpp b/src/gui/doc/snippets/code/src_gui_painting_qregion_unix.cpp
index 63b9de19d1..63b9de19d1 100644
--- a/doc/src/snippets/code/src_gui_painting_qregion_unix.cpp
+++ b/src/gui/doc/snippets/code/src_gui_painting_qregion_unix.cpp
diff --git a/doc/src/snippets/code/src_gui_painting_qtransform.cpp b/src/gui/doc/snippets/code/src_gui_painting_qtransform.cpp
index f54e0a07ca..f54e0a07ca 100644
--- a/doc/src/snippets/code/src_gui_painting_qtransform.cpp
+++ b/src/gui/doc/snippets/code/src_gui_painting_qtransform.cpp
diff --git a/doc/src/snippets/code/src_gui_qopenglshaderprogram.cpp b/src/gui/doc/snippets/code/src_gui_qopenglshaderprogram.cpp
index 637527036f..637527036f 100644
--- a/doc/src/snippets/code/src_gui_qopenglshaderprogram.cpp
+++ b/src/gui/doc/snippets/code/src_gui_qopenglshaderprogram.cpp
diff --git a/doc/src/snippets/code/src_gui_text_qfont.cpp b/src/gui/doc/snippets/code/src_gui_text_qfont.cpp
index fab550cbc7..fab550cbc7 100644
--- a/doc/src/snippets/code/src_gui_text_qfont.cpp
+++ b/src/gui/doc/snippets/code/src_gui_text_qfont.cpp
diff --git a/doc/src/snippets/code/src_gui_text_qfontmetrics.cpp b/src/gui/doc/snippets/code/src_gui_text_qfontmetrics.cpp
index b864b4ddcc..b864b4ddcc 100644
--- a/doc/src/snippets/code/src_gui_text_qfontmetrics.cpp
+++ b/src/gui/doc/snippets/code/src_gui_text_qfontmetrics.cpp
diff --git a/doc/src/snippets/code/src_gui_text_qsyntaxhighlighter.cpp b/src/gui/doc/snippets/code/src_gui_text_qsyntaxhighlighter.cpp
index 3fb6b35bb9..3fb6b35bb9 100644
--- a/doc/src/snippets/code/src_gui_text_qsyntaxhighlighter.cpp
+++ b/src/gui/doc/snippets/code/src_gui_text_qsyntaxhighlighter.cpp
diff --git a/doc/src/snippets/code/src_gui_text_qtextcursor.cpp b/src/gui/doc/snippets/code/src_gui_text_qtextcursor.cpp
index 7954f66cbd..7954f66cbd 100644
--- a/doc/src/snippets/code/src_gui_text_qtextcursor.cpp
+++ b/src/gui/doc/snippets/code/src_gui_text_qtextcursor.cpp
diff --git a/doc/src/snippets/code/src_gui_text_qtextdocument.cpp b/src/gui/doc/snippets/code/src_gui_text_qtextdocument.cpp
index 23ebf8b2d2..23ebf8b2d2 100644
--- a/doc/src/snippets/code/src_gui_text_qtextdocument.cpp
+++ b/src/gui/doc/snippets/code/src_gui_text_qtextdocument.cpp
diff --git a/doc/src/snippets/code/src.gui.text.qtextdocumentwriter.cpp b/src/gui/doc/snippets/code/src_gui_text_qtextdocumentwriter.cpp
index 59ef46c422..59ef46c422 100644
--- a/doc/src/snippets/code/src.gui.text.qtextdocumentwriter.cpp
+++ b/src/gui/doc/snippets/code/src_gui_text_qtextdocumentwriter.cpp
diff --git a/doc/src/snippets/code/src_gui_text_qtextlayout.cpp b/src/gui/doc/snippets/code/src_gui_text_qtextlayout.cpp
index c8e1d2e010..c8e1d2e010 100644
--- a/doc/src/snippets/code/src_gui_text_qtextlayout.cpp
+++ b/src/gui/doc/snippets/code/src_gui_text_qtextlayout.cpp
diff --git a/doc/src/snippets/code/src_gui_util_qdesktopservices.cpp b/src/gui/doc/snippets/code/src_gui_util_qdesktopservices.cpp
index 0b4739841b..0b4739841b 100644
--- a/doc/src/snippets/code/src_gui_util_qdesktopservices.cpp
+++ b/src/gui/doc/snippets/code/src_gui_util_qdesktopservices.cpp
diff --git a/doc/src/snippets/code/src_gui_widgets_qvalidator.cpp b/src/gui/doc/snippets/code/src_gui_util_qvalidator.cpp
index 2f769c5860..2f769c5860 100644
--- a/doc/src/snippets/code/src_gui_widgets_qvalidator.cpp
+++ b/src/gui/doc/snippets/code/src_gui_util_qvalidator.cpp
diff --git a/doc/src/snippets/dragging/mainwindow.cpp b/src/gui/doc/snippets/dragging/mainwindow.cpp
index 57f1abc22d..57f1abc22d 100644
--- a/doc/src/snippets/dragging/mainwindow.cpp
+++ b/src/gui/doc/snippets/dragging/mainwindow.cpp
diff --git a/doc/src/snippets/droparea.cpp b/src/gui/doc/snippets/droparea.cpp
index 27d52d1b89..27d52d1b89 100644
--- a/doc/src/snippets/droparea.cpp
+++ b/src/gui/doc/snippets/droparea.cpp
diff --git a/doc/src/snippets/image/image.cpp b/src/gui/doc/snippets/image/image.cpp
index 1dfe41f8cd..1dfe41f8cd 100644
--- a/doc/src/snippets/image/image.cpp
+++ b/src/gui/doc/snippets/image/image.cpp
diff --git a/doc/src/snippets/image/supportedformat.cpp b/src/gui/doc/snippets/image/supportedformat.cpp
index 6d481908e8..6d481908e8 100644
--- a/doc/src/snippets/image/supportedformat.cpp
+++ b/src/gui/doc/snippets/image/supportedformat.cpp
diff --git a/doc/src/snippets/matrix/matrix.cpp b/src/gui/doc/snippets/matrix/matrix.cpp
index 2aa2606fc6..2aa2606fc6 100644
--- a/doc/src/snippets/matrix/matrix.cpp
+++ b/src/gui/doc/snippets/matrix/matrix.cpp
diff --git a/doc/src/snippets/picture/picture.cpp b/src/gui/doc/snippets/picture/picture.cpp
index 8de5e32323..8de5e32323 100644
--- a/doc/src/snippets/picture/picture.cpp
+++ b/src/gui/doc/snippets/picture/picture.cpp
diff --git a/doc/src/snippets/polygon/polygon.cpp b/src/gui/doc/snippets/polygon/polygon.cpp
index 432156f8e6..432156f8e6 100644
--- a/doc/src/snippets/polygon/polygon.cpp
+++ b/src/gui/doc/snippets/polygon/polygon.cpp
diff --git a/doc/src/snippets/qfontdatabase/main.cpp b/src/gui/doc/snippets/qfontdatabase/main.cpp
index 8e98e309a0..8e98e309a0 100644
--- a/doc/src/snippets/qfontdatabase/main.cpp
+++ b/src/gui/doc/snippets/qfontdatabase/main.cpp
diff --git a/doc/src/snippets/qstatustipevent/main.cpp b/src/gui/doc/snippets/qstatustipevent/main.cpp
index 9a1948f4e8..9a1948f4e8 100644
--- a/doc/src/snippets/qstatustipevent/main.cpp
+++ b/src/gui/doc/snippets/qstatustipevent/main.cpp
diff --git a/doc/src/snippets/separations/finalwidget.cpp b/src/gui/doc/snippets/separations/finalwidget.cpp
index 81a4aa1c42..81a4aa1c42 100644
--- a/doc/src/snippets/separations/finalwidget.cpp
+++ b/src/gui/doc/snippets/separations/finalwidget.cpp
diff --git a/doc/src/snippets/textblock-fragments/xmlwriter.cpp b/src/gui/doc/snippets/textblock-fragments/xmlwriter.cpp
index cd9beadd00..cd9beadd00 100644
--- a/doc/src/snippets/textblock-fragments/xmlwriter.cpp
+++ b/src/gui/doc/snippets/textblock-fragments/xmlwriter.cpp
diff --git a/doc/src/snippets/textdocument-css/main.cpp b/src/gui/doc/snippets/textdocument-css/main.cpp
index 55b8571224..55b8571224 100644
--- a/doc/src/snippets/textdocument-css/main.cpp
+++ b/src/gui/doc/snippets/textdocument-css/main.cpp
diff --git a/doc/src/snippets/textdocument-listitemstyles/main.cpp b/src/gui/doc/snippets/textdocument-listitemstyles/main.cpp
index 223ec22bae..223ec22bae 100644
--- a/doc/src/snippets/textdocument-listitemstyles/main.cpp
+++ b/src/gui/doc/snippets/textdocument-listitemstyles/main.cpp
diff --git a/doc/src/snippets/textdocument-listitemstyles/mainwindow.cpp b/src/gui/doc/snippets/textdocument-listitemstyles/mainwindow.cpp
index 029695eca3..029695eca3 100644
--- a/doc/src/snippets/textdocument-listitemstyles/mainwindow.cpp
+++ b/src/gui/doc/snippets/textdocument-listitemstyles/mainwindow.cpp
diff --git a/doc/src/snippets/textdocument-listitemstyles/mainwindow.h b/src/gui/doc/snippets/textdocument-listitemstyles/mainwindow.h
index fc5c6db2a7..fc5c6db2a7 100644
--- a/doc/src/snippets/textdocument-listitemstyles/mainwindow.h
+++ b/src/gui/doc/snippets/textdocument-listitemstyles/mainwindow.h
diff --git a/doc/src/snippets/textdocument-listitemstyles/textdocument-listitemstyles.pro b/src/gui/doc/snippets/textdocument-listitemstyles/textdocument-listitemstyles.pro
index 5da8d6e1a1..5da8d6e1a1 100644
--- a/doc/src/snippets/textdocument-listitemstyles/textdocument-listitemstyles.pro
+++ b/src/gui/doc/snippets/textdocument-listitemstyles/textdocument-listitemstyles.pro
diff --git a/doc/src/snippets/textdocument-lists/mainwindow.cpp b/src/gui/doc/snippets/textdocument-lists/mainwindow.cpp
index 7ae36b0ced..7ae36b0ced 100644
--- a/doc/src/snippets/textdocument-lists/mainwindow.cpp
+++ b/src/gui/doc/snippets/textdocument-lists/mainwindow.cpp
diff --git a/doc/src/snippets/textdocument-resources/main.cpp b/src/gui/doc/snippets/textdocument-resources/main.cpp
index ed26793d78..ed26793d78 100644
--- a/doc/src/snippets/textdocument-resources/main.cpp
+++ b/src/gui/doc/snippets/textdocument-resources/main.cpp
diff --git a/doc/src/snippets/textdocument-resources/textdocument-resources.pro b/src/gui/doc/snippets/textdocument-resources/textdocument-resources.pro
index 16181f21cf..16181f21cf 100644
--- a/doc/src/snippets/textdocument-resources/textdocument-resources.pro
+++ b/src/gui/doc/snippets/textdocument-resources/textdocument-resources.pro
diff --git a/doc/src/snippets/textdocument-tables/mainwindow.cpp b/src/gui/doc/snippets/textdocument-tables/mainwindow.cpp
index 79e5f03df4..79e5f03df4 100644
--- a/doc/src/snippets/textdocument-tables/mainwindow.cpp
+++ b/src/gui/doc/snippets/textdocument-tables/mainwindow.cpp
diff --git a/doc/src/snippets/textdocument-texttable/main.cpp b/src/gui/doc/snippets/textdocument-texttable/main.cpp
index ca5338533c..ca5338533c 100644
--- a/doc/src/snippets/textdocument-texttable/main.cpp
+++ b/src/gui/doc/snippets/textdocument-texttable/main.cpp
diff --git a/doc/src/snippets/textdocumentendsnippet.cpp b/src/gui/doc/snippets/textdocumentendsnippet.cpp
index caec20dc9b..caec20dc9b 100644
--- a/doc/src/snippets/textdocumentendsnippet.cpp
+++ b/src/gui/doc/snippets/textdocumentendsnippet.cpp
diff --git a/doc/src/snippets/transform/main.cpp b/src/gui/doc/snippets/transform/main.cpp
index d1c600828d..d1c600828d 100644
--- a/doc/src/snippets/transform/main.cpp
+++ b/src/gui/doc/snippets/transform/main.cpp
diff --git a/doc/src/gui/coordsys.qdoc b/src/gui/doc/src/coordsys.qdoc
index 655dbf7cf3..bfa046f7fb 100644
--- a/doc/src/gui/coordsys.qdoc
+++ b/src/gui/doc/src/coordsys.qdoc
@@ -97,10 +97,10 @@
\row
\li
- \snippet doc/src/snippets/code/doc_src_coordsys.cpp 0
+ \snippet code/doc_src_coordsys.cpp 0
\li
- \snippet doc/src/snippets/code/doc_src_coordsys.cpp 1
+ \snippet code/doc_src_coordsys.cpp 1
\endtable
When rendering with a pen with an even number of pixels, the
@@ -163,10 +163,10 @@
\row
\li
- \snippet doc/src/snippets/code/doc_src_coordsys.cpp 2
+ \snippet code/doc_src_coordsys.cpp 2
\li
- \snippet doc/src/snippets/code/doc_src_coordsys.cpp 3
+ \snippet code/doc_src_coordsys.cpp 3
\endtable
\section1 Transformations
@@ -238,7 +238,7 @@
\row
\li {2,1}
- \snippet examples/widgets/analogclock/analogclock.cpp 9
+ \snippet widgets/analogclock/analogclock.cpp 9
First, we set up the painter. We translate the coordinate system
so that point (0, 0) is in the widget's center, instead of being
@@ -253,7 +253,7 @@
See also the \l {Window-Viewport Conversion} section.
- \snippet examples/widgets/analogclock/analogclock.cpp 18
+ \snippet widgets/analogclock/analogclock.cpp 18
We draw the clock's hour hand by rotating the coordinate system
and calling QPainter::drawConvexPolygon(). Thank's to the
@@ -268,14 +268,14 @@
the code guarantees that the code that follows won't be disturbed
by the transformations we've used.
- \snippet examples/widgets/analogclock/analogclock.cpp 24
+ \snippet widgets/analogclock/analogclock.cpp 24
We do the same for the clock's minute hand, which is defined by
the four points (1, 0), (0, 1), (-1, 0), and (0, -40). These
coordinates specify a hand that is thinner and longer than the
minute hand.
- \snippet examples/widgets/analogclock/analogclock.cpp 27
+ \snippet widgets/analogclock/analogclock.cpp 27
Finally, we draw the clock face, which consists of twelve short
lines at 30-degree intervals. At the end of that, the painter is
@@ -319,7 +319,7 @@
-50) to (50, 50) with (0, 0) in the center by calling the
QPainter::setWindow() function:
- \snippet doc/src/snippets/code/doc_src_coordsys.cpp 4
+ \snippet code/doc_src_coordsys.cpp 4
Now, the logical coordinates (-50,-50) correspond to the paint
device's physical coordinates (0, 0). Independent of the paint
@@ -333,7 +333,7 @@
viewport and "window" maintain the same aspect ratio to prevent
deformation:
- \snippet doc/src/snippets/code/doc_src_coordsys.cpp 5
+ \snippet code/doc_src_coordsys.cpp 5
If we make the logical coordinate system a square, we should also
make the viewport a square using the QPainter::setViewport()
diff --git a/doc/src/gui/paintsystem.qdoc b/src/gui/doc/src/paintsystem.qdoc
index 4b33e4fed3..4b33e4fed3 100644
--- a/doc/src/gui/paintsystem.qdoc
+++ b/src/gui/doc/src/paintsystem.qdoc
diff --git a/doc/src/gui/qtgui.qdoc b/src/gui/doc/src/qtgui.qdoc
index bffe07889a..7e11aa5233 100644
--- a/doc/src/gui/qtgui.qdoc
+++ b/src/gui/doc/src/qtgui.qdoc
@@ -35,5 +35,5 @@
To include the definitions of both modules' classes, use the
following directive:
- \snippet doc/src/snippets/code/doc_src_qtgui.pro 0
+ \snippet code/doc_src_qtgui.pro 0
*/
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index 93c087cf64..2d21a7d7b2 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -23,6 +23,9 @@ testcocoon {
HEADERS += $$QT_SOURCE_TREE/src/gui/qtguiversion.h
+QMAKE_DOCS = $$PWD/doc/qtgui.qdocconf
+QMAKE_DOCS_INDEX = ../../doc
+
include(accessible/accessible.pri)
include(kernel/kernel.pri)
include(image/image.pri)
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 91b21227df..89060cfbb4 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -441,7 +441,7 @@ bool QImageData::checkForAlphaPixels() const
\row
\li \inlineimage qimage-32bit_scaled.png
\li
- \snippet doc/src/snippets/code/src_gui_image_qimage.cpp 0
+ \snippet code/src_gui_image_qimage.cpp 0
\endtable
In case of a 8-bit and monchrome images, the pixel value is only
@@ -462,7 +462,7 @@ bool QImageData::checkForAlphaPixels() const
\row
\li \inlineimage qimage-8bit_scaled.png
\li
- \snippet doc/src/snippets/code/src_gui_image_qimage.cpp 1
+ \snippet code/src_gui_image_qimage.cpp 1
\endtable
QImage also provide the scanLine() function which returns a
@@ -949,7 +949,7 @@ extern bool qt_read_xpm_image_or_array(QIODevice *device, const char * const *so
Note that it's possible to squeeze the XPM variable a little bit
by using an unusual declaration:
- \snippet doc/src/snippets/code/src_gui_image_qimage.cpp 2
+ \snippet code/src_gui_image_qimage.cpp 2
The extra \c const makes the entire definition read-only, which is
slightly more efficient (e.g., when the code is in a shared
@@ -4478,7 +4478,7 @@ bool QImage::save(const QString &fileName, const char *format, int quality) cons
This can, for example, be used to save an image directly into a
QByteArray:
- \snippet doc/src/snippets/image/image.cpp 0
+ \snippet image/image.cpp 0
*/
bool QImage::save(QIODevice* device, const char* format, int quality) const
@@ -4801,7 +4801,7 @@ QString QImage::text(const QString &key) const
if a specific image or format supports embedding text
by using QImageWriter::supportsOption(). We give an example:
- \snippet doc/src/snippets/image/supportedformat.cpp 0
+ \snippet image/supportedformat.cpp 0
You can use QImageWriter::supportedImageFormats() to find out
which image formats are available to you.
diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp
index 02c01f9866..4cda7304ac 100644
--- a/src/gui/image/qimagereader.cpp
+++ b/src/gui/image/qimagereader.cpp
@@ -664,7 +664,7 @@ QImageReader::~QImageReader()
Sets the format QImageReader will use when reading images, to \a
format. \a format is a case insensitive text string. Example:
- \snippet doc/src/snippets/code/src_gui_image_qimagereader.cpp 0
+ \snippet code/src_gui_image_qimagereader.cpp 0
You can call supportedImageFormats() for the full list of formats
QImageReader supports.
@@ -682,7 +682,7 @@ void QImageReader::setFormat(const QByteArray &format)
You can call this function after assigning a device to the
reader to determine the format of the device. For example:
- \snippet doc/src/snippets/code/src_gui_image_qimagereader.cpp 1
+ \snippet code/src_gui_image_qimagereader.cpp 1
If the reader cannot read any image from the device (e.g., there is no
image there, or the image has already been read), or if the format is
@@ -1142,7 +1142,7 @@ QImage QImageReader::read()
which always constructs a new image; especially when reading several
images with the same format and size.
- \snippet doc/src/snippets/code/src_gui_image_qimagereader.cpp 2
+ \snippet code/src_gui_image_qimagereader.cpp 2
For image formats that support animation, calling read() repeatedly will
return the next frame. When all frames have been read, a null image will
@@ -1382,7 +1382,7 @@ QString QImageReader::errorString() const
(see text()), and the BMP format allows you to determine the image's size
without loading the whole image into memory (see size()).
- \snippet doc/src/snippets/code/src_gui_image_qimagereader.cpp 3
+ \snippet code/src_gui_image_qimagereader.cpp 3
\sa QImageWriter::supportsOption()
*/
diff --git a/src/gui/image/qimagewriter.cpp b/src/gui/image/qimagewriter.cpp
index 43a93d75c2..c1b7a6459a 100644
--- a/src/gui/image/qimagewriter.cpp
+++ b/src/gui/image/qimagewriter.cpp
@@ -330,7 +330,7 @@ QImageWriter::~QImageWriter()
Sets the format QImageWriter will use when writing images, to \a
format. \a format is a case insensitive text string. Example:
- \snippet doc/src/snippets/code/src_gui_image_qimagewriter.cpp 0
+ \snippet code/src_gui_image_qimagewriter.cpp 0
You can call supportedImageFormats() for the full list of formats
QImageWriter supports.
@@ -529,7 +529,7 @@ QString QImageWriter::description() const
\a text. This is useful for storing copyright information
or other information about the image. Example:
- \snippet doc/src/snippets/code/src_gui_image_qimagewriter.cpp 1
+ \snippet code/src_gui_image_qimagewriter.cpp 1
If you want to store a single block of data
(e.g., a comment), you can pass an empty key, or use
@@ -636,7 +636,7 @@ QString QImageWriter::errorString() const
example, the PNG format allows you to embed text into the image's metadata
(see text()).
- \snippet doc/src/snippets/code/src_gui_image_qimagewriter.cpp 2
+ \snippet code/src_gui_image_qimagewriter.cpp 2
Options can be tested after the writer has been associated with a format.
diff --git a/src/gui/image/qmovie.cpp b/src/gui/image/qmovie.cpp
index 8dfcf57dfd..e1ddcf1a0c 100644
--- a/src/gui/image/qmovie.cpp
+++ b/src/gui/image/qmovie.cpp
@@ -61,7 +61,7 @@
To display the movie in your application, you can pass your QMovie object
to QLabel::setMovie(). Example:
- \snippet doc/src/snippets/code/src_gui_image_qmovie.cpp 0
+ \snippet code/src_gui_image_qmovie.cpp 0
Whenever a new frame is available in the movie, QMovie will emit
updated(). If the size of the frame changes, resized() is emitted. You can
@@ -883,7 +883,7 @@ void QMovie::setPaused(bool paused)
The default speed is 100%.
Example:
- \snippet doc/src/snippets/code/src_gui_image_qmovie.cpp 1
+ \snippet code/src_gui_image_qmovie.cpp 1
*/
void QMovie::setSpeed(int percentSpeed)
{
diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp
index 0544d3d431..34ca077e5b 100644
--- a/src/gui/image/qpicture.cpp
+++ b/src/gui/image/qpicture.cpp
@@ -92,13 +92,13 @@ void qt_format_text(const QFont &fnt, const QRectF &_r,
depending on the window system.
Example of how to record a picture:
- \snippet doc/src/snippets/picture/picture.cpp 0
+ \snippet picture/picture.cpp 0
Note that the list of painter commands is reset on each call to
the QPainter::begin() function.
Example of how to replay a picture:
- \snippet doc/src/snippets/picture/picture.cpp 1
+ \snippet picture/picture.cpp 1
Pictures can also be drawn using play(). Some basic data about a
picture is available, for example, size(), isNull() and
@@ -1226,7 +1226,7 @@ static QStringList qToStringList(const QList<QByteArray> arr)
Note that if you want to iterate over the list, you should iterate
over a copy, e.g.
- \snippet doc/src/snippets/picture/picture.cpp 2
+ \snippet picture/picture.cpp 2
\sa outputFormatList() inputFormats() QPictureIO
*/
@@ -1244,7 +1244,7 @@ QStringList QPicture::inputFormatList()
Note that if you want to iterate over the list, you should iterate
over a copy, e.g.
- \snippet doc/src/snippets/picture/picture.cpp 3
+ \snippet picture/picture.cpp 3
\sa inputFormatList() outputFormats() QPictureIO
*/
@@ -1470,11 +1470,11 @@ static QPictureHandler *get_picture_handler(const char *format)
both are null, the QPictureIO object is valid but useless.
Example:
- \snippet doc/src/snippets/picture/picture.cpp 6
+ \snippet picture/picture.cpp 6
\codeline
- \snippet doc/src/snippets/picture/picture.cpp 7
+ \snippet picture/picture.cpp 7
\codeline
- \snippet doc/src/snippets/picture/picture.cpp 8
+ \snippet picture/picture.cpp 8
Before the regular expression test, all the 0 bytes in the file header are
converted to 1 bytes. This is done because when Qt was ASCII-based, QRegExp
@@ -1839,7 +1839,7 @@ QList<QByteArray> QPictureIO::outputFormats()
Example:
- \snippet doc/src/snippets/picture/picture.cpp 4
+ \snippet picture/picture.cpp 4
\sa setIODevice() setFileName() setFormat() write() QPixmap::load()
*/
@@ -1908,7 +1908,7 @@ bool QPictureIO::read()
The picture will be written using the specified picture format.
Example:
- \snippet doc/src/snippets/picture/picture.cpp 5
+ \snippet picture/picture.cpp 5
\sa setIODevice() setFileName() setFormat() read() QPixmap::save()
*/
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index 248caf7f3d..4cdf61138c 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -241,7 +241,7 @@ QPixmap::QPixmap(const QPixmap &pixmap)
Note that it's possible to squeeze the XPM variable a little bit
by using an unusual declaration:
- \snippet doc/src/snippets/code/src_gui_image_qpixmap.cpp 0
+ \snippet code/src_gui_image_qpixmap.cpp 0
The extra \c const makes the entire definition read-only, which is
slightly more efficient (for example, when the code is in a shared
@@ -334,7 +334,7 @@ QPixmap QPixmap::copy(const QRect &rect) const
region is left unchanged. You can optionally pass a pointer to an empty
QRegion to get the region that is \a exposed by the scroll operation.
- \snippet doc/src/snippets/code/src_gui_image_qpixmap.cpp 2
+ \snippet code/src_gui_image_qpixmap.cpp 2
You cannot scroll while there is an active painter on the pixmap.
@@ -651,7 +651,7 @@ void QPixmap::setMask(const QBitmap &mask)
The mask may not be perfect but it should be reasonable, so you
can do things such as the following:
- \snippet doc/src/snippets/code/src_gui_image_qpixmap.cpp 1
+ \snippet code/src_gui_image_qpixmap.cpp 1
This function is slow because it involves converting to/from a
QImage, and non-trivial computations.
@@ -810,7 +810,7 @@ bool QPixmap::save(const QString &fileName, const char *format, int quality) con
specified image file \a format and \a quality factor. This can be
used, for example, to save a pixmap directly into a QByteArray:
- \snippet doc/src/snippets/image/image.cpp 1
+ \snippet image/image.cpp 1
*/
bool QPixmap::save(QIODevice* device, const char* format, int quality) const
diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp
index 7769c45b2e..b0e5b7e1e3 100644
--- a/src/gui/image/qpixmapcache.cpp
+++ b/src/gui/image/qpixmapcache.cpp
@@ -472,7 +472,7 @@ QPixmapCacheEntry::~QPixmapCacheEntry()
bool find(const QString&, QPixmap*) instead.
Example:
- \snippet doc/src/snippets/code/src_gui_image_qpixmapcache.cpp 0
+ \snippet code/src_gui_image_qpixmapcache.cpp 0
*/
QPixmap *QPixmapCache::find(const QString &key)
@@ -500,7 +500,7 @@ bool QPixmapCache::find(const QString &key, QPixmap& pixmap)
\since 4.6
Example:
- \snippet doc/src/snippets/code/src_gui_image_qpixmapcache.cpp 1
+ \snippet code/src_gui_image_qpixmapcache.cpp 1
*/
bool QPixmapCache::find(const QString &key, QPixmap* pixmap)
diff --git a/src/gui/kernel/qclipboard.cpp b/src/gui/kernel/qclipboard.cpp
index ef5e4f9c18..90fd63ee62 100644
--- a/src/gui/kernel/qclipboard.cpp
+++ b/src/gui/kernel/qclipboard.cpp
@@ -67,7 +67,7 @@ QT_BEGIN_NAMESPACE
as QApplication::clipboard().
Example:
- \snippet doc/src/snippets/code/src_gui_kernel_qclipboard.cpp 0
+ \snippet code/src_gui_kernel_qclipboard.cpp 0
QClipboard features some convenience functions to access common
data types: setText() allows the exchange of Unicode text and
@@ -80,7 +80,7 @@ QT_BEGIN_NAMESPACE
A typical example of the use of these functions follows:
- \snippet doc/src/snippets/droparea.cpp 0
+ \snippet droparea.cpp 0
\section1 Notes for X11 Users
@@ -366,7 +366,7 @@ QImage QClipboard::image(Mode mode) const
This is shorthand for:
- \snippet doc/src/snippets/code/src_gui_kernel_qclipboard.cpp 1
+ \snippet code/src_gui_kernel_qclipboard.cpp 1
\sa image(), setPixmap() setMimeData()
*/
diff --git a/src/gui/kernel/qdrag.cpp b/src/gui/kernel/qdrag.cpp
index 40015c8706..e20401c67b 100644
--- a/src/gui/kernel/qdrag.cpp
+++ b/src/gui/kernel/qdrag.cpp
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
QMimeData object. This is specified with the setMimeData() function in the
following way:
- \snippet doc/src/snippets/dragging/mainwindow.cpp 1
+ \snippet dragging/mainwindow.cpp 1
Note that setMimeData() assigns ownership of the QMimeData object to the
QDrag object. The QDrag must be constructed on the heap with a parent QObject
@@ -80,7 +80,7 @@ QT_BEGIN_NAMESPACE
that the cursor's hot spot points to the center of its bottom
edge:
- \snippet doc/src/snippets/separations/finalwidget.cpp 2
+ \snippet separations/finalwidget.cpp 2
\note On X11, the pixmap may not be able to keep up with the mouse
movements if the hot spot causes the pixmap to be displayed
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index 266eb143e5..eeedd32fd9 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -582,7 +582,7 @@ QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos,
Example:
- \snippet doc/src/snippets/code/src_gui_kernel_qevent.cpp 0
+ \snippet code/src_gui_kernel_qevent.cpp 0
*/
/*!
@@ -604,7 +604,7 @@ QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos,
Example:
- \snippet doc/src/snippets/code/src_gui_kernel_qevent.cpp 0
+ \snippet code/src_gui_kernel_qevent.cpp 0
*/
/*!
@@ -2557,9 +2557,9 @@ QHelpEvent::~QHelpEvent()
\table 100%
\row
\li
- \snippet doc/src/snippets/qstatustipevent/main.cpp 1
+ \snippet qstatustipevent/main.cpp 1
\dots
- \snippet doc/src/snippets/qstatustipevent/main.cpp 3
+ \snippet qstatustipevent/main.cpp 3
\li
\image qstatustipevent-widget.png Widget with status tip.
\endtable
@@ -2570,10 +2570,10 @@ QHelpEvent::~QHelpEvent()
\table 100%
\row
\li
- \snippet doc/src/snippets/qstatustipevent/main.cpp 0
- \snippet doc/src/snippets/qstatustipevent/main.cpp 2
+ \snippet qstatustipevent/main.cpp 0
+ \snippet qstatustipevent/main.cpp 2
\dots
- \snippet doc/src/snippets/qstatustipevent/main.cpp 3
+ \snippet qstatustipevent/main.cpp 3
\li
\image qstatustipevent-action.png Action with status tip.
\endtable
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 2efc29bddf..bdffb985f7 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -2098,7 +2098,7 @@ static inline void applyCursor(const QList<QWindow *> &l, const QCursor &c)
restoreOverrideCursor(), otherwise the stack will never be emptied.
Example:
- \snippet doc/src/snippets/code/src_gui_kernel_qapplication_x11.cpp 0
+ \snippet code/src_gui_kernel_qapplication_x11.cpp 0
\sa overrideCursor(), restoreOverrideCursor(), changeOverrideCursor(),
QWidget::setCursor()
@@ -2154,7 +2154,7 @@ QStyleHints *QGuiApplication::styleHints()
This function must be called before creating the QGuiApplication object, like
this:
- \snippet doc/src/snippets/code/src_gui_kernel_qapplication.cpp 6
+ \snippet code/src_gui_kernel_qapplication.cpp 6
\sa desktopSettingsAware()
*/
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index 14e434f475..f94c6d541e 100644
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -177,16 +177,16 @@ void Q_GUI_EXPORT qt_set_sequence_auto_mnemonic(bool b) { qt_sequence_no_mnemoni
more modifiers, such as Qt::SHIFT, Qt::CTRL, Qt::ALT and Qt::META.
\endlist
- For example, \gui{Ctrl P} might be a sequence used as a shortcut for
+ For example, \uicontrol{Ctrl P} might be a sequence used as a shortcut for
printing a document, and can be specified in any of the following
ways:
- \snippet doc/src/snippets/code/src_gui_kernel_qkeysequence.cpp 0
+ \snippet code/src_gui_kernel_qkeysequence.cpp 0
Note that, for letters, the case used in the specification string
does not matter. In the above examples, the user does not need to
- hold down the \key{Shift} key to activate a shortcut specified
- with "Ctrl+P". However, for other keys, the use of \key{Shift} as
+ hold down the \uicontrol{Shift} key to activate a shortcut specified
+ with "Ctrl+P". However, for other keys, the use of \uicontrol{Shift} as
an unspecified extra modifier key can lead to confusion for users
of an application whose keyboards have different layouts to those
used by the developers. See the \l{Keyboard Layout Issues} section
@@ -207,9 +207,9 @@ void Q_GUI_EXPORT qt_set_sequence_auto_mnemonic(bool b) { qt_sequence_no_mnemoni
as Qt::Key_A.
\b{Note:} On Mac OS X, references to "Ctrl", Qt::CTRL, Qt::Control
- and Qt::ControlModifier correspond to the \key Command keys on the
+ and Qt::ControlModifier correspond to the \uicontrol Command keys on the
Macintosh keyboard, and references to "Meta", Qt::META, Qt::Meta and
- Qt::MetaModifier correspond to the \key Control keys. Developers on
+ Qt::MetaModifier correspond to the \uicontrol Control keys. Developers on
Mac OS X can use the same shortcut descriptions across all platforms,
and their applications will automatically work as expected on Mac OS X.
@@ -220,9 +220,9 @@ void Q_GUI_EXPORT qt_set_sequence_auto_mnemonic(bool b) { qt_sequence_no_mnemoni
setting up actions in a typical application. The table below shows
some common key sequences that are often used for these standard
shortcuts by applications on four widely-used platforms. Note
- that on Mac OS X, the \key Ctrl value corresponds to the \key
- Command keys on the Macintosh keyboard, and the \key Meta value
- corresponds to the \key Control keys.
+ that on Mac OS X, the \uicontrol Ctrl value corresponds to the \uicontrol
+ Command keys on the Macintosh keyboard, and the \uicontrol Meta value
+ corresponds to the \uicontrol Control keys.
\table
\header \li StandardKey \li Windows \li Mac OS X \li KDE \li GNOME
@@ -303,23 +303,23 @@ void Q_GUI_EXPORT qt_set_sequence_auto_mnemonic(bool b) { qt_sequence_no_mnemoni
Many key sequence specifications are chosen by developers based on the
layout of certain types of keyboard, rather than choosing keys that
- represent the first letter of an action's name, such as \key{Ctrl S}
- ("Ctrl+S") or \key{Ctrl C} ("Ctrl+C").
+ represent the first letter of an action's name, such as \uicontrol{Ctrl S}
+ ("Ctrl+S") or \uicontrol{Ctrl C} ("Ctrl+C").
Additionally, because certain symbols can only be entered with the
help of modifier keys on certain keyboard layouts, key sequences intended
for use with one keyboard layout may map to a different key, map to no
keys at all, or require an additional modifier key to be used on
different keyboard layouts.
- For example, the shortcuts, \key{Ctrl plus} and \key{Ctrl minus}, are often
+ For example, the shortcuts, \uicontrol{Ctrl plus} and \uicontrol{Ctrl minus}, are often
used as shortcuts for zoom operations in graphics applications, and these
may be specified as "Ctrl++" and "Ctrl+-" respectively. However, the way
these shortcuts are specified and interpreted depends on the keyboard layout.
- Users of Norwegian keyboards will note that the \key{+} and \key{-} keys
+ Users of Norwegian keyboards will note that the \uicontrol{+} and \uicontrol{-} keys
are not adjacent on the keyboard, but will still be able to activate both
- shortcuts without needing to press the \key{Shift} key. However, users
- with British keyboards will need to hold down the \key{Shift} key
- to enter the \key{+} symbol, making the shortcut effectively the same as
+ shortcuts without needing to press the \uicontrol{Shift} key. However, users
+ with British keyboards will need to hold down the \uicontrol{Shift} key
+ to enter the \uicontrol{+} symbol, making the shortcut effectively the same as
"Ctrl+Shift+=".
Although some developers might resort to fully specifying all the modifiers
@@ -328,9 +328,9 @@ void Q_GUI_EXPORT qt_set_sequence_auto_mnemonic(bool b) { qt_sequence_no_mnemoni
For example, a developer using a British keyboard may decide to specify
"Ctrl+Shift+=" as the key sequence in order to create a shortcut that
- coincidentally behaves in the same way as \key{Ctrl plus}. However, the
- \key{=} key needs to be accessed using the \key{Shift} key on Norwegian
- keyboard, making the required shortcut effectively \key{Ctrl Shift Shift =}
+ coincidentally behaves in the same way as \uicontrol{Ctrl plus}. However, the
+ \uicontrol{=} key needs to be accessed using the \uicontrol{Shift} key on Norwegian
+ keyboard, making the required shortcut effectively \uicontrol{Ctrl Shift Shift =}
(an impossible key combination).
As a result, both human-readable strings and hard-coded key codes
@@ -352,10 +352,10 @@ void Q_GUI_EXPORT qt_set_sequence_auto_mnemonic(bool b) { qt_sequence_no_mnemoni
key codes, can be created by using the multiple argument constructor,
or by passing a human-readable string of comma-separated key sequences.
- For example, the key sequence, \key{Ctrl X} followed by \key{Ctrl C}, can
+ For example, the key sequence, \uicontrol{Ctrl X} followed by \uicontrol{Ctrl C}, can
be specified using either of the following ways:
- \snippet doc/src/snippets/code/src_gui_kernel_qkeysequence.cpp 1
+ \snippet code/src_gui_kernel_qkeysequence.cpp 1
\warning A QApplication instance must have been constructed before a
QKeySequence is created; otherwise, your application may crash.
@@ -937,7 +937,7 @@ QKeySequence::QKeySequence()
\endlink(), so that shortcut keys can be replaced in
translations:
- \snippet doc/src/snippets/code/src_gui_kernel_qkeysequence.cpp 2
+ \snippet code/src_gui_kernel_qkeysequence.cpp 2
Note the "File|Open" translator comment. It is by no means
necessary, but it provides some context for the human translator.
diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp
index ab62ec0992..cb18b0d22f 100644
--- a/src/gui/kernel/qpalette.cpp
+++ b/src/gui/kernel/qpalette.cpp
@@ -499,7 +499,7 @@ static void qt_palette_from_color(QPalette &pal, const QColor &button)
and the QTextDocument::setDefaultStyleSheet() function to alter
the appearance of links. For example:
- \snippet doc/src/snippets/textdocument-css/main.cpp 0
+ \snippet textdocument-css/main.cpp 0
\value NoRole No role; this special role is often used to indicate that a
role has not been assigned.
diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/kernel/qshortcutmap.cpp
index a750082219..267f528ca0 100644
--- a/src/gui/kernel/qshortcutmap.cpp
+++ b/src/gui/kernel/qshortcutmap.cpp
@@ -528,7 +528,7 @@ QKeySequence::SequenceMatch QShortcutMap::find(QKeyEvent *e)
/*! \internal
Clears \a seq to an empty QKeySequence.
Same as doing (the slower)
- \snippet doc/src/snippets/code/src_gui_kernel_qshortcutmap.cpp 0
+ \snippet code/src_gui_kernel_qshortcutmap.cpp 0
*/
void QShortcutMap::clearSequence(QVector<QKeySequence> &ksl)
{
diff --git a/src/gui/opengl/qopenglshaderprogram.cpp b/src/gui/opengl/qopenglshaderprogram.cpp
index c0899e5a41..e9973be2ab 100644
--- a/src/gui/opengl/qopenglshaderprogram.cpp
+++ b/src/gui/opengl/qopenglshaderprogram.cpp
@@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE
program is activated in the current QOpenGLContext by calling
QOpenGLShaderProgram::bind():
- \snippet doc/src/snippets/code/src_gui_qopenglshaderprogram.cpp 0
+ \snippet code/src_gui_qopenglshaderprogram.cpp 0
\section1 Writing portable shaders
@@ -99,12 +99,12 @@ QT_BEGIN_NAMESPACE
\section1 Simple shader example
- \snippet doc/src/snippets/code/src_gui_qopenglshaderprogram.cpp 1
+ \snippet code/src_gui_qopenglshaderprogram.cpp 1
With the above shader program active, we can draw a green triangle
as follows:
- \snippet doc/src/snippets/code/src_gui_qopenglshaderprogram.cpp 2
+ \snippet code/src_gui_qopenglshaderprogram.cpp 2
\section1 Binary shaders and programs
diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp
index 2f0fb9f96c..6ee28a42b9 100644
--- a/src/gui/painting/qbrush.cpp
+++ b/src/gui/painting/qbrush.cpp
@@ -292,7 +292,7 @@ struct QBrushDataPointerDeleter
gradients: QLinearGradient, QConicalGradient, and QRadialGradient
- all of which inherit QGradient.
- \snippet doc/src/snippets/brush/gradientcreationsnippet.cpp 0
+ \snippet brush/gradientcreationsnippet.cpp 0
The texture() defines the pixmap used when the current style is
Qt::TexturePattern. You can create a brush with a texture by
@@ -323,7 +323,7 @@ struct QBrushDataPointerDeleter
QPainter's \l {QPen}{pen} combined with Qt::PenStyle and
Qt::GlobalColor:
- \snippet doc/src/snippets/code/src_gui_painting_qbrush.cpp 0
+ \snippet code/src_gui_painting_qbrush.cpp 0
Note that, by default, QPainter renders the outline (using the
currently set pen) when drawing shapes. Use \l {Qt::NoPen}{\c
@@ -1214,13 +1214,13 @@ QDataStream &operator>>(QDataStream &s, QBrush &b)
A diagonal linear gradient from black at (100, 100) to white at
(200, 200) could be specified like this:
- \snippet doc/src/snippets/brush/brush.cpp 0
+ \snippet brush/brush.cpp 0
A gradient can have an arbitrary number of stop points. The
following would create a radial gradient starting with
red in the center, blue and then green on the edges:
- \snippet doc/src/snippets/brush/brush.cpp 1
+ \snippet brush/brush.cpp 1
It is possible to repeat or reflect the gradient outside its area
by specifiying the \l {QGradient::Spread}{spread method} using the
diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp
index 75122571d6..81f5a7438a 100644
--- a/src/gui/painting/qcolor.cpp
+++ b/src/gui/painting/qcolor.cpp
@@ -148,7 +148,7 @@ QT_BEGIN_NAMESPACE
represents a fully transparent color, while 255 represents a fully
opaque color. For example:
- \snippet doc/src/snippets/code/src_gui_painting_qcolor.cpp 0
+ \snippet code/src_gui_painting_qcolor.cpp 0
The code above produces the following output:
diff --git a/src/gui/painting/qmatrix.cpp b/src/gui/painting/qmatrix.cpp
index c26d7e5d98..afefb1787c 100644
--- a/src/gui/painting/qmatrix.cpp
+++ b/src/gui/painting/qmatrix.cpp
@@ -114,7 +114,7 @@ QT_BEGIN_NAMESPACE
\row
\li \inlineimage qmatrix-simpletransformation.png
\li
- \snippet doc/src/snippets/matrix/matrix.cpp 0
+ \snippet matrix/matrix.cpp 0
\endtable
Although these functions are very convenient, it can be more
@@ -126,7 +126,7 @@ QT_BEGIN_NAMESPACE
\row
\li \inlineimage qmatrix-combinedtransformation.png
\li
- \snippet doc/src/snippets/matrix/matrix.cpp 1
+ \snippet matrix/matrix.cpp 1
\endtable
\section1 Basic Matrix Operations
@@ -142,7 +142,7 @@ QT_BEGIN_NAMESPACE
QMatrix transforms a point in the plane to another point using the
following formulas:
- \snippet doc/src/snippets/code/src_gui_painting_qmatrix.cpp 0
+ \snippet code/src_gui_painting_qmatrix.cpp 0
The point \e (x, y) is the original point, and \e (x', y') is the
transformed point. \e (x', y') can be transformed back to \e (x,
@@ -174,7 +174,7 @@ QT_BEGIN_NAMESPACE
\row
\li \inlineimage qmatrix-combinedtransformation.png
\li
- \snippet doc/src/snippets/matrix/matrix.cpp 2
+ \snippet matrix/matrix.cpp 2
\endtable
\sa QPainter, QTransform, {Coordinate System},
@@ -342,7 +342,7 @@ void QMatrix::setMatrix(qreal m11, qreal m12, qreal m21, qreal m22, qreal dx, qr
The coordinates are transformed using the following formulas:
- \snippet doc/src/snippets/code/src_gui_painting_qmatrix.cpp 1
+ \snippet code/src_gui_painting_qmatrix.cpp 1
The point (x, y) is the original point, and (x', y') is the
transformed point.
@@ -427,7 +427,7 @@ QRect QMatrix::mapRect(const QRect &rect) const
The rectangle's coordinates are transformed using the following
formulas:
- \snippet doc/src/snippets/code/src_gui_painting_qmatrix.cpp 2
+ \snippet code/src_gui_painting_qmatrix.cpp 2
If rotation or shearing has been specified, this function returns
the \e bounding rectangle. To retrieve the exact region the given
@@ -741,7 +741,7 @@ QPainterPath QMatrix::map(const QPainterPath &path) const
The rectangle's coordinates are transformed using the following
formulas:
- \snippet doc/src/snippets/code/src_gui_painting_qmatrix.cpp 3
+ \snippet code/src_gui_painting_qmatrix.cpp 3
Polygons and rectangles behave slightly differently when
transformed (due to integer rounding), so
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 68e60ed548..e622fe46a7 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -941,7 +941,7 @@ void QPainterPrivate::updateState(QPainterState *newState)
painter. Then draw. Remember to destroy the QPainter object after
drawing. For example:
- \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 0
+ \snippet code/src_gui_painting_qpainter.cpp 0
The core functionality of QPainter is drawing, but the class also
provide several functions that allows you to customize QPainter's
@@ -1446,10 +1446,10 @@ QPainter::QPainter()
automatically calls end().
Here's an example using begin() and end():
- \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 1
+ \snippet code/src_gui_painting_qpainter.cpp 1
The same example using this constructor:
- \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 2
+ \snippet code/src_gui_painting_qpainter.cpp 2
Since the constructor cannot provide feedback when the initialization
of the painter failed you should rather use begin() and end() to paint
@@ -1667,7 +1667,7 @@ void QPainter::restore()
The errors that can occur are serious problems, such as these:
- \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 3
+ \snippet code/src_gui_painting_qpainter.cpp 3
Note that most of the time, you can use one of the constructors
instead of begin(), and that end() is automatically done at
@@ -1956,7 +1956,7 @@ QPaintEngine *QPainter::paintEngine() const
default state by endNativePainting(). Here is an example that shows
intermixing of painter commands and raw OpenGL commands:
- \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 21
+ \snippet code/src_gui_painting_qpainter.cpp 21
\sa endNativePainting()
*/
@@ -2871,7 +2871,7 @@ void QPainter::setClipRegion(const QRegion &r, Qt::ClipOperation op)
They operate on the painter's worldMatrix() and are implemented like this:
- \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 4
+ \snippet code/src_gui_painting_qpainter.cpp 4
Note that when using setWorldMatrix() function you should always have
\a combine be true when you are drawing into a QPicture. Otherwise
@@ -3340,7 +3340,7 @@ void QPainter::fillPath(const QPainterPath &path, const QBrush &brush)
\row
\li \inlineimage qpainter-path.png
\li
- \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 5
+ \snippet code/src_gui_painting_qpainter.cpp 5
\endtable
\sa {painting/painterpaths}{the Painter Paths
@@ -3385,7 +3385,7 @@ void QPainter::drawPath(const QPainterPath &path)
\row
\li \inlineimage qpainter-line.png
\li
- \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 6
+ \snippet code/src_gui_painting_qpainter.cpp 6
\endtable
\sa drawLines(), drawPolyline(), {Coordinate System}
@@ -3432,7 +3432,7 @@ void QPainter::drawPath(const QPainterPath &path)
\row
\li \inlineimage qpainter-rectangle.png
\li
- \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 7
+ \snippet code/src_gui_painting_qpainter.cpp 7
\endtable
\sa drawRects(), drawPolygon(), {Coordinate System}
@@ -4101,7 +4101,7 @@ const QFont &QPainter::font() const
\row
\li \inlineimage qpainter-roundrect.png
\li
- \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 8
+ \snippet code/src_gui_painting_qpainter.cpp 8
\endtable
\sa drawRect(), QPen
@@ -4201,7 +4201,7 @@ void QPainter::drawRoundRect(const QRectF &r, int xRnd, int yRnd)
\row
\li \inlineimage qpainter-ellipse.png
\li
- \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 9
+ \snippet code/src_gui_painting_qpainter.cpp 9
\endtable
\sa drawPie(), {Coordinate System}
@@ -4327,7 +4327,7 @@ void QPainter::drawEllipse(const QRect &r)
\row
\li \inlineimage qpainter-arc.png
\li
- \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 10
+ \snippet code/src_gui_painting_qpainter.cpp 10
\endtable
\sa drawPie(), drawChord(), {Coordinate System}
@@ -4391,7 +4391,7 @@ void QPainter::drawArc(const QRectF &r, int a, int alen)
\row
\li \inlineimage qpainter-pie.png
\li
- \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 11
+ \snippet code/src_gui_painting_qpainter.cpp 11
\endtable
\sa drawEllipse(), drawChord(), {Coordinate System}
@@ -4460,7 +4460,7 @@ void QPainter::drawPie(const QRectF &r, int a, int alen)
\row
\li \inlineimage qpainter-chord.png
\li
- \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 12
+ \snippet code/src_gui_painting_qpainter.cpp 12
\endtable
\sa drawArc(), drawPie(), {Coordinate System}
@@ -4675,7 +4675,7 @@ void QPainter::drawLines(const QPoint *pointPairs, int lineCount)
\table 100%
\row
\li
- \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 13
+ \snippet code/src_gui_painting_qpainter.cpp 13
\endtable
\sa drawLines(), drawPolygon(), {Coordinate System}
@@ -4782,7 +4782,7 @@ void QPainter::drawPolyline(const QPoint *points, int pointCount)
\row
\li \inlineimage qpainter-polygon.png
\li
- \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 14
+ \snippet code/src_gui_painting_qpainter.cpp 14
\endtable
The first point is implicitly connected to the last point, and the
@@ -4895,7 +4895,7 @@ void QPainter::drawPolygon(const QPoint *points, int pointCount, Qt::FillRule fi
\row
\li \inlineimage qpainter-polygon.png
\li
- \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 15
+ \snippet code/src_gui_painting_qpainter.cpp 15
\endtable
The first point is implicitly connected to the last point, and the
@@ -5018,7 +5018,7 @@ static inline QPointF roundInDeviceCoordinates(const QPointF &p, const QTransfor
\table 100%
\row
\li
- \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 16
+ \snippet code/src_gui_painting_qpainter.cpp 16
\endtable
If \a pixmap is a QBitmap it is drawn with the bits that are "set"
@@ -5928,7 +5928,7 @@ void QPainter::drawText(const QRect &r, int flags, const QString &str, QRect *br
\row
\li \inlineimage qpainter-text.png
\li
- \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 17
+ \snippet code/src_gui_painting_qpainter.cpp 17
\endtable
The \a boundingRect (if not null) is set to the what the bounding rectangle
@@ -6682,7 +6682,7 @@ void QPainter::drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPo
\table 100%
\row
\li
- \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 18
+ \snippet code/src_gui_painting_qpainter.cpp 18
\endtable
\sa QPicture::play()
@@ -6725,7 +6725,7 @@ void QPainter::drawPicture(const QPointF &p, const QPicture &picture)
Erases the area inside the given \a rectangle. Equivalent to
calling
- \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 19
+ \snippet code/src_gui_painting_qpainter.cpp 19
\sa fillRect()
*/
@@ -7669,7 +7669,7 @@ void QPainterState::init(QPainter *p) {
\table 100%
\row
\li
- \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 20
+ \snippet code/src_gui_painting_qpainter.cpp 20
\endtable
\sa drawPixmap()
diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp
index 0e8811b934..dc310520e0 100644
--- a/src/gui/painting/qpainterpath.cpp
+++ b/src/gui/painting/qpainterpath.cpp
@@ -229,7 +229,7 @@ static void qt_debug_path(const QPainterPath &path)
\row
\li \inlineimage qpainterpath-construction.png
\li
- \snippet doc/src/snippets/code/src_gui_painting_qpainterpath.cpp 0
+ \snippet code/src_gui_painting_qpainterpath.cpp 0
\endtable
The painter path is initially empty when constructed. We first add
@@ -763,7 +763,7 @@ void QPainterPath::lineTo(const QPointF &p)
\row
\li \inlineimage qpainterpath-cubicto.png
\li
- \snippet doc/src/snippets/code/src_gui_painting_qpainterpath.cpp 1
+ \snippet code/src_gui_painting_qpainterpath.cpp 1
\endtable
\sa quadTo(), {QPainterPath#Composing a QPainterPath}{Composing
@@ -890,7 +890,7 @@ void QPainterPath::quadTo(const QPointF &c, const QPointF &e)
\row
\li \inlineimage qpainterpath-arcto.png
\li
- \snippet doc/src/snippets/code/src_gui_painting_qpainterpath.cpp 2
+ \snippet code/src_gui_painting_qpainterpath.cpp 2
\endtable
\sa arcMoveTo(), addEllipse(), QPainter::drawArc(), QPainter::drawPie(),
@@ -1002,7 +1002,7 @@ QPointF QPainterPath::currentPosition() const
\row
\li \inlineimage qpainterpath-addrectangle.png
\li
- \snippet doc/src/snippets/code/src_gui_painting_qpainterpath.cpp 3
+ \snippet code/src_gui_painting_qpainterpath.cpp 3
\endtable
\sa addRegion(), lineTo(), {QPainterPath#Composing a
@@ -1049,7 +1049,7 @@ void QPainterPath::addRect(const QRectF &r)
\row
\li \inlineimage qpainterpath-addpolygon.png
\li
- \snippet doc/src/snippets/code/src_gui_painting_qpainterpath.cpp 4
+ \snippet code/src_gui_painting_qpainterpath.cpp 4
\endtable
\sa lineTo(), {QPainterPath#Composing a QPainterPath}{Composing
@@ -1085,7 +1085,7 @@ void QPainterPath::addPolygon(const QPolygonF &polygon)
\row
\li \inlineimage qpainterpath-addellipse.png
\li
- \snippet doc/src/snippets/code/src_gui_painting_qpainterpath.cpp 5
+ \snippet code/src_gui_painting_qpainterpath.cpp 5
\endtable
\sa arcTo(), QPainter::drawEllipse(), {QPainterPath#Composing a
@@ -1137,7 +1137,7 @@ void QPainterPath::addEllipse(const QRectF &boundingRect)
\row
\li \inlineimage qpainterpath-addtext.png
\li
- \snippet doc/src/snippets/code/src_gui_painting_qpainterpath.cpp 6
+ \snippet code/src_gui_painting_qpainterpath.cpp 6
\endtable
\sa QPainter::drawText(), {QPainterPath#Composing a
diff --git a/src/gui/painting/qpen.cpp b/src/gui/painting/qpen.cpp
index 77f0edc52f..2c95a9f146 100644
--- a/src/gui/painting/qpen.cpp
+++ b/src/gui/painting/qpen.cpp
@@ -79,11 +79,11 @@ typedef QPenPrivate QPenData;
For example:
- \snippet doc/src/snippets/code/src_gui_painting_qpen.cpp 0
+ \snippet code/src_gui_painting_qpen.cpp 0
which is equivalent to
- \snippet doc/src/snippets/code/src_gui_painting_qpen.cpp 1
+ \snippet code/src_gui_painting_qpen.cpp 1
The default pen is a solid black brush with 0 width, square
cap style (Qt::SquareCap), and bevel join style (Qt::BevelJoin).
@@ -135,7 +135,7 @@ typedef QPenPrivate QPenData;
spaces. For example, the custom pattern shown above is created
using the following code:
- \snippet doc/src/snippets/code/src_gui_painting_qpen.cpp 2
+ \snippet code/src_gui_painting_qpen.cpp 2
Note that the dash pattern is specified in units of the pens
width, e.g. a dash of length 5 in width 10 is 50 pixels long.
@@ -476,7 +476,7 @@ QVector<qreal> QPen::dashPattern() const
\row
\li \inlineimage qpen-custom.png
\li
- \snippet doc/src/snippets/code/src_gui_painting_qpen.cpp 3
+ \snippet code/src_gui_painting_qpen.cpp 3
\endtable
The dash pattern is specified in units of the pens width; e.g. a
diff --git a/src/gui/painting/qpolygon.cpp b/src/gui/painting/qpolygon.cpp
index ee1f7967cb..b7dee7ff2a 100644
--- a/src/gui/painting/qpolygon.cpp
+++ b/src/gui/painting/qpolygon.cpp
@@ -98,7 +98,7 @@ static void qt_polygon_isect_line(const QPointF &p1, const QPointF &p2, const QP
points to a QPolygon is to use QVector's streaming operator, as
illustrated below:
- \snippet doc/src/snippets/polygon/polygon.cpp 0
+ \snippet polygon/polygon.cpp 0
In addition to the functions provided by QVector, QPolygon
provides some point-specific functions.
@@ -304,7 +304,7 @@ void QPolygon::point(int index, int *x, int *y) const
The example code creates a polygon with two points (10, 20) and
(30, 40):
- \snippet doc/src/snippets/polygon/polygon.cpp 2
+ \snippet polygon/polygon.cpp 2
\sa setPoint() putPoints()
*/
@@ -330,7 +330,7 @@ void QPolygon::setPoints(int nPoints, const int *points)
The example code creates a polygon with two points (10, 20) and
(30, 40):
- \snippet doc/src/snippets/polygon/polygon.cpp 3
+ \snippet polygon/polygon.cpp 3
*/
void QPolygon::setPoints(int nPoints, int firstx, int firsty, ...)
@@ -381,12 +381,12 @@ void QPolygon::putPoints(int index, int nPoints, const int *points)
The example code creates a polygon with three points (4,5), (6,7)
and (8,9), by expanding the polygon from 1 to 3 points:
- \snippet doc/src/snippets/polygon/polygon.cpp 4
+ \snippet polygon/polygon.cpp 4
The following code has the same result, but here the putPoints()
function overwrites rather than extends:
- \snippet doc/src/snippets/polygon/polygon.cpp 5
+ \snippet polygon/polygon.cpp 5
\sa setPoints()
*/
@@ -418,7 +418,7 @@ void QPolygon::putPoints(int index, int nPoints, int firstx, int firsty, ...)
default) in \a fromPolygon into this polygon, starting at the
specified \a index. For example:
- \snippet doc/src/snippets/polygon/polygon.cpp 6
+ \snippet polygon/polygon.cpp 6
*/
void QPolygon::putPoints(int index, int nPoints, const QPolygon & from, int fromIndex)
@@ -490,7 +490,7 @@ QDebug operator<<(QDebug dbg, const QPolygon &a)
to a QPolygonF is to use its streaming operator, as illustrated
below:
- \snippet doc/src/snippets/polygon/polygon.cpp 1
+ \snippet polygon/polygon.cpp 1
In addition to the functions provided by QVector, QPolygonF
provides the boundingRect() and translate() functions for geometry
diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp
index ebca1edddc..f250150b06 100644
--- a/src/gui/painting/qregion.cpp
+++ b/src/gui/painting/qregion.cpp
@@ -86,7 +86,7 @@ QT_BEGIN_NAMESPACE
rectangles.
Example of using complex regions:
- \snippet doc/src/snippets/code/src_gui_painting_qregion.cpp 0
+ \snippet code/src_gui_painting_qregion.cpp 0
\section1 Additional License Information
@@ -725,7 +725,7 @@ QRegion QRegion::intersect(const QRect &r) const
empty region is a region that contains no points.
Example:
- \snippet doc/src/snippets/code/src_gui_painting_qregion_unix.cpp 0
+ \snippet code/src_gui_painting_qregion_unix.cpp 0
*/
/*!
diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp
index ba971d454d..924a444805 100644
--- a/src/gui/painting/qtransform.cpp
+++ b/src/gui/painting/qtransform.cpp
@@ -159,7 +159,7 @@ QT_BEGIN_NAMESPACE
\row
\li \inlineimage qtransform-simpletransformation.png
\li
- \snippet doc/src/snippets/transform/main.cpp 0
+ \snippet transform/main.cpp 0
\endtable
Although these functions are very convenient, it can be more
@@ -171,7 +171,7 @@ QT_BEGIN_NAMESPACE
\row
\li \inlineimage qtransform-combinedtransformation.png
\li
- \snippet doc/src/snippets/transform/main.cpp 1
+ \snippet transform/main.cpp 1
\endtable
\section1 Basic Matrix Operations
@@ -188,7 +188,7 @@ QT_BEGIN_NAMESPACE
QTransform transforms a point in the plane to another point using the
following formulas:
- \snippet doc/src/snippets/code/src_gui_painting_qtransform.cpp 0
+ \snippet code/src_gui_painting_qtransform.cpp 0
The point \e (x, y) is the original point, and \e (x', y') is the
transformed point. \e (x', y') can be transformed back to \e (x,
@@ -221,7 +221,7 @@ QT_BEGIN_NAMESPACE
\row
\li \inlineimage qtransform-combinedtransformation2.png
\li
- \snippet doc/src/snippets/transform/main.cpp 2
+ \snippet transform/main.cpp 2
\endtable
\sa QPainter, {Coordinate System}, {painting/affine}{Affine
@@ -1662,7 +1662,7 @@ QPainterPath QTransform::map(const QPainterPath &path) const
The rectangle's coordinates are transformed using the following
formulas:
- \snippet doc/src/snippets/code/src_gui_painting_qtransform.cpp 1
+ \snippet code/src_gui_painting_qtransform.cpp 1
Polygons and rectangles behave slightly differently when
transformed (due to integer rounding), so
@@ -1915,7 +1915,7 @@ QRect QTransform::mapRect(const QRect &rect) const
The rectangle's coordinates are transformed using the following
formulas:
- \snippet doc/src/snippets/code/src_gui_painting_qtransform.cpp 2
+ \snippet code/src_gui_painting_qtransform.cpp 2
If rotation or shearing has been specified, this function returns
the \e bounding rectangle. To retrieve the exact region the given
@@ -1991,7 +1991,7 @@ QRectF QTransform::mapRect(const QRectF &rect) const
The coordinates are transformed using the following formulas:
- \snippet doc/src/snippets/code/src_gui_painting_qtransform.cpp 3
+ \snippet code/src_gui_painting_qtransform.cpp 3
The point (x, y) is the original point, and (x', y') is the
transformed point.
diff --git a/src/gui/text/qabstracttextdocumentlayout.cpp b/src/gui/text/qabstracttextdocumentlayout.cpp
index e14cfe0f82..45903f678c 100644
--- a/src/gui/text/qabstracttextdocumentlayout.cpp
+++ b/src/gui/text/qabstracttextdocumentlayout.cpp
@@ -120,7 +120,7 @@ QT_BEGIN_NAMESPACE
and QTextObjectInterface. QObject must be the first class
inherited. For instance:
- \snippet examples/richtext/textobject/svgtextobject.h 1
+ \snippet richtext/textobject/svgtextobject.h 1
The data of a text object is usually stored in the QTextCharFormat
using QTextCharFormat::setProperty(), and then retrieved with
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index ccbd335d61..f64b3e823d 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -367,7 +367,7 @@ QFontEngineData::~QFontEngineData()
Create QFonts like this:
- \snippet doc/src/snippets/code/src_gui_text_qfont.cpp 0
+ \snippet code/src_gui_text_qfont.cpp 0
The attributes set in the constructor can also be set later, e.g.
setFamily(), setPointSize(), setPointSizeFloat(), setWeight() and
@@ -464,11 +464,11 @@ QFontEngineData::~QFontEngineData()
Examples:
- \snippet doc/src/snippets/code/src_gui_text_qfont.cpp 1
+ \snippet code/src_gui_text_qfont.cpp 1
If you had both an Adobe and a Cronyx Helvetica, you might get
either.
- \snippet doc/src/snippets/code/src_gui_text_qfont.cpp 2
+ \snippet code/src_gui_text_qfont.cpp 2
You can specify the foundry you want in the family name. The font f
in the above example will be set to "Helvetica
@@ -477,11 +477,11 @@ QFontEngineData::~QFontEngineData()
To determine the attributes of the font actually used in the window
system, use a QFontInfo object, e.g.
- \snippet doc/src/snippets/code/src_gui_text_qfont.cpp 3
+ \snippet code/src_gui_text_qfont.cpp 3
To find out font metrics use a QFontMetrics object, e.g.
- \snippet doc/src/snippets/code/src_gui_text_qfont.cpp 4
+ \snippet code/src_gui_text_qfont.cpp 4
For more general information on fonts, see the
\link http://nwalsh.com/comp.fonts/FAQ/ comp.fonts FAQ.\endlink
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index 0a56ca3742..b8e1e0cc3b 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -1197,8 +1197,8 @@ QString QFontDatabase::styleString(const QFontInfo &fontInfo)
Example:
- \snippet doc/src/snippets/qfontdatabase/main.cpp 0
- \snippet doc/src/snippets/qfontdatabase/main.cpp 1
+ \snippet qfontdatabase/main.cpp 0
+ \snippet qfontdatabase/main.cpp 1
This example gets the list of font families, the list of
styles for each family, and the point sizes that are available for
diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp
index fe9e1d16c7..cc6fa4bfee 100644
--- a/src/gui/text/qfontmetrics.cpp
+++ b/src/gui/text/qfontmetrics.cpp
@@ -122,7 +122,7 @@ extern void qt_format_text(const QFont& font, const QRectF &_r,
and size(), to return the size of that rectangle.
Example:
- \snippet doc/src/snippets/code/src_gui_text_qfontmetrics.cpp 0
+ \snippet code/src_gui_text_qfontmetrics.cpp 0
\sa QFont, QFontInfo, QFontDatabase, QFontComboBox, {Character Map Example}
*/
@@ -976,7 +976,7 @@ int QFontMetrics::lineWidth() const
and size(), to return the size of that rectangle.
Example:
- \snippet doc/src/snippets/code/src_gui_text_qfontmetrics.cpp 1
+ \snippet code/src_gui_text_qfontmetrics.cpp 1
\sa QFont QFontInfo QFontDatabase
*/
diff --git a/src/gui/text/qsyntaxhighlighter.cpp b/src/gui/text/qsyntaxhighlighter.cpp
index c6810ad61f..c372071019 100644
--- a/src/gui/text/qsyntaxhighlighter.cpp
+++ b/src/gui/text/qsyntaxhighlighter.cpp
@@ -253,7 +253,7 @@ void QSyntaxHighlighterPrivate::reformatBlock(const QTextBlock &block)
pass it the QTextEdit or QTextDocument that you want the syntax
highlighting to be applied to. For example:
- \snippet doc/src/snippets/code/src_gui_text_qsyntaxhighlighter.cpp 0
+ \snippet code/src_gui_text_qsyntaxhighlighter.cpp 0
After this your highlightBlock() function will be called
automatically whenever necessary. Use your highlightBlock()
@@ -262,7 +262,7 @@ void QSyntaxHighlighterPrivate::reformatBlock(const QTextBlock &block)
setFormat() function which applies a given QTextCharFormat on
the current text block. For example:
- \snippet doc/src/snippets/code/src_gui_text_qsyntaxhighlighter.cpp 1
+ \snippet code/src_gui_text_qsyntaxhighlighter.cpp 1
Some syntaxes can have constructs that span several text
blocks. For example, a C++ syntax highlighter should be able to
@@ -285,7 +285,7 @@ void QSyntaxHighlighterPrivate::reformatBlock(const QTextBlock &block)
For example, if you're writing a simple C++ syntax highlighter,
you might designate 1 to signify "in comment":
- \snippet doc/src/snippets/code/src_gui_text_qsyntaxhighlighter.cpp 2
+ \snippet code/src_gui_text_qsyntaxhighlighter.cpp 2
In the example above, we first set the current block state to
0. Then, if the previous block ended within a comment, we higlight
@@ -432,7 +432,7 @@ void QSyntaxHighlighter::rehighlightBlock(const QTextBlock &block)
setFormat() as often as necessary to apply any font and color
changes that you require. For example:
- \snippet doc/src/snippets/code/src_gui_text_qsyntaxhighlighter.cpp 3
+ \snippet code/src_gui_text_qsyntaxhighlighter.cpp 3
Some syntaxes can have constructs that span several text
blocks. For example, a C++ syntax highlighter should be able to
@@ -602,7 +602,7 @@ void QSyntaxHighlighter::setCurrentBlockState(int newState)
and store their relative position and the actual QChar in a simple
class derived from QTextBlockUserData:
- \snippet doc/src/snippets/code/src_gui_text_qsyntaxhighlighter.cpp 4
+ \snippet code/src_gui_text_qsyntaxhighlighter.cpp 4
During cursor navigation in the associated editor, you can ask the
current QTextBlock (retrieved using the QTextCursor::block()
diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp
index 02fd921fac..ce46ec2e59 100644
--- a/src/gui/text/qtextcursor.cpp
+++ b/src/gui/text/qtextcursor.cpp
@@ -972,7 +972,7 @@ QTextLayout *QTextCursorPrivate::blockLayout(QTextBlock &block) const{
diacritics). Functions such as movePosition() and deleteChar()
limit cursor movement to these valid positions.
- \sa \link richtext.html Rich Text Processing\endlink
+ \sa {Rich Text Processing}
*/
@@ -1380,7 +1380,7 @@ void QTextCursor::setKeepPositionOnInsert(bool b)
If there is a selection, the selection is deleted and replaced by
\a text, for example:
- \snippet doc/src/snippets/code/src_gui_text_qtextcursor.cpp 0
+ \snippet code/src_gui_text_qtextcursor.cpp 0
This clears any existing selection, selects the word at the cursor
(i.e. from position() forward), and replaces the selection with
the phrase "Hello World".
@@ -2301,7 +2301,7 @@ void QTextCursor::insertImage(const QTextImageFormat &format)
Convenience method for inserting the image with the given \a name at the
current position().
- \snippet doc/src/snippets/code/src_gui_text_qtextcursor.cpp 1
+ \snippet code/src_gui_text_qtextcursor.cpp 1
*/
void QTextCursor::insertImage(const QString &name)
{
@@ -2445,7 +2445,7 @@ bool QTextCursor::operator>(const QTextCursor &rhs) const
For example:
- \snippet doc/src/snippets/code/src_gui_text_qtextcursor.cpp 2
+ \snippet code/src_gui_text_qtextcursor.cpp 2
The call to undo() will cause both insertions to be undone,
causing both "World" and "Hello" to be removed.
@@ -2474,7 +2474,7 @@ void QTextCursor::beginEditBlock()
For example:
- \snippet doc/src/snippets/code/src_gui_text_qtextcursor.cpp 3
+ \snippet code/src_gui_text_qtextcursor.cpp 3
The call to undo() will cause all three insertions to be undone.
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index ec660dd050..f0546566d4 100644
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -1511,7 +1511,7 @@ QTextBlock QTextDocument::begin() const
This function returns a block to test for the end of the document
while iterating over it.
- \snippet doc/src/snippets/textdocumentendsnippet.cpp 0
+ \snippet textdocumentendsnippet.cpp 0
The block returned is invalid and represents the block after the
last block in the document. You can use lastBlock() to retrieve the
@@ -1868,15 +1868,15 @@ QVariant QTextDocument::resource(int type, const QUrl &name) const
For example, you can add an image as a resource in order to reference it
from within the document:
- \snippet snippets/textdocument-resources/main.cpp Adding a resource
+ \snippet textdocument-resources/main.cpp Adding a resource
The image can be inserted into the document using the QTextCursor API:
- \snippet snippets/textdocument-resources/main.cpp Inserting an image with a cursor
+ \snippet textdocument-resources/main.cpp Inserting an image with a cursor
Alternatively, you can insert images using the HTML \c img tag:
- \snippet snippets/textdocument-resources/main.cpp Inserting an image using HTML
+ \snippet textdocument-resources/main.cpp Inserting an image using HTML
*/
void QTextDocument::addResource(int type, const QUrl &name, const QVariant &resource)
{
@@ -2967,7 +2967,7 @@ void QTextHtmlExporter::emitFrameStyle(const QTextFrameFormat &format, FrameType
The \a encoding parameter specifies the value for the charset attribute
in the html header. For example if 'utf-8' is specified then the
beginning of the generated html will look like this:
- \snippet doc/src/snippets/code/src_gui_text_qtextdocument.cpp 0
+ \snippet code/src_gui_text_qtextdocument.cpp 0
If no encoding is specified then no such meta information is generated.
diff --git a/src/gui/text/qtextdocumentwriter.cpp b/src/gui/text/qtextdocumentwriter.cpp
index b0bbeb7a47..2894c280e8 100644
--- a/src/gui/text/qtextdocumentwriter.cpp
+++ b/src/gui/text/qtextdocumentwriter.cpp
@@ -160,7 +160,7 @@ QTextDocumentWriter::~QTextDocumentWriter()
Sets the format used to write documents to the \a format specified.
\a format is a case insensitive text string. For example:
- \snippet doc/src/snippets/code/src.gui.text.qtextdocumentwriter.cpp 0
+ \snippet code/src_gui_text_qtextdocumentwriter.cpp 0
You can call supportedDocumentFormats() for the full list of formats
QTextDocumentWriter supports.
diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp
index 9a38b1f0b2..bb3d897ebe 100644
--- a/src/gui/text/qtextformat.cpp
+++ b/src/gui/text/qtextformat.cpp
@@ -2269,7 +2269,7 @@ QList<QTextOption::Tab> QTextBlockFormat::tabPositions() const
can be used to customize the numbers used in an ordered list so that they
appear as (1), (2), (3), etc.:
- \snippet doc/src/snippets/textdocument-listitemstyles/mainwindow.cpp add a styled, ordered list
+ \snippet textdocument-listitemstyles/mainwindow.cpp add a styled, ordered list
\sa QTextList
*/
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
index 94af3edeeb..0ab964778a 100644
--- a/src/gui/text/qtextlayout.cpp
+++ b/src/gui/text/qtextlayout.cpp
@@ -282,10 +282,10 @@ Qt::LayoutDirection QTextInlineObject::textDirection() const
created lines.
Here is a code snippet that demonstrates the layout phase:
- \snippet doc/src/snippets/code/src_gui_text_qtextlayout.cpp 0
+ \snippet code/src_gui_text_qtextlayout.cpp 0
The text can then be rendered by calling the layout's draw() function:
- \snippet doc/src/snippets/code/src_gui_text_qtextlayout.cpp 1
+ \snippet code/src_gui_text_qtextlayout.cpp 1
For a given position in the text you can find a valid cursor position with
isValidCursorPosition(), nextCursorPosition(), and previousCursorPosition().
diff --git a/src/gui/text/qtextlist.cpp b/src/gui/text/qtextlist.cpp
index c3c71bc021..82d744d654 100644
--- a/src/gui/text/qtextlist.cpp
+++ b/src/gui/text/qtextlist.cpp
@@ -75,7 +75,7 @@ public:
The \l{QTextCursor::insertList()} function inserts an empty block into the
document at the cursor position, and makes it the first item in a list.
- \snippet doc/src/snippets/textdocument-lists/mainwindow.cpp 0
+ \snippet textdocument-lists/mainwindow.cpp 0
The \l{QTextCursor::createList()} function takes the contents of the
cursor's current block and turns it into the first item of a new list.
diff --git a/src/gui/text/qtextobject.cpp b/src/gui/text/qtextobject.cpp
index a9daf6ba56..d4e9c7d12c 100644
--- a/src/gui/text/qtextobject.cpp
+++ b/src/gui/text/qtextobject.cpp
@@ -939,8 +939,8 @@ bool QTextBlock::isValid() const
An iterator can be constructed and used to access the fragments within
a text block in the following way:
- \snippet doc/src/snippets/textblock-fragments/xmlwriter.cpp 4
- \snippet doc/src/snippets/textblock-fragments/xmlwriter.cpp 7
+ \snippet textblock-fragments/xmlwriter.cpp 4
+ \snippet textblock-fragments/xmlwriter.cpp 7
\sa QTextFragment
*/
diff --git a/src/gui/text/qtexttable.cpp b/src/gui/text/qtexttable.cpp
index 65bc8fde1e..a9866187d3 100644
--- a/src/gui/text/qtexttable.cpp
+++ b/src/gui/text/qtexttable.cpp
@@ -510,9 +510,9 @@ void QTextTablePrivate::update() const
For example, we can insert a table with three rows and two columns at the
current cursor position in an editor using the following lines of code:
- \snippet doc/src/snippets/textdocument-tables/mainwindow.cpp 1
+ \snippet textdocument-tables/mainwindow.cpp 1
\codeline
- \snippet doc/src/snippets/textdocument-tables/mainwindow.cpp 3
+ \snippet textdocument-tables/mainwindow.cpp 3
The table format is either defined when the table is created or changed
later with setFormat().
@@ -545,14 +545,14 @@ void QTextTablePrivate::update() const
\li Suppose we have a 2x3 table of names and addresses. To merge both
columns in the first row we invoke mergeCells() with \a row = 0,
\a column = 0, \a numRows = 1 and \a numColumns = 2.
- \snippet doc/src/snippets/textdocument-texttable/main.cpp 0
+ \snippet textdocument-texttable/main.cpp 0
\row
\li \inlineimage texttable-merge.png
\li This gives us the following table. To split the first row of the table
back into two cells, we invoke the splitCell() function with \a numRows
and \a numCols = 1.
- \snippet doc/src/snippets/textdocument-texttable/main.cpp 1
+ \snippet textdocument-texttable/main.cpp 1
\row
\li \inlineimage texttable-split.png Split Table
diff --git a/src/gui/util/qdesktopservices.cpp b/src/gui/util/qdesktopservices.cpp
index 0fba6e6f3a..5e83e7cc00 100644
--- a/src/gui/util/qdesktopservices.cpp
+++ b/src/gui/util/qdesktopservices.cpp
@@ -135,7 +135,7 @@ void QOpenUrlHandlerRegistry::handlerDestroyed(QObject *handler)
URLs, and by registering a handler it becomes possible to display the help text
inside the application:
- \snippet doc/src/snippets/code/src_gui_util_qdesktopservices.cpp 0
+ \snippet code/src_gui_util_qdesktopservices.cpp 0
If inside the handler you decide that you can't open the requested
URL, you can just call QDesktopServices::openUrl() again with the
@@ -155,7 +155,7 @@ void QOpenUrlHandlerRegistry::handlerDestroyed(QObject *handler)
The following example opens a file on the Windows file system residing on a path
that contains spaces:
- \snippet doc/src/snippets/code/src_gui_util_qdesktopservices.cpp 2
+ \snippet code/src_gui_util_qdesktopservices.cpp 2
If a \c mailto URL is specified, the user's e-mail client will be used to open a
composer window containing the options specified in the URL, similar to the way
@@ -164,7 +164,7 @@ void QOpenUrlHandlerRegistry::handlerDestroyed(QObject *handler)
For example, the following URL contains a recipient (\c{user@foo.com}), a
subject (\c{Test}), and a message body (\c{Just a test}):
- \snippet doc/src/snippets/code/src_gui_util_qdesktopservices.cpp 1
+ \snippet code/src_gui_util_qdesktopservices.cpp 1
\warning Although many e-mail clients can send attachments and are
Unicode-aware, the user may have configured their client without these features.
diff --git a/src/gui/util/qvalidator.cpp b/src/gui/util/qvalidator.cpp
index 3103cc7424..84a5b4c54c 100644
--- a/src/gui/util/qvalidator.cpp
+++ b/src/gui/util/qvalidator.cpp
@@ -303,12 +303,12 @@ void QValidator::fixup(QString &) const
Example of use:
- \snippet doc/src/snippets/code/src_gui_widgets_qvalidator.cpp 0
+ \snippet code/src_gui_util_qvalidator.cpp 0
Below we present some examples of validators. In practice they would
normally be associated with a widget as in the example above.
- \snippet doc/src/snippets/code/src_gui_widgets_qvalidator.cpp 1
+ \snippet code/src_gui_util_qvalidator.cpp 1
Notice that the value \c 999 returns Intermediate. Values
consisting of a number of digits equal to or less than the max
@@ -377,7 +377,7 @@ QIntValidator::~QIntValidator()
the user might be just about to type the minus (especially for right-to-left
languages).
- \snippet doc/src/snippets/code/src_gui_widgets_qvalidator.cpp 2
+ \snippet code/src_gui_util_qvalidator.cpp 2
By default, the \a pos parameter is not used by this validator.
*/
@@ -812,12 +812,12 @@ QDoubleValidator::Notation QDoubleValidator::notation() const
For a brief introduction to Qt's regexp engine, see \l QRegExp.
Example of use:
- \snippet doc/src/snippets/code/src_gui_widgets_qvalidator.cpp 3
+ \snippet code/src_gui_util_qvalidator.cpp 3
Below we present some examples of validators. In practice they would
normally be associated with a widget as in the example above.
- \snippet doc/src/snippets/code/src_gui_widgets_qvalidator.cpp 4
+ \snippet code/src_gui_util_qvalidator.cpp 4
\sa QRegExp, QIntValidator, QDoubleValidator, {Settings Editor Example}
*/
diff --git a/src/network/access/qftp.cpp b/src/network/access/qftp.cpp
index ba30ad08ba..324126baae 100644
--- a/src/network/access/qftp.cpp
+++ b/src/network/access/qftp.cpp
@@ -1361,7 +1361,7 @@ int QFtpPrivate::addCommand(QFtpCommand *cmd)
e.g. if you want to connect and login to a FTP server. This is
simply achieved:
- \snippet doc/src/snippets/code/src_network_access_qftp.cpp 0
+ \snippet code/src_network_access_qftp.cpp 0
In this case two FTP commands have been scheduled. When the last
scheduled command has finished, a done() signal is emitted with
@@ -1379,12 +1379,12 @@ int QFtpPrivate::addCommand(QFtpCommand *cmd)
Example: If you want to download the INSTALL file from the Qt
FTP server, you would write this:
- \snippet doc/src/snippets/code/src_network_access_qftp.cpp 1
+ \snippet code/src_network_access_qftp.cpp 1
For this example the following sequence of signals is emitted
(with small variations, depending on network traffic, etc.):
- \snippet doc/src/snippets/code/src_network_access_qftp.cpp 2
+ \snippet code/src_network_access_qftp.cpp 2
The dataTransferProgress() signal in the above example is useful
if you want to show a \link QProgressBar progress bar \endlink to
@@ -1397,7 +1397,7 @@ int QFtpPrivate::addCommand(QFtpCommand *cmd)
If the login fails for the above example, the signals would look
like this:
- \snippet doc/src/snippets/code/src_network_access_qftp.cpp 3
+ \snippet code/src_network_access_qftp.cpp 3
You can then get details about the error with the error() and
errorString() functions.
diff --git a/src/network/access/qhttpmultipart.cpp b/src/network/access/qhttpmultipart.cpp
index 27164d69ae..ca7e2f6be8 100644
--- a/src/network/access/qhttpmultipart.cpp
+++ b/src/network/access/qhttpmultipart.cpp
@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
and a data block, which are separated by each other by two
consecutive new lines. An example for one part would be:
- \snippet doc/src/snippets/code/src_network_access_qhttppart.cpp 0
+ \snippet code/src_network_access_qhttppart.cpp 0
For setting headers, use setHeader() and setRawHeader(), which behave
exactly like QNetworkRequest::setHeader() and QNetworkRequest::setRawHeader().
@@ -77,12 +77,12 @@ QT_BEGIN_NAMESPACE
To construct a QHttpPart with a small body, consider the following snippet
(this produces the data shown in the example above):
- \snippet doc/src/snippets/code/src_network_access_qhttppart.cpp 1
+ \snippet code/src_network_access_qhttppart.cpp 1
To construct a QHttpPart reading from a device (e.g. a file), the following
can be applied:
- \snippet doc/src/snippets/code/src_network_access_qhttppart.cpp 2
+ \snippet code/src_network_access_qhttppart.cpp 2
Be aware that QHttpPart does not take ownership of the device when set, so
it is the developer's responsibility to destroy it when it is not needed anymore.
@@ -226,7 +226,7 @@ void QHttpPart::setBodyDevice(QIODevice *device)
As an example, consider the following code snippet, which constructs a multipart
message containing a text part followed by an image part:
- \snippet doc/src/snippets/code/src_network_access_qhttpmultipart.cpp 0
+ \snippet code/src_network_access_qhttpmultipart.cpp 0
\sa QHttpPart, QNetworkAccessManager::post()
*/
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index b539ed4d9a..66d8a66b43 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -178,7 +178,7 @@ static void ensureInitialized()
returned in response to the corresponding request.
A simple download off the network could be accomplished with:
- \snippet doc/src/snippets/code/src_network_access_qnetworkaccessmanager.cpp 0
+ \snippet code/src_network_access_qnetworkaccessmanager.cpp 0
QNetworkAccessManager has an asynchronous API.
When the \tt replyFinished slot above is called, the parameter it
@@ -197,7 +197,7 @@ static void ensureInitialized()
A more involved example, assuming the manager is already existent,
can be:
- \snippet doc/src/snippets/code/src_network_access_qnetworkaccessmanager.cpp 1
+ \snippet code/src_network_access_qnetworkaccessmanager.cpp 1
\section1 Network and Roaming support
@@ -283,11 +283,11 @@ static void ensureInitialized()
By default the value of this property reflects the physical state of the device. Applications
may override it to disable all network requests via this network access manager by calling
- \snippet doc/src/snippets/code/src_network_access_qnetworkaccessmanager.cpp 4
+ \snippet code/src_network_access_qnetworkaccessmanager.cpp 4
Network requests can be reenabled again by calling
- \snippet doc/src/snippets/code/src_network_access_qnetworkaccessmanager.cpp 5
+ \snippet code/src_network_access_qnetworkaccessmanager.cpp 5
\note Calling setNetworkAccessible() does not change the network state.
*/
@@ -805,12 +805,12 @@ QNetworkReply *QNetworkAccessManager::deleteResource(const QNetworkRequest &requ
To restore the default network configuration set the network configuration to the value
returned from QNetworkConfigurationManager::defaultConfiguration().
- \snippet doc/src/snippets/code/src_network_access_qnetworkaccessmanager.cpp 2
+ \snippet code/src_network_access_qnetworkaccessmanager.cpp 2
If an invalid network configuration is set, a network session will not be created. In this
case network requests will be processed regardless, but may fail. For example:
- \snippet doc/src/snippets/code/src_network_access_qnetworkaccessmanager.cpp 3
+ \snippet code/src_network_access_qnetworkaccessmanager.cpp 3
\sa configuration(), QNetworkSession
*/
diff --git a/src/network/access/qnetworkdiskcache.cpp b/src/network/access/qnetworkdiskcache.cpp
index bcaf81a6a0..0a1d43f70f 100644
--- a/src/network/access/qnetworkdiskcache.cpp
+++ b/src/network/access/qnetworkdiskcache.cpp
@@ -88,17 +88,17 @@ QT_BEGIN_NAMESPACE
A network disk cache can be enabled by:
- \snippet doc/src/snippets/code/src_network_access_qnetworkdiskcache.cpp 0
+ \snippet code/src_network_access_qnetworkdiskcache.cpp 0
When sending requests, to control the preference of when to use the cache
and when to use the network, consider the following:
- \snippet doc/src/snippets/code/src_network_access_qnetworkdiskcache.cpp 1
+ \snippet code/src_network_access_qnetworkdiskcache.cpp 1
To check whether the response came from the cache or from the network, the
following can be applied:
- \snippet doc/src/snippets/code/src_network_access_qnetworkdiskcache.cpp 2
+ \snippet code/src_network_access_qnetworkdiskcache.cpp 2
*/
/*!
diff --git a/src/network/access/qnetworkreply.cpp b/src/network/access/qnetworkreply.cpp
index aefe07223f..3b6ec5d4b5 100644
--- a/src/network/access/qnetworkreply.cpp
+++ b/src/network/access/qnetworkreply.cpp
@@ -616,7 +616,7 @@ void QNetworkReply::setSslConfiguration(const QSslConfiguration &config)
If, for instance, you want to issue a request to a server that uses
a self-signed certificate, consider the following snippet:
- \snippet doc/src/snippets/code/src_network_access_qnetworkreply.cpp 0
+ \snippet code/src_network_access_qnetworkreply.cpp 0
Multiple calls to this function will replace the list of errors that
were passed in previous calls.
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp
index 1c8655e9ae..9df06328a1 100644
--- a/src/network/access/qnetworkrequest.cpp
+++ b/src/network/access/qnetworkrequest.cpp
@@ -487,7 +487,7 @@ QList<QByteArray> QNetworkRequest::rawHeaderList() const
the corresponding "cooked" header will be set as well.
For example:
- \snippet doc/src/snippets/code/src_network_access_qnetworkrequest.cpp 0
+ \snippet code/src_network_access_qnetworkrequest.cpp 0
will also set the known header LastModifiedHeader to be the
QDateTime object of the parsed date.
diff --git a/src/network/bearer/qnetworkconfigmanager.cpp b/src/network/bearer/qnetworkconfigmanager.cpp
index 511bec8f23..0561ea93d1 100644
--- a/src/network/bearer/qnetworkconfigmanager.cpp
+++ b/src/network/bearer/qnetworkconfigmanager.cpp
@@ -321,7 +321,7 @@ QNetworkConfiguration QNetworkConfigurationManager::configurationFromIdentifier(
This is equivalent to the following code snippet:
- \snippet doc/src/snippets/code/src_network_bearer_qnetworkconfigmanager.cpp 0
+ \snippet code/src_network_bearer_qnetworkconfigmanager.cpp 0
\sa onlineStateChanged()
*/
diff --git a/src/network/doc/doc.pri b/src/network/doc/doc.pri
deleted file mode 100644
index 7ca0ad07d4..0000000000
--- a/src/network/doc/doc.pri
+++ /dev/null
@@ -1,3 +0,0 @@
-qtPrepareTool(QDOC, qdoc)
-docs.commands += $$QDOC $$QT.network.sources/doc/qtnetwork.qdocconf
-QMAKE_EXTRA_TARGETS += docs
diff --git a/doc/src/images/roaming-states.png b/src/network/doc/images/roaming-states.png
index bc61cac219..bc61cac219 100644
--- a/doc/src/images/roaming-states.png
+++ b/src/network/doc/images/roaming-states.png
Binary files differ
diff --git a/doc/src/images/tcpstream.png b/src/network/doc/images/tcpstream.png
index 7975376c8c..7975376c8c 100644
--- a/doc/src/images/tcpstream.png
+++ b/src/network/doc/images/tcpstream.png
Binary files differ
diff --git a/doc/src/images/udppackets.png b/src/network/doc/images/udppackets.png
index bd66c3f65e..bd66c3f65e 100644
--- a/doc/src/images/udppackets.png
+++ b/src/network/doc/images/udppackets.png
Binary files differ
diff --git a/src/network/doc/qtnetwork.qdocconf b/src/network/doc/qtnetwork.qdocconf
index 2e58ad65c9..e14fb32232 100644
--- a/src/network/doc/qtnetwork.qdocconf
+++ b/src/network/doc/qtnetwork.qdocconf
@@ -2,7 +2,7 @@ include(../../../doc/global/qt-cpp-ignore.qdocconf)
project = QtNetwork
description = Qt Network Reference Documentation
-url = http://qt-project.org/doc/qt-5.0/qtsql
+url = http://qt-project.org/doc/qt-5.0/qtnetwork
version = 5.0.0
sourceencoding = UTF-8
diff --git a/doc/src/snippets/code/doc_src_qtnetwork.cpp b/src/network/doc/snippets/code/doc_src_qtnetwork.cpp
index 7fa8a29db0..7fa8a29db0 100644
--- a/doc/src/snippets/code/doc_src_qtnetwork.cpp
+++ b/src/network/doc/snippets/code/doc_src_qtnetwork.cpp
diff --git a/doc/src/snippets/code/doc_src_qtnetwork.pro b/src/network/doc/snippets/code/doc_src_qtnetwork.pro
index a100943e58..a100943e58 100644
--- a/doc/src/snippets/code/doc_src_qtnetwork.pro
+++ b/src/network/doc/snippets/code/doc_src_qtnetwork.pro
diff --git a/doc/src/snippets/code/src_network_access_qftp.cpp b/src/network/doc/snippets/code/src_network_access_qftp.cpp
index db1817ce9f..db1817ce9f 100644
--- a/doc/src/snippets/code/src_network_access_qftp.cpp
+++ b/src/network/doc/snippets/code/src_network_access_qftp.cpp
diff --git a/doc/src/snippets/code/src_network_access_qhttpmultipart.cpp b/src/network/doc/snippets/code/src_network_access_qhttpmultipart.cpp
index 981a93a3ca..981a93a3ca 100644
--- a/doc/src/snippets/code/src_network_access_qhttpmultipart.cpp
+++ b/src/network/doc/snippets/code/src_network_access_qhttpmultipart.cpp
diff --git a/doc/src/snippets/code/src_network_access_qhttppart.cpp b/src/network/doc/snippets/code/src_network_access_qhttppart.cpp
index 1dca3d6683..1dca3d6683 100644
--- a/doc/src/snippets/code/src_network_access_qhttppart.cpp
+++ b/src/network/doc/snippets/code/src_network_access_qhttppart.cpp
diff --git a/doc/src/snippets/code/src_network_access_qnetworkaccessmanager.cpp b/src/network/doc/snippets/code/src_network_access_qnetworkaccessmanager.cpp
index ab8fc97d04..ab8fc97d04 100644
--- a/doc/src/snippets/code/src_network_access_qnetworkaccessmanager.cpp
+++ b/src/network/doc/snippets/code/src_network_access_qnetworkaccessmanager.cpp
diff --git a/doc/src/snippets/code/src_network_access_qnetworkdiskcache.cpp b/src/network/doc/snippets/code/src_network_access_qnetworkdiskcache.cpp
index bc272a2223..bc272a2223 100644
--- a/doc/src/snippets/code/src_network_access_qnetworkdiskcache.cpp
+++ b/src/network/doc/snippets/code/src_network_access_qnetworkdiskcache.cpp
diff --git a/doc/src/snippets/code/src_network_access_qnetworkreply.cpp b/src/network/doc/snippets/code/src_network_access_qnetworkreply.cpp
index 0f1b4c2014..0f1b4c2014 100644
--- a/doc/src/snippets/code/src_network_access_qnetworkreply.cpp
+++ b/src/network/doc/snippets/code/src_network_access_qnetworkreply.cpp
diff --git a/doc/src/snippets/code/src_network_access_qnetworkrequest.cpp b/src/network/doc/snippets/code/src_network_access_qnetworkrequest.cpp
index bdf696e851..bdf696e851 100644
--- a/doc/src/snippets/code/src_network_access_qnetworkrequest.cpp
+++ b/src/network/doc/snippets/code/src_network_access_qnetworkrequest.cpp
diff --git a/doc/src/snippets/code/src_network_bearer_qnetworkconfigmanager.cpp b/src/network/doc/snippets/code/src_network_bearer_qnetworkconfigmanager.cpp
index 2d62d758b7..2d62d758b7 100644
--- a/doc/src/snippets/code/src_network_bearer_qnetworkconfigmanager.cpp
+++ b/src/network/doc/snippets/code/src_network_bearer_qnetworkconfigmanager.cpp
diff --git a/doc/src/snippets/code/src_network_kernel_qdnslookup.cpp b/src/network/doc/snippets/code/src_network_kernel_qdnslookup.cpp
index f2e530ff96..f2e530ff96 100644
--- a/doc/src/snippets/code/src_network_kernel_qdnslookup.cpp
+++ b/src/network/doc/snippets/code/src_network_kernel_qdnslookup.cpp
diff --git a/doc/src/snippets/code/src_network_kernel_qhostaddress.cpp b/src/network/doc/snippets/code/src_network_kernel_qhostaddress.cpp
index c03054c243..c03054c243 100644
--- a/doc/src/snippets/code/src_network_kernel_qhostaddress.cpp
+++ b/src/network/doc/snippets/code/src_network_kernel_qhostaddress.cpp
diff --git a/doc/src/snippets/code/src_network_kernel_qhostinfo.cpp b/src/network/doc/snippets/code/src_network_kernel_qhostinfo.cpp
index 7607841ac5..7607841ac5 100644
--- a/doc/src/snippets/code/src_network_kernel_qhostinfo.cpp
+++ b/src/network/doc/snippets/code/src_network_kernel_qhostinfo.cpp
diff --git a/doc/src/snippets/code/src_network_kernel_qnetworkproxy.cpp b/src/network/doc/snippets/code/src_network_kernel_qnetworkproxy.cpp
index eadf4f91a5..eadf4f91a5 100644
--- a/doc/src/snippets/code/src_network_kernel_qnetworkproxy.cpp
+++ b/src/network/doc/snippets/code/src_network_kernel_qnetworkproxy.cpp
diff --git a/doc/src/snippets/code/src_network_socket_qabstractsocket.cpp b/src/network/doc/snippets/code/src_network_socket_qabstractsocket.cpp
index b419b33c92..b419b33c92 100644
--- a/doc/src/snippets/code/src_network_socket_qabstractsocket.cpp
+++ b/src/network/doc/snippets/code/src_network_socket_qabstractsocket.cpp
diff --git a/doc/src/snippets/code/src_network_socket_qlocalsocket_unix.cpp b/src/network/doc/snippets/code/src_network_socket_qlocalsocket_unix.cpp
index 947e89900a..947e89900a 100644
--- a/doc/src/snippets/code/src_network_socket_qlocalsocket_unix.cpp
+++ b/src/network/doc/snippets/code/src_network_socket_qlocalsocket_unix.cpp
diff --git a/doc/src/snippets/code/src_network_socket_qnativesocketengine.cpp b/src/network/doc/snippets/code/src_network_socket_qnativesocketengine.cpp
index 98ac70cc49..98ac70cc49 100644
--- a/doc/src/snippets/code/src_network_socket_qnativesocketengine.cpp
+++ b/src/network/doc/snippets/code/src_network_socket_qnativesocketengine.cpp
diff --git a/doc/src/snippets/code/src_network_socket_qtcpserver.cpp b/src/network/doc/snippets/code/src_network_socket_qtcpserver.cpp
index 90c4a86836..90c4a86836 100644
--- a/doc/src/snippets/code/src_network_socket_qtcpserver.cpp
+++ b/src/network/doc/snippets/code/src_network_socket_qtcpserver.cpp
diff --git a/doc/src/snippets/code/src_network_socket_qudpsocket.cpp b/src/network/doc/snippets/code/src_network_socket_qudpsocket.cpp
index 2a90772623..2a90772623 100644
--- a/doc/src/snippets/code/src_network_socket_qudpsocket.cpp
+++ b/src/network/doc/snippets/code/src_network_socket_qudpsocket.cpp
diff --git a/doc/src/snippets/code/src_network_ssl_qsslcertificate.cpp b/src/network/doc/snippets/code/src_network_ssl_qsslcertificate.cpp
index 0538990a3d..0538990a3d 100644
--- a/doc/src/snippets/code/src_network_ssl_qsslcertificate.cpp
+++ b/src/network/doc/snippets/code/src_network_ssl_qsslcertificate.cpp
diff --git a/doc/src/snippets/code/src_network_ssl_qsslconfiguration.cpp b/src/network/doc/snippets/code/src_network_ssl_qsslconfiguration.cpp
index a3a08f68d1..a3a08f68d1 100644
--- a/doc/src/snippets/code/src_network_ssl_qsslconfiguration.cpp
+++ b/src/network/doc/snippets/code/src_network_ssl_qsslconfiguration.cpp
diff --git a/doc/src/snippets/code/src_network_ssl_qsslsocket.cpp b/src/network/doc/snippets/code/src_network_ssl_qsslsocket.cpp
index 4d8e3668b5..4d8e3668b5 100644
--- a/doc/src/snippets/code/src_network_ssl_qsslsocket.cpp
+++ b/src/network/doc/snippets/code/src_network_ssl_qsslsocket.cpp
diff --git a/doc/src/snippets/network/tcpwait.cpp b/src/network/doc/snippets/network/tcpwait.cpp
index 9ee68e5b13..9ee68e5b13 100644
--- a/doc/src/snippets/network/tcpwait.cpp
+++ b/src/network/doc/snippets/network/tcpwait.cpp
diff --git a/doc/src/network/network-programming/bearermanagement.qdoc b/src/network/doc/src/bearermanagement.qdoc
index 91dc32c5a5..91dc32c5a5 100644
--- a/doc/src/network/network-programming/bearermanagement.qdoc
+++ b/src/network/doc/src/bearermanagement.qdoc
diff --git a/doc/src/network/network-programming/qtnetwork.qdoc b/src/network/doc/src/network-programming.qdoc
index 0701b04f6f..0701b04f6f 100644
--- a/doc/src/network/network-programming/qtnetwork.qdoc
+++ b/src/network/doc/src/network-programming.qdoc
diff --git a/doc/src/network/qtnetwork.qdoc b/src/network/doc/src/qtnetwork.qdoc
index bd88f797c1..092880ef59 100644
--- a/doc/src/network/qtnetwork.qdoc
+++ b/src/network/doc/src/qtnetwork.qdoc
@@ -36,10 +36,10 @@
To include the definitions of the module's classes, use the
following directive:
- \snippet doc/src/snippets/code/doc_src_qtnetwork.cpp 1
+ \snippet code/doc_src_qtnetwork.cpp 1
To link against the module, add this line to your \l qmake \c
.pro file:
- \snippet doc/src/snippets/code/doc_src_qtnetwork.pro 0
+ \snippet code/doc_src_qtnetwork.pro 0
*/
diff --git a/doc/src/network/network-programming/ssl.qdoc b/src/network/doc/src/ssl.qdoc
index 21828d7af9..21828d7af9 100644
--- a/doc/src/network/network-programming/ssl.qdoc
+++ b/src/network/doc/src/ssl.qdoc
diff --git a/src/network/kernel/qdnslookup.cpp b/src/network/kernel/qdnslookup.cpp
index 7a1d4e45de..a826422978 100644
--- a/src/network/kernel/qdnslookup.cpp
+++ b/src/network/kernel/qdnslookup.cpp
@@ -171,11 +171,11 @@ static void qt_qdnsservicerecord_sort(QList<QDnsServiceRecord> &records)
For example, you can determine which servers an XMPP chat client should
connect to for a given domain with:
- \snippet doc/src/snippets/code/src_network_kernel_qdnslookup.cpp 0
+ \snippet code/src_network_kernel_qdnslookup.cpp 0
Once the request finishes you can handle the results with:
- \snippet doc/src/snippets/code/src_network_kernel_qdnslookup.cpp 1
+ \snippet code/src_network_kernel_qdnslookup.cpp 1
\note If you simply want to find the IP address(es) associated with a host
name, or the host name associated with an IP address you should use
diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp
index 56473e2982..3ca0f84c39 100644
--- a/src/network/kernel/qhostaddress.cpp
+++ b/src/network/kernel/qhostaddress.cpp
@@ -644,7 +644,7 @@ QAbstractSocket::NetworkLayerProtocol QHostAddress::protocol() const
Returns the IPv6 address as a Q_IPV6ADDR structure. The structure
consists of 16 unsigned characters.
- \snippet doc/src/snippets/code/src_network_kernel_qhostaddress.cpp 0
+ \snippet code/src_network_kernel_qhostaddress.cpp 0
This value is valid if the protocol() is
\l{QAbstractSocket::}{IPv6Protocol}.
diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp
index 085f2f6651..32cf90145c 100644
--- a/src/network/kernel/qhostinfo.cpp
+++ b/src/network/kernel/qhostinfo.cpp
@@ -83,7 +83,7 @@ Q_GLOBAL_STATIC(QHostInfoLookupManager, theHostInfoLookupManager)
Example:
- \snippet doc/src/snippets/code/src_network_kernel_qhostinfo.cpp 0
+ \snippet code/src_network_kernel_qhostinfo.cpp 0
The slot is invoked when the results are ready. The results are
@@ -97,7 +97,7 @@ Q_GLOBAL_STATIC(QHostInfoLookupManager, theHostInfoLookupManager)
If you want a blocking lookup, use the QHostInfo::fromName() function:
- \snippet doc/src/snippets/code/src_network_kernel_qhostinfo.cpp 1
+ \snippet code/src_network_kernel_qhostinfo.cpp 1
QHostInfo supports Internationalized Domain Names (IDNs) through the
IDNA and Punycode standards.
@@ -126,12 +126,12 @@ static QBasicAtomicInt theIdCounter = Q_BASIC_ATOMIC_INITIALIZER(1);
The lookup is performed by a single function call, for example:
- \snippet doc/src/snippets/code/src_network_kernel_qhostinfo.cpp 2
+ \snippet code/src_network_kernel_qhostinfo.cpp 2
The implementation of the slot prints basic information about the
addresses returned by the lookup, or reports an error if it failed:
- \snippet doc/src/snippets/code/src_network_kernel_qhostinfo.cpp 3
+ \snippet code/src_network_kernel_qhostinfo.cpp 3
If you pass a literal IP address to \a name instead of a host name,
QHostInfo will search for the domain name for the IP (i.e., QHostInfo will
@@ -139,7 +139,7 @@ static QBasicAtomicInt theIdCounter = Q_BASIC_ATOMIC_INITIALIZER(1);
contain both the resolved domain name and IP addresses for the host
name. Example:
- \snippet doc/src/snippets/code/src_network_kernel_qhostinfo.cpp 4
+ \snippet code/src_network_kernel_qhostinfo.cpp 4
\note There is no guarantee on the order the signals will be emitted
if you start multiple requests with lookupHost().
@@ -311,7 +311,7 @@ QHostInfo::~QHostInfo()
Example:
- \snippet doc/src/snippets/code/src_network_kernel_qhostinfo.cpp 5
+ \snippet code/src_network_kernel_qhostinfo.cpp 5
\sa hostName(), error()
*/
diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp
index 6c1ee0ef42..50bf670e7e 100644
--- a/src/network/kernel/qnetworkproxy.cpp
+++ b/src/network/kernel/qnetworkproxy.cpp
@@ -59,14 +59,14 @@
network-enabled applications that you have written should
automatically support network proxy using the following code.
- \snippet doc/src/snippets/code/src_network_kernel_qnetworkproxy.cpp 0
+ \snippet code/src_network_kernel_qnetworkproxy.cpp 0
An alternative to setting an application wide proxy is to specify
the proxy for individual sockets using QAbstractSocket::setProxy()
and QTcpServer::setProxy(). In this way, it is possible to disable
the use of a proxy for specific sockets using the following code:
- \snippet doc/src/snippets/code/src_network_kernel_qnetworkproxy.cpp 1
+ \snippet code/src_network_kernel_qnetworkproxy.cpp 1
Network proxy is not used if the address used in \l
{QAbstractSocket::connectToHost()}{connectToHost()}, \l
@@ -800,7 +800,7 @@ QList<QByteArray> QNetworkProxy::rawHeaderList() const
the corresponding "cooked" header will be set as well.
For example:
- \snippet doc/src/snippets/code/src_network_access_qnetworkrequest.cpp 0
+ \snippet code/src_network_access_qnetworkrequest.cpp 0
will also set the known header LastModifiedHeader to be the
QDateTime object of the parsed date.
diff --git a/src/network/network.pro b/src/network/network.pro
index a6597338f5..3e1bc6d4e5 100644
--- a/src/network/network.pro
+++ b/src/network/network.pro
@@ -24,9 +24,11 @@ load(qt_module_config)
HEADERS += $$QT_SOURCE_TREE/src/network/qtnetworkversion.h
+QMAKE_DOCS = $$PWD/doc/qtnetwork.qdocconf
+QMAKE_DOCS_INDEX = ../../doc
+
include(access/access.pri)
include(bearer/bearer.pri)
-include(doc/doc.pri)
include(kernel/kernel.pri)
include(socket/socket.pri)
include(ssl/ssl.pri)
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index 9d95d3a70e..9a974c1326 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -142,7 +142,7 @@
We show an example:
- \snippet doc/src/snippets/network/tcpwait.cpp 0
+ \snippet network/tcpwait.cpp 0
If \l{QIODevice::}{waitForReadyRead()} returns false, the
connection has been closed or an error has occurred.
@@ -1937,7 +1937,7 @@ static int qt_timeout_value(int msecs, int elapsed)
The following example waits up to one second for a connection
to be established:
- \snippet doc/src/snippets/code/src_network_socket_qabstractsocket.cpp 0
+ \snippet code/src_network_socket_qabstractsocket.cpp 0
If msecs is -1, this function will not time out.
@@ -2182,7 +2182,7 @@ bool QAbstractSocket::waitForBytesWritten(int msecs)
The following example waits up to one second for a connection
to be closed:
- \snippet doc/src/snippets/code/src_network_socket_qabstractsocket.cpp 1
+ \snippet code/src_network_socket_qabstractsocket.cpp 1
If msecs is -1, this function will not time out.
@@ -2285,7 +2285,7 @@ bool QAbstractSocket::isSequential() const
This function is most commonly used when reading data from the
socket in a loop. For example:
- \snippet doc/src/snippets/code/src_network_socket_qabstractsocket.cpp 2
+ \snippet code/src_network_socket_qabstractsocket.cpp 2
\sa bytesAvailable(), readyRead()
*/
@@ -2873,7 +2873,7 @@ void QAbstractSocket::setSocketError(SocketError socketError)
To disable the use of a proxy for this socket, use the
QNetworkProxy::NoProxy proxy type:
- \snippet doc/src/snippets/code/src_network_socket_qabstractsocket.cpp 3
+ \snippet code/src_network_socket_qabstractsocket.cpp 3
The default value for the proxy is QNetworkProxy::DefaultProxy,
which means the socket will use the application settings: if a
diff --git a/src/network/socket/qlocalsocket.cpp b/src/network/socket/qlocalsocket.cpp
index ced7bba09b..9947f3d16e 100644
--- a/src/network/socket/qlocalsocket.cpp
+++ b/src/network/socket/qlocalsocket.cpp
@@ -255,7 +255,7 @@ QT_BEGIN_NAMESPACE
The following example waits up to one second for a connection
to be established:
- \snippet doc/src/snippets/code/src_network_socket_qlocalsocket_unix.cpp 0
+ \snippet code/src_network_socket_qlocalsocket_unix.cpp 0
If \a msecs is -1, this function will not time out.
@@ -274,7 +274,7 @@ QT_BEGIN_NAMESPACE
The following example waits up to one second for a connection
to be closed:
- \snippet doc/src/snippets/code/src_network_socket_qlocalsocket_unix.cpp 1
+ \snippet code/src_network_socket_qlocalsocket_unix.cpp 1
If \a msecs is -1, this function will not time out.
diff --git a/src/network/socket/qnativesocketengine.cpp b/src/network/socket/qnativesocketengine.cpp
index 8fac3613c0..f2e2f692ac 100644
--- a/src/network/socket/qnativesocketengine.cpp
+++ b/src/network/socket/qnativesocketengine.cpp
@@ -494,7 +494,7 @@ qintptr QNativeSocketEngine::socketDescriptor() const
waitForWrite().
Example:
- \snippet doc/src/snippets/code/src_network_socket_qnativesocketengine.cpp 0
+ \snippet code/src_network_socket_qnativesocketengine.cpp 0
Otherwise, error() should be called to determine the cause of the
error.
@@ -590,7 +590,7 @@ bool QNativeSocketEngine::bind(const QHostAddress &address, quint16 port)
the blocking function waitForRead().
Example:
- \snippet doc/src/snippets/code/src_network_socket_qnativesocketengine.cpp 1
+ \snippet code/src_network_socket_qnativesocketengine.cpp 1
\sa bind(), accept()
*/
diff --git a/src/network/socket/qtcpserver.cpp b/src/network/socket/qtcpserver.cpp
index 42f0056524..9cca943189 100644
--- a/src/network/socket/qtcpserver.cpp
+++ b/src/network/socket/qtcpserver.cpp
@@ -654,7 +654,7 @@ QString QTcpServer::errorString() const
To disable the use of a proxy for this socket, use the
QNetworkProxy::NoProxy proxy type:
- \snippet doc/src/snippets/code/src_network_socket_qtcpserver.cpp 0
+ \snippet code/src_network_socket_qtcpserver.cpp 0
\sa proxy(), QNetworkProxy
*/
diff --git a/src/network/socket/qudpsocket.cpp b/src/network/socket/qudpsocket.cpp
index 23c1956ec5..8e3c427d45 100644
--- a/src/network/socket/qudpsocket.cpp
+++ b/src/network/socket/qudpsocket.cpp
@@ -75,7 +75,7 @@
Example:
- \snippet doc/src/snippets/code/src_network_socket_qudpsocket.cpp 0
+ \snippet code/src_network_socket_qudpsocket.cpp 0
QUdpSocket also supports UDP multicast. Use joinMulticastGroup() and
leaveMulticastGroup() to control group membership, and
diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
index 1fc84cbec1..ba07e7ef06 100644
--- a/src/network/ssl/qsslcertificate.cpp
+++ b/src/network/ssl/qsslcertificate.cpp
@@ -834,7 +834,7 @@ QByteArray QSslCertificate::toText() const
Example:
- \snippet doc/src/snippets/code/src_network_ssl_qsslcertificate.cpp 0
+ \snippet code/src_network_ssl_qsslcertificate.cpp 0
\sa fromData()
*/
diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp
index ec49c0f56e..bdd10e7834 100644
--- a/src/network/ssl/qsslconfiguration.cpp
+++ b/src/network/ssl/qsslconfiguration.cpp
@@ -102,7 +102,7 @@ const QSsl::SslOptions QSslConfigurationPrivate::defaultSslOptions = QSsl::SslOp
achieve that. The following example illustrates how to change the
protocol to TLSv1_0 in a QSslSocket object:
- \snippet doc/src/snippets/code/src_network_ssl_qsslconfiguration.cpp 0
+ \snippet code/src_network_ssl_qsslconfiguration.cpp 0
\sa QSsl::SslProtocol, QSslCertificate, QSslCipher, QSslKey
QSslSocket, QNetworkAccessManager,
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index a041a2aaf1..936f46d95f 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -71,7 +71,7 @@
This method starts an immediate SSL handshake once the connection
has been established.
- \snippet doc/src/snippets/code/src_network_ssl_qsslsocket.cpp 0
+ \snippet code/src_network_ssl_qsslsocket.cpp 0
As with a plain QTcpSocket, QSslSocket enters the HostLookupState,
ConnectingState, and finally the ConnectedState, if the connection
@@ -94,7 +94,7 @@
the existing one passed in. It then initiates the SSL handshake
by calling startServerEncryption().
- \snippet doc/src/snippets/code/src_network_ssl_qsslsocket.cpp 1
+ \snippet code/src_network_ssl_qsslsocket.cpp 1
If an error occurs, QSslSocket emits the sslErrors() signal. In this
case, if no action is taken to ignore the error(s), the connection
@@ -122,7 +122,7 @@
waitForEncrypted(), which will block the calling thread until an
encrypted connection has been established.
- \snippet doc/src/snippets/code/src_network_ssl_qsslsocket.cpp 2
+ \snippet code/src_network_ssl_qsslsocket.cpp 2
QSslSocket provides an extensive, easy-to-use API for handling
cryptographic ciphers, private keys, and local, peer, and
@@ -397,7 +397,7 @@ void QSslSocket::resume()
If the SSL handshake is successful, QSslSocket emits encrypted().
- \snippet doc/src/snippets/code/src_network_ssl_qsslsocket.cpp 3
+ \snippet code/src_network_ssl_qsslsocket.cpp 3
\b{Note:} The example above shows that text can be written to
the socket immediately after requesting the encrypted connection,
@@ -1149,7 +1149,7 @@ void QSslSocket::setCiphers(const QList<QSslCipher> &ciphers)
is a colon-separated list of cipher suite names. The ciphers are listed in
order of preference, starting with the most preferred cipher. For example:
- \snippet doc/src/snippets/code/src_network_ssl_qsslsocket.cpp 4
+ \snippet code/src_network_ssl_qsslsocket.cpp 4
Each cipher name in \a ciphers must be the name of a cipher in the
list returned by supportedCiphers(). Restricting the cipher suite
@@ -1438,7 +1438,7 @@ bool QSslSocket::waitForConnected(int msecs)
The following example waits up to one second for the socket to be
encrypted:
- \snippet doc/src/snippets/code/src_network_ssl_qsslsocket.cpp 5
+ \snippet code/src_network_ssl_qsslsocket.cpp 5
If msecs is -1, this function will not time out.
@@ -1736,7 +1736,7 @@ void QSslSocket::ignoreSslErrors()
If, for instance, you want to connect to a server that uses
a self-signed certificate, consider the following snippet:
- \snippet doc/src/snippets/code/src_network_ssl_qsslsocket.cpp 6
+ \snippet code/src_network_ssl_qsslsocket.cpp 6
Multiple calls to this function will replace the list of errors that
were passed in previous calls.
diff --git a/src/opengl/doc/qtopengl.qdocconf b/src/opengl/doc/qtopengl.qdocconf
new file mode 100644
index 0000000000..f631f03b90
--- /dev/null
+++ b/src/opengl/doc/qtopengl.qdocconf
@@ -0,0 +1,92 @@
+include(../../../doc/global/qt-cpp-ignore.qdocconf)
+
+project = QtOpenGL
+description = Qt OpenGL Reference Documentation
+url = http://qt-project.org/doc/qt-5.0/qtopengl
+version = 5.0.0
+
+sourceencoding = UTF-8
+outputencoding = UTF-8
+naturallanguage = en_US
+qhp.projects = QtOpenGL
+
+qhp.QtOpenGL.file = qtopengl.qhp
+qhp.QtOpenGL.namespace = org.qt-project.qtopengl.500
+qhp.QtOpenGL.virtualFolder = qdoc
+qhp.QtOpenGL.indexTitle = Qt OpenGL Reference Documentation
+qhp.QtOpenGL.indexRoot =
+
+qhp.QtOpenGL.filterAttributes = qtopengl 5.0.0 qtrefdoc
+qhp.QtOpenGL.customFilters.Qt.name = QtOpenGL 5.0.0
+qhp.QtOpenGL.customFilters.Qt.filterAttributes = qtopengl 5.0.0
+qhp.QtOpenGL.subprojects = classes overviews examples
+qhp.QtOpenGL.subprojects.classes.title = Classes
+qhp.QtOpenGL.subprojects.classes.indexTitle = Qt OpenGL's Classes
+qhp.QtOpenGL.subprojects.classes.selectors = class fake:headerfile
+qhp.QtOpenGL.subprojects.classes.sortPages = true
+qhp.QtOpenGL.subprojects.overviews.title = Overviews
+qhp.QtOpenGL.subprojects.overviews.indexTitle = All Overviews and HOWTOs
+qhp.QtOpenGL.subprojects.overviews.selectors = fake:page,group,module
+qhp.QtOpenGL.subprojects.examples.title = Qt OpenGL Examples
+qhp.QtOpenGL.subprojects.examples.indexTitle = Qt OpenGL Examples
+qhp.QtOpenGL.subprojects.examples.selectors = fake:example
+
+dita.metadata.default.author = Qt Project
+dita.metadata.default.permissions = all
+dita.metadata.default.publisher = Qt Project
+dita.metadata.default.copyryear = 2012
+dita.metadata.default.copyrholder = Nokia
+dita.metadata.default.audience = programmer
+
+sources.fileextensions = "*.c++ *.cc *.cpp *.cxx *.mm *.qml *.qdoc"
+headers.fileextensions = "*.ch *.h *.h++ *.hh *.hpp *.hxx"
+
+examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml *.css"
+examples.imageextensions = "*.png"
+
+outputdir = ../../../doc/qtopengl
+tagfile = ../../../doc/qtopengl/qtopengl.tags
+
+HTML.generatemacrefs = "true"
+HTML.nobreadcrumbs = "true"
+
+HTML.templatedir = .
+
+HTML.stylesheets = ../../../doc/global/style/offline.css
+
+HTML.headerstyles = \
+ " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n"
+
+HTML.endheader = \
+ "</head>\n" \
+
+defines = Q_QDOC \
+ QT_.*_SUPPORT \
+ QT_.*_LIB \
+ QT_COMPAT \
+ QT_KEYPAD_NAVIGATION \
+ QT_NO_EGL \
+ Q_WS_.* \
+ Q_OS_.* \
+ Q_BYTE_ORDER \
+ QT_DEPRECATED \
+ QT_DEPRECATED_* \
+ Q_NO_USING_KEYWORD \
+ __cplusplus \
+ Q_COMPILER_INITIALIZER_LISTS
+
+versionsym = QT_VERSION_STR
+
+codeindent = 1
+
+depends += qtcore qtgui qtwidgets
+
+headerdirs += ..
+
+sourcedirs += ..
+
+exampledirs += ../../../examples \
+ ../ \
+ snippets
+
+imagedirs += images
diff --git a/src/opengl/doc/snippets/code/doc_src_qtopengl.cpp b/src/opengl/doc/snippets/code/doc_src_qtopengl.cpp
new file mode 100644
index 0000000000..d14a1ede1a
--- /dev/null
+++ b/src/opengl/doc/snippets/code/doc_src_qtopengl.cpp
@@ -0,0 +1,43 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation 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$
+**
+****************************************************************************/
+
+//! [0]
+#include <QtOpenGL>
+//! [0]
diff --git a/src/opengl/doc/snippets/code/doc_src_qtopengl.pro b/src/opengl/doc/snippets/code/doc_src_qtopengl.pro
new file mode 100644
index 0000000000..72adc2140b
--- /dev/null
+++ b/src/opengl/doc/snippets/code/doc_src_qtopengl.pro
@@ -0,0 +1,3 @@
+#! [1]
+QT += opengl
+#! [1]
diff --git a/doc/src/snippets/code/src_opengl_qgl.cpp b/src/opengl/doc/snippets/code/src_opengl_qgl.cpp
index 4adc126159..4adc126159 100644
--- a/doc/src/snippets/code/src_opengl_qgl.cpp
+++ b/src/opengl/doc/snippets/code/src_opengl_qgl.cpp
diff --git a/doc/src/snippets/code/src_opengl_qglcolormap.cpp b/src/opengl/doc/snippets/code/src_opengl_qglcolormap.cpp
index 04384c1af8..04384c1af8 100644
--- a/doc/src/snippets/code/src_opengl_qglcolormap.cpp
+++ b/src/opengl/doc/snippets/code/src_opengl_qglcolormap.cpp
diff --git a/doc/src/snippets/code/src_opengl_qglpixelbuffer.cpp b/src/opengl/doc/snippets/code/src_opengl_qglpixelbuffer.cpp
index e44ac23d1a..e44ac23d1a 100644
--- a/doc/src/snippets/code/src_opengl_qglpixelbuffer.cpp
+++ b/src/opengl/doc/snippets/code/src_opengl_qglpixelbuffer.cpp
diff --git a/doc/src/snippets/code/src_opengl_qglshaderprogram.cpp b/src/opengl/doc/snippets/code/src_opengl_qglshaderprogram.cpp
index d0474c1899..d0474c1899 100644
--- a/doc/src/snippets/code/src_opengl_qglshaderprogram.cpp
+++ b/src/opengl/doc/snippets/code/src_opengl_qglshaderprogram.cpp
diff --git a/src/opengl/doc/src/qtopengl.qdoc b/src/opengl/doc/src/qtopengl.qdoc
new file mode 100644
index 0000000000..0fa28eed8c
--- /dev/null
+++ b/src/opengl/doc/src/qtopengl.qdoc
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** 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$
+**
+****************************************************************************/
+
+/*!
+ \module QtOpenGL
+ \title QtOpenGL Module
+ \ingroup modules
+ \ingroup technology-apis
+
+ \brief The QtOpenGL module offers classes that make it easy to
+ use OpenGL in Qt applications.
+
+ OpenGL is a standard API for rendering 3D graphics. OpenGL only
+ deals with 3D rendering and provides little or no support for GUI
+ programming issues. The user interface for an OpenGL application
+ must be created with another toolkit, such as Motif on the X
+ platform, Microsoft Foundation Classes (MFC) under Windows, or Qt
+ on both platforms.
+
+ \note OpenGL is a trademark of Silicon Graphics, Inc. in
+ the United States and other countries.
+
+ The Qt OpenGL module makes it easy to use OpenGL in Qt applications.
+ It provides an OpenGL widget class that can be used just like any
+ other Qt widget, except that it opens an OpenGL display buffer where
+ you can use the OpenGL API to render the contents.
+
+ To include the definitions of the module's classes, use the
+ following directive:
+
+ \snippet code/doc_src_qtopengl.cpp 0
+
+ To link against the module, add this line to your \l qmake \c
+ .pro file:
+
+ \snippet code/doc_src_qtopengl.pro 1
+
+ The Qt OpenGL module is implemented as a platform-independent Qt/C++
+ wrapper around the platform-dependent GLX (version 1.3 or later),
+ WGL, or AGL C APIs. Although the basic functionality provided is very
+ similar to Mark Kilgard's GLUT library, applications using the Qt
+ OpenGL module can take advantage of the whole Qt API for
+ non-OpenGL-specific GUI functionality.
+*/
+
+
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index b2b3790b29..f1589694a8 100644
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -24,6 +24,9 @@ contains(QT_CONFIG, opengles1):CONFIG += opengles1
contains(QT_CONFIG, opengles2):CONFIG += opengles2
contains(QT_CONFIG, egl):CONFIG += egl
+QMAKE_DOCS = $$PWD/doc/qtopengl.qdocconf
+QMAKE_DOCS_INDEX = ../../doc
+
HEADERS += qgl.h \
qgl_p.h \
qglcolormap.h \
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index d298777c30..263aa639a7 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -208,15 +208,15 @@ QGLSignalProxy *QGLSignalProxy::instance()
There are different ways to define the display characteristics of
a rendering context. One is to create a QGLFormat and make it the
default for the entire application:
- \snippet doc/src/snippets/code/src_opengl_qgl.cpp 0
+ \snippet code/src_opengl_qgl.cpp 0
Or you can specify the desired format when creating an object of
your QGLWidget subclass:
- \snippet doc/src/snippets/code/src_opengl_qgl.cpp 1
+ \snippet code/src_opengl_qgl.cpp 1
After the widget has been created, you can find out which of the
requested features the system was able to provide:
- \snippet doc/src/snippets/code/src_opengl_qgl.cpp 2
+ \snippet code/src_opengl_qgl.cpp 2
\legalese
OpenGL is a trademark of Silicon Graphics, Inc. in the
@@ -305,7 +305,7 @@ QGLFormat::QGLFormat()
This constructor makes it easy to specify a certain desired format
in classes derived from QGLWidget, for example:
- \snippet doc/src/snippets/code/src_opengl_qgl.cpp 3
+ \snippet code/src_opengl_qgl.cpp 3
Note that there are QGL::FormatOption values to turn format settings
both on and off, e.g. QGL::DepthBuffer and QGL::NoDepthBuffer,
@@ -1323,7 +1323,7 @@ QGLFormat QGLFormat::defaultFormat()
Sets a new default QGLFormat for the application to \a f. For
example, to set single buffering as the default instead of double
buffering, your main() might contain code like this:
- \snippet doc/src/snippets/code/src_opengl_qgl.cpp 4
+ \snippet code/src_opengl_qgl.cpp 4
\sa defaultFormat()
*/
@@ -1368,13 +1368,13 @@ QGLFormat QGLFormat::defaultOverlayFormat()
For example, to get a double buffered overlay context (if
available), use code like this:
- \snippet doc/src/snippets/code/src_opengl_qgl.cpp 5
+ \snippet code/src_opengl_qgl.cpp 5
As usual, you can find out after widget creation whether the
underlying OpenGL system was able to provide the requested
specification:
- \snippet doc/src/snippets/code/src_opengl_qgl.cpp 6
+ \snippet code/src_opengl_qgl.cpp 6
\sa defaultOverlayFormat()
*/
@@ -2808,7 +2808,7 @@ int QGLContext::textureCacheLimit()
Call create() to create a new GL context that tries to match the
new format.
- \snippet doc/src/snippets/code/src_opengl_qgl.cpp 7
+ \snippet code/src_opengl_qgl.cpp 7
\sa format(), reset(), create()
*/
@@ -3226,7 +3226,7 @@ void QGLContextPrivate::setCurrentContext(QGLContext *context)
Here is a rough outline of how a QGLWidget subclass might look:
- \snippet doc/src/snippets/code/src_opengl_qgl.cpp 8
+ \snippet code/src_opengl_qgl.cpp 8
If you need to trigger a repaint from places other than paintGL()
(a typical example is when using \link QTimer timers\endlink to
diff --git a/src/opengl/qglcolormap.cpp b/src/opengl/qglcolormap.cpp
index 6698de52b2..92552fe41c 100644
--- a/src/opengl/qglcolormap.cpp
+++ b/src/opengl/qglcolormap.cpp
@@ -69,7 +69,7 @@
optimization.
Example of use:
- \snippet doc/src/snippets/code/src_opengl_qglcolormap.cpp 0
+ \snippet code/src_opengl_qglcolormap.cpp 0
\sa QGLWidget::setColormap(), QGLWidget::colormap()
*/
diff --git a/src/opengl/qglpixelbuffer.cpp b/src/opengl/qglpixelbuffer.cpp
index bccac7e9a0..ca7568d78e 100644
--- a/src/opengl/qglpixelbuffer.cpp
+++ b/src/opengl/qglpixelbuffer.cpp
@@ -257,7 +257,7 @@ bool QGLPixelBuffer::doneCurrent()
Example:
- \snippet doc/src/snippets/code/src_opengl_qglpixelbuffer.cpp 0
+ \snippet code/src_opengl_qglpixelbuffer.cpp 0
\warning This function uses the \c {render_texture} extension,
which is currently not supported under X11. An alternative that
@@ -292,7 +292,7 @@ bool QGLPixelBuffer::doneCurrent()
Example:
- \snippet doc/src/snippets/code/src_opengl_qglpixelbuffer.cpp 1
+ \snippet code/src_opengl_qglpixelbuffer.cpp 1
An alternative on Windows and Mac OS X systems that support the
\c render_texture extension is to use bindToDynamicTexture() to
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp
index ab5fa6a747..e73e63f6a3 100644
--- a/src/opengl/qglshaderprogram.cpp
+++ b/src/opengl/qglshaderprogram.cpp
@@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE
program is activated in the current QGLContext by calling
QGLShaderProgram::bind():
- \snippet doc/src/snippets/code/src_opengl_qglshaderprogram.cpp 0
+ \snippet code/src_opengl_qglshaderprogram.cpp 0
\section1 Writing portable shaders
@@ -97,12 +97,12 @@ QT_BEGIN_NAMESPACE
\section1 Simple shader example
- \snippet doc/src/snippets/code/src_opengl_qglshaderprogram.cpp 1
+ \snippet code/src_opengl_qglshaderprogram.cpp 1
With the above shader program active, we can draw a green triangle
as follows:
- \snippet doc/src/snippets/code/src_opengl_qglshaderprogram.cpp 2
+ \snippet code/src_opengl_qglshaderprogram.cpp 2
\section1 Binary shaders and programs
diff --git a/src/printsupport/dialogs/qabstractprintdialog.cpp b/src/printsupport/dialogs/qabstractprintdialog.cpp
index 4e3586f646..841a9e688e 100644
--- a/src/printsupport/dialogs/qabstractprintdialog.cpp
+++ b/src/printsupport/dialogs/qabstractprintdialog.cpp
@@ -379,7 +379,7 @@ void QAbstractPrintDialogPrivate::setPrinter(QPrinter *newPrinter)
Typically, QPrintDialog objects are constructed with a QPrinter
object, and executed using the exec() function.
- \snippet doc/src/snippets/code/src_gui_dialogs_qabstractprintdialog.cpp 0
+ \snippet code/src_gui_dialogs_qabstractprintdialog.cpp 0
If the dialog is accepted by the user, the QPrinter object is
correctly configured for printing.
diff --git a/src/printsupport/doc/images/plastique-printdialog-properties.png b/src/printsupport/doc/images/plastique-printdialog-properties.png
new file mode 100644
index 0000000000..38c1ae7038
--- /dev/null
+++ b/src/printsupport/doc/images/plastique-printdialog-properties.png
Binary files differ
diff --git a/src/printsupport/doc/images/plastique-printdialog.png b/src/printsupport/doc/images/plastique-printdialog.png
new file mode 100644
index 0000000000..3f8af01790
--- /dev/null
+++ b/src/printsupport/doc/images/plastique-printdialog.png
Binary files differ
diff --git a/src/printsupport/doc/images/printer-rects.png b/src/printsupport/doc/images/printer-rects.png
new file mode 100644
index 0000000000..8ebea60da8
--- /dev/null
+++ b/src/printsupport/doc/images/printer-rects.png
Binary files differ
diff --git a/src/printsupport/doc/qtprintsupport.qdocconf b/src/printsupport/doc/qtprintsupport.qdocconf
new file mode 100644
index 0000000000..a21639bbc9
--- /dev/null
+++ b/src/printsupport/doc/qtprintsupport.qdocconf
@@ -0,0 +1,92 @@
+include(../../../doc/global/qt-cpp-ignore.qdocconf)
+
+project = QtPrintSupport
+description = Qt Print Support Reference Documentation
+url = http://qt-project.org/doc/qt-5.0/qtprintsupport
+version = 5.0.0
+
+sourceencoding = UTF-8
+outputencoding = UTF-8
+naturallanguage = en_US
+qhp.projects = QtPrintSupport
+
+qhp.QtPrintSupport.file = qtprintsupport.qhp
+qhp.QtPrintSupport.namespace = org.qt-project.qtprintsupport.500
+qhp.QtPrintSupport.virtualFolder = qdoc
+qhp.QtPrintSupport.indexTitle = Qt Print Support Reference Documentation
+qhp.QtPrintSupport.indexRoot =
+
+qhp.QtPrintSupport.filterAttributes = qtprintsupport 5.0.0 qtrefdoc
+qhp.QtPrintSupport.customFilters.Qt.name = QtPrintSupport 5.0.0
+qhp.QtPrintSupport.customFilters.Qt.filterAttributes = qtprintsupport 5.0.0
+qhp.QtPrintSupport.subprojects = classes overviews examples
+qhp.QtPrintSupport.subprojects.classes.title = Classes
+qhp.QtPrintSupport.subprojects.classes.indexTitle = Qt Print Support's Classes
+qhp.QtPrintSupport.subprojects.classes.selectors = class fake:headerfile
+qhp.QtPrintSupport.subprojects.classes.sortPages = true
+qhp.QtPrintSupport.subprojects.overviews.title = Overviews
+qhp.QtPrintSupport.subprojects.overviews.indexTitle = All Overviews and HOWTOs
+qhp.QtPrintSupport.subprojects.overviews.selectors = fake:page,group,module
+qhp.QtPrintSupport.subprojects.examples.title = Qt Print Support Examples
+qhp.QtPrintSupport.subprojects.examples.indexTitle = Qt Print Support Examples
+qhp.QtPrintSupport.subprojects.examples.selectors = fake:example
+
+dita.metadata.default.author = Qt Project
+dita.metadata.default.permissions = all
+dita.metadata.default.publisher = Qt Project
+dita.metadata.default.copyryear = 2012
+dita.metadata.default.copyrholder = Nokia
+dita.metadata.default.audience = programmer
+
+sources.fileextensions = "*.c++ *.cc *.cpp *.cxx *.mm *.qml *.qdoc"
+headers.fileextensions = "*.ch *.h *.h++ *.hh *.hpp *.hxx"
+
+examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml *.css"
+examples.imageextensions = "*.png"
+
+outputdir = ../../../doc/qtprintsupport
+tagfile = ../../../doc/qtprintsupport/qtprintsupport.tags
+
+HTML.generatemacrefs = "true"
+HTML.nobreadcrumbs = "true"
+
+HTML.templatedir = .
+
+HTML.stylesheets = ../../../doc/global/style/offline.css
+
+HTML.headerstyles = \
+ " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n"
+
+HTML.endheader = \
+ "</head>\n" \
+
+defines = Q_QDOC \
+ QT_.*_SUPPORT \
+ QT_.*_LIB \
+ QT_COMPAT \
+ QT_KEYPAD_NAVIGATION \
+ QT_NO_EGL \
+ Q_WS_.* \
+ Q_OS_.* \
+ Q_BYTE_ORDER \
+ QT_DEPRECATED \
+ QT_DEPRECATED_* \
+ Q_NO_USING_KEYWORD \
+ __cplusplus \
+ Q_COMPILER_INITIALIZER_LISTS
+
+versionsym = QT_VERSION_STR
+
+codeindent = 1
+
+depends += qtcore qtgui qtwidgets
+
+headerdirs += ..
+
+sourcedirs += ..
+
+exampledirs += ../../../examples \
+ ../ \
+ snippets
+
+imagedirs += images
diff --git a/src/printsupport/doc/snippets/code/doc_src_qtprintsupport.cpp b/src/printsupport/doc/snippets/code/doc_src_qtprintsupport.cpp
new file mode 100644
index 0000000000..ca022c4cd5
--- /dev/null
+++ b/src/printsupport/doc/snippets/code/doc_src_qtprintsupport.cpp
@@ -0,0 +1,43 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation 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$
+**
+****************************************************************************/
+
+//! [1]
+#include <QtPrintSupport>
+//! [1]
diff --git a/src/printsupport/doc/snippets/code/doc_src_qtprintsupport.pro b/src/printsupport/doc/snippets/code/doc_src_qtprintsupport.pro
new file mode 100644
index 0000000000..39dd838120
--- /dev/null
+++ b/src/printsupport/doc/snippets/code/doc_src_qtprintsupport.pro
@@ -0,0 +1,3 @@
+#! [0]
+QT += printsupport
+#! [0]
diff --git a/doc/src/snippets/code/src_gui_dialogs_qabstractprintdialog.cpp b/src/printsupport/doc/snippets/code/src_gui_dialogs_qabstractprintdialog.cpp
index 41a6e1e622..41a6e1e622 100644
--- a/doc/src/snippets/code/src_gui_dialogs_qabstractprintdialog.cpp
+++ b/src/printsupport/doc/snippets/code/src_gui_dialogs_qabstractprintdialog.cpp
diff --git a/doc/src/snippets/printing-qprinter/errors.cpp b/src/printsupport/doc/snippets/printing-qprinter/errors.cpp
index f202d4f6a1..f202d4f6a1 100644
--- a/doc/src/snippets/printing-qprinter/errors.cpp
+++ b/src/printsupport/doc/snippets/printing-qprinter/errors.cpp
diff --git a/doc/src/snippets/printing-qprinter/object.cpp b/src/printsupport/doc/snippets/printing-qprinter/object.cpp
index 4125c9757c..4125c9757c 100644
--- a/doc/src/snippets/printing-qprinter/object.cpp
+++ b/src/printsupport/doc/snippets/printing-qprinter/object.cpp
diff --git a/doc/src/snippets/widgetprinting.cpp b/src/printsupport/doc/snippets/widgetprinting.cpp
index bf0f005ba2..bf0f005ba2 100644
--- a/doc/src/snippets/widgetprinting.cpp
+++ b/src/printsupport/doc/snippets/widgetprinting.cpp
diff --git a/doc/src/printsupport/printing.qdoc b/src/printsupport/doc/src/printing.qdoc
index 5447032a2b..cc79b41704 100644
--- a/doc/src/printsupport/printing.qdoc
+++ b/src/printsupport/doc/src/printing.qdoc
@@ -74,7 +74,7 @@
a QPrintDialog, allowing the user to specify the printer to use, paper size, and
other printing properties.
- \snippet examples/richtext/orderform/mainwindow.cpp 18
+ \snippet richtext/orderform/mainwindow.cpp 18
It is also possible to set certain default properties by modifying the QPrinter
before it is supplied to the print dialog. For example, applications that
@@ -88,7 +88,7 @@
to perform painting operations on it. We can construct and set up a painter in
the following way:
- \snippet doc/src/snippets/printing-qprinter/object.cpp 0
+ \snippet printing-qprinter/object.cpp 0
Since the QPrinter starts with a blank page, we only need to call the
\l{QPrinter::}{newPage()} function after drawing each page, except for the
@@ -143,7 +143,7 @@
will have to scale the painter. You may also want to position the widget on the
page. The following code sample shows how this may look.
- \snippet doc/src/snippets/widgetprinting.cpp 0
+ \snippet widgetprinting.cpp 0
This will center the widget on the page and scale it so that it fits the page.
diff --git a/doc/src/printsupport/qtprintsupport.qdoc b/src/printsupport/doc/src/qtprintsupport.qdoc
index 7eea8203aa..d6ba0c88f0 100644
--- a/doc/src/printsupport/qtprintsupport.qdoc
+++ b/src/printsupport/doc/src/qtprintsupport.qdoc
@@ -36,11 +36,11 @@
To include the definitions of the module's classes, use the
following directive:
- \snippet doc/src/snippets/code/doc_src_qtprintsupport.cpp 1
+ \snippet code/doc_src_qtprintsupport.cpp 1
To link against the module, add this line to your \l qmake \c
.pro file:
- \snippet doc/src/snippets/code/doc_src_qtprintsupport.pro 0
+ \snippet code/doc_src_qtprintsupport.pro 0
*/
diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp
index 4929b3308e..d7a2a302e4 100644
--- a/src/printsupport/kernel/qprinter.cpp
+++ b/src/printsupport/kernel/qprinter.cpp
@@ -740,7 +740,7 @@ void QPrinter::setPrinterName(const QString &name)
To detect other failures check the output of QPainter::begin() or QPrinter::newPage().
- \snippet doc/src/snippets/printing-qprinter/errors.cpp 0
+ \snippet printing-qprinter/errors.cpp 0
\sa setPrinterName()
*/
diff --git a/src/printsupport/printsupport.pro b/src/printsupport/printsupport.pro
index 0aa92a95de..9002ba3996 100644
--- a/src/printsupport/printsupport.pro
+++ b/src/printsupport/printsupport.pro
@@ -15,6 +15,9 @@ load(qt_module_config)
HEADERS += $$QT_SOURCE_TREE/src/printsupport/qtprintsupportversion.h
+QMAKE_DOCS = $$PWD/doc/qtprintsupport.qdocconf
+QMAKE_DOCS_INDEX = ../../doc
+
QMAKE_LIBS += $$QMAKE_LIBS_PRINTSUPPORT
include(kernel/kernel.pri)
diff --git a/src/sql/doc/doc.pri b/src/sql/doc/doc.pri
deleted file mode 100644
index 2bc2e005d4..0000000000
--- a/src/sql/doc/doc.pri
+++ /dev/null
@@ -1,3 +0,0 @@
-qtPrepareTool(QDOC, qdoc)
-docs.commands += $$QDOC $$QT.sql.sources/doc/qtsql.qdocconf
-QMAKE_EXTRA_TARGETS += docs
diff --git a/src/sql/sql.pro b/src/sql/sql.pro
index e3f81f3498..c2345d92ef 100644
--- a/src/sql/sql.pro
+++ b/src/sql/sql.pro
@@ -21,7 +21,9 @@ DEFINES += QT_NO_CAST_FROM_ASCII
PRECOMPILED_HEADER = ../corelib/global/qt_pch.h
SQL_P = sql
-include(doc/doc.pri)
+QMAKE_DOCS = $$PWD/doc/qtsql.qdocconf
+QMAKE_DOCS_INDEX = ../../doc
+
include(kernel/kernel.pri)
include(drivers/drivers.pri)
include(models/models.pri)
diff --git a/src/testlib/doc/qttest.qdocconf b/src/testlib/doc/qttest.qdocconf
new file mode 100644
index 0000000000..5f9ea96a28
--- /dev/null
+++ b/src/testlib/doc/qttest.qdocconf
@@ -0,0 +1,92 @@
+include(../../../doc/global/qt-cpp-ignore.qdocconf)
+
+project = QtTest
+description = Qt Test Reference Documentation
+url = http://qt-project.org/doc/qt-5.0/qttest
+version = 5.0.0
+
+sourceencoding = UTF-8
+outputencoding = UTF-8
+naturallanguage = en_US
+qhp.projects = QtTest
+
+qhp.QtTest.file = qttest.qhp
+qhp.QtTest.namespace = org.qt-project.qttest.500
+qhp.QtTest.virtualFolder = qdoc
+qhp.QtTest.indexTitle = Qt Test Reference Documentation
+qhp.QtTest.indexRoot =
+
+qhp.QtTest.filterAttributes = qttest 5.0.0 qtrefdoc
+qhp.QtTest.customFilters.Qt.name = QtTest 5.0.0
+qhp.QtTest.customFilters.Qt.filterAttributes = qttest 5.0.0
+qhp.QtTest.subprojects = classes overviews examples
+qhp.QtTest.subprojects.classes.title = Classes
+qhp.QtTest.subprojects.classes.indexTitle = Qt Test's Classes
+qhp.QtTest.subprojects.classes.selectors = class fake:headerfile
+qhp.QtTest.subprojects.classes.sortPages = true
+qhp.QtTest.subprojects.overviews.title = Overviews
+qhp.QtTest.subprojects.overviews.indexTitle = All Overviews and HOWTOs
+qhp.QtTest.subprojects.overviews.selectors = fake:page,group,module
+qhp.QtTest.subprojects.examples.title = Qt Test Examples
+qhp.QtTest.subprojects.examples.indexTitle = Qt Test Examples
+qhp.QtTest.subprojects.examples.selectors = fake:example
+
+dita.metadata.default.author = Qt Project
+dita.metadata.default.permissions = all
+dita.metadata.default.publisher = Qt Project
+dita.metadata.default.copyryear = 2012
+dita.metadata.default.copyrholder = Nokia
+dita.metadata.default.audience = programmer
+
+sources.fileextensions = "*.c++ *.cc *.cpp *.cxx *.mm *.qml *.qdoc"
+headers.fileextensions = "*.ch *.h *.h++ *.hh *.hpp *.hxx"
+
+examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml *.css"
+examples.imageextensions = "*.png"
+
+outputdir = ../../../doc/qttest
+tagfile = ../../../doc/qttest/qttest.tags
+
+HTML.generatemacrefs = "true"
+HTML.nobreadcrumbs = "true"
+
+HTML.templatedir = .
+
+HTML.stylesheets = ../../../doc/global/style/offline.css
+
+HTML.headerstyles = \
+ " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n"
+
+HTML.endheader = \
+ "</head>\n" \
+
+defines = Q_QDOC \
+ QT_.*_SUPPORT \
+ QT_.*_LIB \
+ QT_COMPAT \
+ QT_KEYPAD_NAVIGATION \
+ QT_NO_EGL \
+ Q_WS_.* \
+ Q_OS_.* \
+ Q_BYTE_ORDER \
+ QT_DEPRECATED \
+ QT_DEPRECATED_* \
+ Q_NO_USING_KEYWORD \
+ __cplusplus \
+ Q_COMPILER_INITIALIZER_LISTS
+
+versionsym = QT_VERSION_STR
+
+codeindent = 1
+
+depends += qtcore
+
+headerdirs += ..
+
+sourcedirs += ..
+
+exampledirs += ../../../examples \
+ ../ \
+ snippets
+
+imagedirs += images
diff --git a/doc/src/snippets/code/doc_src_qsignalspy.cpp b/src/testlib/doc/snippets/code/doc_src_qsignalspy.cpp
index a957285cea..a957285cea 100644
--- a/doc/src/snippets/code/doc_src_qsignalspy.cpp
+++ b/src/testlib/doc/snippets/code/doc_src_qsignalspy.cpp
diff --git a/doc/src/snippets/code/doc_src_qtestevent.cpp b/src/testlib/doc/snippets/code/doc_src_qtestevent.cpp
index 787a8e666b..787a8e666b 100644
--- a/doc/src/snippets/code/doc_src_qtestevent.cpp
+++ b/src/testlib/doc/snippets/code/doc_src_qtestevent.cpp
diff --git a/src/testlib/doc/snippets/code/doc_src_qtestlib.cpp b/src/testlib/doc/snippets/code/doc_src_qtestlib.cpp
new file mode 100644
index 0000000000..8bad7cca48
--- /dev/null
+++ b/src/testlib/doc/snippets/code/doc_src_qtestlib.cpp
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation 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$
+**
+****************************************************************************/
+
+//! [0]
+class MyFirstTest: public QObject
+{
+ Q_OBJECT
+private slots:
+ void initTestCase()
+ { qDebug("called before everything else"); }
+ void myFirstTest()
+ { QVERIFY(1 == 1); }
+ void mySecondTest()
+ { QVERIFY(1 != 2); }
+ void cleanupTestCase()
+ { qDebug("called after myFirstTest and mySecondTest"); }
+};
+//! [0]
+
+
+//! [8]
+void TestQString::toUpper()
+{
+ QString str = "Hello";
+ QVERIFY(str.toUpper() == "HELLO");
+}
+//! [8]
+
+
+//! [11]
+QCOMPARE(QString("hello").toUpper(), QString("HELLO"));
+QCOMPARE(QString("Hello").toUpper(), QString("HELLO"));
+QCOMPARE(QString("HellO").toUpper(), QString("HELLO"));
+QCOMPARE(QString("HELLO").toUpper(), QString("HELLO"));
+//! [11]
+
+//! [12]
+class MyFirstBenchmark: public QObject
+{
+ Q_OBJECT
+private slots:
+ void myFirstBenchmark()
+ {
+ QString string1;
+ QString string2;
+ QBENCHMARK {
+ string1.localeAwareCompare(string2);
+ }
+ }
+};
+//! [12]
diff --git a/src/testlib/doc/snippets/code/doc_src_qtestlib.pro b/src/testlib/doc/snippets/code/doc_src_qtestlib.pro
new file mode 100644
index 0000000000..c514d26075
--- /dev/null
+++ b/src/testlib/doc/snippets/code/doc_src_qtestlib.pro
@@ -0,0 +1,7 @@
+#! [1]
+QT += testlib
+#! [1]
+
+#! [2]
+CONFIG += testcase
+#! [2]
diff --git a/src/testlib/doc/snippets/code/doc_src_qtestlib.qdoc b/src/testlib/doc/snippets/code/doc_src_qtestlib.qdoc
new file mode 100644
index 0000000000..05759b0ccb
--- /dev/null
+++ b/src/testlib/doc/snippets/code/doc_src_qtestlib.qdoc
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation 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$
+**
+****************************************************************************/
+
+//! [2]
+testname [options] [testfunctions[:testdata]]...
+//! [2]
+
+
+//! [3]
+/myTestDirectory$ testQString toUpper
+//! [3]
+
+
+//! [4]
+/myTestDirectory$ testQString toUpper toInt:zero
+//! [4]
+
+
+//! [5]
+/myTestDirectory$ testMyWidget -vs -eventdelay 500
+//! [5]
+
+
+//! [6]
+cetest [options] ...
+//! [6]
+
+
+//! [7]
+set INCLUDE=C:\Program Files\Windows CE Tools\wce500\Windows Mobile 5.0 Pocket PC SDK\Activesync\Inc;%INCLUDE%
+set LIB=C:\Program Files\Windows CE Tools\wce500\Windows Mobile 5.0 Pocket PC SDK\Activesync\Lib;%LIB%
+//! [7]
+
+
+//! [9]
+/myTestDirectory$ qmake -project "QT += testlib"
+/myTestDirectory$ qmake
+/myTestDirectory$ make
+//! [9]
+
+
+//! [10]
+********* Start testing of TestQString *********
+Config: Using QTest library %VERSION%, Qt %VERSION%
+PASS : TestQString::initTestCase()
+PASS : TestQString::toUpper()
+PASS : TestQString::cleanupTestCase()
+Totals: 3 passed, 0 failed, 0 skipped
+********* Finished testing of TestQString *********
+//! [10]
diff --git a/src/testlib/doc/snippets/code/doc_src_qttest.cpp b/src/testlib/doc/snippets/code/doc_src_qttest.cpp
new file mode 100644
index 0000000000..21860fd7c4
--- /dev/null
+++ b/src/testlib/doc/snippets/code/doc_src_qttest.cpp
@@ -0,0 +1,43 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation 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$
+**
+****************************************************************************/
+
+//! [0]
+#include <QtTest>
+//! [0]
diff --git a/src/testlib/doc/snippets/code/doc_src_qttest.pro b/src/testlib/doc/snippets/code/doc_src_qttest.pro
new file mode 100644
index 0000000000..62b8fb064c
--- /dev/null
+++ b/src/testlib/doc/snippets/code/doc_src_qttest.pro
@@ -0,0 +1,3 @@
+#! [1]
+QT += testlib
+#! [1]
diff --git a/doc/src/snippets/code/src_qtestlib_qtestcase.cpp b/src/testlib/doc/snippets/code/src_qtestlib_qtestcase.cpp
index 2c6565edf5..2c6565edf5 100644
--- a/doc/src/snippets/code/src_qtestlib_qtestcase.cpp
+++ b/src/testlib/doc/snippets/code/src_qtestlib_qtestcase.cpp
diff --git a/src/testlib/doc/src/qttest.qdoc b/src/testlib/doc/src/qttest.qdoc
new file mode 100644
index 0000000000..b1242202a8
--- /dev/null
+++ b/src/testlib/doc/src/qttest.qdoc
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** 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$
+**
+****************************************************************************/
+
+/*!
+ \module QtTest
+ \title QtTest Module
+ \ingroup modules
+
+ \keyword QtTest
+
+ \brief The QtTest module provides classes for unit testing Qt applications and libraries.
+
+ Applications that use Qt's unit testing classes need to
+ be configured to be built against the QtTest module.
+ To include the definitions of the module's classes, use the
+ following directive:
+
+ \snippet code/doc_src_qttest.cpp 0
+
+ To link against the module, add this line to your \l qmake \c
+ .pro file:
+
+ \snippet code/doc_src_qttest.pro 1
+
+ See the \l{QTestLib Manual} for a detailed introduction on how to use
+ Qt's unit testing features with your applications.
+
+ The QtTest module is part of all \l{Qt editions}.
+*/
+
diff --git a/src/testlib/doc/src/qttestlib-manual.qdoc b/src/testlib/doc/src/qttestlib-manual.qdoc
new file mode 100644
index 0000000000..06b1ea7861
--- /dev/null
+++ b/src/testlib/doc/src/qttestlib-manual.qdoc
@@ -0,0 +1,840 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** 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$
+**
+****************************************************************************/
+
+/*!
+ \page qtestlib-manual.html
+ \title QTestLib Manual
+ \brief An overview of Qt's unit testing framework.
+
+ \ingroup frameworks-technologies
+ \ingroup qt-basic-concepts
+
+ \keyword qtestlib
+
+ The QTestLib framework, provided by Nokia, is a tool for unit
+ testing Qt based applications and libraries. QTestLib provides
+ all the functionality commonly found in unit testing frameworks as
+ well as extensions for testing graphical user interfaces.
+
+ \section1 QTestLib Features
+
+ QTestLib is designed to ease the writing of unit tests for Qt
+ based applications and libraries:
+
+ \table
+ \header \li Feature \li Details
+ \row
+ \li \b Lightweight
+ \li QTestLib consists of about 6000 lines of code and 60
+ exported symbols.
+ \row
+ \li \b Self-contained
+ \li QTestLib requires only a few symbols from the Qt Core library
+ for non-gui testing.
+ \row
+ \li \b {Rapid testing}
+ \li QTestLib needs no special test-runners; no special
+ registration for tests.
+ \row
+ \li \b {Data-driven testing}
+ \li A test can be executed multiple times with different test data.
+ \row
+ \li \b {Basic GUI testing}
+ \li QTestLib offers functionality for mouse and keyboard simulation.
+ \row
+ \li \b {Benchmarking}
+ \li QTestLib supports benchmarking and provides several measurement back-ends.
+ \row
+ \li \b {IDE friendly}
+ \li QTestLib outputs messages that can be interpreted by Visual
+ Studio and KDevelop.
+ \row
+ \li \b Thread-safety
+ \li The error reporting is thread safe and atomic.
+ \row
+ \li \b Type-safety
+ \li Extensive use of templates prevent errors introduced by
+ implicit type casting.
+ \row
+ \li \b {Easily extendable}
+ \li Custom types can easily be added to the test data and test output.
+ \endtable
+
+ \note For higher-level GUI and application testing needs, please
+ see the \l{Partner Directory} for Qt testing products provided by
+ Nokia partners.
+
+
+ \section1 QTestLib API
+
+ All public methods are in the \l QTest namespace. In addition, the
+ \l QSignalSpy class provides easy introspection for Qt's signals and slots.
+
+
+ \section1 Using QTestLib
+
+ \section2 Creating a Test
+
+ To create a test, subclass QObject and add one or more private slots to it. Each
+ private slot is a testfunction in your test. QTest::qExec() can be used to execute
+ all testfunctions in the test object.
+
+ In addition, there are four private slots that are \e not treated as testfunctions.
+ They will be executed by the testing framework and can be used to initialize and
+ clean up either the entire test or the current test function.
+
+ \list
+ \li \c{initTestCase()} will be called before the first testfunction is executed.
+ \li \c{cleanupTestCase()} will be called after the last testfunction was executed.
+ \li \c{init()} will be called before each testfunction is executed.
+ \li \c{cleanup()} will be called after every testfunction.
+ \endlist
+
+ If \c{initTestCase()} fails, no testfunction will be executed. If \c{init()} fails,
+ the following testfunction will not be executed, the test will proceed to the next
+ testfunction.
+
+ Example:
+ \snippet code/doc_src_qtestlib.cpp 0
+
+ For more examples, refer to the \l{QTestLib Tutorial}.
+
+ \section2 Building a Test
+
+ If you are using \c qmake as your build tool, just add the
+ following to your project file:
+
+ \snippet code/doc_src_qtestlib.pro 1
+
+ If you would like to run the test via \c{make check}, add the
+ additional line:
+
+ \snippet code/doc_src_qtestlib.pro 2
+
+ See \l{qmake Common Projects#building-a-testcase}{the qmake manual} for
+ more information about \c{make check}.
+
+ If you are using other build tools, make sure that you add the location
+ of the QTestLib header files to your include path (usually \c{include/QtTest}
+ under your Qt installation directory). If you are using a release build
+ of Qt, link your test to the \c QtTest library. For debug builds, use
+ \c{QtTest_debug}.
+
+ See \l {Chapter 1: Writing a Unit Test}{Writing a Unit Test} for a step by
+ step explanation.
+
+ \section2 QTestLib Command Line Arguments
+
+ \section3 Syntax
+
+ The syntax to execute an autotest takes the following simple form:
+
+ \snippet code/doc_src_qtestlib.qdoc 2
+
+ Substitute \c testname with the name of your executable. \c
+ testfunctions can contain names of test functions to be
+ executed. If no \c testfunctions are passed, all tests are run. If you
+ append the name of an entry in \c testdata, the test function will be
+ run only with that test data.
+
+ For example:
+
+ \snippet code/doc_src_qtestlib.qdoc 3
+
+ Runs the test function called \c toUpper with all available test data.
+
+ \snippet code/doc_src_qtestlib.qdoc 4
+
+ Runs the \c toUpper test function with all available test data,
+ and the \c toInt test function with the testdata called \c
+ zero (if the specified test data doesn't exist, the associated test
+ will fail).
+
+ \snippet code/doc_src_qtestlib.qdoc 5
+
+ Runs the testMyWidget function test, outputs every signal
+ emission and waits 500 milliseconds after each simulated
+ mouse/keyboard event.
+
+ \section3 Options
+
+ \section4 Logging Options
+
+ The following command line options determine how test results are reported:
+
+ \list
+ \li \c -o \e{filename,format} \BR
+ write output to the specified file, in the specified format (one of
+ \c txt, \c xml, \c lightxml or \c xunitxml). The special filename \c -
+ may be used to log to standard output.
+ \li \c -o \e filename \BR
+ write output to the specified file.
+ \li \c -txt \BR
+ outputs results in plain text.
+ \li \c -xml \BR
+ outputs results as an XML document.
+ \li \c -lightxml \BR
+ outputs results as a stream of XML tags.
+ \li \c -xunitxml \BR
+ outputs results as an Xunit XML document.
+ \endlist
+
+ The first version of the \c -o option may be repeated in order to log
+ test results in multiple formats, but no more than one instance of this
+ option can log test results to standard output.
+
+ If the first version of the \c -o option is used, neither the second version
+ of the \c -o option nor the \c -txt, \c -xml, \c -lightxml or \c -xunitxml
+ options should be used.
+
+ If neither version of the \c -o option is used, test results will be logged to
+ standard output. If no format option is used, test results will be logged in
+ plain text.
+
+ \section4 Test Log Detail Options
+
+ The following command line options control how much detail is reported
+ in test logs:
+
+ \list
+ \li \c -silent \BR
+ silent output, only shows fatal errors, test failures and minimal status messages.
+ \li \c -v1 \BR
+ verbose output; shows when each test function is entered.
+ (This option only affects plain text output.)
+ \li \c -v2 \BR
+ extended verbose output; shows each \l QCOMPARE() and \l QVERIFY().
+ (This option affects all output formats and implies \c -v1 for plain text output.)
+ \li \c -vs \BR
+ shows every signal that gets emitted and the slot invocations resulting from those signals.
+ (This option affects all output formats.)
+ \endlist
+
+ \section4 Testing Options
+
+ The following command-line options influence how tests are run:
+
+ \list
+ \li \c -functions \BR
+ outputs all test functions available in the test, then quits.
+ \li \c -datatags \BR
+ outputs all data tags available in the test.
+ A global data tag is preceded by ' __global__ '.
+ \li \c -eventdelay \e ms \BR
+ if no delay is specified for keyboard or mouse simulation
+ (\l QTest::keyClick(),
+ \l QTest::mouseClick() etc.), the value from this parameter
+ (in milliseconds) is substituted.
+ \li \c -keydelay \e ms \BR
+ like -eventdelay, but only influences keyboard simulation and not mouse
+ simulation.
+ \li \c -mousedelay \e ms \BR
+ like -eventdelay, but only influences mouse simulation and not keyboard
+ simulation.
+ \li \c -maxwarnings \e number\BR
+ sets the maximum number of warnings to output. 0 for unlimited, defaults to 2000.
+ \li \c -nocrashhandler \BR
+ disables the crash handler on Unix platforms.
+ \endlist
+
+ \section4 Benchmarking Options
+
+ The following command line options control benchmark testing:
+
+ \list
+ \li \c -callgrind \BR
+ use callgrind to time benchmarks (Linux only).
+ \li \c -tickcounter \BR
+ use CPU tick counters to time benchmarks.
+ \li \c -eventcounter \BR
+ counts events received during benchmarks.
+ \li \c -minimumvalue \e n \BR
+ sets the minimum acceptable measurement value.
+ \li \c -iterations \e n \BR
+ sets the number of accumulation iterations.
+ \li \c -median \e n \BR
+ sets the number of median iterations.
+ \li \c -vb \BR
+ output verbose benchmarking information.
+ \endlist
+
+ \section4 Miscellaneous Options
+
+ \list
+ \li \c -help \BR
+ outputs the possible command line arguments and give some useful help.
+ \endlist
+
+ \section2 Creating a Benchmark
+
+ To create a benchmark, follow the instructions for creating a test and then add a
+ QBENCHMARK macro to the test function that you want to benchmark.
+
+ \snippet code/doc_src_qtestlib.cpp 12
+
+ The code inside the QBENCHMARK macro will be measured, and possibly also repeated
+ several times in order to get an accurate measurement. This depends on the selected
+ measurement back-end. Several back-ends are available. They can be selected on the
+ command line:
+
+ \target testlib-benchmarking-measurement
+
+ \table
+ \header \li Name
+ \li Commmand-line Argument
+ \li Availability
+ \row \li Walltime
+ \li (default)
+ \li All platforms
+ \row \li CPU tick counter
+ \li -tickcounter
+ \li Windows, Mac OS X, Linux, many UNIX-like systems.
+ \row \li Valgrind/Callgrind
+ \li -callgrind
+ \li Linux (if installed)
+ \row \li Event Counter
+ \li -eventcounter
+ \li All platforms
+ \endtable
+
+ In short, walltime is always available but requires many repetitions to
+ get a useful result.
+ Tick counters are usually available and can provide
+ results with fewer repetitions, but can be susceptible to CPU frequency
+ scaling issues.
+ Valgrind provides exact results, but does not take
+ I/O waits into account, and is only available on a limited number of
+ platforms.
+ Event counting is available on all platforms and it provides the number of events
+ that were received by the event loop before they are sent to their corresponding
+ targets (this might include non-Qt events).
+
+ \note Depending on the device configuration, Tick counters on the
+ Windows CE platform may not be as fine-grained, compared to other platforms.
+ Devices that do not support high-resolution timers default to
+ one-millisecond granularity.
+
+ See the chapter 5 in the \l{QTestLib Tutorial} for more benchmarking examples.
+
+ \section1 Using QTestLib remotely on Windows CE
+ \c cetest is a convenience application which helps the user to launch an
+ application remotely on a Windows CE device or emulator.
+
+ It needs to be executed after the unit test has been successfully compiled.
+
+ Prior to launching, the following files are copied to the device:
+
+ \list
+ \li all Qt libraries the project links to
+ \li \l {QtRemote}{QtRemote.dll}
+ \li the c runtime library specified during installation
+ \li all files specified in the \c .pro file following the \l DEPLOYMENT rules.
+ \endlist
+
+ \section2 Using \c cetest
+ \section3 Syntax
+ The syntax to execute an autotest takes the following simple form:
+
+ \snippet code/doc_src_qtestlib.qdoc 6
+
+ \section3 Options
+ \c cetest provides the same options as those for unit-testing on non cross-compiled
+ platforms. See \l {QTestLib Command Line Arguments} {Command Line Arguments} for
+ more information.
+
+ The following commands are also included:
+
+ \list
+ \li \c -debug \BR
+ Test version compiled in debug mode.
+ \li \c -release \BR
+ Test version compiled in release mode.
+ \li \c -libpath \e path \BR
+ Target path to copy Qt libraries to.
+ \li \c -qt-delete \BR
+ Delete Qt libraries after execution.
+ \li \c -project-delete \BR
+ Delete project files after execution.
+ \li \c -delete \BR
+ Delete project and Qt libraries after execution.
+ \li \c -conf \BR
+ Specifies a qt.conf file to be deployed to remote directory.
+ \endlist
+
+ \note \c{debug} is the default build option.
+
+ \section2 QtRemote
+ \c QtRemote is a small library which is build after QTestLib. It allows the host
+ system to create a process on a remote device and waits until its execution has
+ been finished.
+
+ \section2 Requirements
+ \c cetest uses Microsoft ActiveSync to establish a remote connection between the
+ host computer and the device. Thus header files and libraries are needed to compile
+ cetest and QtRemote successfully.
+
+ Prior to \l{Installing Qt for Windows CE}{installation} of Qt, you need to set your
+ \c INCLUDE and \c LIB environment variables properly.
+
+ A default installation of Windows Mobile 5 for Pocket PC can be obtained by:
+
+ \snippet code/doc_src_qtestlib.qdoc 7
+
+ Note that Qt will remember the path, so you do not need to set it again
+ after switching the environments for cross-compilation.
+
+ \section1 3rd Party Code
+
+ The CPU tick counters used for benchmarking is licensed under the following
+ license: (from src/testlib/3rdparty/cycle.h)
+
+ \legalese
+ Copyright (c) 2003, 2006 Matteo Frigo\br
+ Copyright (c) 2003, 2006 Massachusetts Institute of Technology
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ \endlegalese
+*/
+
+/*!
+ \page qtestlib-tutorial.html
+ \brief A short introduction to testing with QTestLib.
+ \contentspage QTestLib Manual
+ \nextpage {Chapter 1: Writing a Unit Test}{Chapter 1}
+ \ingroup best-practices
+
+ \title QTestLib Tutorial
+
+ This tutorial gives a short introduction to how to use some of the
+ features of the QTestLib framework. It is divided into five
+ chapters:
+
+ \list 1
+ \li \l {Chapter 1: Writing a Unit Test}{Writing a Unit Test}
+ \li \l {Chapter 2: Data Driven Testing}{Data Driven Testing}
+ \li \l {Chapter 3: Simulating GUI Events}{Simulating GUI Events}
+ \li \l {Chapter 4: Replaying GUI Events}{Replaying GUI Events}
+ \li \l {Chapter 5: Writing a Benchmark}{Writing a Benchmark}
+ \endlist
+
+*/
+
+
+/*!
+ \example qtestlib/tutorial1
+
+ \contentspage {QTestLib Tutorial}{Contents}
+ \nextpage {Chapter 2: Data Driven Testing}{Chapter 2}
+
+ \title Chapter 1: Writing a Unit Test
+
+ In this first chapter we will see how to write a simple unit test
+ for a class, and how to execute it.
+
+ \section1 Writing a Test
+
+ Let's assume you want to test the behavior of our QString class.
+ First, you need a class that contains your test functions. This class
+ has to inherit from QObject:
+
+ \snippet qtestlib/tutorial1/testqstring.cpp 0
+
+ Note that you need to include the QTest header, and that the
+ test functions have to be declared as private slots so the
+ test framework finds and executes it.
+
+ Then you need to implement the test function itself. The
+ implementation could look like this:
+
+ \snippet code/doc_src_qtestlib.cpp 8
+
+ The \l QVERIFY() macro evaluates the expression passed as its
+ argument. If the expression evaluates to true, the execution of
+ the test function continues. Otherwise, a message describing the
+ failure is appended to the test log, and the test function stops
+ executing.
+
+ But if you want a more verbose output to the test log, you should
+ use the \l QCOMPARE() macro instead:
+
+ \snippet qtestlib/tutorial1/testqstring.cpp 1
+
+ If the strings are not equal, the contents of both strings is
+ appended to the test log, making it immediately visible why the
+ comparison failed.
+
+ Finally, to make our test case a stand-alone executable, the
+ following two lines are needed:
+
+ \snippet qtestlib/tutorial1/testqstring.cpp 2
+
+ The \l QTEST_MAIN() macro expands to a simple \c main()
+ method that runs all the test functions. Note that if both the
+ declaration and the implementation of our test class are in a \c
+ .cpp file, we also need to include the generated moc file to make
+ Qt's introspection work.
+
+ \section1 Executing a Test
+
+ Now that we finished writing our test, we want to execute
+ it. Assuming that our test was saved as \c testqstring.cpp in an
+ empty directory: we build the test using qmake to create a project
+ and generate a makefile.
+
+ \snippet code/doc_src_qtestlib.qdoc 9
+
+ \b {Note:}If you're using windows, replace \c make with \c
+ nmake or whatever build tool you use.
+
+ Running the resulting executable should give you the following
+ output:
+
+ \snippet code/doc_src_qtestlib.qdoc 10
+
+ Congratulations! You just wrote and executed your first unit test
+ using the QTestLib framework.
+*/
+
+/*!
+ \example qtestlib/tutorial2
+
+ \previouspage {Chapter 1: Writing a Unit Test}{Chapter 1}
+ \contentspage {QTestLib Tutorial}{Contents}
+ \nextpage {Chapter 3: Simulating Gui Events}{Chapter 3}
+
+ \title Chapter 2: Data Driven Testing
+
+ In this chapter we will demonstrate how to execute a test
+ multiple times with different test data.
+
+ So far, we have hard coded the data we wanted to test into our
+ test function. If we add more test data, the function might look like
+ this:
+
+ \snippet code/doc_src_qtestlib.cpp 11
+
+ To prevent that the function ends up being cluttered by repetitive
+ code, QTestLib supports adding test data to a test function. All
+ we need is to add another private slot to our test class:
+
+ \snippet qtestlib/tutorial2/testqstring.cpp 0
+
+ \section1 Writing the Data Function
+
+ A test function's associated data function carries the same name,
+ appended by \c{_data}. Our data function looks like this:
+
+ \snippet qtestlib/tutorial2/testqstring.cpp 1
+
+ First, we define the two elements of our test table using the \l
+ QTest::addColumn() function: A test string, and the
+ expected result of applying the QString::toUpper() function to
+ that string.
+
+ Then we add some data to the table using the \l
+ QTest::newRow() function. Each set of data will become a
+ separate row in the test table.
+
+ \l QTest::newRow() takes one argument: A name that will be
+ associated with the data set. If the test fails, the name will be
+ used in the test log, referencing the failed data. Then we
+ stream the data set into the new table row: First an arbitrary
+ string, and then the expected result of applying the
+ QString::toUpper() function to that string.
+
+ You can think of the test data as a two-dimensional table. In
+ our case, it has two columns called \c string and \c result and
+ three rows. In addition a name as well as an index is associated
+ with each row:
+
+ \table
+ \header
+ \li index
+ \li name
+ \li string
+ \li result
+ \row
+ \li 0
+ \li all lower
+ \li "hello"
+ \li HELLO
+ \row
+ \li 1
+ \li mixed
+ \li "Hello"
+ \li HELLO
+ \row
+ \li 2
+ \li all upper
+ \li "HELLO"
+ \li HELLO
+ \endtable
+
+ \section1 Rewriting the Test Function
+
+ Our test function can now be rewritten:
+
+ \snippet qtestlib/tutorial2/testqstring.cpp 2
+
+ The TestQString::toUpper() function will be executed three times,
+ once for each entry in the test table that we created in the
+ associated TestQString::toUpper_data() function.
+
+ First, we fetch the two elements of the data set using the \l
+ QFETCH() macro. \l QFETCH() takes two arguments: The data type of
+ the element and the element name. Then we perform the test using
+ the \l QCOMPARE() macro.
+
+ This approach makes it very easy to add new data to the test
+ without modifying the test itself.
+
+ And again, to make our test case a stand-alone executable,
+ the following two lines are needed:
+
+ \snippet qtestlib/tutorial2/testqstring.cpp 3
+
+ As before, the QTEST_MAIN() macro expands to a simple main()
+ method that runs all the test functions, and since both the
+ declaration and the implementation of our test class are in a .cpp
+ file, we also need to include the generated moc file to make Qt's
+ introspection work.
+*/
+
+/*!
+ \example qtestlib/tutorial3
+
+ \previouspage {Chapter 2: Data Driven Testing}{Chapter 2}
+ \contentspage {QTestLib Tutorial}{Contents}
+ \nextpage {Chapter 4: Replaying GUI Events}{Chapter 4}
+
+ \title Chapter 3: Simulating GUI Events
+
+ QTestLib features some mechanisms to test graphical user
+ interfaces. Instead of simulating native window system events,
+ QTestLib sends internal Qt events. That means there are no
+ side-effects on the machine the tests are running on.
+
+ In this chapter we will se how to write a simple GUI test.
+
+ \section1 Writing a GUI test
+
+ This time, let's assume you want to test the behavior of our
+ QLineEdit class. As before, you will need a class that contains
+ your test function:
+
+ \snippet qtestlib/tutorial3/testgui.cpp 0
+
+ The only difference is that you need to include the QtGui class
+ definitions in addition to the QTest namespace.
+
+ \snippet qtestlib/tutorial3/testgui.cpp 1
+
+ In the implementation of the test function we first create a
+ QLineEdit. Then we simulate writing "hello world" in the line edit
+ using the \l QTest::keyClicks() function.
+
+ \note The widget must also be shown in order to correctly test keyboard
+ shortcuts.
+
+ QTest::keyClicks() simulates clicking a sequence of keys on a
+ widget. Optionally, a keyboard modifier can be specified as well
+ as a delay (in milliseconds) of the test after each key click. In
+ a similar way, you can use the QTest::keyClick(),
+ QTest::keyPress(), QTest::keyRelease(), QTest::mouseClick(),
+ QTest::mouseDClick(), QTest::mouseMove(), QTest::mousePress()
+ and QTest::mouseRelease() functions to simulate the associated
+ GUI events.
+
+ Finally, we use the \l QCOMPARE() macro to check if the line edit's
+ text is as expected.
+
+ As before, to make our test case a stand-alone executable, the
+ following two lines are needed:
+
+ \snippet qtestlib/tutorial3/testgui.cpp 2
+
+ The QTEST_MAIN() macro expands to a simple main() method that
+ runs all the test functions, and since both the declaration and
+ the implementation of our test class are in a .cpp file, we also
+ need to include the generated moc file to make Qt's introspection
+ work.
+*/
+
+/*!
+ \example qtestlib/tutorial4
+
+ \previouspage {Chapter 3: Simulating GUI Event}{Chapter 3}
+ \contentspage {QTestLib Tutorial}{Contents}
+ \nextpage {Chapter 5: Writing a Benchmark}{Chapter 5}
+
+ \title Chapter 4: Replaying GUI Events
+
+ In this chapter, we will show how to simulate a GUI event,
+ and how to store a series of GUI events as well as replay them on
+ a widget.
+
+ The approach to storing a series of events and replay them, is
+ quite similar to the approach explained in \l {Chapter 2:
+ Data Driven Testing}{chapter 2}; all you need is to add a data
+ function to your test class:
+
+ \snippet qtestlib/tutorial4/testgui.cpp 0
+
+ \section1 Writing the Data Function
+
+ As before, a test function's associated data function carries the
+ same name, appended by \c{_data}.
+
+ \snippet qtestlib/tutorial4/testgui.cpp 1
+
+ First, we define the elements of the table using the
+ QTest::addColumn() function: A list of GUI events, and the
+ expected result of applying the list of events on a QWidget. Note
+ that the type of the first element is \l QTestEventList.
+
+ A QTestEventList can be populated with GUI events that can be
+ stored as test data for later usage, or be replayed on any
+ QWidget.
+
+ In our current data function, we create two \l
+ {QTestEventList}s. The first list consists of a single click to
+ the 'a' key. We add the event to the list using the
+ QTestEventList::addKeyClick() function. Then we use the
+ QTest::newRow() function to give the data set a name, and
+ stream the event list and the expected result into the table.
+
+ The second list consists of two key clicks: an 'a' with a
+ following 'backspace'. Again we use the
+ QTestEventList::addKeyClick() to add the events to the list, and
+ QTest::newRow() to put the event list and the expected
+ result into the table with an associated name.
+
+ \section1 Rewriting the Test Function
+
+ Our test can now be rewritten:
+
+ \snippet qtestlib/tutorial4/testgui.cpp 2
+
+ The TestGui::testGui() function will be executed two times,
+ once for each entry in the test data that we created in the
+ associated TestGui::testGui_data() function.
+
+ First, we fetch the two elements of the data set using the \l
+ QFETCH() macro. \l QFETCH() takes two arguments: The data type of
+ the element and the element name. Then we create a QLineEdit, and
+ apply the list of events on that widget using the
+ QTestEventList::simulate() function.
+
+ Finally, we use the QCOMPARE() macro to check if the line edit's
+ text is as expected.
+
+ As before, to make our test case a stand-alone executable,
+ the following two lines are needed:
+
+ \snippet qtestlib/tutorial4/testgui.cpp 3
+
+ The QTEST_MAIN() macro expands to a simple main() method that
+ runs all the test functions, and since both the declaration and
+ the implementation of our test class are in a .cpp file, we also
+ need to include the generated moc file to make Qt's introspection
+ work.
+*/
+
+/*!
+ \example qtestlib/tutorial5
+
+ \previouspage {Chapter 4: Replaying GUI Events}{Chapter 4}
+ \contentspage {QTestLib Tutorial}{Contents}
+
+ \title Chapter 5: Writing a Benchmark
+
+ In this final chapter we will demonstrate how to write benchmarks
+ using QTestLib.
+
+ \section1 Writing a Benchmark
+ To create a benchmark we extend a test function with a QBENCHMARK macro.
+ A benchmark test function will then typically consist of setup code and
+ a QBENCHMARK macro that contains the code to be measured. This test
+ function benchmarks QString::localeAwareCompare().
+
+ \snippet qtestlib/tutorial5/benchmarking.cpp 0
+
+ Setup can be done at the beginning of the function, the clock is not
+ running at this point. The code inside the QBENCHMARK macro will be
+ measured, and possibly repeated several times in order to get an
+ accurate measurement.
+
+ Several \l {testlib-benchmarking-measurement}{back-ends} are available
+ and can be selected on the command line.
+
+ \section1 Data Functions
+
+ Data functions are useful for creating benchmarks that compare
+ multiple data inputs, for example locale aware compare against standard
+ compare.
+
+ \snippet qtestlib/tutorial5/benchmarking.cpp 1
+
+ The test function then uses the data to determine what to benchmark.
+
+ \snippet qtestlib/tutorial5/benchmarking.cpp 2
+
+ The "if (useLocaleCompare)" switch is placed outside the QBENCHMARK
+ macro to avoid measuring its overhead. Each benchmark test function
+ can have one active QBENCHMARK macro.
+
+ \section1 External Tools
+
+ Tools for handling and visualizing test data are available as part of
+ the \l {qtestlib-tools} project in the \l{Qt Labs} web site.
+ These include a tool for comparing performance data obtained from test
+ runs and a utility to generate Web-based graphs of performance data.
+
+ See the \l{qtestlib-tools Announcement}{qtestlib-tools announcement}
+ for more information on these tools and a simple graphing example.
+
+*/
+
+
+
diff --git a/src/testlib/qsignalspy.qdoc b/src/testlib/qsignalspy.qdoc
index dddaed74f6..7ce0a51505 100644
--- a/src/testlib/qsignalspy.qdoc
+++ b/src/testlib/qsignalspy.qdoc
@@ -38,7 +38,7 @@
The following example records all signal emissions for the \c clicked() signal
of a QCheckBox:
- \snippet doc/src/snippets/code/doc_src_qsignalspy.cpp 0
+ \snippet code/doc_src_qsignalspy.cpp 0
\c{spy.takeFirst()} returns the arguments for the first emitted signal, as a
list of QVariant objects. The \c clicked() signal has a single bool argument,
@@ -46,17 +46,17 @@
The example below catches a signal from a custom object:
- \snippet doc/src/snippets/code/doc_src_qsignalspy.cpp 1
+ \snippet code/doc_src_qsignalspy.cpp 1
\b {Note:} Non-standard data types need to be registered, using
the qRegisterMetaType() function, before you can create a
QSignalSpy. For example:
- \snippet doc/src/snippets/code/doc_src_qsignalspy.cpp 2
+ \snippet code/doc_src_qsignalspy.cpp 2
To retrieve the \c QModelIndex, you can use qvariant_cast:
- \snippet doc/src/snippets/code/doc_src_qsignalspy.cpp 3
+ \snippet code/doc_src_qsignalspy.cpp 3
*/
/*! \fn QSignalSpy::QSignalSpy(QObject *object, const char *signal)
@@ -69,7 +69,7 @@
return false.
Example:
- \snippet doc/src/snippets/code/doc_src_qsignalspy.cpp 4
+ \snippet code/doc_src_qsignalspy.cpp 4
*/
/*! \fn QSignalSpy::isValid() const
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 245245e1ca..21468f0585 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -113,7 +113,7 @@ QT_BEGIN_NAMESPACE
by the test framework.
Example:
- \snippet doc/src/snippets/code/src_qtestlib_qtestcase.cpp 0
+ \snippet code/src_qtestlib_qtestcase.cpp 0
\sa QCOMPARE(), QTRY_VERIFY()
*/
@@ -127,7 +127,7 @@ QT_BEGIN_NAMESPACE
C string.
Example:
- \snippet doc/src/snippets/code/src_qtestlib_qtestcase.cpp 1
+ \snippet code/src_qtestlib_qtestcase.cpp 1
\sa QVERIFY(), QCOMPARE()
*/
@@ -160,7 +160,7 @@ QT_BEGIN_NAMESPACE
by the test framework.
Example:
- \snippet doc/src/snippets/code/src_qtestlib_qtestcase.cpp 2
+ \snippet code/src_qtestlib_qtestcase.cpp 2
\sa QVERIFY(), QTRY_COMPARE(), QTest::toString()
*/
@@ -236,12 +236,12 @@ QT_BEGIN_NAMESPACE
Assuming a test has the following data:
- \snippet doc/src/snippets/code/src_qtestlib_qtestcase.cpp 3
+ \snippet code/src_qtestlib_qtestcase.cpp 3
The test data has two elements, a QString called \c aString and an integer
called \c expected. To fetch these values in the actual test:
- \snippet doc/src/snippets/code/src_qtestlib_qtestcase.cpp 4
+ \snippet code/src_qtestlib_qtestcase.cpp 4
\c aString and \c expected are variables on the stack that are initialized with
the current test data.
@@ -271,7 +271,7 @@ QT_BEGIN_NAMESPACE
Example:
- \snippet doc/src/snippets/code/src_qtestlib_qtestcase.cpp 5
+ \snippet code/src_qtestlib_qtestcase.cpp 5
*/
/*! \macro QTEST(actual, testElement)
@@ -286,11 +286,11 @@ QT_BEGIN_NAMESPACE
Instead of writing:
- \snippet doc/src/snippets/code/src_qtestlib_qtestcase.cpp 6
+ \snippet code/src_qtestlib_qtestcase.cpp 6
you can write:
- \snippet doc/src/snippets/code/src_qtestlib_qtestcase.cpp 7
+ \snippet code/src_qtestlib_qtestcase.cpp 7
\sa QCOMPARE()
*/
@@ -320,7 +320,7 @@ QT_BEGIN_NAMESPACE
function that is invoked by the test framework.
Example:
- \snippet doc/src/snippets/code/src_qtestlib_qtestcase.cpp 8
+ \snippet code/src_qtestlib_qtestcase.cpp 8
*/
/*! \macro QEXPECT_FAIL(dataIndex, comment, mode)
@@ -347,7 +347,7 @@ QT_BEGIN_NAMESPACE
by the test framework.
Example 1:
- \snippet doc/src/snippets/code/src_qtestlib_qtestcase.cpp 9
+ \snippet code/src_qtestlib_qtestcase.cpp 9
In the example above, an expected fail will be written into the test output
if the variable \c i is not 42. If the variable \c i is 42, an unexpected pass
@@ -355,7 +355,7 @@ QT_BEGIN_NAMESPACE
statement in the example.
Example 2:
- \snippet doc/src/snippets/code/src_qtestlib_qtestcase.cpp 10
+ \snippet code/src_qtestlib_qtestcase.cpp 10
The above testfunction will not continue executing for the test data
entry \c{data27}.
@@ -391,7 +391,7 @@ QT_BEGIN_NAMESPACE
a warning is printed to the test log.
For example, in this code:
- \snippet doc/src/snippets/code/src_qtestlib_qtestcase.cpp 26
+ \snippet code/src_qtestlib_qtestcase.cpp 26
The testdata file will be resolved as the first existing file from:
@@ -441,7 +441,7 @@ QT_BEGIN_NAMESPACE
\l {QApplication::setNavigationMode()}.
Example:
- \snippet doc/src/snippets/code/src_qtestlib_qtestcase.cpp 11
+ \snippet code/src_qtestlib_qtestcase.cpp 11
\sa QTEST_APPLESS_MAIN(), QTEST_GUILESS_MAIN(), QTest::qExec(),
QApplication::setNavigationMode()
@@ -486,7 +486,7 @@ QT_BEGIN_NAMESPACE
For example:
- \snippet examples/qtestlib/tutorial5/benchmarking.cpp 0
+ \snippet qtestlib/tutorial5/benchmarking.cpp 0
\sa {QTestLib Manual#Creating a Benchmark}{Creating a Benchmark},
{Chapter 5: Writing a Benchmark}{Writing a Benchmark}
@@ -556,7 +556,7 @@ QT_BEGIN_NAMESPACE
before clicking the key.
Example:
- \snippet doc/src/snippets/code/src_qtestlib_qtestcase.cpp 13
+ \snippet code/src_qtestlib_qtestcase.cpp 13
The example above simulates clicking \c a on \c myWidget without
any keyboard modifiers and without delay of the test.
@@ -571,7 +571,7 @@ QT_BEGIN_NAMESPACE
before clicking the key.
Examples:
- \snippet doc/src/snippets/code/src_qtestlib_qtestcase.cpp 14
+ \snippet code/src_qtestlib_qtestcase.cpp 14
The first example above simulates clicking the \c escape key on \c
myWidget without any keyboard modifiers and without delay. The
@@ -650,7 +650,7 @@ QT_BEGIN_NAMESPACE
click.
Example:
- \snippet doc/src/snippets/code/src_qtestlib_qtestcase.cpp 15
+ \snippet code/src_qtestlib_qtestcase.cpp 15
The example above simulates clicking the sequence of keys
representing "hello world" on \c myWidget without any keyboard
@@ -726,7 +726,7 @@ QT_BEGIN_NAMESPACE
Example:
- \snippet doc/src/snippets/code/src_qtestlib_qtestcase.cpp 16
+ \snippet code/src_qtestlib_qtestcase.cpp 16
The example above defines a toString() specialization for a class
called \c MyPoint. Whenever a comparison of two instances of \c
@@ -851,7 +851,7 @@ QT_BEGIN_NAMESPACE
your test will stay responsive to user interface events or network communication.
Example:
- \snippet doc/src/snippets/code/src_qtestlib_qtestcase.cpp 17
+ \snippet code/src_qtestlib_qtestcase.cpp 17
The code above will wait until the network server is responding for a
maximum of about 12.5 seconds.
@@ -867,7 +867,7 @@ QT_BEGIN_NAMESPACE
time after being asked to show itself on the screen. Returns true.
Example:
- \snippet doc/src/snippets/code/src_qtestlib_qtestcase.cpp 24
+ \snippet code/src_qtestlib_qtestcase.cpp 24
*/
/*! \fn bool QTest::qWaitForWindowShown(QWindow *window, int timeout)
@@ -914,7 +914,7 @@ QT_BEGIN_NAMESPACE
instance run out of scope to commit the sequence to the event system.
Example:
- \snippet doc/src/snippets/code/src_qtestlib_qtestcase.cpp 25
+ \snippet code/src_qtestlib_qtestcase.cpp 25
*/
/*!
@@ -2023,7 +2023,7 @@ FatalSignalHandler::~FatalSignalHandler()
The following example will run all tests in \c MyTestObject:
- \snippet doc/src/snippets/code/src_qtestlib