| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QPainter not restored correctly in Graphics View.
Setting QGraphicsItem::ItemClipsChildrenToShape forces ItemClipsToShape
Fix compilation
Fixed drawing of QPixmaps with masks in the GL 2 and X11 engines.
Fix warning on MSVC
QThread: make sure start works even if called after exit
Revert "Fixed painter path drawing on FBO without stencil buffer."
Fix a crash with D&d on mingw
Revert "Keep other text format with QTextOption::SuppressColors tag on"
Fixed stencil buffer on FBOs with OpenGL ES.
Keep other text format with QTextOption::SuppressColors tag on
QTreeView: do not scroll to top if last item is removed
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QPainter not restored correctly in Graphics View.
Setting QGraphicsItem::ItemClipsChildrenToShape forces ItemClipsToShape
Fix compilation
Fixed drawing of QPixmaps with masks in the GL 2 and X11 engines.
Fix warning on MSVC
QThread: make sure start works even if called after exit
Revert "Fixed painter path drawing on FBO without stencil buffer."
Fix a crash with D&d on mingw
Revert "Keep other text format with QTextOption::SuppressColors tag on"
Fixed stencil buffer on FBOs with OpenGL ES.
Keep other text format with QTextOption::SuppressColors tag on
QTreeView: do not scroll to top if last item is removed
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
World transform and opacity was sometimes not restored correctly after
drawing items.
Auto test included.
Task-number: Discovered while working on QTBUG-12760
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Problem was that setting ItemClipsChildrenToShape on an item resulted
in item itself being clipped to its own shape (ItemClipsToShape).
This commit also reduces state changes on the painter and re-uses the
clip whenever possible, which in turn means better performance for
items that clip children to shape.
Auto test included.
Task-number: QTBUG-12760
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix warning on MSVC
QThread: make sure start works even if called after exit
Revert "Fixed painter path drawing on FBO without stencil buffer."
Fix a crash with D&d on mingw
Revert "Keep other text format with QTextOption::SuppressColors tag on"
Fixed stencil buffer on FBOs with OpenGL ES.
Keep other text format with QTextOption::SuppressColors tag on
QTreeView: do not scroll to top if last item is removed
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Regression in 4.7.0 introduced by 13ca61fcfdc53a6a06a
Reviewed-by: brad
Task-number: QTBUG-13810
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When the last item is the current item and is removed,
QTreeViewPrivate::updateScrollBars() is called after QTreeViewPrivate's
viewItems member is cleared. This commit makes sure that viewItems is
restored by calling QTreeView::doItemsLayout() in this case, preventing
that the scroll bar range is set to zero temporarily and the view is
scrolled to the top unexpectedly (this was a regression in 4.7.0:
QTBUG-13567).
Merge-request: 2481
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
consistent. If index == count() the item should be appended.
Also, this should happen regardless of whether the list is empty.
|
|/ / / |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add a semi-private API to get QScriptEngine for a QDeclarativeEngine. So far the qmljsdebugger lib in QtCreator
accessed the script engine via QDeclarativeEnginePrivate. Replace this by a minimal API that is still in a
private header, where we nevertheless can make some BC checks/guarantees.
Aaron Kennedy agreed with the idea.
Task-number: QTCREATORBUG-2179
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Mitigate private header problems in QtCreator by adding semi-private API
Update QtDeclarative def files
Add exports for Bauhaus
Fix corkboards example for smaller screens
Fix easing example having wrong contentHeight
Fix a crash in QDeclarativeVisualDataModel
Small optimization for QDeclarativeVisualDataModel.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add a semi-private API to get QScriptEngine for a QDeclarativeEngine. So far the qmljsdebugger lib in QtCreator
accessed the script engine via QDeclarativeEnginePrivate. Replace this by a minimal API that is still in a
private header, where we nevertheless can make some BC checks/guarantees.
Aaron Kennedy agreed with the idea.
Task-number: QTCREATORBUG-2179
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-13754
Reviewed-by: Martin Jones
|
|\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |/
| |
| |
| |
| | |
the sensivity to additions of new calls to unimplemented qmake functions
to .prf files kinda sucks, so remove it.
|
|/
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
| |
Task-number: QTBUG-13653
Reviewed-by: aavit
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixes QPen dash offset for OpenGL paint engines (1.x & 2.x).
Support multisampled pbuffers under Windows.
tst_qpixmapfilter: Fix compilation in namespace
qtextcodec_symbian: Add few aliases
Give a warning in QPixmap::handle() if pixmap is not X11 class.
Make QStaticText honor QPainter::pen() for rich text on X11 w/raster
Fixed compilation of MeeGo graphics system without eglext.h
Fixed memory corruption issue in qt_blurImage for Indexed8 images.
|
| |
| |
| |
| | |
Reviewed-by: Samuel
|
| |
| |
| |
| |
| |
| |
| | |
If transposed was set to 0 we did not check the color depth of the image
and ended up with a buffer overflow.
Reviewed-by: Jens Bache-Wiig
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Make qml debugging work with command line arguments
Fix example after changes to font.letterSpacing.
Autotest and small fix for QDeclarativeFontLoader.
Improve error messages
Changes to objects returned from get() should emit itemsChanged() so
Make it clear that private ListModel constructor is only for worker
Remove duplicated move() implementations
Doc changes
Fix QDeclarativeXmlQuery mutex locking and don't wait for new jobs if the query has already quit
PathView didn't accept mouse events, preventing it from working in a Flickable.
Moving items in a PathView caused PathView.onPath to be set to false.
Fix worker agent to emit ListModel itemsChanged() correctly when set()
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The environment variables do not work for Symbian devices, so
without this change, QML debugging cannot be done on them.
In addition, configure now contains an option to disable qml
debugging entirely, due to it being a major security risk.
Reviewed-by: kkoehne
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
that the view is updated (currently the model data changes but the
view does not). In flat-model mode, get() now returns a
QScriptClass-type object so that changes to the returned object are
received, and for nested-model mode, the fix adds a
QDeclarativeOpenMetaObject subclass and ModelNode::listIndex so that
itemsChanged() can be emitted when the node data changes.
Task-number: QTBUG-12363
|
| |
| |
| |
| |
| |
| |
| |
| | |
Check that we no longer hold a reference to the item before setting
onPath to false.
Task-number: QTBUG-13689
Reviewed-by: Michael Brasser
|
| |
| |
| |
| |
| |
| | |
For change 82575a9f6123eed3e858 which fixed a behavioural regression.
Reviewed-by: Olivier Goffart
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QGraphicsEffect::sourceBoundingRect().
Context:
QGraphicsEffect::sourceBoundingRect() returns:
item->boundingRect() | item->childrenBoundingRect();
Problem was that item->childrenBoundingRect() adjusted the children's
bounding rect with the children's ancestor effects (child -> root item),
which means the source bounding rect was bigger than needed. We should
only account for effects downwards in the hierarchy.
root (has effect)
|
item (has effect)
|
child
|
grandChild
Auto test included.
Task-number: QT-3633, QT-3828
Reviewed-by: samuel
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
| |
Regression after: f5c5e20a
Problem was that the cached bounding rect was never invalidated. We can
also remove the cached bounding rect in QGraphicsEffectSource because
QGraphicsItem::childrenBoundingRect now clips by default. This basically
means partially reverting above commit and invalidate whenever
ItemClipsChildrenToShape flag changes.
Auto test included.
Task-number: Discovered while investigating QT-3633
Reviewed-by: samuel
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed regression in QPixmap::size() for null pixmaps.
Make test less sensitive to platform specifics
Doc: Further QML improvements.
Doc: Minor improvements to QML-related documentation.
The test livelock of QTimer is now expected to work
Make sure mapSelectionFromSource does not return a selection with invalid ranges.
QEventDispatcherUnix: do not process too many timer if other events need to be processed first
Doc: Continued work on the QML documentation.
Doc: More work on the QML documentation.
Doc: More work on the declarative API documentation.
Doc: Some editing and tidying up.
Doc: Added a missing file.
Doc: Fixed text in license headers.
|
| |
| |
| |
| |
| |
| |
| |
| | |
Zero timers on Windows are implemented using posted events, as are
QueuedConnections, making the QTBUG13633_dontBlockEvents test sensitive
to the order between invokeMethod() and starting a zero timer.
Reviewed-by: Olivier
|
| |
| |
| |
| |
| |
| |
| | |
Following the patch e3801c20bd3626c3c9c9fac110ee2f9e4269e3c8 of Olivier,
this test is working for Mac as well.
Reviewed-by: Olivier Goffart
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
ranges.
Similar for mapSelectionToSource, but that one could possibly be an assert instead.
Merge-request: 2474
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
be processed first
Task-number: QTBUG-13633
Reviewed-by: Brad
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Models with a single role also have a modelData property added. These
role names both ended up in a hash, resulting in only one or the other
updating. Now we handle modelData specially.
Task-number: QTBUG-13664
Reviewed-by: Michael Brasser
|
| | |
|
| |
| |
| |
| |
| |
| | |
to the base state.
Task-number: QTBUG-11834
|
|\ \
| |/
|/|
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Export QDeclarativeScriptAction
Completing the interface for children/data/resources
Unit tests for Bauhaus enablers
This patch allows modifications on PropertyChanges on the fly
|
| |
| |
| |
| | |
See 6454f4db1697af1d36ad4c0ea83ccd0bb490fd39
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix QTBUG-13501 - crash when a gesture is accepted but not consumed
Add test: assert when gesture is never accepted.
|
| |/
| |
| |
| | |
Test for Qt-Bug 13501.
|
|/
|
|
|
|
|
|
|
|
|
| |
Items with the ItemHasNoContents flag set are never drawn so the
'paintedViewBoundingRect' is never cached/updated resulting in
updates wrongly being discarded. The solution is to always invalidate
the children for such items.
Auto test included.
Task-number: QT-3803
|
|\
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
In ParentChange treat flip in x and y as a 180 degree rotation
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The two are equivalent, but flip doesn't work in ParentChange.
Task-number: QTBUG-13554
Reviewed-by: Michael Brasser
|
|\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (25 commits)
run depend_command even if the binary has no absolute path
fix scaleFactor/totalScaleFactor in QPinchGestureRecognizer
Added velocity property to the QPanGesture.
Changed the speed property on QSwipeGesture to velocity
fix typos in comment
unbreak test
Don't add generic subdirs project twice.
Remove debug, quiet warnings.
Fix memory leaks and valgrind errors.
QStroker: Fix erroneous SvgMiterJoin behavior for parallel lines
Revert "Properly implement qobject_cast for const pointers."
Bearer management: Fix compilation with namespace.
fetch next token after class definition opening
delay next token fetching when opening namespace
don't let operator overloads confuse us
don't try to show source when no locations are given
Implement a private API for setting title widgets
Fix the bug for QSettings on Windows, to store qint32/quint32, qint64/quint64 in Windows registry.
fix CRLF
Added private API to install an x11EventFilter
...
|
| | | |
|
| |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Don't add generic subdirs project twice.
Remove debug, quiet warnings.
Fix memory leaks and valgrind errors.
QStroker: Fix erroneous SvgMiterJoin behavior for parallel lines
Revert "Properly implement qobject_cast for const pointers."
Bearer management: Fix compilation with namespace.
fetch next token after class definition opening
delay next token fetching when opening namespace
don't let operator overloads confuse us
don't try to show source when no locations are given
Implement a private API for setting title widgets
Fix the bug for QSettings on Windows, to store qint32/quint32, qint64/quint64 in Windows registry.
fix CRLF
Added private API to install an x11EventFilter
NTLM code: Save domain in different variable
Update the error handling of invalid hostnames in QUrl.
Remove unsupported code from qobject.h for MSVC < .NET 2003
Properly implement qobject_cast for const pointers.
Revert "Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page"
|