| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
| |
f47f01fd34d08f6152c9053c0d6928fc359aa0f9 changed the height of the
Text to not include the extra spacing at the end of the block. This
is different to what QDextDocument does. Revert back to the old
behavior.
Change-Id: Ie43dea4dd5a0e9ba179f44c246fb834322db11e3
Reviewed-by: Joona Petrell
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
Change-Id: Iddfc48e643a7f043afa1c5d5f1777f645a39548e
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We used to calculate the size and position of the cache image
ourselves. Rather use the line positions and bounding rect calculated
by QLayout.
Change-Id: I601688ab7e310b0015a1994adf52b108f39504d8
Reviewed-by: Joona Petrell
|
| |
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-15882
Reviewed-by: Martin Jones
Change-Id: I77c02de3bcd1a1d05dfcdd71327da45182050071
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QApplication::keyboardInputDirection()
Task-number: QTBUG-15880
Reviewed-by: Martin Jones
Change-Id: I240d53c8572fd3d1222b555e93812a3ee38e2558
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| | |
Change-Id: Ied5b257305fa68db64fcf270ad2a42f691fbdca2
Task-number: QTBUG-17765
Reviewed-by: Martin Jones
|
| |
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-17280
Reviewed-by: Martin Jones
Change-Id: Ibbbd2da44d5826b6e499b731eda66b2016bade85
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-15880
Reviewed-by: Martin Jones
Change-Id: Ie9cebd7bc6d40f5f555bfd83ddc3a24a55c6cb4d
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We handled horizontal alignment ourselves, but this neglected some
RTL layouting issues (e.g. trailing spaces). Allow QTextLayout to
do the aligning for us. Also fix eliding of multiline text for
RTL language - in this case the eliding should be to the left.
Change-Id: I487137b123ae66c1f5fc358a8d8a013049d05818
Reviewed-by: Joona Petrell
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-15880
Reviewed-by: Martin Jones
Removed implicit text alignment of empty text in QML editor
following the application's default layout direction.
Change was originally made few days ago in the commit
88253db8a7d7910e1393b1948fb3747117538c92. Aligning empty and
neutral text to the right for RTL locales requires much more
comprehensive changes to the Qt's internal text classes than
initially thought.
Change-Id: I93a26df259b87dff47d57423949270656746c9a7
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-17490
Reviewed-by: Martin Jones
Change-Id: I3dd3854f820860d32e822605ed547150d5f17eb2
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
src/declarative/graphicsitems/qdeclarativelistview.cpp
Change-Id: Ic21311365c6139520ae337a379bdedb6ffe497db
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
tools/qml/qml.pri
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (21 commits)
Autotest: make at least one update before checking if more are needed
Fix warning about id maybe used when uninitialised
Doc: setSslConfiguration also sets the CA certificates
Autotest: check that the type received is the expected one
Attempt to fix symbian 3.1 and 3.2 compile break.
Prevents crashing when ICO file has bad color table value
directfb: fix crash in client/server mode of qws
Make Qt/DirectFB less verbose about failing to load pixmaps.
Autotest: don't use the deprecated signal from QDBusConnectionInterface
Autotest: be nicer to the subprocess and SIGTERM it
Fix warnings in QtDeclarative
Autotest: avoid memory leaks if test fails
QtDBus: Make sure we can receive unknown types
QtDBus meta object: keep methods, signals and props with unknown types
Autotest: add a new test for parsing an introspection with unknown types
Make the QtDBus parser not complain about unknown things
fix-layer-getsurface-result-check-for-screen-size-determination
Bump QtWebKit version to 2.0.2
SSL: fix memory leak when loading certificates on Mac OS X
Add a mutex to protect the access to the QSet.
...
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The timer gets started only by making updates. If you try to check if
an update is needed without making the first update, the timer won't
be started and the function will return false.
|
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-17476
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We must make sure we advance the receiving iterator, or we end up in
an infinite loop.
Task-number: QTBUG-17476
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Use VoidStar as the metatype, with an unknown type called
"QDBusRawType". The actual D-Bus type is saved as an hex value as a
template parameter.
D-Bus type Qt type comment
h QDBusRawType<0x68>* Unix file descriptors
~ QDBusRawType<0x7e>* invalid type
ai QDBusRawType<0x6169>* array of int32
a{i(ssy)} QDBusRawType<0x617b6928737379297d>*
Note that the number in the template doesn't have to be valid. The
QDBusRawType class doesn't exist anyway.
I thought of just leaving the raw D-Bus type there, but who knows what
kind of things can appear there, like other '>' (which may cause
problems for anything trying to parse the meta object later).
Task-number: QTBUG-17476
|
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-17476
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Keep only the warnings about application errors. If the unknown things
come from the outside, it's not our job to make noise.
Task-number: QTBUG-17476
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
In theory, there should be no problems with doing this unlocked,
as the test should only run one thread at a time in this particular
code section.
In practice, if the test is failing, multiple threads would be
modifying the QSet. So the mutex is necessary to detect the
test failing.
Reviewed-By: Morten Sørvig
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix TextEdit auto test failure on windows.
Fix FocusScope example.
Fix compilation on old Symbian platforms
Export symbols from qtestlib required for QtQuickTest
Allow MouseArea to prevent mouse grab begin stolen by Flickable.
Fix QTBUG-17008 XmlListModel blocks Windows system events
Fix TextInput, TextEdit auto test failure on windows and mac.
QDeclarativeDebug: Fix crash when serializing list of QObjects
Update the input context when the pre-edit cursor position changes.
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Added test case for corrupt pixel count in XPM image.
QImage crash when invalid XPM is read.
Fix an issue with removing rows in a table model.
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Fixed by merge request 1080.
Task-number: QTBUG-17254
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Tables with nulls in a row were not being deleted properly in some
cases. Made sure the responsible function no longer has default
parameters so this doesn't happen again.
Change-Id: I479121172d5ac172ca49da78638b9353d7a67548
Task-number: QTBUG-16007, QTBUG-15979
Reviewed-by: Charles Yin
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix inheritance of widget input contexts.
|
| | |\ \ \ \ \
| | | | |/ / /
| | | |/| | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QStyleSheetStyle: dont crash in PE_WIDGET when widget is null
|