| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
| |
Merge-request: 629
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Allow GNU Free Documentation license header.
Add missing license header.
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to ab9a897b688e991a8405cf938dea9d6a2f1ac072
Fix example compile and runtime warnings, webkit examples not built.
qgl_cl_p.h is no longer existent
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 5699175f55acbdfa4ac95ab6c727ebd4a201f3a2
Doc: Fixed documentation errors.
doc: Added more DITA output to the XML generator
doc: Fixed type of Package::name
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 508b02a252b524d34f3ed970eef3bdb6350a2b77
Fix for emitting changed signal in QClipboard
Fixed tst_QNetworkDiskCache creating badly named directories.
Specialize peek() for QBuffer
Documentation changes to QTextLayout.
Doc: Updated example license to three clause BSD license.
|
| | |
| |
| |
| | |
Reviewed-by: Trust Me
|
| | |\ |
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to ab9a897b688e991a8405cf938dea9d6a2f1ac072
Fix example compile and runtime warnings, webkit examples not built.
qgl_cl_p.h is no longer existent
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 5699175f55acbdfa4ac95ab6c727ebd4a201f3a2
Doc: Fixed documentation errors.
doc: Added more DITA output to the XML generator
doc: Fixed type of Package::name
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 508b02a252b524d34f3ed970eef3bdb6350a2b77
Fix for emitting changed signal in QClipboard
Fixed tst_QNetworkDiskCache creating badly named directories.
Specialize peek() for QBuffer
Documentation changes to QTextLayout.
Doc: Updated example license to three clause BSD license.
|
| | | |/
| |/|
| | |
| | | |
Reviewed-by: Trust Me
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
ab9a897b688e991a8405cf938dea9d6a2f1ac072
From Andreas Kling <andreas.kling@nokia.com>:
* Unbreak _HB_OPEN_Get_Device() and Get_ValueRecord()
|
| | | |
| | |
| | |
| | | |
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
|
| | |\ \ |
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Merge-request: 695
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
5699175f55acbdfa4ac95ab6c727ebd4a201f3a2
Author: Andreas Kling <andreas.kling@nokia.com>
Date: Fri Jun 18 16:10:31 2010 +0200
Make HB_AnchorFormat3's Device tables a pointer array
Saves sizeof(pointer) * 1 when the font doesn't have these tables.
Cuts resident memory consumption by 40kB when loading qt.nokia.com
in QtWebKit.
Signed-off-by: Simon Hausmann <simon.hausmann@nokia.com>
|
| | | |\ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Alan Alpert
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
508b02a252b524d34f3ed970eef3bdb6350a2b77
* Andreas' compression for HB_ValueRecord
* Re-enable packing for RVCT
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When the app that owns the selection quits and there is no clipboard manager
running we emit the changed signal whenever the timestamp of the event we got
is greater than our timestamp.
Task-number: QTBUG-8157
Reviewed-by: Thiago Macieira
Author: Luboš Luňák
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This code was intending to create a uniquely named directory containing
the PID of the test, but it was accidentally creating a directory
with a name possibly containing unprintable characters.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This avoids going through the generic implementation in QIODevice
and avoids a 16kB buffer allocation from QIODevicePrivateLinearBuffer.
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
More cxxFunction stuff for member functions.
Task-number: QTBUG-11391
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | | |
integration
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
- Improves quality of English in some cases
- Removes some redundant redundancy
Generally makes it more pleasant to read, IMHO.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Trust Me
|
| | |\ \ \ \ \ |
|
| | |\ \ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
See change 8f47373e3795d7ec50387d5f1a771a59567bdaea for context.
Reviewed-by: Trust Me
Requested-by: Legal
|
| |\ \ \ \ \ \ \ \
| |_|_|_|_|_|_|/
|/| | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Start the implementation of in-place recoding for images
Fix a possible crash with the EVR video renderer in windows
Don't do opaque detection when copying a sub-rect of a QPixmap.
Optimized QPixmap::fromImage for raster pixmaps.
Doc: Small change to QAbstractItemDelegate::editorEvent()
Typo in qcleanlooksstyle.cpp
Doc: Specified QAbstractEventDispatcher::filterEvent()'s argument types.
Speed up calls to QPainter::setCompositionMode when the mode is unchanged
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Currently, with the graphics system raster, converting from images
to QPixmap often needs to allocate a new image to convert the right
format.
For example, for an image in ARGB32 of 10 mbytes, we need to allocate
a second image of 10 mbytes in ARGB32_PM to convert the source image
in the right format for pixmap.
This can create a hight peak of memory, and is a bit slower
than it should.
This patch introduce in-place conversion of images when they are
loaded with QPixmap::loadFromData().
The images are loaded in their default format by QImageReader,
and are then converted in-place, trying to reduce memory
allocations.
Reviewed-by: Samuel Rødal
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This can happn when the component can be instanciated but not all
the services are available on it. The code is now more robust.
Reviewed-By: gabi
|
| | |\ \ \ \ \ \ \
| | |_|_|_|_|_|/
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Don't do opaque detection when copying a sub-rect of a QPixmap.
Optimized QPixmap::fromImage for raster pixmaps.
Doc: Small change to QAbstractItemDelegate::editorEvent()
Typo in qcleanlooksstyle.cpp
Doc: Specified QAbstractEventDispatcher::filterEvent()'s argument types.
Speed up calls to QPainter::setCompositionMode when the mode is unchanged
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
If the pixmap is non-opaque in the first place most likely a reasonably
sized sub-rect is also non-opaque, so this check is a waste in 90 % of
the cases.
Reviewed-by: Gunnar Sletta
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
If we know that the QImage is ARGB32 or ARGB32_Premultiplied and doesn't
contain any alpha pixels we can treat it as RGB32 when doing the
conversion.
Reviewed-by: Gunnar Sletta
|
| | | |\ \ \ \ \ \ |
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Task-number: QTBUG-11506
|
| | | | |\ \ \ \ \ \ |
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Avoid marking the composition mode as dirty and calling into the
extended engine if the composition mode that the application wants to
set is the same that's currently used.
Reviewed-by: Gunnar
|
| | | |/ / / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Task-number: QTBUG-2446
Reviewed-by: Marius Bugge Monsen
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Task-number: QTBUG-10904
Reviewed-by: Morten Engvoldsen
|
| |\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
|/| | | | | | | |
| | | | | | | | |
| | | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
Updated WebKit to 6623b5da196390748dc619461739f9cb84524736
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Integrated changes:
|| <https://webkit.org/b/38401> || Make repaint throttling parameters configurable runtime. ||
|| <https://webkit.org/b/40073> || [Qt] rendering error in mediawiki ||
|| <https://webkit.org/b/36463> || Spatial Navigation: make it work with focusable elements in overflow content ||
|| <https://webkit.org/b/39857> || GIFs loop one time too few ||
|| <https://webkit.org/b/36818> || [Qt] Animated GIF images does not animate 10x as expected by default. ||
|| <https://webkit.org/b/37844> || [Qt] Image::drawTiled animations does not work ||
|| <https://webkit.org/b/40567> || [Qt] QtWebKit crashes while initializing flash plugin 10.1.53.64... ||
|| <https://webkit.org/b/39439> || Spatial Navigation: using offset{Left,Top} is not enough to get the proper inner frames position ||
|| <https://webkit.org/b/39195> || Spatial Navigation: refactor scrollInDirection to work with scrollable content ||
|
| |\ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|/
| |/| | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
doc: Added more DITA output to the XML generator
Usefully convert from QtScript object/array to QVariant
document QSslSocket::systemCaCertificates() change in changelog
Implement QIODevice::peek() using read() + ungetBlock().
Allocate the memory for QtFontSize when count > 1
doc: Added more DITA output to the XML generator
Defer allocation of GIF decoding tables/stack.
Make sure only started gestures can cause cancellations
Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-16062010 ( 8b2d3443afca194f8ac50a63151dc9d19a150582 )
qmake: Fix CONFIG += exceptions_off with the MSVC project generator.
Fix some kind of race condition while using remote commands.
Work around ICE in Intel C++ Compiler 11.1.072
Reduce the memory consumption of QtFontStyle
|
| | |\ \ \ \ \ \ \ \ |
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
For arrays, the conversion would crash if the array was cyclic.
Introduce a set that keeps track of which objects are being
converted, and return an empty list when a cycle is detected.
For other types of objects, the object was previously attempted
to be converted to a primitive, which typically meant you would
get the string representation ("[object Object]"), since most
(practically all) objects can be converted to a string -- not
useful at all.
Change the conversion so it converts the object to a QVariantMap
instead. This was already done for slots that took a QVariantMap
as argument, but only one level deep. Make the conversion recursive,
using the same mechanism as for arrays to detect cycles.
This change also means that you get a meaningful
JS object => QVariant => JS object roundtrip.
It also aligns the behavior with the Qt WebKit bridge.
Update the documentation to describe the new behavior.
The 4.7 changelog will also be updated under "important behavioral
changes".
This change exposed an issue with one of the QML autotests: A JS
object was assigned to a QVariant property, which caused it to be
converted to a string (rather than a QVariantMap) -- just shows
that the previous behavior was unintuitive). Later, this variant
property is compared to another object, the intention being to
compare the _properties_ of the two objects; but because the variant
property contained a string, this would cause the other operand
(object) to be converted to a string as well ("[object Object]"),
causing a meaningless test pass.
Change the test to deserialize both objects using JSON.stringify,
and compare the resulting strings, so that actual
JS object => QVariant(Map) => JS object roundtrip is tested (the
intention).
Task-number: QTBUG-3511
Reviewed-by: Olivier Goffart
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Reviewed-by: Zeno Albisser
|
| | |/ / / / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
More cxxFunction stuff for member functions.
Task-number: QTBUG-11391
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
The previous implementation was doing ungetChar() in a loop.
Task-number: QTBUG-9654
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: mread
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
This fix a regression introduced by
71ba2b0973d291e991e1498c266e69d6640c8531.
In the case count >= 1 && count < 8, no memory is allocated.
Reviewed-by: Andreas Kling
|
| | |\ \ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
doc: Added more DITA output to the XML generator
Defer allocation of GIF decoding tables/stack.
Make sure only started gestures can cause cancellations
Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-16062010 ( 8b2d3443afca194f8ac50a63151dc9d19a150582 )
qmake: Fix CONFIG += exceptions_off with the MSVC project generator.
Fix some kind of race condition while using remote commands.
Work around ICE in Intel C++ Compiler 11.1.072
Reduce the memory consumption of QtFontStyle
|
| | | |\ \ \ \ \ \ \ \ |
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
WebKit creates many image readers but will only retrieve the dimensions
until the image itself is actually needed (i.e appears in the viewport.)
This avoids allocating 16kB per GIF image until it's time to actually
decode it.
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
The design is that calling setGestureCancelPolicy on the gesture
that is in starting state, and is accepted can cause other gestures
to be cancelled.
So change the logic to follow this, which means we won't try to execute
the cancel strategy if the gesture was never accepted and avoid the
crash detailed in the task.
Reviewed-by: Denis
Task-number: QTBUG-9771
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
to javascriptcore-snapshot-16062010 ( 8b2d3443afca194f8ac50a63151dc9d19a150582 )
Integrated changes:
|| <https://webkit.org/b/37195> || JSC's currentThreadStackBase is not reentrant on some platforms
|
