| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Task-number: QTBUG-4041
Reviewed-by: Morten Engvoldsen
|
|
|
|
| |
Task-number: QTBUG-10210
|
|
|
|
| |
Task-number: QTBUG-10640
|
|
|
|
| |
Task-number: QTBUG-6394
|
|
|
|
| |
Task-number: QTBUG-10951
|
|
|
|
|
|
|
|
| |
The meaning of the destinationChild parameter differs when moving
down in the same parent, contrary to statements by the previous docs.
Reviewed-by: Olivier Goffart
Merge-Request: 600
|
|
|
|
|
|
|
|
| |
Add environment variable switch for graphicssystem so a default can be set
at runtime without passing a command-line parameter.
Merge-request: 622
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
If you have two non-sharing GL contexts and try to draw the same
QPixmap in both of them, they will wind up competing for a spot in the
texture cache. Make the context group a part of the cache key to avoid
that.
Task-number: QT-3462
Reviewed-by: Kim
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
With a null rect argument, QGraphicsItem::scroll() is supposed to scroll
the whole item. When using ItemCoordinateCache, currently the only
supported mode for scroll optimization, we simple scrolled the whole
cache pixmap. Problem: The cache pixmap has a border of 2 pixels. So we
scroll the contents _and_ the border. This leaves white/transparent
horizontal and vertical line artifacts when scrolling.
This change unifies the two cases - partial and full scrolling - into
one (shorter) approach that works without scrolling the margin as well.
Reviewed-by: Alexis Menard <alexis.menard@nokia.com>
|
|
|
|
| |
Reviewed-by: paul
|
|
|
|
|
|
|
|
|
|
|
| |
QGraphicsItem::scroll() scrolls the cache pixmap when cacheMode is
enabled (for ItemCoordinateCache only). Because the pixmap exists both
in the cache and in a temp QPixmap copy, the ref count is 2, so the
scroll operation has to do a deep copy. To avoid this, we remove the
pixmap from the cache before and reinsert it again after calling
QPixmap::scroll().
Reviewed-by: Alexis Menard <alexis.menard@nokia.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (21 commits)
Doc: Fixed an off-by-one error in an example.
Fix QT_NO_TEXTHTMLPARSER
Fix QT_NO_DOM
Fix QT_NO_TEXTSTREAM compilation errors.
Fix QT_NO_VALIDATOR compilation.
Doc: Removed a misleading sentence about a class constructor.
Doc: correcting docs in QDrag::exec
Doc: Adding note about QDrag::exec()
Revert behavior of QTextLayout::boundingRect() when line width is set
Fix unreasonably large width of QTextLayout::boundingRect()
Doc: replacing old image
Fix compilation with stricts compilers.
Fix QT_NO_DIRMODEL build error in QtDeclarative.
Revert "Added native key support to QSharedMemory API."
Revert "Improved documentation for QSharedMemory's key/setKey functions."
Fix a simple mistake in QXmlStreamReader::atEnd() docs.
Improved documentation for QSharedMemory's key/setKey functions.
Added native key support to QSharedMemory API.
Make test work with shadow builds again.
Doc: Corrected the documentation about the compression threshold.
...
|
| |\ |
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 644
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 2395
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
|
| | |\
| | | |
| | | |
| | | |
| | | | |
Merge-request: 649
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge-request: 647
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge-request: 648
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
|
| | | | |
|
| | |\ \ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
In change 817469519a784b1cc84f89cb3cb84f7560874f8e, there was a
behavioral change which can cause regressions, as the bounding rect of
the QTextLayout would previously return the set line width when this
was greater than the calculated natural text width. We revert to this
behavior to avoid regressions and add an autotest for it. When the
line width is not set (and si.width is equal to QFIXED_MAX), then we
will still return the natural text width.
Reviewed-by: Lars
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When no lineWidth is set on the QTextLine, the QScriptLine::width will
be the maximum value that can be represented by QFixed, thus always
overriding the width of the bounding rect. The lineWidth of the
QTextLine should never be used as the width of the bounding rect, since
it's not a calculated value. The real bounding rect is found by querying
the natural text width.
Task-number: QTBUG-11104
Reviewed-by: Rhys Weatherley
|
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | | |
Adding note to the QDrag::exec docs alerting the user about Windows speciffic behaviour.
Task-number: QT-640
|
| | |\ \ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Base class is type-dependent. One must not use unqualified-id to access base member.
Reveiwed-by: Roberto Raggi
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
Merge-request: 652
Merge-request: 652
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
|
| | |/ /
| | | |
| | | |
| | | | |
Task-number: QT-1520
|
| | | |
| | | |
| | | |
| | | | |
This reverts commit 9b4ff3deb28b3d642dc4480207f2f23841cf26e9.
|
| | | |
| | | |
| | | |
| | | | |
This reverts commit 26f3dbf0e20dbaf131bbbb35440b1ecb40b3f405.
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge-request: 655
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Methods setNativeKey() and nativeKey() were added to
QSharedMemory API. Shared memory's native key is returned
by nativeKey() and it is set with either setKey() or
setNativeKey(). setKey() leads to a native key that is
platform independent while setNativeKey() directly sets
the native key without any mangling.
When using setNativeKey(), key() returns a null string
and shared memory's system semaphore is not set. This
means that is up to the user to define a such protection
mechanism (i.e. lock() can't be used on native keys).
QSharedMemory tests were updated.
Merge-request: 1497
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Broken by 0cdf33e9acb00b8f3654e8268253a3fb7c5db92c, which assumes the
binary and sources are in the same directory. The fix reverts the code
back to how it was in 4.5 (where it still works with shadow builds).
Reviewed-by: Denis Dzyubenko
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
Task-number: QTBUG-10854
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
Task-number: QTBUG-10479
|
| |\ \ \ |
|
| |\ \ \ \ |
|
| |\ \ \ \ \ |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Trust Me
|
|\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Remove stray debug
|
| | | | | | | | |
|
|\ \ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix multithreaded use of bearer management on Symbian.
Fix up cancelling of active object.
Fix locking after merge from Qt Mobility.
|
| |\ \ \ \ \ \ \ \ |
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Move more initialization code into initialize() function.
The constructor for the SymbianEngine class can be called from any
thread. Move all initialization into initialize() function which is
guarinteed to be run in the main thread. This is required as some
Symbian resources are not shared between thread in the same process.
The implementation of the defaultConfiguration() function could only be
called from the main thread. Cache a copy of the default network
configuration when the configurations are updated and just return this
when the defaultConfiguration() function is called.
Only lock the engine mutex from external entry points.
Remove need for locking in waitRandomTime() function. Prevents dead
lock due to nested event loop.
Task-number: QTBUG-10296
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Task-number: QTBUG-10296
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Simplify locking by using inline getter functions.
Task-number: QTBUG-10296
|
|\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Add notifier for PathPercent.value
Fix example
|
| | | | | | | | | | | |
|
| | | | | | | | | | | |
|