| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
A 180° rotation results in a TxScale QTransform with negative scaling
factors (x=-1.0 y=-1.0). This is not properly handled by blitter paint
engine yet, so use software rendering fallback in this case.
This rendering issue can be seen when using "-webkit-transform" CSS
property in WebKit with DirectFB QPA platform.
cherry-picked from qt5/qtbase 07ea3cf0b3883979e84bd91a5dc6a7a126de3123
Change-Id: I0911fd1166a3968d0a1d6bcca47ce2b26866de44
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
|
|
|
|
|
|
|
|
|
| |
With minimal effort we can keep the GCC 3.4 build working.
Task-number: QTBUG-19803
Change-Id: I31611a27b97d5ac426ea857d8f1b656dc6f5377a
(cherry picked from commit 7d7f09650c3b3b2990f16ff4a6401a8c74e1f868)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This case has typically required specific work-arounds in other
rendering paths as well.
(cherry picked from commit dfb55f8a6c8d3ec4da840191c331ace3c2aa2bf3)
Task-number: QTBUG-25153
Change-Id: I217e710a30222792ebca3bf297e438d944c32992
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If available printers in CUPS support.
If the number of available printers changes, we want
to update the count. Additionally, if that number has
gone to zero, we want to ensure that the number of
available printers in the static object is reset to
zero.
This fixes a crash that occurs if:
* You print
* You kill cupsd (or it crashes because you're porting it and your port is
* unstable)
* You try to print again before restarting it.
cherry-picked from qt5/qtbase eda0e120e9e2e7b7be747f4ed035d686c9547769
Change-Id: If4640045073acaecec4495f5cb01806ae859cf65
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Take into account brush transformation for TexturePattern fill.
Example : arrows are not rendered properly in
http://www.youtube.com/leanback website.
cherry-picked from qt5/qtbase 2f2656002735a14687c5d6b5a3250666a8e102e3
Change-Id: I11fead281e372b2a24da835f85c327879e9997f0
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
- Assigned/Unused variables.
- Unsigned comparison >= 0 is always true.
- Constructor initialization order.
- Signed/Unsigned comparisons.
Change-Id: I1f9edab0506573420ed0bf3055252ba48625c8eb
Reviewed-by: Kai Koehne <kai.koehne@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>
|
|
|
|
|
|
|
|
|
|
|
|
| |
We did coordinate rounding of the fill in the raster paint engine to
match how drawLine_midpoint_i rendered lines. With the new cosmetic
stroker in 4.8 this rounding is not needed anymore.
Task-number: QTBUG-26013
(cherry picked from commit b6acec1e5d55d03ad3a0a70d2cf371d3f8fde629)
Change-Id: I0324e3a45c525890fb58817a180c6aa712716780
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Set fd in openPrintDevice() so that it gets cleaned up properly
in closePrintDevice().
Backported from the Qt5 commit:
99bab571b4cb41362e891f1bb1e812119701c932
Task-number: QTBUG-14724
Change-Id: I02968d597822b636078ae89566dd8ed8a948019b
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
A horizontal line should round up at the same time as a vertical line
with square cap, when rendering at subpixel coordinates. Thus, the
special casing in the cosmetic stroker of offsetting by half a pixel
should be for flat caps instead of for square caps.
Task-number: QTBUG-26013
(cherry picked from commit 72aaba336c7afe6d79d59995bfb31a8effca4e9e)
Change-Id: If7e7c6b6e37c5b1ce4685012a11fd29ff0b1df5a
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Extend drawPixmap capabilities for qpa through new OpacityPixmapCapability
QBlittable flag and add related implementation in DirectFB platform.
cherry-picked from qt5/qtbase 4ae829c1dbd0e8a72b82ab4c6cddb0a4ffe009f6
Change-Id: I8abdb0fa72bc030d769190d7cba40561007e7b46
Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Add non-opaque fill support for qpa through new QBlittable flag
"AlphaFillRectCapability" and add related implementation in DirectFB
qpa platform.
cherry-picked from qt5/qtbase aab15782e21bf0aaea7f2211278e9aa9fc78c6d7
Change-Id: Ia1c74c2926d2e244290dcb62cbd3b6848ba95707
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
|
|
| |
When using QBlittable with SourceOverScaledPixmapCapability, rendering
through clipAndDrawPixmap is incorrect when stretching: source pixmap
rectangle has to be corrected using scaling factor.
Change-Id: I80ad1c5ddc73a7b7394d0f5b412931c6279c175a
Reviewed-by: Jørgen Lind <jorgen.lind@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>
|
|
|
|
|
|
|
|
|
|
|
| |
Bug detected with animatedtiles in example/animation.
In qpa mode, using some specific resolution of directfb such as
800x600 causes a bug in FillRectF where there is an infinite loop due
to scalabilty of qreal value: One is rounded and the other not.
Change-Id: I0a9c902889f589d669f60ff1b71fdc5266143826
Reviewed-by: Holger Freyther <holger+qt@freyther.de>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
C++11 makes narrowing initialisation using {}s an error.
For an ARM target qreal != double, so force-cast to
qreal.
KAPPA now is consistent with the define of the same name
in qbezier.cpp.
Change-Id: I506218ee1f8cd0cdee21791cc402a479a429f7e5
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Symbian emulator shows QML applications badly when OpenVG graphics
system is used. This fix ignores OpenVG graphics system default
configuration when built for emulator target.
Task-number: ou1cimx1#1005008
Change-Id: I63fb89c5074e03fd582bfbbccca55f33473285c3
Reviewed-by: Pauli Järvinen <ext-pauli.p.jarvinen@nokia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
When the scaling effects the pen width so that it is less than 1 pixel
in width then it would use the QCosmeticStroker to draw, however this
should not be the case for cosmetic pens that are not less than 1 pixel
in width as the scaling does not change their width.
Task-number: QTBUG-25006
Change-Id: I142db0f3a7ee02aa87171495d5a7a7011100814e
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
(cherry picked from commit 6eae3cec5a34fbed28e519ffd8a8f3f1cd7b5c5b)
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fixed typo in qwindowsurface_raster.cpp, to get rid of compile error:
'class QRasterWindowSurfacePrivate' has no member named 'needsSync'
Mispelling was introduces by commit: 30dee4f4
Task-number: QTBUG-23320
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Change-Id: If473289e0549b2dec440285fec1ce64030de035f
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It is possible in environment with limited resources, that EGL
surface creation fails. When this happens, the QPainter doesn't
get properly activated, which in turn caused a crash later in
the drawing code.
Now, a check has been added into qapplication_s60.cpp to abort
window drawing immediately, if surface creation has failed. The
EGL surface is then tried to be recreated on the next time when
the window becomes visible, which usually allows the application
to recover.
In most cases, the crash happened in the function qDrawBorderPixmap,
which didn't check the validity of the QPaintEngine pointer before
accessing it. This method is analogous with the public methods of
the class QPainter where, on the other hand, availability of
QPaintEngine was always checked. To be in line, and to prevent
ptential crashes, a similar safety check and warning message have
now been added to method qDrawBorderPixmap.
Furthermore, a null-check was added to qwindowsurface_gl.cpp for the
QGLContext pointer. The same pointer was already previously
null-checked in the other branch of the same function, indicating
that the null-check is probably necessary.
Task-number: ou1cimx1#969923
Change-Id: I6d78be72b9c2308ef74b1119d8c8ec34ec015195
Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
The bug was caused by attempting to stroke an empty subpath. If there
have been no line-to's emitted we should not try to join the start and
end of that line segment.
Task-number: QTBUG-23248
Change-Id: I38b7e955ed6683f8fc25f9551e93b4f472c022bf
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The original intention was to identify a clipping bug, it turns out
that during a ::begin() (and systemChanged) we should forward the
QPaintEnginePrivate state to our proxy engine.
Instead of using the proxy-pattern subclass rasterengine and
specialize the paths we are able to accelerate using the blitter
interface. This will avoid similiar problems in the future. I have
no performance measurement to show which of the two approaches is
faster/slower.
Change-Id: I5ee0de566f4568103f741af697bdabbb097927e4
Based-On: I39bff11b32b1fe20284c7e8df60050de5991bb6e
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
* Group code responsible for tracking the render pipeline state
to check if we can easily accelerate it
* Code that will call into the QBlittable
* Code that will lock the QBlittable before calling into raster
Change-Id: I759a1864967d92a4cdd48c29941cb20d36afd84f
Based-On: I862e242d59805de5094ed363b486afcdbc23ff78
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
A default QPainter will set a QBrush with Qt::NoBrush BrushStyle, the
current code detects this as a non solid fill and all calls with fillRect
and a color will not go through QBlittable. Check for Solid or NoBrush
style. Manually verified that a p.fillRect(rect, Qt::red) goes through
the accelerated path now.
Change-Id: Ie53abf0a7ba349ba70742a94086708aca0beaa37
Based-On: Ic0d98030e94f5d11abbe61628fbf71d1e08219c2
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Create updateCompleteState(QPainterState*) so we don't need to
call into the paintengine, move all state methods into the
QBlitterPaintEnginePrivate class.
Change-Id: Ia621aeb9dba98152503f14d8900cf57b5bf2d4f9
Based-On: If30fdcc3f63755e0443bced7d9d9fb993d4ec2b7
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Cosmetic change to remove four spaces of indention from some of the
more deeply nested methods.
Change-Id: I9f09a0ce65d74d6dab59a293bb7fb172a5e47aef
Baed-On: I67fdd0ab722b7c7c67c4da7a0a0bd86459751700
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
It starts with being initialized wrongly, the call to buffer() will
lock the data while we think it is not locked, it can also get out of
sync by someone calling buffer() again. Remove the variable and
check with the QBlittable if we need to lock the resource into memory.
Change-Id: I6d7b336ed2e272724ec5b1348b410cbc4452422f
Based-On: I350375011138d1b4c2c48c100b7b30b8ea2ae460
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Move the bit helper functions into CapabilitiesToStateMask as they
are only used in this class, allocate the class as part of the
QBlitterPaintEnginePrivate, shorten the name as well.
Change-Id: Ifab7905d7e240b7c9f08ac5e3421a632b6fe2249
Based-On: If22ddd117a9789cd98edb08f23fd0ffabb17d5a5
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
|
| |
Attempt to follow Qt style guidelines.
Change-Id: I53d3e93eab615e2b8b705698eb87a8d2636723ec
Based-On: I3298c8d41d40ab5b0153a33d44b1b607a2edca8e
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This fixes the paper size setting on Mac as it would not return the
same paper size that was set with setPaperSize() when calling
paperSize().
Test is included.
Task-number: QTBUG-20882
Change-Id: Ib0064dd40de147d6db2424cdb31021e66894cc37
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
|
|
|
|
|
|
|
|
| |
Task-number: ou1cimx1yyy964181
Change-Id: I2f24d1d0f988bfe029e24fd29d59e6421301b670
Reviewed-by: Jani Hautakangas <jani.hautakangas@nokia.com>
Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This solves the bug with using custom paper sizes on Mac, if a QSize
was specified then with a Unit it would not respect this on Mac as it
would not convert it correctly. Also paperSize() would return the
wrong value.
There is already a test for this in tst_QPrinter::testCustomPageSizes()
Task-number: QTBUG-18723
Change-Id: I47c0cf2dd48ea3e0daa3b748f337ec38714aaf34
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Jiang Jiang <jiang.jiang@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>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Symbian: Fix exporting and importing of some functions for autotests
Symbian: Fix SRCDIR usage in qlayout autotest.
Symbian: Fix qcssparser autotest
Symbian: Fix qscriptextensionplugin autotest
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Symbian builds seem more strict about properly declaring exports than
other builds, so added proper exporting and importing to some
function declarations.
Task-number: ou1cimx1#957184
Reviewed-by: mread
|
|/
|
|
|
|
|
|
|
|
|
|
| |
The raster engine and the capabilities were leaked, use the
QScopedPointer to prevent that from happening.
Cherry-picked-from: qtbase:d5f12b898b8480c891382c54672422c50218751a.
Change-Id: I31ba0117280b48ad942fbb638fb151ccb7b34385
Merge-request: 1492
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|\ |
|
| |\
| | |
| | |
| | |
| | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team:
Doc: Fixing typo
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Reducing the amount of spelling errors from NBN.
Change-Id: I9b228bb95b4a757cff57595125009e70b0097d86
Reviewed-by: Rohan McGovern
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Fix Linux-Symbian parallel cross-compilation configure step
Symbian: don't merge native clipboard, overwrite.
Surviving out of memory in Qt Quick app
Export QtGui functions required by QtMultimediaKit backend
fix bearer crash
Fix alignment of non-wrapped richtext QML Text elements.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The QtQuickPlayground app contains a version of samegame which allow
the user to edit the code. By setting the ball size to 8, the app can
run out of memory. This leaves it in a pretty bad state. But apps
on Symbian shouldn't crash due to OOM and should allow some operation.
This change fixes the immediate OOM crashes in declarative, gui and
corelib. It shows warning dialogs which explain what has gone wrong and
leaves the app in a state that can be exited cleanly
from the Symbian task list.
Task-number: QT-5319
Reviewed-by: Shane Kearns
Reviewed-by: Gareth Stockwell
Reviewed-by: Martin Jones
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
In order for video rendering to work, the Symbian QtMultimediaKit
backend needs access to QtGui functionality which is not exposed
via public interfaces, namely:
* QSymbianControl::setIgnoreFocusChanged(bool)
* Setting custom painting modes, which control how content is
blitted from the backing store into the native window surface
* Requesting notification when Qt drawing starts and stops, so
that the backend can ensure this does not interfere with video
rendering.
Until now, this has been achieved by the backend including private
QtGui headers. If these headers are not present in the environment
in which QtMobility is compiled, a warning is printed, telling the
user that video / viewfinder rendering will not work correctly when
the resulting binaries are installed.
This patch adds a Symbian-specific public interface to QtGui, which
exports the functionality above.
Task-number: MOBILITY-747
Reviewed-by: mread
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This is useful on some SGX boards, where each GL context locks a huge chunk into
RAM, but we don't want to set the default runtime system to 'meego' as this
requires certain EGL extensions.
Merge-request: 2718
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This actually breaks runtime graphicssystem in all configurations as far as I
can tell, but definitely in the following setup:
-graphicssystem runtime -runtimegraphicssystem meego
Qt creates the runtime graphicssystem, which then sees it should create a MeeGo
GS instance. This then calls qgraphicssystemfactory::create("meego"), which was
overwriting graphics_system_name (incorrectly!)
Harmattan's Qt does not do this, and thus, is able to switch graphicssystems
correctly.
This partially reverts commit b595c2fbe0fa354190b713ef09dd1f348e22e2b6.
Merge-request: 2718
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Missing icon in the designer documentation
Fridge magnet example code snippet error
qpaintdevice-qt3.html documentation errors
QWebElement example missed information
QSPlitter style-sheet example was invalid
Errors in QSqlDriver::handle examples
QGLColormap example was invalid
QPointer made no mention of QWeakPointer
Invalid links to http://developer.symbian.org
QNetworkDiskCache documentation missed information
QStyleSheet example used a property that is hidden.
QList document referenced to non existing function
QXmlQuery::bindVariable documentation bug
Fix multiple typos in QLineF documentation.
Qmake project file docs lacked information.
Documentation error in SSL document
Fix multiple typos in documentation.
Fix for QVector::toList - code example documentation.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Document instructed to user qApp->x11Info() to access
x11Info in the examples. The QApplication doesn't have
x11Info() -method, QWidget does. Changed the examples
to use QWidget instead of QApplication.
Task-number: QTBUG-18544
Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
New code assumed building with OpenGL/OpenVG, which is the
production configuration, but not the default configuration
Reviewed-By: Jani Hautakangas
Task-Number: QTBUG-21996
|
|\ \ \ |
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Fixes: libpng symbols exported from QtGui.dll on Windows
omit unassigned (and too recent codepoints) from the text Normalization process
Fixed broken window surface flush when depth is 24 and bpp is not 32.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Some X servers use a compact representation of 24 depth visuals. In that
case we can't use the shared memory or XPutImage paths, as Qt's RGB32
does not match the internal memory layout.
Also fixed QPixmap::fromImage() to work in this case to prevent the red
and blue channels from being swapped.
Task-number: QTBUG-21754
Reviewed-by: Alberto Mardegan
|