summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativeimage.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Updated year in copyright headerKai Koehne2014-03-261-1/+1
| | | | | | | | | | | | | | | | | | find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g' Manually patched files: demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp src/3rdparty/s60/eiksoftkeyimage.h tools/qdoc3/test/qt-project.qdocconf tests/auto/qsharedpointer/nontracked.h tests/auto/qsharedpointer/nontracked.cpp Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-131-1/+1
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-291-24/+24
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-011-2/+2
| | | | | | | | | | | | | - 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 McDonald2012-01-111-1/+1
| | | | | | | | | 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>
* Doc: Standardized on QtQuick for \since declarations.David Boddie2011-08-301-2/+2
| | | | | | (cherry picked from commit 609dc22f719ecb8d48349fd56f84960bbf46d731) Reapplied after bad v4.7.4 merge
* Update licenseheader text in source filesJyri Tahtela2011-05-131-17/+17
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Image w/ PreserveAspectFit has its width changed once more than needed.Martin Jones2011-04-071-4/+16
| | | | | | | | Avoid an extra setImplicitWidth/setImplicitHeight on image load. Change-Id: I8bec1c97244068000c7a7f5fb3e937f80f3b36f5 Task-number: QTBUG-18573 Reviewed-by: Michael Brasser
* Once Image sourceSize is set there is no way to clear it.Martin Jones2011-03-311-0/+3
| | | | | | | | | Image sourceSize lacked a RESET method to allow reverting to the natural size of the image. Change-Id: I4e9089d8e16991375745db553f891bd377143eab Task-number: QTBUG-18442 Reviewed-by: Yann Bodson
* Image.PreserveAspectFit has unexpected effect on Image's sourceSizeMartin Jones2011-03-171-4/+6
| | | | | | | | | | | The sourceSize should always be the size of the image, unless set otherwise. When calculating the size of an image with Image.PreserveAspectFit set the natural image size should be used for the calculation if no size has been set explicitly. Change-Id: I104b7d1c3c16aa5b4fc98b1f9078ed8ae997cf69 Task-number: QTBUG-16389 Reviewed-by: Joona Petrell
* Doc improvement for Image.fillMode.Yann Bodson2011-03-171-2/+5
| | | | | Change-Id: I2aec2c9fae07a8551001b2c7d5f5ab8da0fbb7df Task-number: QTBUG-14899
* Rename Image::cached to 'cached' (and QDeclarativePixmap::Cached also)Bea Lam2011-01-191-3/+3
| | | | | | | | This is to keep consistent property naming consistent. E.g. Image has 'smooth', 'mirror' properties rather than 'smoothed', 'mirrored'. For consistency QDeclarativePixmap::Cached was renamed as well. Reviewed-by: Martin Jones
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-191-1/+1
|\
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Revert "Don't use implicitSize when calculating implicit size"Alan Alpert2011-01-121-6/+4
| | | | | | | | | | This reverts commit d91eb7728beea99eb347293c89500cfa03814208. Need to consult on the expected behavior before fixing this one.
* | Don't use implicitSize when calculating implicit sizeAlan Alpert2011-01-121-4/+6
| | | | | | | | | | | | | | | | Width/height ended up getting trapped at <0 in this fillMode if only one of witdh/height was explicit. Task-number: QTBUG-16389 Reviewed-by: Michael Brasser
* | Add 'mirror' property to Image element.Bea Lam2010-12-101-47/+56
| | | | | | | | | | | | | | | | Setting mirror to true will horizontally invert an image. This feature is part of the task to support RTL in QML (see QTBUG-11042). Task-number: QTBUG-15878 Reviewed-by: Joona Petrell
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2010-12-011-1/+1
|\ \ | |/
| * Don't draw null pixmap in QDeclarativeImage paint functionJoona Petrell2010-11-301-1/+1
| | | | | | | | | | Task-number: QTBUG-15690 Reviewed-by: Martin Jones
* | Add 'cached' property to Image elementYann Bodson2010-11-121-0/+9
|/ | | | | | | | Setting cached to false is useful when dealing with large images, to make sure that they aren't cached at the expense of small 'ui element' images. Task-number: QTBUG-7300 Reviewed-by: Aaron Kennedy
* Image bounding rect should always include the area being paintedJoona Petrell2010-11-051-3/+24
| | | | | | | | This didn't always happend with fillMode PreserveAspectCrop, resulting in drawing artifacts. Task-number: QT-3933 Reviewed-by: Martin Jones
* Fix errors in example code. Also reverts the example code to the oldBea Lam2010-11-041-7/+9
| | | | | | list format. Task-number: QTBUG-14871
* Document and test paintedWidth and paintedHeight properties of ImageYann Bodson2010-10-051-0/+9
| | | | Task-number: QTBUG-14197
* Doc: More work on the QML documentation.David Boddie2010-09-071-1/+1
|
* Merge branch '4.7' into qmldocsDavid Boddie2010-09-011-13/+0
|\ | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativetext.cpp src/declarative/graphicsitems/qdeclarativetextedit.cpp
| * Remove pointless \internal docs (that contain no information)Aaron Kennedy2010-08-271-13/+0
| |
* | Merge branch '4.7' into qmldocsDavid Boddie2010-08-271-1/+1
|\ \ | |/
| * typoYann Bodson2010-08-251-1/+1
| |
* | Doc: Started to improve QML reference documentation.David Boddie2010-08-231-17/+29
|/
* qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-161-0/+2
| | | | ...and a set of functional group pages.
* Doc error fixes.Martin Jones2010-07-191-1/+1
|
* improvements to docs and examplesBea Lam2010-07-141-33/+26
|
* Remove Image::pixmap property. QML applications should useBea Lam2010-07-081-10/+0
| | | | | | QDeclarativeImageProvider to provide pixmaps instead. Task-number: QTBUG-11980
* docsBea Lam2010-07-071-12/+14
|
* Make declarative pixmap cache easier to useAaron Kennedy2010-07-051-2/+2
| | | | | | | | | | | | | | | | | The QDeclarativePixmapCache was both slow, and very trickey to use correctly. Many QML elements did not correctly cancel outstanding requests, which leads to pixmaps leaking indefinately. Other elements, such as Text, were subject to race conditions that meant they may never actually load all their images. QDeclarativePixmap is a single class than encapsulates the action of fetching a pixmap, as well as the pixmap itself and the responsibility of canceling outstanding requests. Rather than relying on Qt's pixmap cache that doesn't cache all the information QML needs, QDeclarativePixmap implements its own cache, that correctly degrades over time (unlike QPixmapCache that can stop expiring items in some conditions). Reviewed-by: Warwick Allison
* DocsBea Lam2010-06-281-0/+5
|
* Minor doc fixesBea Lam2010-06-111-1/+1
|
* Doc improvements, including snippet fixes, linking to examples, makingBea Lam2010-06-111-0/+2
| | | | docs more consistent
* Doc fixes and improvements - fix some example code, link toBea Lam2010-06-021-5/+0
| | | | examples from class docs and improve assorted docs
* Doc improvementsBea Lam2010-05-191-12/+23
|
* Doc fixBea Lam2010-05-161-0/+1
|
* Improve Image docs. Move all fillMode image examples to fillModeBea Lam2010-05-121-84/+109
| | | | property docs and remove the animated gif.
* docWarwick Allison2010-05-051-10/+10
| | | | Task-number: QTBUG-10386
* Remove obsolete doc groupings.Michael Brasser2010-05-041-2/+0
|
* Doc: some simple examples of sourceSize usage.Martin Jones2010-04-291-0/+26
| | | | Task-number: QTBUG-10252
* Doc: overview for ImageMartin Jones2010-04-281-1/+21
|
* Doc fixesBea Lam2010-04-281-1/+1
|
* Documentation fixes.Yann Bodson2010-04-191-3/+6
|
* QDeclarativeImage should stretch in one direction when tiling in the other.Yann Bodson2010-04-191-5/+20
| | | | | Task-number: QTBUG-6716 Reviewed-by: Michael Brasser
* Doc: in QML use "real" and "enumeration", not "qreal" and "enum"Martin Jones2010-04-161-1/+1
|