| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
In the case where a polygon or polyline that contains consequtive equal
points, we end up calculating an invalid normal vector for the joins.
This fix skips past duplicate consequtive points.
Task-number: QTBUG-9548
Reviewed-by: Kim
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed caching of QPainter patterns in the GL 2 engine.
Fixes CursorChange and TooltipChange events delivery for QGraphicsWidget
QTableView: fix spans corruption when removing spans.
Fixes painting artifacts when scaling a QGraphicsProxyWidget.
Fix <MemLeak> valgrind report shows memory leak for QImage::save().
Fix test sql for sql server.
|
| |
| |
| |
| |
| |
| |
| | |
The patterns all got the same cache key (e.g. 1), which caused the
patterns to be uploaded as a texture every single time they were used.
Reviewed-by: Kim
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
As the documentation mentions, these two events are delivered
respectively after the cursor has changed and after the tooltip has
changed. These two events were previously delivered just before.
This patch is needed for fixing QTBUG-5349 even if it is not directly
related.
Auto-test included.
Reviewed-by: bnilsen
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- We should not do -1 after erasing, as it is done later on.
- We should consider the 0 height even if it is not the last span.
- Added an assert.
Task-number: QTBUG-9631
Reviewed-by: Gabriel
|
| |
| |
| |
| |
| |
| |
| |
| | |
Incorrect simple conversion of the exposed rect from QRectF to QRect
when rendering the widget.
Task-number: QTBUG-7296
Reviewed-by: bnilsen
|
| |
| |
| |
| | |
Reviewed-by: Marius Storm-Olsen
|
| |
| |
| |
| |
| |
| |
| |
| | |
Increased default buffer size and period size for windows.
11025monoS16LE was choppy, needed bigger periods.
Task-number:QTBUG-9101
Reviewed-by:Derick Hawcroft
|
| |
| |
| |
| |
| |
| |
| | |
record from different soundcards
Task-number:QTBUG-9221
Reviewed-by:Andrew den Exter
|
|\ \
| |/ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( e3dc4ef2b801d91e115c54f833fa7766d392ceda )
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
( e3dc4ef2b801d91e115c54f833fa7766d392ceda )
Changes in WebKit/qt since the last update:
* r51006 -- https://bugs.webkit.org/show_bug.cgi?id=31475 -- Crash in StringHash::equal due to unaligned string data
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix crash for multiscript text in QTextEngine::boundingBox()
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The logClusters pointer is already adjusted for the item, so it should
be indexed relative to the item, hence from 0 to itemLength-1. Adding
pos to the index would give us a random value for all script items > 0.
Thus this would sometimes crash for text that spanned several scripts,
since we would sometimes get a value back which was outside the bounds
of the glyph array.
Task-number: QTBUG-9374
Reviewed-by: Samuel
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed modal dialog not to have automatic "Exit" right softkey in S60.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
During softkey refactoring this piece of code get changes, but the
changed code did not work correctly if window had no softkey actions.
Switched back to old way where softkey source is stored to variable,
and windowType is asked from stored variable. If softkey source is
dialog or popup, "Exit" is not added automatically to RSK.
Task-number: QT-2203
Reviewed-by: Sami Merila
|
|/ / / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QtMultimedia backend for Windows
-Added 8000 as long as another frequency is available.
-options available changed from hard-coded to detected options.
Task-number:QTBUG-9100
Reviewed-by:Derick Hawcroft
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Removed state change from close() function, should be set by caller
depending on context.
Task-number:QTBUG-9357
Reviewed-by:Dmytro Poplavskiy
|
|\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Implementing QFontEngineS60::getSfntTableData()
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
That function was not yet implementing. Its absense caused some
Harfbuzz based shaping not to happen.
See Robert DeWolf's comment on task QTBUG-5857
Since QFontEngineS60 is private implementation and generally not
exported, no symbols need to be added to the .def files for this patch.
Task-number: QTBUG-5857
Reviewed-by: trustme
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 544
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 544
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix crash in the fileiconprovider for Windows
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In some cases the fileiconprovider has been reported to crash
while accessing icons with overlays. This situation got
worse with change b67bd25be08b54c3e6e49b2b9429e54ff58db268
since these cases were often hidden by broken caching.
The workaround for now is to simply check that the hIcon structure
is non empty before converting the icon.
Task-number: QTBUG-8324
Reviewed-by: ogoffart
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Ensure Phonon MMF backend emits aboutToFinish
Remove compiler warning
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
It seems that, after a call to CMdaAudioPlayerUtility::SetPosition,
the reported position values are slightly lower than they should be.
This, combined with the fact that the backend emitted aboutToFinish
from its timer tick slot, means that the aboutToFinish signal is
sometimes not emitted at the end of an audio clip, if the position
has been advanced by seeking during playback.
This patch adds a check in the implementation of the
MMdaAudioPlayerCallback::MapcPlayComplete callback - if, at this point,
aboutToFinish has not been emitted, it is emitted now.
Task-number: QTBUG-9368
Reviewed-by: trustme
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
RVCT complains that a non-POD type (VideoParameters) is passed through
the TRACE_ENTRY ellipsis, when building in debug mode.
Reviewed-by: trustme
|
|\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix compile error with QT_NO_NETWORKDISKCACHE in QtNetwork
Fix crash when using qDebug() on a QBrush with Qt::TexturePattern style.
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 2332
Reviewed-by: Peter Hartmann
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 541
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
|\ \ \
| |/ / |
|
| |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Revert "Add a children private property needed for QML to support QGraphicsObject"
Revert "struct -> class, it's better."
Revert "Add NOTIFY to size property so QML bindings are working fine."
Revert "Better handling for NOTIFY in QGraphicsWidget regarding geometry changes"
Revert "Add a a layout property in QGraphicsWidget."
Add a workaround for a bug in Mac filesystem watcher.
Another "off by 1" problem in OpenVG - in paths this time.
Doc: Added links and notes to modules, ActiveQt and XMLPatterns docs.
Compile on MingW
struct -> class, it's better.
Add a a layout property in QGraphicsWidget.
Fix QFileSystemModel to not install useless watchers on the filesystem
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QGraphicsObject"
This reverts commit 4be83fa7337c5a4eb7b0ce085aa5854af5d33252.
Conflicts:
src/gui/graphicsview/qgraphicswidget.cpp
This drops the support of QML on top of 4.6
|
| | |
| | |
| | |
| | | |
This reverts commit 1d094129c0c3994df4e59cd9eda6981a7b131903.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This reverts commit 79a02c86c445e50630bcae62a4505f212281ec8b.
Conflicts:
src/gui/graphicsview/qgraphicswidget.cpp
This drop the support of QML on top of 4.6
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
changes"
This reverts commit 13bccd4ade76dd8a9c1cc067cc2b8da69c11def2.
Conflicts:
src/gui/graphicsview/qgraphicswidget.cpp
Drop the support of QML on top of 4.6
|
| | |
| | |
| | |
| | |
| | |
| | | |
This reverts commit 87fae30fc63460e0ed2cc98f55a22e28d7520311.
This drop the support of QML on top of 4.6
|
| | |
| | |
| | |
| | | |
Reviewed-by:TrustMe
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QS60Style: Custom QPushButton: Heigth is calculated wrongly
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If button contains a layout with widgets instead of having direct label
and icon, QS60Style calculates the size of the content incorrectly.
This is regression for a fix to QTBUG-7586. Now style ignores orginal
size of pushbutton and tries to calculate correct height by itself.
Issue is fixed by selecting teh bigger of orginal height and calculated
height.
Task-number: QT-3197
Reviewed-by: Alessandro Portale
|
| |_|/
|/| |
| | |
| | |
| | | |
Task-number: QTBUG-9450
Reviewed-by: Sarah Smith
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Summary so far: paths and images do not need the 0.5 adjustment
to the transform, but glyphs do. Not sure why glyphs do, but the
fonts definitely look wrong without the adjustment.
Task-number: QT-3192
Reviewed-by: trustme
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Doc: Added links and notes to modules, ActiveQt and XMLPatterns docs.
Compile on MingW
struct -> class, it's better.
Add a a layout property in QGraphicsWidget.
Fix QFileSystemModel to not install useless watchers on the filesystem
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Compile on MingW
struct -> class, it's better.
Add a a layout property in QGraphicsWidget.
Fix QFileSystemModel to not install useless watchers on the filesystem
|
| | |\ \ |
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by:TrustMe
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by:michael brasser
|
| | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix QFileSystemModel to not install useless watchers on the filesystem
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
When someone call setRootPath we need to remove the previous watcher.
This save memory and also it avoids Qt Creator to run out of filesystem
watcher which then leads to a crash. If you call setRootPath on the
previous path all changes that might happen in between will be propagated
in the model.
Task-number:QTBUG-8632
Reviewed-by:Friedemann Kleint
|