| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
revert f36fb8b2b63b3734cc2bd66b329ca4fef1204845
Read QWS_SIZE from layer rather than screen
Get rid of no_cast_from_ascii warning
Docs: Amendments to latest changes to QImageReader docs.
images: Document QImageReader::loopCount behaviour for infinite loops
gif: Add unit test for QImageReader::size calls
gif: 10% speedup on microbenchmark on QImageReader
png: Avoid calling QImage::scanLine(int) from within a loop
QImageReader: Avoid errorString creation in the normal case
Fix text rendering on GL2 paint engine
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When running the X11 emulator of DirectFB IDirectFBScreen->GetSize
returns the size of the entire X11 Display, not the actual DirectFB
window.
We can read this from the primary layer instead and this value is
correct both on devices and on the desktop.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
On the microbenchmark of what is executed during
pure pageloading in regarding to QImageReader this
is an improvement.
Do not use the non const QImage::scanLine as this will
go through the QImage::detach all the time making
QImage::scanLine show up in the profile.
Introduce a FAST_SCAN_LINE that is doing the scanLine
calculation on local variables.
Reviewed-by: Andreas
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
| |
To support building Qt as part of Symbian SDK where epoc32 is not yet
populated, changed the autodetection logic in determining stlport
version. Now, we assume that we want the new version, unless only the
old version exists on SDK already.
Sqlite binaries export autodetection is now skipped if CONFIG value
symbian_no_export_sqlite exists, allowing clean builds to explicitly
suppress exporting.
Task-number: QTBUG-6971
Reviewed-by: axis
|
|
|
|
|
|
|
|
|
| |
Where possible, we convert the post-scale clip rectangle into a
pre-scale clip rectangle because it is more efficient to clip first.
Task-number: QT-2023
Reviewed-by: Sarah Smith
Reviewed-by: Daniel Pope
|
|
|
|
|
|
|
|
|
|
|
| |
The jpeg is read and scanlines discarded until the clip region
is found (libjpeg doesn't support direct seeking). This is
faster than the previous approach of reading the entire jpeg
and then clipping.
Task-number: QT-2023
Reviewed-by: Sarah Smith
Reviewed-by: Daniel Pope
|
|
|
|
|
|
|
|
|
|
| |
The libjpeg library has builtin support for scaling to 1/2, 1/4, and 1/8
the original size very quickly. Use this in the implementation of
setScaledSize() to get close to the desired size and then scale
with QImageSmoothScaler the rest of the way.
Task-number: QT-2023
Reviewed-by: Daniel Pope
|
|
|
|
|
|
|
|
|
|
|
| |
A long time ago, in a Qt version far, far, away there was a
parameter string mechanism for asking for header details,
requesting scaling, and so on. This has since been replaced
with actual real API's and it is no longer possible to pass
such parameter strings to the image plugins. This change
removes the crufty beloved old code.
Reviewed-by: Sarah Smith
|
|
|
|
|
|
| |
Remove some superfluous spaces.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This patch enables you to use a different layer for Qt apps by
specifying:
E.g.
QWS_DISPLAY=directfb:layerid=2
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
|
|
|
|
|
|
|
| |
For better compatibility with non-QWS DirectFB apps running in the same
session we should set the stacking class of Windows that have the
StaysOnTop flag set. This corresponds nicely to DWSC_UPPER.
Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Version checks in sqldrivers.pro are not needed. These version checks
also fail if symbian version does not match to 3.1 3.2 or 5.0.
The included sqlite_symbian.pro checks if the binaries are already
present or not.
Reviewed-By: Shane Kearns
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
| |
Configure complains about "Could not retrieve
HKEY_LOCAL_MACHINE\Software\Symbian\EPOC SDKs setting". It should only
try to do that for Symbian builds.
Reviewed-by: Lincoln Ramsay
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This was introduced by d0b0b525de.
The use of QT_NO_DEBUG macros causes release-armv5 builds to fail
when the -release option is passed to configure.
This change causes the debugging code (ObjectDump and related
classes) to be included in release builds, although these functions
are not executed.
This is a temporary fix; task QTBUG-6012 has been created for
re-removing this code from release builds.
Reviewed-by: Frans Englich
|
|\ |
|
| |
| |
| |
| | |
Over src/ tools/ examples/ and demos/
|
| |
| |
| |
| | |
Reviewed-by: Gareth Stockwell
|
|/
|
|
|
|
|
|
| |
This value seems to cause problems on various chipsets and we get a
double buffered window regardless.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
(cherry picked from commit 3bc9a381ebfaf9144120936bb579b71fc7cf29ae)
|
|\ |
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
dist/changes-4.6.0
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QRegion::numRects() is marked obsolete.
Removed all usage of the old function inside Qt and test-cases.
Reviewed-by: Andreas Aardal Hanssen
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QLCDNumber doesn't follow the API convention of *Count and set*Count().
Introduce properly named functions, and obsolete the old ones.
Reviewed-by: Andreas Aardal Hanssen
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QPaintDevice and QImage used the functions numColors(), setNumColors(),
and numBytes(). However, this is not consistent with the rest of the Qt
API which uses *Count() and set*Count().
Removed all usage of these functions inside Qt and test-cases.
Reviewed-by: Andreas Aardal Hanssen
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QRegExp::numCaptures() is marked as obsolete.
Replaced all usage in Qt and test-cases.
Reviewed-by: Andreas Aardal Hanssen
|
| |\ \ \ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Loading a JPEG image after calling QImageReader::setScaledSize() could
cause a 1 pixel wide column of uninitialised pixels at the far right of
the image. The bug was caused by rounding in the scaling algorithm.
Fixed by copying the last calculated pixel all the way to the end of
the row.
Task-number: QTBUG-3282
Reviewed-by: Trond
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Replaced tabs with spaces and Qt-ified code formatting in
QImageSmoothScaler::scale().
Reviewed-by: Trond
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The PHOTOMETRIC_MINISBLACK and PHOTOMETRIC_MINISWHITE settings also
apply to 8-bit grayscale, so we need to check the bit depth of the image
as well. For convenience we also try to write the images using
PHOTOMETRIC_MINISBLACK and PHOTOMETRIC_MINISWHITE as opposed to
PHOTOMETRIC_PALETTE when we detect that the color table is grayscale.
Task-number: QTBUG-5459
Reviewed-by: Benjamin Poulain
|
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
- Added "qttrace" to binary file, making it possible to do a sanity
verification of the input file in qttracereplay
- Sanity check input binary file, both for existance and for content
in qttracereplay
- Console app on windows and mac
- Added helpful output for -h and --help command line options
Reviewed-by: Samuel
|
|\ \ \ \
| | |/ /
| |/| | |
|
| |\ \ \ |
|
| | |/ /
| | | |
| | | |
| | | | |
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| |\ \ \
| | |_|/
| |/| | |
|
| | |\ \ |
|
| | |_|/
| |/| |
| | | |
| | | | |
As requested by the Maemo team.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Qt's/DirectFB's composition modes are not compatible for drawing
operations. We only support SourceOver and handle whether or not to
blend colors using DSDRAW_BLEND based on the alpha/opacity value.
If drawing with Source and an opaque color we can still handle the
operation using DirectFB. This has major impact since WebKit fills the
background of web pages using Source.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When drawing primitives in DirectFB we always set composition mode to
NONE and manually manage whether or not to blend. This patch makes sure
we will reset the composition mode afterwards.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
| | |/
| |/| |
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
tests/auto/qsqlquery/tst_qsqlquery.cpp
tests/auto/qtextlayout/tst_qtextlayout.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Increasing the alignment does not seem to affect MBX.
Back port of 7997279bc22d30bf1d1a30a567bda33ecc9aeb2d
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: trustme
Back port of 4ae09215de36fcfd17dc6875aca102d784d65012
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The cross-process memory sharing code never really worked in the
way we needed it to - so remove it until something better comes along.
Reviewed-by: trustme
Back port of 04648b44f0784223122a782320d0b09b5c1e9497
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QT-2261
Reviewed-by: Tom
Back port of 75719e4e06882825fe056935d782b4153bf0ac5b
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The PvrEglSurfaceHolder is a hold-over from Qtopia that isn't
needed any more and was never very stable anyway.
Reviewed-by: trustme
Back port of f613b0170d0fe806378779472315d0bbdc1aada9
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Pre-multiply fix: 01a671ff0bd380e5cff311cc233352c867a041a0
Painting performance: c3cfba7295c990d8135e1dd70b8cdbefd25615ab
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When QGLWidget was used as a viewport for QGraphicsView, it was
still treating the window surface as RGB16. Use the screen's actual
pixel format.
Also ensure that PvrEglWindowSurface::image() returns a non-null
QImage if the drawable hasn't been created yet.
Reviewed-by: trustme
Back port of 53b3a0572242d0a425e74848afba1293f195d29b
|