| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| | |
Conflicts:
src/declarative/qml/qdeclarativeengine.cpp
src/declarative/qml/qdeclarativepropertycache.cpp
|
| | | |
|
| |/
|
|
|
|
|
| |
Forward begin / endNativePainting from the emulation paint engine.
Task-number: QTBUG-15498
Reviewed-by: Gunnar Sletta
|
| |
|
|
|
|
|
|
|
|
|
| |
We would disregard the first glyph in each line when calculating the
required height of the line in the glyph cache. If the first glyph
was taller than any of the other glyphs in the same line, the glyph
drawn underneath it in the cache could potentially overlap it, and
you would see it as dots or lines underneath the glyph in the output.
Task-number: QTBUG-14806
Reviewed-by: Jiang Jiang
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Two possible failures when using the glyph cache on raster engine and
populating the cache with very many glyphs:
1. Change 72f161739b270b01807f97cd853030440f0fd430 caused the maximum
height of the glyph cache to be 32768, which was not sufficient for
large fonts with very many characters (e.g. Chinese text)
2. Since we are using QPainter to draw into the glyph cache for RGB32
glyphcaches, and QPainter does not support very high coordinates,
we need to create a reference image that references a section of the
glyph cache and paint into that instead.
Task-number: QT-3971
Reviewed-by: Samuel
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When the OpenGL glyph cache filled up (the max texture size on the
hardware was exceeded) the characters would be drawn as black blocks
instead. As a work-around for this, the cache will now be cleared and
repopulated whenever this happens, meaning that once in a while (when
a lot of different glyphs have been drawn in a font) there will be a
performance hit. A more complete solution is described in QTBUG-13784,
but this requires so much refactoring that it was deemed too risky for
a patch release. This patch fixes the problem with a small penalty
and low risk.
Task-number: QT-3971
Reviewed-by: Samuel
|
| |
|
|
|
|
|
|
|
| |
If opacity is updated independently from the pen properties sometimes
the raster engine's fast_text flag would not be updated correctly,
causing it to use a rendering path which doesn't support alpha.
Reviewed-by: Robin Burchell
Reviewed-by: Andreas Kling
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Doc: Fixing typo
Fix QTBUG-14640:oci performance problem with qlonglong
32bit => 16bit conversion has 4byte-aligned output.
Fix gcc bug in qReallocAligned
Prevented threading related crash in OpenGL module.
Fix possible crash in QStaticText and QDeclarativeTextLayout
Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
32bit => 16bit conversion has 4byte-aligned output.
Fix gcc bug in qReallocAligned
Prevented threading related crash in OpenGL module.
Fix possible crash in QStaticText and QDeclarativeTextLayout
Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The QStaticTextItem held an uncounted reference to QFontEngine. The
pointer would dangle in some cases where there was no font object
referencing the engine and the cache was cleaned out (e.g. when a
new application font is added.) Properly count the reference, and also
add reference counting to userData to make it harder to shoot yourself
in the foot, since the QStaticTextItem class is now being used in
different places,
Task-number: QTBUG-14446
Reviewed-by: Martin Jones
|
| |/ /
| |
| |
| |
| | |
Task-number: QTBUG-13714
Reviewed-by: Trust Me
|
| |\ \
| |/
|/|
| |
| | |
Conflicts:
tests/auto/qpainter/tst_qpainter.cpp
|
| | |
| |
| |
| |
| |
| |
| | |
Don't take for granted that these are included...
Task-number: QTBUG-14614
Reviewed-by: Bradley T. Hughes
|
| | |
| |
| |
| |
| |
| |
| | |
We need to protect the gradient cache accesses with a mutex.
Task-number: QTBUG-14614
Reviewed-by: Bradley T. Hughes
|
| | |
| |
| |
| | |
Reviewed-by: Shane Kearns
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix epocroot handling in createpackage.pl script
Make s60pixelmetrics harvester utility app more robust
Implemented Qt::WA_ShowWithoutActivating for Symbian.
Clean up ARM SIMD drawhelper code and make sure it works.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Blending argb32_pre pixmaps is now ARM SIMD boosted because
it's the most crucial and most used feature in applications.
ARM SIMD boosted blending is 30% faster than non ARM SIMD
boosted blending.
Task-number: QTBUG-4891
Reviewed-by: Samuel
|
| |\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (49 commits)
Assistant: Insert all keywords with empty ids, as ids are not mendatory.
qmake: delete .pdb file when making 'distclean' instead of 'clean'
qmake: pass include directories to MS resource compiler
use specified pkg-config
qmake/symbian: Add icons with backslashes in pkg files
Make qtconfig help messages translatable
remove exec bits again ...
Add TIFFClose to QTIffHandler::option() to avoid memory leak
[QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel event is sent to two stacked MDI windows
Added missing QtWebKit example files and some whitespace fixes.
Added missing native separator transforms.
Doc: tuning search reasult box
qdoc: Don't generate html output for png files.
Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0
Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize()
Doc: correct spelling
Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cpp
Doc: correcting grammar on the installation pages
Doc: correcting broken link to labs
Doc: adding note to function QWSKeyboardHandler::processKeycode - that it was added in Qt 4.6
...
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (49 commits)
Assistant: Insert all keywords with empty ids, as ids are not mendatory.
qmake: delete .pdb file when making 'distclean' instead of 'clean'
qmake: pass include directories to MS resource compiler
use specified pkg-config
qmake/symbian: Add icons with backslashes in pkg files
Make qtconfig help messages translatable
remove exec bits again ...
Add TIFFClose to QTIffHandler::option() to avoid memory leak
[QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel event is sent to two stacked MDI windows
Added missing QtWebKit example files and some whitespace fixes.
Added missing native separator transforms.
Doc: tuning search reasult box
qdoc: Don't generate html output for png files.
Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0
Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize()
Doc: correct spelling
Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cpp
Doc: correcting grammar on the installation pages
Doc: correcting broken link to labs
Doc: adding note to function QWSKeyboardHandler::processKeycode - that it was added in Qt 4.6
...
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (38 commits)
Doc: tuning search reasult box
qdoc: Don't generate html output for png files.
Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0
Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize()
Doc: correct spelling
Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cpp
Doc: correcting grammar on the installation pages
Doc: correcting broken link to labs
Doc: adding note to function QWSKeyboardHandler::processKeycode - that it was added in Qt 4.6
Doc: correcting typo
Doc: Fixing bug - line too long and not visible. Breaking the line in two
Doc: Fixing typo
Doc: Fixing snippet bug. Path pointing to the wrong snippet
Doc: Fixed doc references to non-existing API
Doc: Fix broken links in QSslConfiguration
Added a project file for the Getting Started with QML and changed the
Clarified the auto connect enumeration regarding which type of
Added installation section and fixed some whitespace.
Doc: Fixing spacing bug in columns
Doc: Fixing bug in QML tutorial
...
|
| | | | |\ \ |
|
| | | | |\ \ \ |
|
| | | | |\ \ \ \ |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
In the repository, we should always use the No Commercial license
alongside the GNU Free Documentation License for documentation
files.
|
| |/ / / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
QFontEngineS60::boundingBox_const(): The metrics that
CFont::getCharacterData() returns is equivalent to what
TOpenFontCharMetrics::GetHorizBounds() returns. So, remove
the use of TRect glyphBounds, and
TOpenFontCharMetrics::GetHorizBounds().
Implementation of TOpenFontCharMetrics::GetHorizBounds():
http://developer.symbian.org/oss/API_REF/Public_API/file/837f303aceeb/epoc32/include/openfont.h#l1352
QRasterPaintEngine::drawGlyphsS60(): The metrics that
QFontEngineS60::getCharacterData() returns are equivalent to
what QFontEngineS60::boundingBox() returns. So, remove the
use of glyph_metrics_t metrics, and QFontEngineS60::boundingBox().
These changes increase the Fps in
qt\tests\manual\textrendering\textperformance "Latin" from 16.2 to
16.5 Fps on an XM5800. And they do that by removing code :)
Task-number: QTBUG-14378
Reviewed-by: Jason Barron
|
| |/ / / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
If QWidget::destroy() is called (perhaps by setParent) then the window
surface is deleted by the destructor of QSymbianControl instead of in
the "normal" place which is ~QWidget(). This means that we should not
attempt to use the RWindow in the window surface because it is in the
process of being destroyed.
Reviewed-by: Jani Hautakangas
|
| |\ \ \ \ \ \
| |_|_|_|/ /
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Fix build with cups 1.5 snapshots
|
| | |\ \ \ \ \
| | |_|_|/ /
| |/| | | /
| | | |_|/
| | |/| | |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Without this patch, Qt CUPS support fails to build with current
CUPS snapshots:
In file included from ../../include/QtGui/private/qcups_p.h:1:0,
from painting/qpdf.cpp:47:
.../qcups_p.h:78:11: error: 'ppd_file_t' does not name a type
.../qcups_p.h:80:11: error: 'ppd_file_t' does not name a type
.../qcups_p.h:81:11: error: 'ppd_option_t' does not name a type
.../qcups_p.h:84:11: error: 'ppd_option_t' does not name a type
.../qcups_p.h:87:34: error: ISO C++ forbids declaration of 'type
name' with no type
.../qcups_p.h:87:47: error: template argument 1 is invalid
.../qcups_p.h:103:56: error: 'ppd_group_t' does not name a type
.../qcups_p.h:103:77: error: ISO C++ forbids declaration of 'group'
with no type
.../qcups_p.h:104:62: error: 'ppd_group_t' does not name a type
.../qcups_p.h:104:75: error: ISO C++ forbids declaration of 'group'
with no type
.../qcups_p.h:108:11: error: 'ppd_option_t' does not name a type
.../qcups_p.h:110:5: error: 'ppd_file_t' does not name a type
Merge-request: 835
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
| |/ / / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The QS60PaintEngine should not assume that the pixmap is always of type
'Raster'. It should check the classId and if it is not 'Raster' it
should forward the call to QRasterPaintEngine which already handles
this scenario by converting the pixmap to a QImage and drawing that
instead.
Reviewed-by: Jani Hautakangas
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We should only add to rendered_spans once, before freeing the rasterizer
memory pool. This fixes the tst_qpathclipper:clip2() auto-test failure
on 32-bit linux.
Reviewed-by: Kim
|
| |\ \ \ \
| |_|_|/
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (24 commits)
Stabilize tst_QGraphicsWidget::QT_BUG_13865_doublePaintWhenAddingASubItem
Fixed accessing freed memory in raster engine.
Build fix for -qtnamespace.
Fixed parsing of SVGs with absolute font sizes.
Moving QPdf::stripSpecialCharacter to fontengine
Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine"
Fixed a layout issue where you could get NaN as dimensions
QTextCodec: Fix valgrind warning when using QTextCodec in destructions functions
Fix double painting when adding an item into a linear layout
Fixed antialiased rasterization bug in raster engine.
Fixed potential crash when loading corrupt GIFs.
Work around an ATI driver problem with mutli-sampled pbuffers.
tst_qstatemachine.cpp: fix compilation with Sun Studio
Fixed regression in clipping.qps autotest on 64-bit.
Fixed crash when using Qt::WA_DeleteOnClose on a QPrintDialog on Mac.
Fixed performance regression in curve stroking.
Don't disable texture_from_pixmap on GLX/X11 by default.
Avoid creating copy of an image in memory when storing as png
Doc update for the support of MSVC 2010 64-bit
fix documentation of drawText(int, int, int, int, ...
...
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The bug was discovered when running the svgviewer example on
64-bit Windows.
Reviewed-by: Samuel
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
It is only used by the fontengines. This is one of the steps to make it
easier to make fontengines build outside of QtGui.
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When rasterization in the gray raster fails due to out of memory there
might already have been a number of spans flushed. To avoid flushing
these spans multiple times and thus getting overdraw artifacts we need
to keep track of how many spans to skip when we redo the rasterization.
This fixes the rendering error in arthur test paths_aa.qps
Reviewed-by: Yoann Lopes
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
TPos needs to be 32-bit, not 64-bit. QT_FT_Pos being 64-bit caused
sizeof(TWorker) + sizeof(TCell) in qgrayraster.c to exceed 4096, which
is the MINIMUM_POOL_SIZE, leading to rendering errors in certain cases.
Reviewed-by: Yoann Lopes
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Change c46688b8a88da made us use m_curve_threshold for both
QBezier::shifted and QBezier::toPolygon, and adjusted the threshold
dynamically based on the painter scale. Since the threshold in shifted
was already relative to the pen width, it is independent from the
painter scale. Instead, we need to set a separate threshold for dashing.
Also, in several places we were calling setCurveThresholdForTransform
with the painter matrix even though we were transforming the points into
device coordinate space before stroking.
Task-number: QTBUG-13894
Reviewed-by: Gunnar Sletta
|
| | | | | |
|
| | |\ \ \
| | | |/
| | |/| |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The bug caused a useless realloction everytime a path was rasterized
with gray_raster.
Task-number: QTBUG-13871
Reviewed-by: Samuel
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Change 4c515ceb fixed Intersect and Unite-clipping after doing
setClipping(false), but also introduced a performance problem.
If there was no pre-existing clip we'd convert IntersectClips to
ReplaceClips, which is unnecessary since the paint engines already
handle this correctly.
IntersectClips can be handled much more efficiently in the OpenGL 2
paint engine for example. We only need to convert to ReplaceClip when
someone has used setClipEnabled(false) which is anyways expensive and
not recommended.
Reviewed-by: Trond
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When rasterization in the gray raster fails due to out of memory there
might already have been a number of spans flushed. To avoid flushing
these spans multiple times and thus getting overdraw artifacts we need
to keep track of how many spans to skip when we redo the rasterization.
This fixes the rendering error in arthur test paths_aa.qps
Reviewed-by: Yoann Lopes
|
| | |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The gray raster uses long to ensure having 32-bit integers since it was
originally designed to work on 16-bit platforms as well. On 64-bit
platforms switching to use int instead of long gives a performance boost
of ~10 % or so depending on the use case.
Reviewed-by: Yoann Lopes
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Change 7c673a4cf64ba04 introduced some autotest failures in the
fpe_steepSlopes test in QPainter.
Since the other rasterizers all deal in a 26.6 fixed point coordinate
space we should snap the line vertices to this to prevent floating point
overflows due to very steep slopes.
This also necessitates keeping track of four different slope / inverse
slope increments for each of the four edges.
This also fixes a previously QEXPECT_FAIL'ed test case.
Task-number: QTBUG-13429
Reviewed-by: Trond
|
| |/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
With a large pen width and a small scale, due to the hacky way we draw
points (stroking a line from (x, y) to (x + tiny_amount, y)), we some
times end up snapping these two points to the same in rasterizeLine().
If we instead apply the SquareCap before we do clipping / snapping we
don't get this problem.
Task-number: QTBUG-13429
Reviewed-by: Trond
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
apply msvc flags to wince too
fix qt static build on wince
fix build with QT_NO_GESTURES
qmake: fix quoting of moc calls
Use regparm(3) for ICC too, otherwise it's an ABI mismatch in QChar
Regenerate the Unicode tables after updates to the generator tool
Compile in C++0x mode
remove extra includes
minor clean-ups
minor improvements for data parsers
tiny clean-up for generated data
move QUnicodeTables:: script() and lineBreakClass() implementations
make lupdate test less fragile
Enable building Qt/Webkit with debug symbols
Add breakpad support
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Our glyph caching system doesn't take GL texture size limitation into
account, and assumes you can create an infinitely large texture.
On top of that, the cache will never create a cache that is wider
than 256, or QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH, which means we'll
hit the texture size limit even faster. With this patch the entire
texture is utilized. However, to fix in properly we need to support
having multiple texture for each font engine. That will be fixed
shortly (see task QTBUG-13784).
Task-number: QT-3971
Reviewed-by: Eskil
|
| |/ /
| |
| |
| |
| |
| |
| | |
Some old work-around code is no longer needed...
Task-number: QTBUG-13721
Reviewed-by: Samuel
|
