summaryrefslogtreecommitdiffstats
path: root/src/gui/painting
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright headersAkseli Salovaara2015-03-31186-2402/+2402
| | | | | | | | | 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>
* Check world matrix is true when seeing if transformations are supportedAndy Shaw2015-01-021-0/+2
| | | | | | | | | | If the world matrix is turned off then if the raster paintengine should not support transformations for the text as otherwise it could end up being incorrectly transformed. Task-number: QTBUG-35200 Change-Id: I68fa6654ee87016986ba9d9469673fc8b9e0875e Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* QPdf::addImage(): avoid a QImage detach when it's in an acceptable FormatMartin Pley2014-09-111-3/+3
| | | | | | | | | | | Don't detach QImage, when it's in Format_Mono or Format_ARG32. Use QImage::constScanLine() instead of QImage::scanLine(). Change-Id: I30fcafb576aea3189637a40fd75f77c70017ba46 Reviewed-by: John Layt <jlayt@kde.org> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com> (cherry picked from qtbase/1a32cc0ae42a4a49f2d45b8ad8251ec40a30bf76) Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Fix QPainter::drawPolyline() painting errors with cosmetic penaavit2014-08-291-4/+4
| | | | | | | | Task-number: QTBUG-31579 Change-Id: I8fd2c03ff9a22e4963bfcbcfe196ae4c61b9e10f Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com> (cherry picked from qtbase/319cbb7597100f3b65792dc6a0ce2885ce6c0e8c) Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Remove use of 'register' from Qt.Kevin Funk2014-08-114-83/+83
| | | | | | | | | | | | | | | It is deprecated and clang is warning about it [-Wdeprecated-register]. Original patch from Stephen Kelly, see commit d9fb6e6dbb2b322556d581265da2442e3b91a6a3 in qt5/qtbase This is a backport of this commit + additional manual replacements in header files. There are still some 'register' uses inside implementation files left, but headers are all 'register'-free now. Change-Id: I7225381df1f093073583d62fa86f7bd7cca869c7 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Don't convert signed to unsigned when we need all 32bitAllan Sandfeld Jensen2014-07-301-2/+2
| | | | | | | | | | | | | | The fast scale methods qt_scale_image_16bit and qt_scale_image_32bit were incorrectly assigning an unsigned value to a signed variable, which broke their support of images with dimensions from 32384 to 65535. Images with dimensions higher than that are already using another code- path. Backported from change 0afc80c9225ca9630f627fe1aea3d4fd7f958082 in qtbase Task-number: QTBUG-40297 Change-Id: Ib55f7f9294f03a2f81206130e665af452f8cd085 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Fix raster graphics on X11 RGB30Allan Sandfeld Jensen2014-05-261-1/+1
| | | | | | | | | | | The window surface incorrectly assumes that any pixel depth of 24 or above would be on 8bit/color. This breaks 10bit/color formats like RGB30. This patch instead make it specifically check for color depth 24 or 32 which are the two with 8bit/color. Task-number: QTBUG-25998 Change-Id: Id0b7e07bdb64679f8c647158938da12efede9142 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Avoid out of bounds memory reads when scaling imagesv4.8.6Lars Knoll2014-04-036-27/+45
| | | | | | | | | | | | | | | | | | The calculation of the width/height required for the scaling algorithm was prone to floating point rounding issues, where the lower value got rounded down, the higher one rounded up. This could lead to a situation where we iterated over one more line/pixel in the line than we have in the source image. Correct this by passing the dimension of the source image into the function and bounds checking the values before iterating. Backport of If44b2235a479224660d508a0504fec40d724763a from Qt 5 Task-number: QTBUG-35927 Change-Id: If145ee715a143b889538243f45227d8d78a0050f Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* printsupport: set duplex setting correctly to CUPS printerTeemu Katajisto2014-03-281-14/+14
| | | | | | | | | | If CUPS printer default is not DuplexNone then setting duplex to None for printer did not have any effect on duplex setting. (backported from qtbase/385e584926f2957d6e9ec4c2c4e89b37a5e0c80c) Change-Id: Ia72f599a9e5fa511b3214c6b8016e21f40409b86 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Updated year in copyright headerKai Koehne2014-03-26186-186/+186
| | | | | | | | | | | | | | | | | | 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>
* Avoid floating point exceptions in rasterizeLine.Gunnar Sletta2014-01-121-16/+45
| | | | | | | | | Task-number: QTBUG-16757 Change-Id: I3ef988f1e039c12529d62197d85a62f201e4ae12 Reviewed-by: Lars Knoll <lars.knoll@digia.com> (cherry picked from qtbase/85b4f0d2d3ffd326548ca8f0e15ac27f5fd8d77d) Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Respect the custom paper size settings on MacAndy Shaw2013-12-042-23/+48
| | | | | | | | | | | | | | | When the user added a custom paper size then it would be silently ignored when printing on Mac. This now ensures that it is respected when appropriate. Manual cherry-pick from Qt 5: 26a0a3ed85008c3a0edae125fca48c7c36a7437f [ChangeLog][Platform Specific Changes][OS X][QtPrintSupport] Respect the custom paper size settings when printing. Task-number: QTBUG-34700 Change-Id: If2ff9b704a636c94510f826d300e53af99c8e7ab Reviewed-by: John Layt <jlayt@kde.org>
* Fix MinGW-warnings about narrowing/invalid conversions.Friedemann Kleint2013-11-181-1/+1
| | | | | Change-Id: I9b49dd6d12a5e59c6f2674ab3c82a8a7ec583775 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Optimize macDisplayColorSpaceMorten Johan Sørvig2013-11-142-18/+29
| | | | | | | | | | | | On 10.9, getting the display based on the rect is slow(er). Use a window -> color space cache instead of a display -> color space cache. Change-Id: If40a6d089019a54ceb724b8007adaffea89c96fb Task-number: QTBUG-34358 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* QPdfEngine - Remove Producer copyright noticeSamuel Gaist2013-11-041-1/+1
| | | | | | | | | | | | | | Remove the copyright notice from the PDF Producer field which could be misunderstood. Comparison to other PDF Producers shows no other company does this. Based on https://codereview.qt-project.org/#change,70182 Task-number: QTBUG-33853 Change-Id: I3a2820c1466963e7391b4a9a729c7261a3582e0b Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: John Layt <jlayt@kde.org>
* Ensure lastPixel.y is also initalized to -1 when necessaryAndy Shaw2013-10-091-0/+3
| | | | | | | | Task-number: QTBUG-31579 Change-Id: Ia4916ac0d384ea523bbfad0dafbc90044da7ec3e Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> (cherry picked from qtbase/f0b950144dde85b65df0c3cf83f7c8df0e94bbbf)
* Fixes: ASSERT in qpaintengine_x11 when using native graphicssystemaavit2013-07-101-1/+1
| | | | | | | | | | | | QFontEngineFT::loadGlyph() was called with wrong number/type of arguments, but as the compiler silently accepted an enum value as a QFixed, and the rest had default values, this was not discovered. Fix not needed in Qt5, since this functionality is not there. Task-number: QTBUG-32166 Change-Id: Ifc5be593530fee5ff0e329a9f56f6ba48eea6cdf Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Fix drawing of 0-width polylines from outside the devicerect.Gunnar Sletta2013-07-042-17/+27
| | | | | | | | | | | | | | | This was broken by a previous fix which aimed to fix gaps in polylines with tiny line segments. The result was that we skipped updating the origin point when stroke() didn't produce pixels which accidentally included the case of the line being completely outside the deviceRect. I fixed this by returning the value of clipLine in drawLine to the caller so we could still update the origin for this case. Task-number: QTBUG-31579 Change-Id: Iac29436f042da7658bbeaf9370351dc6f2c95065 (cherry picked from qtbase/900cccfd459fcbdbc4aa3d313afe12cfbf68fd87) Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Fixed invalid memory read in SSSE3 image blending code.Samuel Rodal2013-04-221-1/+1
| | | | | | | | | | | We need to do bounds comparison on the actual offset we're going to use with _mm_load_si128 to read 16 bytes from memory (even though we won't use the trailing bytes in the end). Task-number: QTBUG-28324 (cherry-picked from qtbase commit 52619ae7787b3c4febb73a02afa623b12edabc97) Change-Id: I705ae191312e5ffe25e45caea71ada73ec97f68d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fixed QPainter::drawPolyline() not drawing solid lines.Samuel Rødal2013-03-201-1/+16
| | | | | | | | | | If a line segment isn't filled we keep using the same point of origin. Task-number: QTBUG-26156 Change-Id: I20af8410a7039b69848f201ab62fd3c01b95531b Reviewed-by: Titta Heikkala <titta.heikkala@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> (cherry picked from commit b528e1324add2208abf8f83fb51a8bd2183157f5)
* Fixed artifacts when drawing same line with different clips.Samuel Rødal2013-03-201-6/+6
| | | | | | | | | | | Expanding on the change fixing QTBUG-24762 with the realization that any line needs to be drawn in a consistent way regardless of system or painter clip, not just dashed lines. Task-number: QTBUG-25036 Change-Id: Ief7ef19cc92c52e7d792500a581a072ba032767e Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> (cherry picked from commit c7191d3e214b9cdb17ec383b61f7e21e784f80d0)
* Clear the alphaCache when starting new paintingAndy Shaw2013-03-141-1/+1
| | | | | | | | | The alpha cache needs to be cleared when starting a new paint otherwise it will assume that some elements already exist in the PDF when they don't. Change-Id: I97451c53c0c99b80a25a057735cef7b3bb830a7a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Fixes: assert in QPainter::fillRect on very large paint devicesaavit2013-03-141-0/+2
| | | | | | | | | | For devices taller than 32768, fillRect with linear gradient would go below the cliprect. Task-number: QTBUG-26766 Change-Id: I516ede1545909e9ce2de5812c61bb473f99f5759 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> (cherry picked from qtbase/db775741ed57efc16c697471f5b87689df7105a8)
* Fixed dashes being rendered differently depending on system clip.Samuel Rødal2013-03-144-18/+24
| | | | | | | | | | | | We need to clip lines to the unclipped device rect in the case of dashing, since otherwise the dashes will be shifted and rendered differently when partial repaints are done. Task-number: QTBUG-24762 Change-Id: I3599b54baa552acc20bf8cc2e12f846b45f6019e Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> (cherry picked from commit a12f6ba302e54c1570c54aa4c722f2dafbf794af)
* QPdfEnginePrivate: Fix invalid format for rectangles on some localesDmitry Shachnev2013-02-221-6/+10
| | | | | | | | | | | This is done by using locale-independent QByteArray::setNum() instead of qvsnprintf() for printing doubles. Cherry-picked from qtbase c9ae652487514acd19f3631224ced7ac14f756c8. Task-number: QTBUG-24949 Change-Id: Id0a6e9ad6a45d7e17dfcffd625891d68c00d516c Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Fix comments to use pre C99 standard style insteadPasi Petäjäjärvi2013-01-281-5/+5
| | | | | | | | VxWorks compiler fails to compile *.c file with C99 style comments on it Change-Id: Ib5c5ff14006c17f9392b77363232b8b7cc112d34 (cherry picked from qtbase/2aaffe1800db0d8a170b278ac9a43f2e00ef0e8f) Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* fix illegal reference to a destroyed variableGatis Paeglis2013-01-201-1/+1
| | | | | | | | | | | | | The char array 'dash_o' is an automatic variable. The string "-o" is copied into this array. Later the address of the array dash_o is assigned twice to lpargs[++i]. After leaving the block, the array dash_o is gone and lpargs[...] contains an illegal reference. This was discovered in a release mode when compiled with gcc version 4.7.2 Patch doesn't apply for Qt5 where 'lpr' support has been removed. Change-Id: I4f99badfa380ad3b29893a350f0d699bfb934c68 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-13186-186/+186
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* QPaintEngine: Fix build if compiled with QT_NO_XRENDERPeter Hartmann2012-12-151-1/+4
| | | | | | | | | composition_mode is only defined if QT_NO_XRENDER is not defined. Bug was introduced with 439aa67582e715ddc0ca7e30305b0c9498a71f81 "Fixes ignored composition mode in QPainter::fillRect with X11 engine." Change-Id: I2dc036ffa277cbf0f9327ede3fead9a407147fc0 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Fixes ignored composition mode in QPainter::fillRect with X11 engine.Samuel Rødal2012-12-111-2/+8
| | | | | | | | | It's not sufficient to check that the source brush has an alpha, there are composition modes that depend on the destination instead. Task-number: QTBUG-28499 Change-Id: I4b267544c607b6a68c4c52a6784d526bec604d75 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* qpa: Fix rendering issue in blitter engine (negative scaling factors)Julien Brianceau2012-11-081-1/+5
| | | | | | | | | | | | | | 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>
* Fixed GCC 3.4 build with sse2 enabled.Samuel Rødal2012-10-301-1/+2
| | | | | | | | | 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>
* Fixed cosmetic line drawing where begin and end points are equal.Samuel Rødal2012-10-171-0/+5
| | | | | | | | | | | 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>
* Fix number of available printers in CUPS supportNick Ratelle2012-10-141-1/+2
| | | | | | | | | | | | | | | | | | | | | 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>
* qpa: Fix rendering issue in blitter paint engineJulien Brianceau2012-10-121-3/+4
| | | | | | | | | | | 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>
* Fix g++/MinGW compiler warnings.Friedemann Kleint2012-09-291-1/+0
| | | | | | | | | | - 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 from Nokia to DigiaIikka Eklund2012-09-29186-4442/+4442
| | | | | | | | 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>
* Fixed outline / fill inconsistencies in raster paint engine.Samuel Rødal2012-09-273-20/+2
| | | | | | | | | | | | 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>
* cleanup CUPS tmp filesTeemu Katajisto2012-09-271-0/+1
| | | | | | | | | | | | | 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>
* Fixed inconsistent rounding of square cap pens.Samuel Rødal2012-09-251-10/+10
| | | | | | | | | | | | | 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>
* qpa: extend drawPixmap capabilitiesJulien Brianceau2012-09-122-10/+57
| | | | | | | | | | 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>
* qpa: add non-opaque fill supportJulien Brianceau2012-09-122-11/+62
| | | | | | | | | | | 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>
* qpa: incorrect rendering when stretching and clippingJulien Brianceau2012-09-031-5/+17
| | | | | | | | | 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>
* Update contact information in license headers.Sergio Ahumada2012-08-01186-372/+372
| | | | | | | | | | | | | - 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>
* Fix infinite loop due to FPU limitationStéphane Cerveau2012-07-171-2/+2
| | | | | | | | | | | 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>
* ARM: fix compilation with C++11 enabledMarc Mutz2012-07-052-2/+2
| | | | | | | | | | | | | | | 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: disable OpenVG as default on Symbian emulator buildsPasi Pentikainen2012-06-131-1/+1
| | | | | | | | | | | 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>
* The scaling should not effect the width of a cosmetic penAndy Shaw2012-03-301-1/+1
| | | | | | | | | | | | 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)
* Build fix to raster window surface.Janne Anttila2012-02-261-1/+1
| | | | | | | | | | | | 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>
* Prevent crashing on Symbian in case EGL surface creation fails.Pauli Jarvinen2012-02-081-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>