summaryrefslogtreecommitdiffstats
path: root/examples/painting
Commit message (Collapse)AuthorAgeFilesLines
* Added UIDs to projects lacking themMiikka Heikkinen2009-11-041-1/+4
| | | | | | Also added symbianpkgrules.pri include to some examples Reviewed-by: Janne Koskinen
* Fixed noisy looking textures in Basic Drawing example with GL2 engine.Kim Motoyoshi Kalland2009-10-051-3/+2
| | | | | | | | | | | When running the Basic Drawing example with the GL2 paint engine and antialiasing enabled, textures looked noisy. When antialiasing was enabled, the example translated the painter half a pixel to get sharp lines. This caused the textures to be sampled at texel corners. Without linear interpolation, sampling textures at texel corners is unpredictable. The fix is to not translate the painter. Reviewed-by: Gunnar
* Demos and applications have a nice Qt logo when installed on SymbianEspen Riskedal2009-10-026-6/+6
| | | | | | | | | | Added a line to the symbianpkgrules.pri files which includes an ICON if the TARGET.UID3 is defined. We should fix the application_icon.prf to handle ICON without UID3 situations more gracefully, but for now I reordered existing UID3s to be specified before the symbianpkgrules.pri includes. Reviewed-by: Aleksandar Babic
* Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-09-241-0/+1
|\ | | | | | | | | | | | | Conflicts: examples/webkit/formextractor/formextractor.pro mkspecs/features/qt.prf src/gui/painting/qpaintengineex.cpp
| * Fixed background scrolling in the SVG viewer example.Kim Motoyoshi Kalland2009-09-241-0/+1
| | | | | | | | Reviewed-by: Trond
| * Update license headers again.Jason McDonald2009-09-0836-144/+144
| | | | | | | | Reviewed-by: Trust Me
* | Update license headers again.Jason McDonald2009-09-0936-144/+144
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.5' into 4.6Thiago Macieira2009-08-3136-468/+468
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp demos/boxes/vector.h demos/embedded/fluidlauncher/pictureflow.cpp demos/embedded/fluidlauncher/pictureflow.h doc/src/desktop-integration.qdoc doc/src/distributingqt.qdoc doc/src/examples-overview.qdoc doc/src/examples.qdoc doc/src/frameworks-technologies/dbus-adaptors.qdoc doc/src/geometry.qdoc doc/src/groups.qdoc doc/src/objecttrees.qdoc doc/src/platform-notes.qdoc doc/src/plugins-howto.qdoc doc/src/qt3support.qdoc doc/src/qtdbus.qdoc doc/src/qtdesigner.qdoc doc/src/qtgui.qdoc doc/src/qtmain.qdoc doc/src/qtopengl.qdoc doc/src/qtsvg.qdoc doc/src/qtuiloader.qdoc doc/src/qundo.qdoc doc/src/richtext.qdoc doc/src/topics.qdoc src/corelib/tools/qdumper.cpp src/gui/embedded/qkbdpc101_qws.cpp src/gui/embedded/qkbdsl5000_qws.cpp src/gui/embedded/qkbdusb_qws.cpp src/gui/embedded/qkbdvr41xx_qws.cpp src/gui/embedded/qkbdyopy_qws.cpp src/gui/embedded/qmousebus_qws.cpp src/gui/embedded/qmousevr41xx_qws.cpp src/gui/embedded/qmouseyopy_qws.cpp src/gui/painting/qpaintengine_d3d.cpp src/gui/painting/qwindowsurface_d3d.cpp src/opengl/gl2paintengineex/glgc_shader_source.h src/opengl/gl2paintengineex/qglpexshadermanager.cpp src/opengl/gl2paintengineex/qglpexshadermanager_p.h src/opengl/gl2paintengineex/qglshader.cpp src/opengl/gl2paintengineex/qglshader_p.h src/opengl/util/fragmentprograms_p.h src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp src/script/parser/qscript.g src/script/qscriptarray_p.h src/script/qscriptasm_p.h src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp src/script/qscriptclassdata_p.h src/script/qscriptcompiler.cpp src/script/qscriptcompiler_p.h src/script/qscriptcontext.cpp src/script/qscriptcontext_p.cpp src/script/qscriptcontext_p.h src/script/qscriptcontextfwd_p.h src/script/qscriptecmaarray.cpp src/script/qscriptecmaarray_p.h src/script/qscriptecmaboolean.cpp src/script/qscriptecmacore.cpp src/script/qscriptecmadate.cpp src/script/qscriptecmadate_p.h src/script/qscriptecmaerror.cpp src/script/qscriptecmaerror_p.h src/script/qscriptecmafunction.cpp src/script/qscriptecmafunction_p.h src/script/qscriptecmaglobal.cpp src/script/qscriptecmaglobal_p.h src/script/qscriptecmamath.cpp src/script/qscriptecmamath_p.h src/script/qscriptecmanumber.cpp src/script/qscriptecmanumber_p.h src/script/qscriptecmaobject.cpp src/script/qscriptecmaobject_p.h src/script/qscriptecmaregexp.cpp src/script/qscriptecmaregexp_p.h src/script/qscriptecmastring.cpp src/script/qscriptecmastring_p.h src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptengine_p.h src/script/qscriptenginefwd_p.h src/script/qscriptextenumeration.cpp src/script/qscriptextenumeration_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h src/script/qscriptextvariant.cpp src/script/qscriptfunction.cpp src/script/qscriptfunction_p.h src/script/qscriptgc_p.h src/script/qscriptmember_p.h src/script/qscriptobject_p.h src/script/qscriptprettypretty.cpp src/script/qscriptprettypretty_p.h src/script/qscriptvalue.cpp src/script/qscriptvalueimpl.cpp src/script/qscriptvalueimpl_p.h src/script/qscriptvalueimplfwd_p.h src/script/qscriptvalueiteratorimpl.cpp src/script/qscriptxmlgenerator.cpp src/script/qscriptxmlgenerator_p.h tests/auto/linguist/lupdate/testdata/recursivescan/project.ui tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp tools/linguist/shared/cpp.cpp
| * Update tech preview license header.Jason McDonald2009-08-3136-468/+468
| | | | | | | | Reviewed-by: Trust Me
| * Update license headers.Jason McDonald2009-08-1136-36/+36
| | | | | | | | Reviewed-by: Trust Me
* | Fixed the bubbles.svg file after fixing some bugs in the SVG renderer.Trond Kjernåsen2009-08-261-1/+1
| | | | | | | | Reviewed-by: Kim
* | renamed examplebase.pri to symbianpkgrules.priEspen Riskedal2009-08-218-19/+23
| | | | | | | | | | | | | | | | examplesbase.pri sounded to generic and it was not obvious that this was only for Symbian. Also merged the different symbian rules if they were spread around in the .pro file. Reviewed-by: Aleksandar Sasha Babic
* | Remove changes from bad merge.Jason Barron2009-08-211-3/+4
| | | | | | | | | | | | This was related to e93ffdbb6fde611defc34fd27aec25c40da5a60e. Again, this most likely happened when switching between 4.5 and 4.6 and resolving some conflict incorrectly.
* | Merge commit 'qt/master'Jason Barron2009-08-201-12/+24
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/painting/svgviewer/files/bubbles.svg src/corelib/kernel/qobject.cpp src/network/kernel/qhostinfo.cpp tests/auto/qhostinfo/tst_qhostinfo.cpp
| * | Improved support for SVG animation.Kim Motoyoshi Kalland2009-08-201-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for from-by-animation and by-animation in the animateTransform element. Updated bubbles.svg in the svgviewer example to make it work like intended with the corrected animation code. Task-number: Partially fixes 254784 Reviewed-by: Trond
* | | Merge commit 'qt/master'Jason Barron2009-08-1336-36/+36
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/opengl/samplebuffers/glwidget.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer.cpp src/gui/gui.pro tests/auto/qhttp/tst_qhttp.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp
| * | Update contact URL in license headers.Jason McDonald2009-08-1236-36/+36
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Merge commit 'origin/master'Jason Barron2009-08-061-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qfilesystemmodel/qfilesystemmodel.pro tests/auto/qfontdialog/tst_qfontdialog.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp tests/auto/qsqldriver/qsqldriver.pro tests/auto/qsqlquery/qsqlquery.pro tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro tests/auto/qsqltablemodel/qsqltablemodel.pro tests/auto/qsqlthread/qsqlthread.pro tests/auto/qstatemachine/tst_qstatemachine.cpp tests/auto/qtcpsocket/tst_qtcpsocket.cpp
| * | | 'Trailing whitespace' and 'blank line' fixes for demos and examplesJanne Anttila2009-08-041-1/+1
| | | |
* | | | Merge commit 'qt/master-stable'Jason Barron2009-08-041-2/+2
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/openssl/openssl.pri demos/embedded/embedded.pro examples/itemviews/chart/chart.pro examples/network/network.pro examples/painting/painterpaths/painterpaths.pro examples/threads/mandelbrot/mandelbrot.pro qmake/project.cpp src/3rdparty/libtiff/libtiff/tif_config.h src/corelib/arch/arch.pri src/corelib/global/qglobal.cpp src/corelib/kernel/kernel.pri src/corelib/kernel/qcore_unix_p.h src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/corelib/tools/qsharedpointer_impl.h src/corelib/tools/tools.pri src/gui/kernel/qaction.h src/gui/kernel/qapplication.cpp src/gui/painting/qregion.h src/gui/widgets/qlineedit.cpp src/gui/widgets/qlineedit_p.h src/network/socket/qnativesocketengine_unix.cpp tests/auto/qdir/tst_qdir.cpp tests/auto/qdiriterator/tst_qdiriterator.cpp tests/auto/qhttp/qhttp.pro tests/auto/qline/qline.pro tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qresourceengine/qresourceengine.pro tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qstring/qstring.pro tests/auto/qtcpsocket/qtcpsocket.pro tests/auto/qtcpsocket/tst_qtcpsocket.cpp
| * | Fix compilation errors in examples and demos on VxWorks and QNX.Robert Griebl2009-07-291-1/+1
| | | | | | | | | | | | Reviewed-by: Harald Fernengel
* | | Merge commit 'origin/master' into 4.6-mergedJason Barron2009-07-091-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qcoreevent.cpp src/corelib/tools/qdumper.cpp src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/kernel/qwidget_s60.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkreplyimpl.cpp src/sql/drivers/ibase/qsql_ibase.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/network-settings.h tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qobjectrace/tst_qobjectrace.cpp tests/auto/qsqldatabase/tst_qsqldatabase.cpp tools/configure/configureapp.cpp translations/qt_ru.ts
| * \ \ Merge branch 'warningRemovals'axis2009-06-301-1/+1
| |\ \ \
| | * | | Removed unused parameters from examples and demos to prevent warningsaxis2009-06-301-1/+1
| | | | |
| * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-2936-73/+73
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore src/gui/dialogs/qfiledialog_p.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp tests/auto/network-settings.h tests/auto/qitemdelegate/tst_qitemdelegate.cpp
* | | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-3036-73/+73
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore configure.exe src/corelib/concurrent/qtconcurrentthreadengine.h src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicssceneevent.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qapplication_p.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qwidget.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkaccesshttpbackend.cpp tests/auto/network-settings.h tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro tests/auto/qvariant/tst_qvariant.cpp
| * | | Merge license header changes from 4.5Volker Hilsheimer2009-06-1636-73/+73
| |\ \ \ | | | |/ | | |/|
| | * | Cleanup our usage of the term "Qt Software".Jason McDonald2009-06-161-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Update license headers as requested by the marketing department.Jason McDonald2009-06-1636-72/+72
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-251-1/+1
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring Qt 4.6 into the Qt-S60 repo. Conflicts: configure.exe mkspecs/features/qttest_p4.prf qmake/generators/makefile.cpp src/corelib/io/qdir.cpp src/corelib/io/qprocess.h src/corelib/kernel/qcoreevent.h src/corelib/kernel/qobject.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/corelib/thread/qthread_p.h src/corelib/tools/qvector.h src/gui/dialogs/qdialog.cpp src/gui/dialogs/qfiledialog.cpp src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qmessagebox.cpp src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsview.cpp src/gui/image/qpixmapcache.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/painting/qdrawhelper.cpp src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qmenubar.cpp src/network/socket/qlocalserver.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qitemdelegate/tst_qitemdelegate.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qpixmap/qpixmap.pro
| * | Replace all instances of "Ctrl+Q" with QKeySequence::Quit.Norwegian Rock Cat2009-05-121-1/+1
| |/ | | | | | | We introduce this new enum, we should be using it.
* | Added proper UID3 for some demos and examples.Miikka Heikkinen2009-06-101-0/+2
| |
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-04-2710-1/+718
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure.exe recompiled with MSVC6. Conflicts: configure.exe examples/network/network.pro src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qfilesystemmodel_p.h src/gui/kernel/qapplication.cpp tests/auto/_Categories/qmake.txt tests/auto/qfile/test/test.pro tests/auto/qfile/tst_qfile.cpp tests/auto/qlibrary/tst_qlibrary.cpp tests/auto/qline/tst_qline.cpp tests/auto/qstyle/tst_qstyle.cpp tests/auto/qtextstream/tst_qtextstream.cpp tests/auto/qtranslator/qtranslator.pro tests/auto/qwaitcondition/tst_qwaitcondition.cpp translations/qt_ja_JP.ts
| * Squashed commit of the following:David Boddie2009-03-261-0/+5
| | | | | | | | | | | | | | | | | | | | commit e67776ff836b1e761dd1db1945daddc6394b6a54 Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 17:47:42 2009 +0100 Doc: Added missing file. Reviewed-by: TrustMe
| * Squashed commit of the following:David Boddie2009-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 23e30464792f7e403e0815775eb7acbaad975238 Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 17:41:20 2009 +0100 Doc: Added some basic documentation for the QSvgGenerator class. Task-number: 244944 Reviewed-by: TrustMe commit f84c1806d2ba40a61499584562d754f65d43f854 Merge: 8a42be7... 213d922... Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 16:59:14 2009 +0100 Merge branch '4.5' of ../qt-45 into qt/4.5 commit 8a42be789077de45f8fd9f13afd177798df7495e Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 16:58:33 2009 +0100 Doc: Added missing pieces for the SVG Generator example. Reviewed-by: David Boddie <dboddie@trolltech.com>
| * Squashed commit of the following:David Boddie2009-03-268-0/+712
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 8af45bfd7efe647963bcedf1736b62ee8568590d Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 16:39:31 2009 +0100 Doc: Committed a stray change. Reviewed-by: David Boddie commit 2aa564839e6a4821e9419230a1dd13ef691c679d Merge: f9e590a... db3c3ca... Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 16:38:53 2009 +0100 Merge branch '4.5' of ../qt-45 into qt/4.5 commit f9e590a4ef3e134cf2a1606a6fe3307df6935e96 Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 16:37:02 2009 +0100 Doc: Simplified the SVG Generator example and updated the list of examples. Committing before merging into the 4.5 branch. Reviewed-by: David Boddie <dboddie@trolltech.com> commit ba35080c7d728b9e47ac68e74fe62877285c400f Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 14:29:13 2009 +0100 Doc: Added a SVG generator example. This example shows how to paint on an QSvgGenerator device. Reviewed-by: David Boddie <dboddie@trolltech.com>
| * Long live Qt 4.5!Lars Knoll2009-03-2353-0/+4448
|
* Long live Qt for S60!axis2009-04-2453-0/+4467