| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QPainterPath can't handle NaNs/Inf inside coordinates, but instead of
safely ignoring or aborting an operation, it shows a warning and keeps
going on, with undefined behavior. Sometimes leading to infinite loops,
leaks or crashes (see qtwebkit example below).
This is particularly bad when QPainterPath is used to render content
from untrusted sources (web or user data). As an example, there's a
qtwebkit bug where the browser crashes when a particular SVG is loaded:
https://bugs.webkit.org/show_bug.cgi?id=51698.
Please note that "untrusted sources" doesn't apply only to network
sources. This behavior can probably be exploited on applications such as
file-browsers with previews enabled.
Task-number: QTBUG-16664
Signed-off-by: Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
Merge-request: 1026
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/webkit/imageanalyzer/imageanalyzer.h
examples/webkit/imageanalyzer/mainwindow.h
mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h
src/corelib/io/qfsfileengine_iterator_unix.cpp
src/corelib/io/qfsfileengine_iterator_win.cpp
src/corelib/kernel/qcoreapplication.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/plugins/bearer/connman/qconnmanservice_linux.cpp
src/plugins/platforms/openvglite/qwindowsurface_vglite.h
src/s60installs/bwins/QtCoreu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/s60installs.pro
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/qdoc3/test/qt-html-templates.qdocconf
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QFont/Windows: restrict the pixel size accuracy
Update copyright year to 2011.
For non-developer builds, skip test that requires private API
tst_qhttpnetworkconnection: Compile fix
Change QHostInfoCache to use QElapsedTime instead of QTime.
Fix for qtdemo bug
|
| | | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Currently Symbian doesn't support semi-transparent EGL surfaces.
WA_TranslucentBackground attribute is ineffective if set after EGL
surface creation. To enable translucency in this case we need to
recreate backing store to get raster surface which supports translucency.
Task-number: QT-4416
Reviewed-by: Jason Barron
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Only test control character handling in X11
Compile when qreal != double
Make application font family names locale sensitive in X11
Rename QTextBlockFormat::AtLeastHeight -> MinimumHeight
Add line spacing to QTextBlockFormat, get/set functions, CSS support
Optimize texture glyph cache
Disable certain GPOS features by default
Move advances for control character in Indic syllable shaping
|
| | |\ \ |
|
| | |\ \ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
To avoid calling the bounding box function for the same non-printable
characters in every call, we cache them as empty in the coords table
and bail out before painting them. This patch also fixes some possible
reads of uninitialized memory (reference to return value) and reference
to a default constructed object consisting of uninitialized pods.
Reviewed-by: Samuel
|
| | |_|/ /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
depending on platform, qBinaryFind might be up to 3 times faster than bsearch
or a bit bit slower at the worst case; so why don't simply use qBinaryFind instead of bsearch and be an optimist? ;)
also we know that all color names are in the lower case already and thus
we can avoid lowercasing of them again and again, and again;
the name to find needs to be lowercased separately instead.
some color-by-name-lookup numbers:
before:
0.000737 msecs per iteration (total: 3,684, iterations: 5000000)
after:
0.000154 msecs per iteration (total: 771, iterations: 5000000)
Merge-request: 906
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
| |\ \ \ \
| | |_|/
| |/| | |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This would produce an invalid path, causing potential crashes in various
parts of Qt.
Task-number: QTBUG-16377
Reviewed-by: Gunnar Sletta
|
| | |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | | |
Fix a bug in pdf print engine that was noticeable when printing
a webpage: the missing image graphic didn't appear in the pdf.
Task-number: QTBUG-16435
Reviewed-by: sroedal
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (39 commits)
Whitespace change
Fix for coding conventions.
Fix resource leak in QCLuceneStandardAnalyzer::QCLuceneStandardAnalyzer.
Fix resource leak in QCLuceneStopAnalyzer::QCLuceneStopAnalyzer.
Assistant: Get rid of bogus warning.
add missing license header
Add inter-process binary shader cache for MeeGo
Track average wait times under our maximum spin time threshold
Store and track spin times in nanosecond resolution
Optimize adaptive spinning mutex code
Improve QMutex contention performance on Linux
Improve QMutex contention performance on Mac OS X
Disable spinning under lock contention on single CPU machines
Remove unnecessary testAndSetAcquire from QMutex::lockInternal()
Move contender count maintenance to QMutexPrivate
test contention when using 2 mutexes
Ensure that every thread does contend in the contention tests
Add baseline test data to measure test overhead
Test contention performance for long (10ms) critical sections
Add a benchmark for contended and uncontended QMutex performance
...
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (33 commits)
Add inter-process binary shader cache for MeeGo
Track average wait times under our maximum spin time threshold
Store and track spin times in nanosecond resolution
Optimize adaptive spinning mutex code
Improve QMutex contention performance on Linux
Improve QMutex contention performance on Mac OS X
Disable spinning under lock contention on single CPU machines
Remove unnecessary testAndSetAcquire from QMutex::lockInternal()
Move contender count maintenance to QMutexPrivate
test contention when using 2 mutexes
Ensure that every thread does contend in the contention tests
Add baseline test data to measure test overhead
Test contention performance for long (10ms) critical sections
Add a benchmark for contended and uncontended QMutex performance
Removed QMutexPrivate::self() declaration
Add QElapsedTimer::nsecsElapsed() const
Delay creation of the process manager
Make the QRasterPaintEngineState copy constructor cheaper.
Micro-optimization for QSpanData::setup()
define FSCTL_SET_REPARSE_POINT in test header
...
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (33 commits)
Add inter-process binary shader cache for MeeGo
Track average wait times under our maximum spin time threshold
Store and track spin times in nanosecond resolution
Optimize adaptive spinning mutex code
Improve QMutex contention performance on Linux
Improve QMutex contention performance on Mac OS X
Disable spinning under lock contention on single CPU machines
Remove unnecessary testAndSetAcquire from QMutex::lockInternal()
Move contender count maintenance to QMutexPrivate
test contention when using 2 mutexes
Ensure that every thread does contend in the contention tests
Add baseline test data to measure test overhead
Test contention performance for long (10ms) critical sections
Add a benchmark for contended and uncontended QMutex performance
Removed QMutexPrivate::self() declaration
Add QElapsedTimer::nsecsElapsed() const
Delay creation of the process manager
Make the QRasterPaintEngineState copy constructor cheaper.
Micro-optimization for QSpanData::setup()
define FSCTL_SET_REPARSE_POINT in test header
...
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Use initializer syntax to avoid default-constructing a throwaway
QBrush and QPen.
Reviewed-by: Samuel Rødal
|
| | | | | |/
| | | |/|
| | | | |
| | | | |
| | | | |
| | | | | |
Don't call QColor::rgba() in a macro arg that gets evaluated multiple times.
Reviewed-by: Samuel Rødal
|
| |\ \ \ \ \
| |/ / / /
|/| | | /
| | |_|/
| |/| |
| | | | |
Conflicts:
src/s60main/newallocator_hook.cpp
tools/runonphone/serenum_unix.cpp
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Gives an improvement of around 19.6 % for upscaling a 256x256 pixmap to
480x480 with SmoothPixmapFilter enabled.
Reviewed-by: Olivier Goffart
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Gives a 36 % performance boost for downscaling a 512x512 pixmap to
480x480 with SmoothPixmapFilter enabled.
Reviewed-by: Andreas Kling
|
| |\ \ \ \
| |_|/ /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed PREPEND_INCLUDEPATH being executed too early.
Moved the default dependency targets to default_post.prf.
Fixed autotest.
get rid of QPrinterInfoPrivate::isNull member
QPrinterInfo::supportedPaperSizes(): return early if the info is invalid
fix QPrinterInfo::defaultPrinter() on win
micro-optimizations, clean-ups and styling fixes
refactoring of QPrinterInfo
minor refactoring of QPrinterInfoPrivate
use binary search int the string2PaperSize() helper
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Moved the default dependency targets to default_post.prf.
Fixed autotest.
get rid of QPrinterInfoPrivate::isNull member
QPrinterInfo::supportedPaperSizes(): return early if the info is invalid
fix QPrinterInfo::defaultPrinter() on win
micro-optimizations, clean-ups and styling fixes
refactoring of QPrinterInfo
minor refactoring of QPrinterInfoPrivate
use binary search int the string2PaperSize() helper
|
| | | | \ \ | |
| | | | \ \ | |
| | | |\ \ \ \
| | | |_|_|/
| | |/| | | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
invalid QPrinterInfo always have d_ptr == &QPrinterInfoPrivate::shared_null;
no need in separate flag for that
Merge-request: 2516
Signed-off-by: axis
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
e.g. don't report supported paper sized in any case
Merge-request: 2516
Signed-off-by: axis
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
to not return a partially filled invalid printer info.
is the default printer couldn't be retrieved, return an invalid QPrinterInfo()
rather than a semi-invalid info
which has isDefault() == true and printerName() == "qt_no_printers"
Merge-request: 2516
Signed-off-by: axis
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Merge-request: 2516
Signed-off-by: axis
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
move QPrinterInfoPrivate to it's own header file;
rename qprinterinfo.qdoc to qprinterinfo.cpp to make it consistent with others;
squash the duplicated code into qprinterinfo.cpp;
avoid extra d_ptr assignments in the QPrinterInfo copying c-tor;
simplify the QPrinterInfo from QPrinter c-tor code;
fix styling and few method param names;
remove the `m_` prefix of QPrinterInfoPrivate's members (as they are members
of a private class anyway ;P)
remove the boilerplates
Merge-request: 2516
Signed-off-by: axis
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
use member initialization lists;
remove unused Q_DECLARE_PUBLIC stuff and q_ptr member; make members public instead
Merge-request: 2516
Signed-off-by: axis
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
since it is much much faster
Merge-request: 2516
Signed-off-by: axis
|
| |\ \ \ \ \ \
| |/ / / / /
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix the redirection of painting for the toolbar.
|
| | |/ / / /
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-16154
Reviewed-by: Samuel Rødal
|
| |\ \ \ \ \
| |/ / / /
|/| | | /
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
demos/declarative/minehunt/minehunt.pro
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/plugins/phonon/mmf/mmf.pro
src/s60installs/s60installs.pro
tests/auto/qapplication/test/test.pro
tests/auto/qgraphicsview/tst_qgraphicsview.cpp
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Clipping to a scaled QRectF was so far hitting the slow
code path in the raster paintengine that generates clip spans
for every line. This is not needed as we also clip translated
QRectF's to integer rects.
This patch does the same for scaled rectangles and ensures the
clipping really happens at the closest pixel boundary.
Reviewed-by: Samuel
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We can't use the qdrawhelper_sse.cpp or qdrawhelper_sse3dnow.cpp when
SSE is not run-time detected, as those are compiled with -msse and
MMXEXT is just a subset of SSE. The compiler might choose to use an
instruction not in the subset, causing a crash at run-time.
Task-number: QTBUG-15693
Reviewed-by: Thiago Macieira
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Use memcpy() instead of the generic conversion routines where both template
arguments are qrgb565. Yields a massive performance gain for tiling opaque
(background) images in WebKit on 16-bit displays.
This was previously restricted to Q_WS_QWS for some unknown reason.
Reviewed-by: Benjamin Poulain
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (67 commits)
Add expected failures for JS test suite on Symbian
Ensure ListView contentHeight is set to a valid size.
Revert "Add mirroring-positioners.qml example" that was accidentally pushed
Fix dragging Flickable back over start point.
Add mirroring-positioners.qml example
A QAIM model resulted in items moving to incorrect locations
Build on Symbian
refuse to open empty translation files
fix path separator matching
fix -dont-process for mingw cross-build
fix nonsense condition
Fix qwidget test crash
QmlViewer: Remove trailing whitespace
QmlViewer: Remove trailing whitespace
QmlViewer: Fix crash on exit
Don't include <features.h> directly: non-standard header.
Remove superfluous OpenGL linking for QtDeclarative
Corrected case on Symbian library.
Missing glyphs in GL when scaling QStaticText and QML text items
PathView: removing the currentIndex could make it invalid.
...
|
| | |\ \ \ \
| | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
configure
src/gui/graphicsview/qgraphicslayout.cpp
src/gui/text/qfontengine_s60.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qwindowsurface_gl.cpp
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The coordinates should be modulo the image width and height like for all
the other tiled blend functions.
Covered by perspectives.qps
Task-number: QTBUG-15837
Reviewed-by: Olivier Goffart
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Use the y coordinates to compute the y delta... This could cause
too fine (or too coarse) subdivision of cubic bezier curves, so
potentially both performance problems and visual artifacts.
Task-number: QTBUG-15660
Reviewed-by: Andreas Kling
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This reverts commit a9c0fbd5e946ae6e90b6db6dd4aea64c824a4066.
The subdivision code in the above commit messed up subdivision of
cubic beziers, so we have to revert it.
Task-number: QTBUG-15660
Reviewed-by: Andreas Kling
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QWingedEdge should reserve the amount of segments/edges/vertices in
relative to the element count instead of length of the QPainterPath
passed in. This problem is especially severe when QTextLayout using
it to calculate the region for full line selection highlighting,
because the region used QFIXED_MAX as right most coordinate, it will
cost more than 2 GB of memory allocated just for it (recorded by
valgrind on Mac OS X), and cause crash in systems short of memory.
Task-number: QTBUG-15823
Reviewed-by: Samuel Rødal
|
| |/ / / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Support pretransforming glyph coordinates for paint engines that don't
expect untransformed coordinates.
Task-number: QTBUG-15605
Reviewed-by: Samuel
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (100 commits)
Fix proxy reading from gconf so that it is only done once / session.
rebuild configure
fix misleading uppercasing deprecation warning
Enable Phonon on Symbian by default.
Disable OpenGL on Symbian only by default instead of always
VFP type on ARM option in Linux configure script
Adding -dont-process option to Unix configure script
Synchronized configure.exe OpenGL options with Unix configure
build lrelease as part of the "libs" part.
purge vestiges of imageformat-plugins
Unify epocroot usage in createpackage and patch_capabilities scripts
Update visual tests for the recent qmlviewer change
Do not use openGL on Mac OS X for QML visual tests
Give qmlviewer a minimum size if root object has no size.
Add 'Writing New Components' docs, and document the connect() function.
Mention that image providers should be added before loading QML files
Update QML visual tests
Cleaned up sis_targets.prf
Append qml import path individually for each available drive on Symbian
Update TextInput when echoMode changes.
...
|
| | |\ \ \ \
| | |/ / /
| | | / /
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
configure
qmake/generators/win32/msbuild_objectmodel.cpp
src/gui/image/qpnghandler.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/opengl/qgl_x11egl.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
