| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Do not call invalidate from activateRecursive().
This resulted in that a layout was invalidated as many times as there
were items in the layout.
* Several improvements. Do not call resize(size()) too often.
Calling resize() from the widgetEvent() is not very nice though...
* Remove commented out code
* make sure layout is activated even if the widget does not change size
* activate the layout if the resize is same as size()
* In order to not break existing apps, make this an opt-in feature
with QGraphicsLayout::setInstantInvalidatePropagation(true);
Reviewed-by: Frederik Gladhorn
Reviewed-by: John Tapsell
|
|\ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Bump Qt version to 4.7.3
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| |\ \ |
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix unstable qdeclarativeflickable test.
Update TextEdit's visible selection when only the anchor changes.
Set correct initial value for TextEdit and TextInput canPaste property
|
| | | | |
| | | | |
| | | | |
| | | | | |
Change-Id: I81b02147f88e948e3f3a663de0390893f8349fd9
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
At the limits of a TextEdit's text a key press can change/reset the anchor
position without changing the cursor position. Checking the cursor position
alone isn't enough to determine the selection hasn't changed.
Change-Id: Ic425ac0c06897d77e9c86b907ff10b39d78dd7a1
Task-number: QTBUG-17982
Reviewed-by: Martin Jones
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Change-Id: Ied5b257305fa68db64fcf270ad2a42f691fbdca2
Task-number: QTBUG-17765
Reviewed-by: Martin Jones
|
| | |\ \ \
| | | | |/
| | | |/|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix possible bearer management Crash with Panic E32USER-CBase, 69
QNetworkCookie: fix quoted values
Fix for QTBUG-17746. Quotes is retained in cookie value
Unsuccessful unlocking of QNetworkConfigurationPrivate mutex
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Do not strip quotes etc. from cookie values; from the RFC 2109:
"The VALUE is opaque to the user agent (...)".
In addition, escaped quotes are allowed in quoted values.
Reviewed-by: Markus Goetz
Task-number: QTBUG-17746
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When using TV-out, the TV display can be used as an independent screen.
By default the content shown there is a clone of the device screen,
however from now on parenting a widget to QDesktopWidget::screen(1)
and calling show() will turn off cloning and have the widget shown
instead. screenCount() and the screenCountChanged signal can be used
to detect the availability of the secondary display, just like on other
platforms.
Task-number: QT-830
Reviewed-by: Sami Merila
Reviewed-by: Jani Hautakangas
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QT-4632
Reviewed-by: Jani Hautakangas
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QNativeImageHandleProvider is a thin interface consisting of get()
and release() functions. Pixmaps constructed with such a provider
will call these functions to acquire and release a native handle,
e.g. a CFbsBitmap or RSgImage pointer in case of Symbian. The behavior
is largely similar to constructing pixmaps via fromSymbianCFbsBitmap
or fromSymbianRSgImage, with the exception of pixmap hibernation:
release() (and subsequently get()) is guaranteed to be called also
in case of hibernation, allowing more fine-grained tracking of
the usage and lifetime of image data.
Task-number: QT-4632
Reviewed-by: Jani Hautakangas
|
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Enable readback of pixel data for pixmaps that are constructed directly
from a VGImage. These do not have any backing data in main memory
(i.e. 'source' is null), however certain operations, like toImage(),
fill(), or painting into the pixmap do not work without it. With this
patch the data is read back via vgGetImageSubData when needed.
Task-number: QT-4669
Reviewed-by: Jani Hautakangas
|
| |\ \ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix TextInput auto test failure on mac.
Fix word selection locking on string boundaries.
Fix potential crash in QTextControl.
QDeclarativePropertyMap::keys() cannot be called from qml
Compensate for horizontal scroll in TextInput micro focus.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Disable auto scroll so the relative position of the text isn't
changed when inserting text and changing the cursor position.
Change-Id: I6a18e91e98014f1e94216bc85241ebb0d604dd84
Reviewed-by: Bea Lam
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QTextBoundaryFinder will return the position -1 if it reaches the end
of a string without finding a boundary, reset the cursor and anchor
to 0 or the string length as appropriate in those cases.
Also allow selection to lock onto the string limits as if they were
words.
Change-Id: Ie9d233967c73eb6a61f19c76494f04bca18612f8
Task-number: QTBUG-17860
Reviewed-by: Martin Jones
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Not allow create dynamic properties which are same with existing method (method, signal, slot) names.
Change-Id: I0ae64c8a6a89ef4f7614169088f7c005edad40b0
Task-number:QTBUG-17868
Reviewed-by:Martin Jones
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Return the adjusted cursore rectangle rather than the one
returned by QLineControl.
Change-Id: I343ecdb47ef2ea59519c8d155bbb9917d9c8ce56
Task-number: QTBUG-17864
Reviewed-by: Martin Jones
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Position the TextInput cursor correctly after IM text is commited.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If text is removed before the cursor position decrement not increment
the cursor by the by the difference.
Change-Id: If9558c88157cc884652af7aaf9bd5fad0ea822d8
Task-number: QTBUG-17863
Reviewed-by: Martin Jones
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Make the TextInput cursorRectangle relative to the item.
Don't assert if font engine creates new glyphs
Doc: remove experimental GestureArea from contents and add PinchArea
Add QML file for TextEdit positionAt test.
Don't return positions within preedit text from positionAt().
Add an is input method composing property to TextEdit and TextInput.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The rectangle returned was relative to the text and didn't adjust for
horizontal scrolling.
Change-Id: I09227d73bbd8b32d830744d5911d785246051c2f
Reviewed-by: Martin Jones
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Change-Id: Id18f58822f990788b511cbce02f8e4cf7d787c21
Task-number: QTBUG-14734
|
| | | |
| | | |
| | | |
| | | | |
Change-Id: I4632f77f87e8ced55a9959baaebd2b1624d0b568
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Preedit text isn't visible outside the inner workings of the Text
elements so any position returned that is greater than the current
cursor position is invalid.
Change-Id: I433fc635dcd6d087bde13fc47a1a92e4222a3b2c
Task-number: QTBUG-17834
Reviewed-by: Martin Jones
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Allows input handling to be disabled or changed while an input method
is active. This might be used to allow mouse events through to the element
or in conjunction with the cursor position to determine whether a click
occurred on the preedit text.
Change-Id: I35e148691920579c1d7c6f27b7e805d9551beadd
Task-number: QTBUG-17835
Reviewed-by: Martin Jones
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: TRUSTME
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
|
| | |\ \ \
| | | |/ /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix FolderListModel test - set folder to one containing files.
Drag over bounds errors when ListView has variable height content
FolderListModel emitted incorrect rowsRemoved range causing crash.
fix/improve docs for new QtQuick 1.1 attributes
Fix test instability.
Document BorderImage::asynchronous
Ensure layout is updated when section property changes.
QDeclarativeDebug: Export needed symbols on Symbian
Add a 'CursorPosition' parameter to TextInput.positionAt().
Fix qmlviewer compilation on old Symbian platforms
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Change-Id: I95aabd35c3a33b603aa3b11130ddea5f5c101ce9
Task-number: QTBUG-17775
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
There are two related problems:
- when dragging variable height content up beyond bounds items are
destroyed, causing the maximum extent to change, which in turn causes
skipping. This is fixed by storing the extents on press so that later
changes do not affect drag behavior.
- when variable height content is dragged beyond the bounds and
and released, items are created as the view returns to bounds. This
changes the extents, however the bound target was not updated. If the
viewport height changes during fixup the bounds animation is now
updated.
Change-Id: Ib37ec9e51f8ceb71af1e2e58f25fd8da18dcd632
Task-number: QTBUG-17769
Reviewed-by: Michael Brasser
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
beginRemoveRows() takes the first and last index as parameters, but
it was passing count rather than count-1 as the last index.
Change-Id: I81a6fbf085acacf5f8c1ca847b0bdc826bcf405b
Task-number: QTBUG-17775
Reviewed-by: Bea Lam
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Allow the asynchronous view changes to complete before testing section
positions.
Change-Id: I09c7592205b6e3c55807ec1c5aa4b09f9cd8b92c
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When the section property changed the sections were recalculated,
but the items were not relayouted.
Also avoid 'Unable to assign undefined value' warning by setting
section item parent before component is completed.
Change-Id: I7bd8eb369877a6faf72b32b80b45a68366c95772
Task-number: QTBUG-17759
Reviewed-by: Michael Brasser
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Specifies whether positionAt should resolve to the nearest position
between characters or the position of the nearest character.
Change-Id: I9eb2db2f8dd2accb2d9844ff204fba0337e71876
Task-number: QTBUG-16070
Reviewed-by: Martin Jones
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix Mac synthesized italic fonts clipping issue for QGLWidget
Fix cursor position adjustment when removing strings
Fix out of bounds handling in Mac shaper
|
| | | |\ \ \ |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Commit 0ba1b4d0 introduced a regression to QTextDocument: it postponed
cursor position adjustment until the move operation is done, but
contentsChanged will be triggered by finishEdit() in this move
operation, thus cursor positions in this signal handler will be in
inconsistent states (normally we should first update cursor position
then trigger contentsChanged). In this case we should also postpone
finishEdit() handling after cursor positions have been adjusted, then
the states expose to applications will be consistent.
Task-number: QTBUG-15857
Reviewed-by: Eskil
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
After ensure space, local QGlyphLayout variable should be updated to
the moved address.
stringToCMap returns true for success, so stringToCMapFailed should
be the reverse of the return value.
Out of bounds happened quite often in all situations using the
QStackedTextEngine, because the memory allocated at the first time
is usually not much, making it easier to trigger out of bounds in
shaping. But it can also happen when using normal QTextLayout.
Test it by comparing the width returned by normal QTextLayout and
the width returned by QTextLayout created from QStackedTextEngine
via QFontMetricsF.
Task-number: QTBUG-16648
Reviewed-by: Eskil
|
| | |\ \ \ \ \
| | | | |_|_|/
| | | |/| | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Make QtScript support COLLECT_ON_EVERY_ALLOCATION define
Add missing API shims to QScriptValue constructors
Don't crash when marking arguments object of native context
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
JSC assumes that the callee is always valid, since JSC::Arguments
is used for JS frames, which must have a callee.
But we use JSC::Arguments for arguments object of
pushContext()-created contexts, and then there is no callee.
But the callee member can't be null, so now we put a fake callee
there and make sure it doesn't bleed up to the public API.
Alternative solution: Add "if (d->callee)" to
JSC::Arguments::markChildren(), then no other changes would be
needed. But we don't want to patch JSC any more.
Non-solution: Subclass JSC::Arguments and reimplement
markChildren() to temporarily set a dummy callee during marking.
Can't be done, as JSC::Arguments::d is private (again, we don't
want to patch JSC).
Task-number: QTBUG-17788
Reviewed-by: Olivier Goffart
|
| | |\ \ \ \ \
| | | |/ / / /
| | |/| / / /
| | | |/ / /
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QSortFilterProxyModel::reset() should invalidate.
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This was broken by: d149a3faca9b97ce806249bc7ef73fe2f59589d5
The connection was removed in that commit because we did not want
the layoutChanged signal to be emitted. So instead of calling
invalidate(), we call clearMapping() directly.
In order to do that, clear_mapping has been turned into a private slot
Task-number: QTBUG-17812
Reviewed-by: Gabriel
|
| | |\ \ \ \
| | | | |_|/
| | | |/| |
| | | | | |
| | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
DelayRemove of list delegate on section boundary duplicated section
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
When removing a delegate with a removal animation that fell on a
section boundary (i.e. owned the section header), the following
item would also create a section header before the previous item was
removed. Make updateSections() include the removed, but visible items
in its update. Ensure updateSections() is called when the removed
item is destroyed to ensure a new section header is created at that
point.
Change-Id: Ie831e3acf65b2989ebb030e2ab38cdbe179a9d45
Task-number: QTBUG-17606
Reviewed-by: Michael Brasser
|
| | |\ \ \ \
| | | |/ / /
| | |/| / /
| | | |/ /
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Prevent infinite loop in raster engine on zero dash pattern length.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-17053
Reviewed-by: Kim
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
tools/qml/qml.pri
|