summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Fixed hellowindow making context current in wrong thread.Samuel Rødal2011-08-311-1/+1
| | | | | | | | | | Make the context a child of the Renderer, which is already moved to the correct thread. Change-Id: Iafda090e15b322c03e2c10b1905050f636b90197 Reviewed-on: http://codereview.qt.nokia.com/3915 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Merge branch 'master' into refactorGunnar Sletta2011-08-311-1/+1
|\
| * Compile fix on Mac OS XBradley T. Hughes2011-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | The file is called shapeitem.cpp (lowercase i), not shapeItem.cpp (with uppercase I) Change-Id: I0dd230158cf8c8323bfa779901475535e7c7d694 Reviewed-on: http://codereview.qt.nokia.com/3883 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Copy core GL functionality to QtGui with QGL -> QOpenGL naming.Samuel Rødal2011-08-298-29/+228
| | | | | | | | | | | | Change-Id: Ibc989afa4a30dd184d41d1a1cd89f97196e48855 Reviewed-on: http://codereview.qt.nokia.com/3710 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* | Temporarily disable printers on Windows, fix export.Friedemann Kleint2011-08-261-0/+2
| | | | | | | | | | | | | | Change-Id: I351692b53cf559cd3be64cec8907bd544ba41593 Reviewed-on: http://codereview.qt.nokia.com/3653 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
* | Fix building of examples.Friedemann Kleint2011-08-2524-16/+38
| | | | | | | | | | | | Change-Id: Iebb56c81fd13deaa82d8883e3f1529f1a78ebea8 Reviewed-on: http://codereview.qt.nokia.com/3603 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Merge branch 'master' into refactorGunnar Sletta2011-08-252-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_qpa.cpp src/gui/kernel/qcursor_qpa.cpp src/gui/kernel/qwindowsysteminterface_qpa.cpp src/gui/kernel/qwindowsysteminterface_qpa.h src/gui/kernel/qwindowsysteminterface_qpa_p.h src/gui/text/qtextcontrol.cpp src/plugins/platforms/wayland/wayland.pro src/widgets/accessible/qaccessible2.h src/widgets/widgets/qwidgetlinecontrol_p.h Change-Id: I5e6f4eb184159dccc67e8f13673edb884d179c74
| * Support -qtnamespace and -qtlibinfix in qtbase examplesLiang Qi2011-08-082-0/+4
| | | | | | | | | | | | | | | | Task-number: QTBUG-19971 Change-Id: Ie20eb2fc133658dd34e1ec25a3b80c36f0f01aa3 Reviewed-on: http://codereview.qt.nokia.com/2754 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Liang Qi <liang.qi@nokia.com>
* | make 'make install' installPaul Olav Tvete2011-08-231-1/+7
| | | | | | | | | | | | | | Change-Id: I766e7917f6362b1f9cc26d18381e8d76eaf6ff83 Reviewed-on: http://codereview.qt.nokia.com/3261 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Make the hellowindow example multi-threaded to stress the GL backend.Samuel Rødal2011-08-193-28/+63
| | | | | | | | | | | | | | Change-Id: I9e158c0889b050f9ed76ea21176102fc792eef83 Reviewed-on: http://codereview.qt.nokia.com/3150 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* | Move printing into it's own libraryLars Knoll2011-08-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Create a libQtPrintSupport library that contains our current printing infrastructure. Long term this will get replaced with a libQtPrint, as the current architecture is not really maintainable. Change-Id: I7362fff6786b58c5b4e9213c23eda36d15048aa2 Reviewed-on: http://codereview.qt.nokia.com/3209 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* | Use the paged paintdevice in the print() method of QTextDocument.Lars Knoll2011-08-192-0/+2
| | | | | | | | | | | | | | | | | | | | This is required to be able to move the printing system into it's own library. Change-Id: If70a55be4c4413f9cd917a30d1b368f32c1145e4 Reviewed-on: http://codereview.qt.nokia.com/3207 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* | Build fix after setPreferredPaintEngine was removedPaul Olav Tvete2011-08-171-3/+0
| | | | | | | | | | | | | | Change-Id: I286529e0e1917ee3c808eba7dad0957dd4d8194f Reviewed-on: http://codereview.qt.nokia.com/3083 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Get rid of OpenGL 1.x engine and platform code from QtOpenGL.Samuel Rødal2011-08-1611-1022/+0
| | | | | | | | | | | | | | Change-Id: I646b8e26d5e7214432a044866764d57cc11b2390 Reviewed-on: http://codereview.qt.nokia.com/3006 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* | Merge remote branch 'gerrit/master' into refactorSamuel Rødal2011-08-033-3/+3
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_x11.cpp src/gui/widgets/qlinecontrol.cpp src/gui/widgets/qlinecontrol_p.h src/gui/widgets/qtabwidget.h Change-Id: I90ba893a5553b9ff5658ca0a3221ecf76be4c736
| * Eliminate reference to Trolltech.Jason McDonald2011-08-021-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-19653 Change-Id: If3c822dd59ccbdd03037068acfe902ed9688a874 Reviewed-on: http://codereview.qt.nokia.com/2482 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * Fix obsolete contact emailJason McDonald2011-07-282-2/+2
| | | | | | | | | | | | | | | | | | | | | | Replace the old Trolltech contact email address with the current Qt contact email address. Task-number: QTBUG-20370 Change-Id: If5b9c3a044e1ee46264548eea456c704ced8e363 Reviewed-on: http://codereview.qt.nokia.com/2153 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* | Added workable QScreen API on top of QPlatformScreen.Samuel Rødal2011-07-254-6/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPlatformIntegration::screens() no longer has to be implemented, implementations should call QPlatformIntegration::screenAdded() for each screen instead. This is for being able to support adding screens at run-time later on, by connecting it to a signal in QGuiApplication. The QGuiGLContext API has changed a bit, by not sending in all the parameters in the constructor but instead having a create() function. The createPlatformGLContext() factory in QPlatformIntegration takes a QGuiGLContext * instead of a QSurfaceFormat and a share context, similar to how the window and backing store factory functions work. The XCB plugin has experimental support for connecting to multiple X displays simultaneously, creating one or more QScreen for each. Change-Id: I248a22a4fd3481280710110272c04a30a8021e8f Reviewed-on: http://codereview.qt.nokia.com/2103 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* | Build fix for examples.Friedemann Kleint2011-07-252-8/+1
| | | | | | | | | | | | | | | | | | Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Change-Id: I36f5a4088a39673a8e74a4d53ac83a42696af096 Reviewed-on: http://codereview.qt.nokia.com/2095 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Merge remote branch 'gerrit/master' into refactorSamuel Rødal2011-07-2131-3/+1203
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/opengl/cube/main.cpp examples/widgets/applicationicon/main.cpp examples/widgets/orientation/main.cpp src/gui/image/qicon.cpp src/gui/image/qimage.h src/gui/image/qpixmap.h src/gui/image/qpixmap_mac.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qpalette.cpp src/gui/kernel/qwidget.cpp src/gui/styles/qmacstyle_mac.mm src/gui/widgets/qmenubar.cpp src/gui/widgets/qslider.cpp src/opengl/qwindowsurface_gl.cpp tests/auto/qvariant/qvariant.pro tests/benchmarks/corelib/kernel/qobject/qobject.pro tests/benchmarks/gui/animation/qanimation/qanimation.pro tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro tests/benchmarks/gui/image/qimagereader/qimagereader.pro tests/benchmarks/gui/itemviews/qtableview/qtableview.pro tests/benchmarks/gui/kernel/qapplication/qapplication.pro tests/benchmarks/gui/kernel/qwidget/qwidget.pro tests/benchmarks/gui/painting/qpainter/qpainter.pro tests/benchmarks/gui/painting/qtbench/qtbench.pro tests/benchmarks/gui/painting/qtracebench/qtracebench.pro tests/benchmarks/gui/text/qtext/qtext.pro Change-Id: I4b911c795ecb29d73b6a7fd18819711b49478a30
| * Doc: Speculative attempt to fix build breakage.David Boddie2011-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | Case sensitivity problems strike again. (cherry picked from commit 9aa5f949f092032589917a0bfe16e78828d0dabe) Change-Id: I5c9472c385fb045db8ab8ea54ec69bebb934ec6c Reviewed-on: http://codereview.qt.nokia.com/407 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Boddie
| * Doc: Fixed file name of a header file to use lower case characters.David Boddie2011-07-211-1/+1
| | | | | | | | | | | | | | | | (cherry picked from commit c68d24b7bafa3058d44c0a30ade329972403b6c6) Change-Id: If733804fbab8baf5c4a5331005834ddeecec3ff4 Reviewed-on: http://codereview.qt.nokia.com/406 Reviewed-by: David Boddie
| * Doc: Added missing license headers for documentation and examples.David Boddie2011-07-2030-0/+1200
| | | | | | | | | | | | | | Change-Id: I696f6ce2ee9b6055c549e615de952773d171f3e7 Reviewed-on: http://codereview.qt.nokia.com/408 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Boddie
| * drop an obsolete QChar::NoCategory enum valueRitt Konstantin2011-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | there is no such category in the Unicode specs. the QChar::NoCategory was a subject of bugs since it was introduced. int 4.6 it's meaning was limited to mention ucs4 > UNICODE_LAST_CODEPOINT only (which is useless anyways) in order to preserve the old (wrong) behavior. fix it now for qtbase Change-Id: I630534824e071090b39772881e747c1fdb758719 Reviewed-on: http://codereview.qt.nokia.com/1584 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* | Rename QPixmapData to QPlatformPixmap.Samuel Rødal2011-07-191-1/+1
| | | | | | | | | | | | | | | | | | Makes the API symmetric with the other Lighthouse APIs. Change-Id: I8a399f3c968ea35d4624711b31f2ac5bb94b7893 Reviewed-on: http://codereview.qt.nokia.com/1735 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* | Merge remote branch 'gerrit/master' into refactorSamuel Rødal2011-07-1222-50/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/image/qicon.cpp src/gui/image/qicon.h src/gui/image/qicon_p.h src/gui/text/qfontdatabase.cpp src/plugins/platforms/wayland/gl_integration/qwaylandglwindowsurface.cpp src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp sync.profile Change-Id: Ie0a23a12177ff51bf562e15b2dd41f071afb19b4
| * Remove more references to demos.Casper van Donderen2011-07-0822-49/+18
| | | | | | | | | | | | | | Change-Id: I431184cd0534c86047706fdaa1045b2935de5d7a Reviewed-on: http://codereview.qt.nokia.com/1307 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Boddie
| * Remove references to QT_INSTALL_DEMOS & DemosPath.Casper van Donderen2011-07-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The distinction between 'examples' and 'demos' is completely blurred at this point. We've decided, with the SDK people, to scrap the existing terminology in favor of the word 'example' only -- distinguishing between code snippets, walkthroughs, "demonstrations" can be done via keywords or some other method. Removing QT_INSTALL_DEMOS from all .pro files in Qt is still in progress. Change-Id: I86fc0e40d54baa54c5641fc6acbd8b67e4ad2789 Reviewed-on: http://codereview.qt.nokia.com/1034 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | Remove multimedia subdir from examplesOlli Werwolff2011-07-071-3/+0
| | | | | | | | | | | | | | Change-Id: I099c5a8785798a41968ec2793384ee58ac0fde39 Reviewed-on: http://codereview.qt.nokia.com/1269 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Merge remote branch 'gerrit/master' into refactorLars Knoll2011-07-0643-820/+110
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/opengldesktop/opengldesktop.cpp examples/itemviews/interview/interview.pro examples/mainwindows/mainwindow/mainwindow.pro examples/openvg/README examples/richtext/textedit/textedit.pro examples/tools/undo/undo.pro src/corelib/global/qglobal.h src/corelib/kernel/qcoreapplication.h src/corelib/kernel/qcoreevent.h src/corelib/kernel/qmetatype.h src/gui/kernel/qevent.cpp src/gui/kernel/qevent.h src/gui/painting/qpaintengine_raster.cpp src/gui/painting/qpaintengine_raster_p.h src/gui/text/qfontdatabase.cpp src/opengl/qgl.h src/openvg/qpaintengine_vg.cpp src/plugins/platforms/wayland/qwaylandwindow.cpp tests/auto/qmainwindow/qmainwindow.pro Change-Id: I6bfb586740a68379bb99f4612ec993393a5f3234
| * Remove references to demos from docs.Casper van Donderen2011-07-0526-798/+26
| | | | | | | | | | | | | | Change-Id: I1ae723af883c305ea64a4e46cc3ce889dd3c021b Reviewed-on: http://codereview.qt.nokia.com/1032 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Boddie
| * Add the richtext and tools demo-examples to build.Casper van Donderen2011-06-284-7/+9
| | | | | | | | | | | | | | Change-Id: I3a64dc0fb11f9ebbcb0cb2f97598370ca5962a3c Reviewed-on: http://codereview.qt.nokia.com/773 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Boddie
| * SSL example: update secure socket client example to use new cert APIPeter Hartmann2011-06-271-14/+14
| | | | | | | | | | | | | | | | | | issuerInfo and subjectInfo now return a QStringList instead of a QString Change-Id: I04174a7f6319ae156ac8de964d04c0525c9c5a9a Reviewed-on: http://codereview.qt.nokia.com/799 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
| * Add the mainwindows demos-examples to the build.Casper van Donderen2011-06-273-5/+8
| | | | | | | | | | | | | | Change-Id: I6ec0be8f058ad127c759fff3c4082a596db53405 Reviewed-on: http://codereview.qt.nokia.com/752 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kevin Wright <kevin.wright@nokia.com>
| * Add the itemviews demos-examples to the build.Casper van Donderen2011-06-273-7/+9
| | | | | | | | | | | | | | Change-Id: I032216c228193040568ef5d547685b587d2a43e6 Reviewed-on: http://codereview.qt.nokia.com/751 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kevin Wright <kevin.wright@nokia.com>
| * Add the painting demos-examples to build.Casper van Donderen2011-06-275-13/+20
| | | | | | | | | | | | | | Change-Id: Ia6f23719af0ec3091573909b5666ec795ee22410 Reviewed-on: http://codereview.qt.nokia.com/685 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| * Add the shared painting and affine example to the build.Casper van Donderen2011-06-273-5/+23
| | | | | | | | | | | | | | Change-Id: I85e66c9a33a1c908b7588beb219cc9540698ab68 Reviewed-on: http://codereview.qt.nokia.com/623 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | Merge remote-tracking branch 'base/master' into refactorJørgen Lind2011-06-27387-1/+32582
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/demos.pro demos/embedded/digiflip/digiflip.pro examples/examples.pro examples/graphicsview/embeddeddialogs/embeddeddialogs.pro src/gui/kernel/qplatformglcontext_qpa.cpp src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp src/plugins/platforms/wayland/qwaylanddisplay.cpp src/plugins/platforms/wayland/qwaylandwindow.cpp Change-Id: I2a4ec9e2ca9c9aa9d57b55f98985e810b77bb745
| * Add the embedded demos-examples to the build.Casper van Donderen2011-06-247-16/+18
| | | | | | | | | | | | | | Change-Id: Ib0a1e650913416e3ec05f1a86c139844a814f8bf Reviewed-on: http://codereview.qt.nokia.com/686 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Boddie
| * Add the graphicsview demo-examples to the build.Casper van Donderen2011-06-244-8/+14
| | | | | | | | | | | | | | Change-Id: I2f97985db9e547c37db00c32b2e1a1658f076f75 Reviewed-on: http://codereview.qt.nokia.com/684 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Boddie
| * Update sql and animation demos to be an example.Casper van Donderen2011-06-245-9/+16
| | | | | | | | | | | | | | Change-Id: I683383e2dab9428ea3fe4cfffba24bb7fefbc7c7 Reviewed-on: http://codereview.qt.nokia.com/618 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Boddie
| * Move all other demos in qtbase to examples.Casper van Donderen2011-06-24376-0/+31388
| | | | | | | | | | | | | | Change-Id: Iab0e7364d1f6b348d0e3033ea9304139f5bd6d0d Reviewed-on: http://codereview.qt.nokia.com/617 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Boddie
| * Move the affine example.Casper van Donderen2011-06-247-0/+1163
| | | | | | | | | | | | | | Change-Id: I27a164495e469cb2a5c82688f35062b54be5e62f Reviewed-on: http://codereview.qt.nokia.com/598 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Boddie
* | Reintroduce QWindow::SurfaceTypeMorten Sorvig2011-06-221-0/+1
| | | | | | | | | | | | | | On Cocoa it makes sense to distinguish between the two window types. Reviewed-by: Samuel
* | Made QExposeEvent public and added exposeEvent() in QWindow.Samuel Rødal2011-06-222-2/+6
| | | | | | | | This is needed for applications that use QBackingStore directly.
* | Compile.Friedemann Kleint2011-06-211-1/+0
| |
* | OpenGL API refactor.Samuel Rødal2011-06-212-10/+9
| | | | | | | | | | | | Rename QGuiGLFormat to QSurfaceFormat, and make QWindow sub-class of QSurface and QPlatformWindow sub-class of QPlatformSurface, instead of having QPlatformGLSurface accessor in QWindow.
* | Rename QWindowSurface -> QBackingStore and split into platform / public.Samuel Rødal2011-06-212-7/+8
| | | | | | | | Also get rid of GL window surface and related classes.
* | Make glx wayland backends working.Laszlo Agocs2011-06-201-2/+1
| |
* | Merge remote-tracking branch 'base/master' into refactorJørgen Lind2011-06-10107-161/+159
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/animation/animatedtiles/animatedtiles.pro examples/animation/appchooser/appchooser.pro examples/animation/moveblocks/moveblocks.pro examples/animation/states/states.pro examples/animation/stickman/stickman.pro examples/dialogs/configdialog/configdialog.pro examples/dialogs/sipdialog/sipdialog.pro examples/dialogs/standarddialogs/standarddialogs.pro examples/dialogs/tabdialog/tabdialog.pro examples/draganddrop/draggableicons/draggableicons.pro examples/draganddrop/draggabletext/draggabletext.pro examples/draganddrop/fridgemagnets/fridgemagnets.pro examples/draganddrop/puzzle/puzzle.pro examples/gestures/imagegestures/imagegestures.pro examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro examples/graphicsview/collidingmice/collidingmice.pro examples/graphicsview/elasticnodes/elasticnodes.pro examples/graphicsview/weatheranchorlayout/weatheranchorlayout.pro examples/itemviews/addressbook/addressbook.pro examples/itemviews/chart/chart.pro examples/itemviews/fetchmore/fetchmore.pro examples/itemviews/puzzle/puzzle.pro examples/mainwindows/menus/menus.pro examples/painting/basicdrawing/basicdrawing.pro examples/painting/concentriccircles/concentriccircles.pro examples/painting/imagecomposition/imagecomposition.pro examples/painting/painterpaths/painterpaths.pro examples/painting/transformations/transformations.pro examples/qtconcurrent/imagescaling/imagescaling.pro examples/qtestlib/tutorial1/tutorial1.pro examples/qtestlib/tutorial2/tutorial2.pro examples/qtestlib/tutorial3/tutorial3.pro examples/qtestlib/tutorial4/tutorial4.pro examples/qtestlib/tutorial5/tutorial5.pro examples/qws/dbscreen/dbscreen.pro examples/qws/svgalib/svgalib.pro examples/richtext/syntaxhighlighter/syntaxhighlighter.pro examples/statemachine/rogue/rogue.pro examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro examples/tools/styleplugin/plugin/plugin.pro examples/uitools/multipleinheritance/multipleinheritance.pro examples/widgets/analogclock/analogclock.pro examples/widgets/calculator/calculator.pro examples/widgets/calendarwidget/calendarwidget.pro examples/widgets/codeeditor/codeeditor.pro examples/widgets/icons/icons.pro examples/widgets/imageviewer/imageviewer.pro examples/widgets/lineedits/lineedits.pro examples/widgets/movie/movie.pro examples/widgets/shapedclock/shapedclock.pro examples/widgets/softkeys/softkeys.pro examples/widgets/tetrix/tetrix.pro src/gui/painting/qpaintengine_raster.cpp src/gui/painting/qpaintengine_raster_p.h src/openvg/openvg.pro src/openvg/qpaintengine_vg_p.h src/plugins/graphicssystems/meego/meego.pro src/plugins/platforms/fontdatabases/basicunix/basicunix.pri
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 08:06:21 +0000