| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.
Change-Id: I7e3e96183e073877b46bc8071b2ccae19e69426b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If the high bit in a mask is set, for instance if the mask is
0xff000000, and we shift it to the right by 24 positions, since the mask
was not declared as unsigned we ended up with a mask value of
0xffffffff. We then add 1 to this value and divide by the result,
causing a division by zero crash.
The masks need to be declared unsigned to prevent sign bit extension
when shifting right.
Task-number: QTBUG-29194
Change-Id: I1003d546a70d540b5c135b6b75dee9b4962a7210
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
(cherry picked from qtbase, af84313c622af880e95d461ea8b7dbca58d2dffa)
|
|
|
|
|
|
| |
Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
For the special transparent color index, the decoder would skip
writing anything out (thus leaving the pixels at 0 rgba value).
Although correct for later frames, for the initial frame this would
loose the color information for such pixels (which one otherwise
could have made visible e.g. by converting then image to an
alpha-less image format).
Change-Id: I316cefce8f21797feedebfbf98296ad84eaa4b99
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@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>
|
|
|
|
|
|
|
| |
This test has been passing in a stable way since build 679.
Change-Id: I19dd774793b11604ac0c725cc23adc58fd63cba7
Reviewed-by: Caroline Chao <caroline.chao@nokia.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>
|
|
|
|
|
|
| |
Change-Id: Ib13737eac7f7cee3ebca44aa712cb6b152672a81
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
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>
|
|
|
|
|
|
|
|
|
|
| |
Marking a test with CONFIG+=insignificant_test will cause the exit code
of the test to be discarded during `make check'. This is intended to be
used for tests which are valuable to run, but are known to be unstable
and are not feasible to immediately fix.
Change-Id: Id7b2407d0a13c8de19a58badb78fa7c018c9b50a
Reviewed-by: Jo Asplin
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Set execution bits for more scripts.
Set execution bits for .test files.
Fix more permissions (no execute bit).
Fix permission (no execute bit).
QGraphicsLayoutItem - bound constraint the minimum and maximum size
Notify X11 of its resizable state through MWM Hints.
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
The read from device test should be better named "read from network
device" because that is what is being tested here - so remove the tga
test data, since sequential only (devices that cannot seek) are not
supported (yet) for tga.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The test that was failing was the readFromDevice one - where the
extension is not known.
Looks as though image detection is required in a positive way, that is
it is not enough to say I think I can read this file, and then fail if
the format is "corrupt", you must be certain that the file was intended
to be that format.
In the case of TGA the original format has no magic byte header, and no
consistent way to check if it really is a TGA file. With 2.0 the footer
was added at the end, so that can be checked for confirming the file is
TGA. However rejecting files which do not have this means that old TGA
files will not be read.
On a quick survey TGA files that have been used in applications so far
all seem to be 2.0 TrueVision, so for now, lets just reject earlier
files and see how it goes.
Also add reading the tga test file to the readFromDevice test.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Rev-By: Samuel Rodal
Fix-for: QTBUG-21955
Part of fix for https://bugreports.qt.nokia.com/browse/QTBUG-21955
Having tga plugin inside a Qt add-on causes packaging problems.
There have been many queries over the years for tga support even tho it
is a niche image format. It is particularly useful for OpenGL work as a
texture format since it is a blittable bitmap, but it is very
innefficient compared to png or jpg.
For this reason only read support is added, and this is documented.
Also add some unit tests.
The unit tests are in the qimagereader suite, and this is the right
place for them as the other formats are tested there.
Noticed that there was an annoying bug with tiff files and chased it
down, in the hope of getting a clean test case PASS. Looks as tho
there is a bit of work for someone to fix the other FAILs, but the ones
for tga are all passing.
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Rev-By: Samuel Rodal
Fix-for: QTBUG-21955
Part of fix for https://bugreports.qt.nokia.com/browse/QTBUG-21955
Having tga plugin inside a Qt add-on causes packaging problems.
There have been many queries over the years for tga support even tho it
is a niche image format. It is particularly useful for OpenGL work as a
texture format since it is a blittable bitmap, but it is very
innefficient compared to png or jpg.
For this reason only read support is added, and this is documented.
Also add some unit tests.
The unit tests are in the qimagereader suite, and this is the right
place for them as the other formats are tested there.
Noticed that there was an annoying bug with tiff files and chased it
down, in the hope of getting a clean test case PASS. Looks as tho
there is a bit of work for someone to fix the other FAILs, but the ones
for tga are all passing.
|
|
|
|
|
|
|
| |
The headers are just skipped, information stored in them is ignored.
Merge-request: 824
Reviewed-by: Kim Motoyoshi Kalland <kim.kalland@nokia.com>
|
|
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|
|
|
|
|
| |
Text chunks placed after the real image data (IDAT chunks) were ignored.
Reviewed-by: Kim
|
|\ |
|
| |
| |
| |
| |
| |
| | |
Fixed by merge request 1080.
Task-number: QTBUG-17254
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/webkit/imageanalyzer/imageanalyzer.h
examples/webkit/imageanalyzer/mainwindow.h
mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h
src/corelib/io/qfsfileengine_iterator_unix.cpp
src/corelib/io/qfsfileengine_iterator_win.cpp
src/corelib/kernel/qcoreapplication.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/plugins/bearer/connman/qconnmanservice_linux.cpp
src/plugins/platforms/openvglite/qwindowsurface_vglite.h
src/s60installs/bwins/QtCoreu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/s60installs.pro
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/qdoc3/test/qt-html-templates.qdocconf
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
demos/declarative/minehunt/minehunt.pro
src/corelib/io/io.pri
src/corelib/io/qfsfileengine.cpp
src/corelib/io/qfsfileengine_unix.cpp
src/corelib/io/qfsfileengine_win.cpp
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtDeclarativeu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtDeclarativeu.def
src/s60installs/eabi/QtGuiu.def
tests/auto/qapplication/test/test.pro
tests/auto/qaudioinput/qaudioinput.pro
tests/auto/qaudiooutput/qaudiooutput.pro
tests/auto/qchar/qchar.pro
tests/auto/qdiriterator/qdiriterator.pro
tests/auto/qsound/qsound.pro
|
| |\|
| | |
| | |
| | |
| | |
| | | |
Conflicts:
mkspecs/features/symbian/symbian_building.prf
src/network/access/qhttpnetworkconnectionchannel.cpp
|
| | | |
|
| | |
| | |
| | |
| | | |
Reviewed-by: Kim
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-14398
Reviewed-by: Kim
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Complement previous commit by aligning Qt itself to use .files
consistently for DEPLOYMENT as well as INSTALLS.
This excludes changes to webkit.
Task-number: QTBUG-3216
Reviewed-by: axis
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
First, pgm and pbm formats need the same exception given to ppm format
as they are subtypes of the same format. (as text based image formats they
are vulnerable to line end differences)
Second, a workaround for the readFromDevice test case hanging on the symbian
emulator. The test expects to be able to send a whole image to a socket and
have this fit within the send/receive buffers of the TCP stack.
At least for the emulator's winsock backend, this hangs the autotest inside
a blocking write. On the Nokia 5800, the test passed so it's currently skipped
only for the emulator.
Reviewed-By: Jason Barron
|
|
|
|
|
| |
Task-number: QT-3871
Reviewed-by: Kim
|
|
|
|
|
| |
Task-number: QTBUG-13653
Reviewed-by: aavit
|
|
|
|
| |
Task-number: QT-3613
|
|
|
|
|
|
|
|
| |
Looks like native png and jpeg libs on some devices have rounding
problems, so compare the color values with a fuzz of 3. This fixes
this test on Maemo 5 and 6.
Reviewed-by: Benjamin Poulain
|
| |
|
|\
| |
| |
| |
| | |
Conflicts:
src/plugins/imageformats/gif/qgifhandler.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If state is set to ReadHeader before canRead() then setFormat("png")
never gets called. We should make sure that setFormat() gets set
whenever canRead() returns true.
Task-number: QTBUG-2263
Reviewed-by: Kent Hansen
|
|\ \
| |/
|/| |
|
| |
| |
| |
| | |
This bug was introduced with bug fix 558089fb21e7f388f9810c51abbd9bf3872b2178
|
| |
| |
| |
| |
| |
| |
| |
| | |
Was introduced with 2fe059c. Also now updates pos() as expected after
reading in these cases.
Autotest added to catch issues where pos != 0, or wrong pos after read.
Reviewed-by: Kim
|
|/
|
|
|
|
|
|
|
|
| |
Improved/fixed canRead(). Added svgz support. Implemented ClipRect,
ScaledClipRect and BackgroundColor support. Avoid data copy when reading
from memory. Improved support reading from sequential devices. Added svg
and svgz files to the qimagereader autotests.
Task-number: QTBUG-8227 and QTBUG-9053
Reviewed-by: Kim
|
|
|
|
|
|
|
|
| |
Only the compiled in formats where checked when
setAutoDetectImageFormat(false) was set on a QImageReader object.
Task-number: QTBUG-7980
Reviewed-by: aavit
|
|
|
|
|
| |
Task-number: QTBUG-7037
Reviewed-by: Kim
|
|
|
|
|
|
|
| |
Rework the previous commit a bit and include caching of image sizes.
Task-number: QTBUG-6696
Reviewed-by: Kim
|
|
|
|
|
| |
Task-number: QTBUG-7514
Reviewed-by: Kim
|
|
|
|
|
|
|
| |
follow-up to 0585997b7dbe25ece9f60684171c16206d10d65f
Task-number: related to QTBUG-7688
Reviewed-by: TRUSTME
|
|
|
|
|
|
|
|
|
|
| |
Regression was introduced by commit
fd9cdaa55da455b90eacec571aeb2c84fa55f7e0.
Also fix a completely broken autotest that didn't actually test
anything.
Task-number: QTBUG-7688
Reviewed-by: Alexis
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The gif and mng reader will return -1 as QImageReader::loopCount()
for infinite images. Document that this -1 is clashing with the
error handling of this method.
The documentation was mixing the default and error cases. In some
cases "Otherwise -1" and "Otherwise 0" was used. Change this to
mention the default coming from QImageIOHandler in the "Otherwise"
clause and document the error case with -1.
Add a test case to check that loopCount() returns -1 for infinite
animations.
Reviewed-by: Andreas
|