| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Dragging in nested views no longer works as expected
Fix implicit height not growing when pre-edit text wraps.
Fix leak in State element.
Fix leak in bindings created by PropertyChanges.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QTextDocument::isEmpty() doesn't account for pre-edit text so use the
return value of size() to determine if implicitHeight should fall back
to the font height instead.
Change-Id: I028552a7646372b22894c45946a57ec4951b044a
Task-number: QTBUG-21288
Reviewed-by: Martin Jones
|
|/
|
|
|
|
| |
(cherry picked from commit 609dc22f719ecb8d48349fd56f84960bbf46d731)
Reapplied after bad v4.7.4 merge
|
|\
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
|
|\ \
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Doc: Fixing typo
Fix left alignment of native RTL pre-edit text.
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If there is no committed text in a TextInput or TextEdit determine
if the pre-edit text is right to left before falling back to the
global keyboard settings.
Change-Id: I7e5568e936341602b8faf7be120f9a770c115f48
Task-number: QMLNG-72
Reviewed-by: Michael Brasser
|
|/ |
|
|\
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalAlignment and anchors.mirror properties
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
effectiveHorizontalAlignment and anchors.mirror properties
* these properties are seldomly used
* they confuse developers that do not care about right-to-left user interfaces
* LayoutMirroring.enabled property can be used instead to determine if mirroring is enabled
* if needed, you can easily determine the effective layout directions and alignments
with a little bit of JavaScript:
function effectiveLayoutDirection() {
if (LayoutMirroring.enabled)
return (listView.layoutDirection == Qt.LeftToRight) ? Qt.RightToLeft : Qt.LeftToRight;
else
return listView.layoutDirection;
}
Task-number: QTBUG-11042
Reviewed-by: Martin Jones
|
|/
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
|
|
| |
Translate the cursor rectangle from control coordinates to painting
coordinates rather than the other way around, ensure the cursor
delegate is also translated, and update the cursor rectangle, cursor
delegate and micro focus when the preedit cursor changes position.
Change-Id: Iac7a87f7fb965d5f56d059d8f4b97feef8b47789
Task-number: QTBUG-18515 QT-4827
Reviewed-by: Martin Jones
|
|
|
|
| |
Change-Id: I80d2247cd05ef71907bbf690e8e68a8860a65d4c
|
|
|
|
| |
Change-Id: I7993c13c7fe43027caaa28ef3866df5f0d21f5b9
|
|
|
|
|
|
|
| |
Task-number: QTBUG-15880
Reviewed-by: Martin Jones
Change-Id: If537d7c795dec46eedee62511e75bab862676ef1
|
|
|
|
|
|
|
|
|
| |
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-15880
Reviewed-by: Martin Jones
Change-Id: Ie9cebd7bc6d40f5f555bfd83ddc3a24a55c6cb4d
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
changes
Task-number: QTBUG-15880
Reviewed-by: Martin Jones
Change-Id: I1ea87b05c483e5c9339fc47cf719c22d001ef52b
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Ensure attributes added in QtQuick 1.1 are marked with the
'\since QtQuick 1.1' tag. Also add links to items listed in the
QtQuick 1.1 section in whatsnew.qdoc.
Task-number: QTBUG-17771
Change-Id: Ic8fb3c8d3c99a1469c1767779efaafd27ef460e1
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
tools/qml/qml.pri
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
PathView items were not correctly updated when rootIndex changed.
Allow text to selected in a TextEdit or TextInput inside a Flickable.
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (216 commits)
Doc: Fixed a reference to the wrong image.
Fixed a bug that caused marked up inline text to be truncated.
Doc: Renamed an image to ensure that it does not clash with another.
Doc: Fixed QML, unindented snippet.
Doc: Removed unnecessary HTML entity from the title.
Doc: Fixed broken links to the old Symbian Foundation Wiki.
Doc: Updated the copyright statements in the templates.
Doc: Fixing typo
Replace all occurances of "Qt 4.7" with "QtQuick 1.0"
Doc: Adjusted the font sizes for the offline documentation.
Doc: Added a missing style sheet to the qhp manifest.
Doc: Fixed the qthelp namespace for the Qt documentation.
Doc: including missing pages in overviews.
Doc: Fixed typo in QCoreApplication docs
Fixed whitespace.
Avoid hard-coding product names in page titles.
Doc: Unindented a code snippet.
Doc: Fixed confusing wording of a sentence.
Doc: Fixed a broken link.
Doc: Updated the information about commercial editions of Qt.
...
|
| | | |\ \ |
|
| | | | | | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Only display a cursor if both the item and its scene have focus.
Change-Id: I0c91ab4d533cd7d773ffc2489633e12c0d399ad9
Task-number: QTBUG-17365
Reviewed-by: Martin Jones
|
| | |_|_|/
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This brings TextInput in line with QLineEdit. The fix for TextEdit
applies equally to QTextEdit.
Change-Id: I5c47e5c8e951ee53cb1fe45d9c302050cd19deef
Task-number: QTBUG-15705
Reviewed-by: axis
|
|/ / / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
alignment
Also, implicit empty text alignment now follows the Application's default layout direction traditionally
set by the locale.
Task-number: QTBUG-15880
Reviewed-by: Martin Jones
Change-Id: I88340513d489290bafd393072786a19731097b77
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Set keepMouseGrabs to true when the selectByMouse property is enabled
to prevent flickable from stealing the mouse grab and interrupting
a selection.
Change-Id: I08e11265ab9c55d239fd09aceef4fdb8e74aba9d
Task-number: QTBUG-16956
Reviewed-by: Martin Jones
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Neither would open a software input panel or allow text entry while
read only, but on Symbian at least the text input mode indicator was
still displayed giving the appearance of being able to enter text.
Task-number: QT-4497
Reviewed-by: Damian Jansen
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Adds an option to do per word selection when selectByMouse is true.
Also changes the selection behavior so that the first word selected
remains selected when the direction of the selection changes which
is more consistent with other implementations including the existing
per word selection in QTextEdit.
Task-number: QTBUG-16283
Reviewed-by: Martin Jones
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Overridden as readonly for elements that have an inherent implicit size
such as Text, TextEdit, TextInput, positioners, Loader.
Task-number: QTBUG-14957
Reviewed-by: Michael Brasser
|
|\ \ \
| | |/
| |/| |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We failed to reset textWidth before calculating the ideal width of
the text.
Task-number: QTBUG-16710
Reviewed-by: Michael Brasser
|
| |/
| |
| |
| |
| |
| |
| |
| | |
When animating pointSize avoid generating a huge number of fonts with
slightly different point sizes.
Task-number: QTBUG-13960
Reviewed-by: Aaron Kennedy
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-16190
Reviewed-by: Martin Jones
|
| |
| |
| |
| |
| |
| |
| |
| | |
The lineCount property should return the number of lines contained
in textEdit. Also corrected minor documentation in Text
Task-number: QTBUG-12305
Reviewed-by: Michael Brasser
|
| |
| |
| |
| |
| |
| |
| |
| | |
Add a dragEnabled property to QTextControl so text dragging can
optionally be disabled.
Task-number: QTBUG-16248
Reviewed-by: Martin Jones
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Add an overload for moveCursorSelection which takes a parameter
specifying whether to update the selection with individual characters
or whole words.
Task-number: QTBUG-16283
Reviewed-by: Martin Jones
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Since TextEdit can also contain rich text with anchors, it should also
have a linkActivated signal like Text does.
Task-number: QTBUG-15283
Reviewed-by: Martin Jones
|
|\ \ \
| |/ /
|/| /
| |/
| |
| | |
Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.cpp
tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
|
| |
| |
| |
| |
| |
| |
| | |
Check bounds in TextInput and TextEdit.
Task-number: QTBUG-16188
Reviewed-by: Bea Lam
|
| |
| |
| |
| | |
Reverted a commit 2eee49127b80b5b56c605f76ccea004b03d89577 "Remove active selection when TextEdit loses focus". Contrary to TextInput, by default TextEdit keeps the selection visible when the editor loses active focus. If this is not wanted, a property called persistentSelection can be set false to make selection dependant on the focus.
|