| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
QPainterPath is kinda evil with a somewhat public private class and a
really private cast, so we need to up-cast the d pointer when deleting.
RevBy: aportale
|
|
|
|
|
|
|
|
| |
Squashed commit of the branch haralds-haralds-qt-s60-topics/topic/exceptions,
which also contains the full history.
Rev-By: Harald Fernengel
Rev-By: Ralf Engels
|
|\
| |
| |
| |
| | |
Conflicts:
tests/auto/qlocalsocket/tst_qlocalsocket.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We didn't actually check the depth of the target window before
calling the qt_x11_drawImage() fu, that will only work with
depths >= 24.
Task-number: 255311
Reviewed-by: Samuel
BT: yes
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The blend functions assume the width / height of the images being
blended to be greater than 0. A width of 0 caused the first iteration of
a duff's device memcpy (QT_MEMCPY_USHORT) to be executed, thus blending
8 pixels instead of none.
BT: yes
Task-number: 255014
Reviewed-by: Trond
|
| |
| |
| |
| |
| |
| |
| |
| | |
The R and B channels were swapped on little endian machines with
BGR layout.
Task-number: 254934
Reviewed-by: Samuel
|
| |
| |
| |
| |
| |
| |
| | |
This won't leak on error case, and will work with arbitrary sizes.
Also changed from int to short as instructed by Samuel.
Reviewed-by: Samuel <qt-info@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
This doesn't really need a static instance lying around and this
current implementation crashes since we never call the constructor.
Just recreate it on the fly when instance() is called which apparently
is never.
|
| |
| |
| |
| |
| |
| |
| | |
It seems that this class has been completely forgotten until now, but
this never causes any problems because apparently no one uses it.
Provide a quick little implementation to get things linking.
Implementation brought to you courtesy of Qt/Mac.
|
|\ \ |
|
| | | |
|
|\ \ \
| |/ /
|/| /
| |/
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
examples/itemviews/puzzle/puzzle.pro
examples/qtconcurrent/imagescaling/imagescaling.pro
examples/widgets/movie/movie.pro
tools/configure/configureapp.cpp
Will rebuild configure.exe in next commit.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Reworked the 85f98acaa3a38079071bea711e43c9a86edec1f6 fix, since
it broke glyph positioning in the GL engine under Windows.
Instead of changing the glyph cache margin, which impacts where
the glyph is positioned, we just make the image the glyph is drawn
into 4 pixels bigger in width/heigth.
The margin in QImageTextureGlyphCache needs to be reworked..
Task-number: 254450
Reviewed-by: Eskil
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |\ |
|
| | |
| | |
| | |
| | |
| | | |
Task-number: 254179
Reviewed-by: Norwegian Rock Cat
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/corelib/io/qfile.cpp
src/corelib/kernel/qsharedmemory_unix.cpp
src/network/socket/qnativesocketengine_p.h
src/network/socket/qnativesocketengine_unix.cpp
|
| | |
| | |
| | |
| | | |
Task-number: 252491
|
| | |
| | |
| | |
| | | |
Task-number: 252493
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This reverts commit 30f7edc0aab629499b74263391ae529ad31b2ff8.
There is no way to restore float-equal warning using the pragma trick.
This means (as it was mentioned in the said commit log) anyone that
includes qtransform.h will be forced to deal with float-equal.
Reviewed-by: Samuel Rødal
|
| |/
| |
| |
| | |
The typo was in commit 30f7edc0aab629499b74263391ae529ad31b2ff8.
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
tests/auto/network-settings.h
tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp
tests/auto/qiodevice/tst_qiodevice.cpp
tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp
tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp
tests/auto/qsslsocket/tst_qsslsocket.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Due to optimizations, there are few cases where comparing with a constant
is needed, e.g. in operator*=. G++ will give us a warning for this.
Since we know what we are doing, surpress the warning.
The only drawback for this workaround is if somebody includes
qtransform.h in his code and disable the float-equal warning since
the warning will be activated again.
Reviewed-by: Samuel Rødal
|
| |
| |
| |
| |
| |
| | |
Usually, "the the" is not proper English
Reviewed-By: Thiago Macieira
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
src/corelib/kernel/qcoreapplication.cpp
Configure.exe not rebuilt because the changes are irrelevant for the
S60 port. We'll rebuild it before merging back.
|
| |
| |
| |
| |
| |
| |
| |
| | |
When the end point of a line in a path is clipped, only closed paths
should have the closing line.
Task-number: 253663
Reviewed-by: Samuel
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QColor::toCmyk() converted the color to RGB and then to CMYK. If the color
was already in CMYK, this conversion change it.
The color is now returned directly if it is in CMYK
Reviewed-by: Ariya
Task-number: 253625
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Some text drawn with OpenType fonts where cut off by a pixel or two
under certain circumstances. This adds an additional 2 pixel pad margin
to the glyph cache entries. The padding behaves slightly different
when ClearType is enabled/disabled, hence the general 2 pixel padding.
Task-number: 246196
Reviewed-by: Samuel
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The handling of gradients with object bounding mode on pens in the
emulation paint engine has been changed to agree with the SVG standard,
where pen widths are ignored when calculating bounding boxes. Instead
of converting strokes to fills and then transforming the gradients
based on the fills' bounding box, the gradients are now transformed
first based on the bounding box of the stroke path.
Reviewed-by: Trond
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/widgets/qmenu_symbian.cpp
|
| |\ \
| | |/
| | |
| | |
| | | |
Conflicts:
tests/auto/qtemporaryfile/qtemporaryfile.pro
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
It's obvious that not only PDF and PS printers are valid..
Task-number: related to 252873
Reviewed-by: Samuel
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When passing a printer that is set up to print to a PDF file into
QPrintDialog, the print dialog could invalidate the printer and
not update the validity of it in a proper manner.
Task-number: 252873
Reviewed-by: Samuel
|
| | |
| | |
| | |
| | | |
Reviewed-by: nrc
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The fix for 1x1 source rect image drawing in change
ffbb3c1a2aee4134dce80cd144a26bf32865b698 was incorrect for transforms
with type >= TxScale. The aliased coordinate delta needs to be applied
in device coordinates, not in logical coordinates.
Also specialize the non-antialiased TxScale case by simply calling
fillRect_normalized directly, avoiding having to scan convert the
rectangle manually.
Task-number: 251561
Reviewed-by: Trond
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Updates triggered by the line edit itself, i.e. cursor blinking, are not
processed after the top-level is resized. This is yet another problem
caused by the event dispatcher on Windows (Qt posted events are not sent
during top-level resize, task 146849). We added a work-around for that
particular case by posting an event via Windows, but the widget is not
visible on the screen (hidden from Windows' POV) so it'll never be posted.
And of course then we'll never receive it and the backing store is not
synced. This work-around is therefore useless for widgets that are
not visible on the screen.
However, not receiving update requests while resizing the top-level
(in this case QGraphicsView), is not a problem for embedded widgets
because all items and hence the proxied widgets are repainted by
graphics view anyways.
Task-number: 252400
Reviewed-by: Olivier
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When building docs for the mac, qdoc comments for functions defined
in the .h file were not found in any of the .cpp files in the mac
package because they were in the x11 or windows .cpp file. So I
moved them to a .cpp file that is in all the packages.
Task-number: 252496 252492
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Don't know why the X server crashes, but it's reproducible both by us
and customers so we should fall back to the raster paint engine to avoid
the crash.
Task-number: 244362
Reviewed-by: Trond
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Don't use aliased coordinate delta for image drawing.
Related to change fde7475bcf9c10522a8170e6eb8fb9a8fadc21cd.
Task-number: 251561
Reviewed-by: Trond
|
| |\ \
| | |/ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Images coordinates should simply be rounded and are not to be subject
to the aliased coordinate delta. The patch also adds a tiny delta in
QSpanData::setupMatrix() to ensure coordinates for fetching from source
images are rounded the opposite direction of the target rectangle.
This removes a lot of artifacts when trying to do border-image based
drawing on non-integer coordinates. A new qps test for border-image
drawing is included.
Task-number: 251561
Reviewed-by: Trond
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The bug appears in the raster paint engine and only in release mode as
the cause of the bug is in the MMX and SSE blend functions which are
disabled in debug. To prevent it simply we return early if we detect
that we have an opacity of 0.
Reviewed-by: Trond
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The width of a pixmap is NOT the same as the bytes per row. We may have
been able to do that in the past, but it doesn't work in the general
case. I also took the liberty to introduce a QCFType to automatically
handling the free in the general case.
Task-number: 252176
Reviewed-by: sroedal
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
To avoid increasing code size for an uncommon case, the code
is #ifdef QT_QWS_ROTATE_BGR
Task-number: 250299
Reviewed-by: Tom
|
| | |
| | |
| | |
| | |
| | | |
Task-number: 252668
Reviewed-by: Samuel
|
| | |
| | |
| | |
| | |
| | |
| | | |
Avoid QRegion<->QPainterPath conversion if possible.
Reviewed-by: Samuel
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We can speed up the calculation by using rect intersections
if possible, i.e. QRegion &= QRect instead of QRegion &= QRegion.
Then we'll get rid of one QRegion construction and the intersection
itself is slightly faster.
Reviewed-by: Samuel
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Addendum to change 9b674ddcea7c0ff7912f185474b7d98bc83bd39f.
The problem was that QWidget::paintEngine() (pure virtual) was
called while being in the destructor. The use-case itself
(see above change) is very very corner case, but still,
it shouldn't crash.
Reviewed-by: bnilsen
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
It seems the Xrender PictStandardA1 mask format doesn't work with
XLFD bitmap fonts wrapped in a fontconfig structure.
Task-number: 252328
Reviewed-by: Samuel
|