Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update contact information in license headers. | Sergio Ahumada | 2012-08-01 | 11 | -22/+22 |
| | | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> | ||||
* | Update year in Nokia copyright messages. | Jason McDonald | 2012-01-11 | 11 | -11/+11 |
| | | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> | ||||
* | Squashed commit of the changes from the mobile-examples repository | David Boddie | 2011-04-28 | 14 | -8/+104 |
| | | | | (4.7-generated-declarative branch). | ||||
* | Update copyright year to 2011. | Jason McDonald | 2011-01-10 | 11 | -11/+11 |
| | | | | Reviewed-by: Trust Me | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 11 | -303/+292 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Update copyright year to 2010 | Jason McDonald | 2010-01-06 | 11 | -11/+11 |
| | | | | Reviewed-by: Trust Me | ||||
* | Fix build breakage in 1b14c3d33dea0fe4814f2749c49cf916ca13e012 | Jason McDonald | 2009-11-19 | 1 | -6/+0 |
| | | | | Reviewed-by: Bradley T. Hughes | ||||
* | Merge branch '4.6' of oslo-staging-1 into 4.6 | Simon Hausmann | 2009-11-19 | 1 | -1/+1 |
|\ | |||||
| * | Fix compilation with Sun CC: no semi-colon after Q_PROPERTY | Thiago Macieira | 2009-11-18 | 1 | -1/+1 |
| | | | | | | | | Reviewed-By: Peter Hartmann | ||||
* | | Remove examples/effects/customshader which uses private API | Tom Cooksey | 2009-11-19 | 19 | -572/+0 |
|/ | | | | | | | | Commit 3f109fd85cbdc49dc3ef1c14066073079f4e34bf made QGraphicsShaderEffect private API, however the example showing how to use it was kept. This patch just removes that example. Reviewed-by: Samuel | ||||
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6 | Gunnar Sletta | 2009-11-13 | 6 | -69/+84 |
|\ | |||||
| * | Merge oslo-staging-2/4.6 into upstream/4.6 | Olivier Goffart | 2009-11-13 | 6 | -69/+84 |
| |\ | |||||
| | * | Merge commit 'widget/4.6' into oslo-staging-2/4.6 | Olivier Goffart | 2009-11-11 | 6 | -69/+84 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qbrush.cpp | ||||
| | | * | Make the new examples for effects use the Qt Animation Framework | Thierry Bastian | 2009-11-10 | 6 | -69/+84 |
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5640 Reviewed-by: Leo | ||||
* | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | Gunnar Sletta | 2009-11-13 | 6 | -9/+16 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0 | ||||
| * | | | fademessage example: don't use a fixed width for the rect under the text | Joerg Bornemann | 2009-11-11 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | Its using QFontMetrics::width now. Reviewed-by: thartman | ||||
| * | | | fademessage example: deploy jpeg plugin on Windows CE | Joerg Bornemann | 2009-11-11 | 1 | -0/+3 |
| |/ / | | | | | | | | | | Reviewed-by: thartman | ||||
| * | | Improvements to graphics effects API after review round. | Samuel Rødal | 2009-11-10 | 4 | -6/+6 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | * Get rid of QGraphicsEffectSource from the public API, instead add convenience functions in QGraphicsEffect. This way we commit to less API, and are free to introduce a customizable QGraphicsEffectSource in a future release. * Move PixmapPadMode into QGraphicsEffect and tweak the names of the enum values. * Make QGraphicsBlurEffect::BlurHint into a bit flag, for extensibility. Reviewed-by: Bjørn Erik Nilsen | ||||
* | | Use a non-cosmetic 1-width pen in example to match graphicsview specs | Gunnar Sletta | 2009-11-10 | 1 | -1/+1 |
|/ | | | | Reviewed-by: Samuel | ||||
* | customshader won't work on OpenGL/ES 1.1 so disable for those platforms | Rhys Weatherley | 2009-10-15 | 1 | -1/+5 |
| | | | | Reviewed-by: trustme | ||||
* | Add an example that shows strength animation QGraphicsColorizeEffect. | Ariya Hidayat | 2009-09-14 | 8 | -1/+274 |
| | | | | | | | | When a button is pressed, a popup message is shown and the background (everything, every items, behind the popup message) is faded to light green. Reviewed-by: Bjørn Erik Nilsen | ||||
* | Bring back the blurry drop shadow in the lighting example. | Ariya Hidayat | 2009-09-14 | 1 | -1/+3 |
| | | | | Reviewed-by: Bjørn Erik Nilsen | ||||
* | Update license headers again. | Jason McDonald | 2009-09-09 | 15 | -60/+60 |
| | | | | Reviewed-by: Trust Me | ||||
* | Make QGraphicsShaderEffect private API for 4.6 | Rhys Weatherley | 2009-09-06 | 3 | -5/+5 |
| | | | | | | | The custom shader code in the OpenGL2 paint engine needs time to mature before we make this official public API. Reviewed-by: trustme | ||||
* | Cleanup examples/effects/lighting. | Bjørn Erik Nilsen | 2009-09-01 | 5 | -149/+21 |
| | | | | There's no need to re-implement QGraphicsDropShadowEffect anymore. | ||||
* | Update tech preview license header for files that are new in 4.6. | Jason McDonald | 2009-08-31 | 17 | -221/+221 |
| | | | | Reviewed-by: Trust Me | ||||
* | Fixed custom shader example to correctly use premultiplied colors. | Samuel Rødal | 2009-08-31 | 1 | -1/+1 |
| | | | | Reviewed-by: Gunnar | ||||
* | Added missing precision specifiers to custom shader effect. | Samuel Rødal | 2009-08-26 | 1 | -1/+1 |
| | | | | | | The precision specifiers need to be there on OpenGL ES 2.0. Reviewed-by: Tom | ||||
* | Make the 'effects' examples compile when qreal == float. | Jason Barron | 2009-08-26 | 2 | -2/+2 |
| | | | | | | | | | All of the types supplied to qBound() must be the same and in the case where qreal is typedef'ed to a float, this is not the case because the outer 2 arguments are considered doubles. We explicitly cast them to qreal to guarantee they are all the same type. Reviewed-by: bnilsen | ||||
* | Fixed documentation and use of incorrect entry point for custom shaders. | Samuel Rødal | 2009-08-25 | 1 | -3/+1 |
| | | | | | | | The entry point has been changed to be customShader, taking source image and texture coordinates as parameters. Reviewed-by: Tom | ||||
* | Fix obsolete license headers. | Jason McDonald | 2009-08-21 | 17 | -34/+34 |
| | | | | Reviewed-by: Trust Me | ||||
* | Only compile shader effect example when having OpenGL. | Bjørn Erik Nilsen | 2009-08-21 | 1 | -2/+3 |
| | |||||
* | Move shader effect example from examples/graphicsview to examples/effects | Bjørn Erik Nilsen | 2009-08-21 | 20 | -1/+569 |
| | |||||
* | Use pixmap filter for the drop shadow effect. | Bjørn Erik Nilsen | 2009-08-21 | 2 | -2/+5 |
| | |||||
* | Rename QGraphicsShadowEffect to QGraphicsDropShadowEffect. | Bjørn Erik Nilsen | 2009-08-20 | 2 | -4/+4 |
| | | | | Discussed with Andreas. | ||||
* | Move examples/graphicsview/blurpicker|lighting to examples/effects. | Bjørn Erik Nilsen | 2009-08-19 | 24 | -0/+828 |