| 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>
|
|
|
|
| |
(4.7-generated-declarative branch).
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: Bradley T. Hughes
|
|\ |
|
| |
| |
| |
| | |
Reviewed-By: Peter Hartmann
|
|/
|
|
|
|
|
|
| |
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
|
|\ |
|
| |\ |
|
| | |\
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/gui/painting/qbrush.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-5640
Reviewed-by: Leo
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | | |
Conflicts:
dist/changes-4.6.0
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Its using QFontMetrics::width now.
Reviewed-by: thartman
|
| |/ /
| | |
| | |
| | | |
Reviewed-by: thartman
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* 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
|
|/
|
|
| |
Reviewed-by: Samuel
|
|
|
|
| |
Reviewed-by: trustme
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
Reviewed-by: Bjørn Erik Nilsen
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
| |
The custom shader code in the OpenGL2 paint engine needs time to
mature before we make this official public API.
Reviewed-by: trustme
|
|
|
|
| |
There's no need to re-implement QGraphicsDropShadowEffect anymore.
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: Gunnar
|
|
|
|
|
|
| |
The precision specifiers need to be there on OpenGL ES 2.0.
Reviewed-by: Tom
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
The entry point has been changed to be customShader, taking source
image and texture coordinates as parameters.
Reviewed-by: Tom
|
|
|
|
| |
Reviewed-by: Trust Me
|
| |
|
| |
|
| |
|
|
|
|
| |
Discussed with Andreas.
|
|
|