| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
(cherry picked from commit 609dc22f719ecb8d48349fd56f84960bbf46d731)
Reapplied after bad v4.7.4 merge
|
|
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
| |
Avoid an extra setImplicitWidth/setImplicitHeight on image load.
Change-Id: I8bec1c97244068000c7a7f5fb3e937f80f3b36f5
Task-number: QTBUG-18573
Reviewed-by: Michael Brasser
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
| |
Change-Id: I2aec2c9fae07a8551001b2c7d5f5ab8da0fbb7df
Task-number: QTBUG-14899
|
|
|
|
|
|
|
|
| |
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
|
|\ |
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| | |
This reverts commit d91eb7728beea99eb347293c89500cfa03814208.
Need to consult on the expected behavior before fixing this one.
|
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| |/ |
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-15690
Reviewed-by: Martin Jones
|
|/
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
| |
This didn't always happend with fillMode PreserveAspectCrop,
resulting in drawing artifacts.
Task-number: QT-3933
Reviewed-by: Martin Jones
|
|
|
|
|
|
| |
list format.
Task-number: QTBUG-14871
|
|
|
|
| |
Task-number: QTBUG-14197
|
| |
|
|\
| |
| |
| |
| |
| | |
Conflicts:
src/declarative/graphicsitems/qdeclarativetext.cpp
src/declarative/graphicsitems/qdeclarativetextedit.cpp
|
| | |
|
|\ \
| |/ |
|
| | |
|
|/ |
|
|
|
|
| |
...and a set of functional group pages.
|
| |
|
| |
|
|
|
|
|
|
| |
QDeclarativeImageProvider to provide pixmaps instead.
Task-number: QTBUG-11980
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
| |
|
|
|
|
| |
docs more consistent
|
|
|
|
| |
examples from class docs and improve assorted docs
|
| |
|
| |
|
|
|
|
| |
property docs and remove the animated gif.
|
|
|
|
| |
Task-number: QTBUG-10386
|
| |
|
|
|
|
| |
Task-number: QTBUG-10252
|
| |
|
| |
|
| |
|
|
|
|
|
| |
Task-number: QTBUG-6716
Reviewed-by: Michael Brasser
|
| |
|