summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativetextinput
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-241-0/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qfontengine_ft.cpp src/gui/text/qtextlayout.cpp src/plugins/phonon/mmf/mmf.pro src/plugins/s60/5_0/5_0.pro src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtDeclarativeu.def src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtMultimediau.def src/s60installs/bwins/QtNetworku.def src/s60installs/bwins/QtScriptu.def src/s60installs/bwins/QtSqlu.def src/s60installs/bwins/QtTestu.def src/s60installs/bwins/QtXmlPatternsu.def src/s60installs/bwins/QtXmlu.def src/s60installs/bwins/phononu.def src/s60installs/s60installs.pro tests/auto/qcssparser/qcssparser.pro tests/auto/qtextlayout/tst_qtextlayout.cpp Changes in qtextlayout.cpp and tst_qtextlayout.cpp and qfontengine_ft.cpp are not merged because they will have other fixes in 4.8
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-201-0/+10
| |\ | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Notify when the TextInput cursorRectangle property changes within pre-edit
| | * Notify when the TextInput cursorRectangle property changes within pre-editAndrew den Exter2011-05-201-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Anything that updates the horizontal scroll is also likely to change the position of the cursor rectangle and the micro focus. So group these actions together and ensure they're done before emitting cursorPositionChanged() so positionToRectangle() returns a valid value from that handler. Change-Id: I5fadc58efb148a8dabe88a94381c86cd64dba3bd Task-number: QTBUG-19089 Reviewed-by: Martin Jones
| * | Update licenseheader text in source filesJyri Tahtela2011-05-131-17/+17
| |/ | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
| | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-277-0/+194
|\ \ | |/ | | | | | | | | Conflicts: src/opengl/qwindowsurface_gl.cpp src/s60installs/eabi/QtGuiu.def
| * Ignore changes to selectByMouse during a selection.Andrew den Exter2011-04-277-0/+185
| | | | | | | | | | | | | | | | | | | | | | Use the value of selectByMouse at the time of a mouse press event in all subsequent mouse events in a sequence. This is the same as ignoring the intial mouse press except mouse events for other actions are still accepted. Change-Id: I59b50bf95d26c6320e6e74eeb679b4153e0edf4d Task-number: QTBUG-18887 Reviewed-by: Martin Jones
| * Move the TextInput cursor delegate when the preedit position changes.Andrew den Exter2011-04-271-0/+9
| | | | | | | | | | | | Change-Id: Ia7150122444e465ffbcc02e921d42d01c2dfdac1 Task-number: QTBUG-18892 Reviewed-by: Martin Jones
* | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-221-1/+50
|\ \ | |/
| * Fix TextInput cursor position unchanged when selection length is 0.Andrew den Exter2011-04-211-0/+9
| | | | | | | | | | | | | | | | | | Move the cursor position to the start position when both the new and old selections are empty as would happen if either was non-empty. Change-Id: I493e52c551b47e009fd13b3e95856ff012ee5d95 Task-number: QTBUG-18768 Reviewed-by: Martin Jones
| * Fix TextInput echoMode clearing inputMethodHints set by the user.Andrew den Exter2011-04-211-1/+41
| | | | | | | | | | | | | | | | | | | | | | | | Changing to the Normal echo mode from another mode clears the NoPredictiveText and NoAutoUppercase flags, irrespective of who originally set them. Add separate accessors for the property value so echo mode can overwrite the authoritive value without losing the value set in QML. Change-Id: I6a9563057bb17796b17ac7c2a3c564bb5e886c4d Task-number: QTBUG-18735 Reviewed-by: Martin Jones
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-211-0/+14
|\ \ | |/ | | | | | | Conflicts: src/plugins/qmltooling/qmldbg_ost/qostdevice.h
| * Fix excessive scrolling in TextInput with mid string pre-edit text.Andrew den Exter2011-04-191-0/+14
| | | | | | | | | | | | | | | | | | | | Don't emit text or cursor position changed signals until all the state changes from the input method event are made. Otherwise properties like horizontal scroll are updated based on invalid intermediate data. Change-Id: If543dbe58dc571aeda495152d99be95645eea140 Task-number: QTBUG-18789 Reviewed-by: Martin Jones
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-011-8/+42
|\ \ | |/
| * Fix TextInput auto test failure on mac.Andrew den Exter2011-04-011-3/+10
| | | | | | | | | | | | | | Allow for some error due to additional padding on mac. Change-Id: Iee9ce8eb9c4cec2f96c22340162f628ffcbd44d1 Reviewed-by: Bea Lam
| * Fix width of TextInput micro focus rectangle.Andrew den Exter2011-03-301-5/+32
| | | | | | | | | | | | | | | | | | | | | | Remove the padding QLineControl::cursorRect() adds for region updates. QGraphicsView also grew the rectangle by returning the bounding rect of the transformed rectangle which is fixed by using the same transform for QRect as is used for QRectF. Change-Id: I8d8df9dbc6b4250e4e5392871191123a76b304a0 Task-number: QTBUG-18343 Reviewed-by: Martin Jones
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-311-20/+15
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/example-slideswitch.qdoc doc/src/development/qmake-manual.qdoc doc/src/snippets/code/doc_src_qmake-manual.pro doc/src/snippets/code/doc_src_qtscript.qdoc src/corelib/animation/qabstractanimation.cpp src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qdir/qdir.pro tests/auto/qsslsocket/tst_qsslsocket.cpp tools/qdoc3/doc/qdoc-manual.qdocconf
| * Return correct boundaries reasons from QTextBoundaryFinder.Andrew den Exter2011-03-301-20/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The next character after a boundary is at pos, not pos + 1. Also consider whether the previous and next character are whitespace in combination when determing word boudaries otherwise positions between whitespace characters will return both StartWord and EndWord. And since there's no need to look ahead one character don't shortcut` the regular logic for the boundary before the last character. Change-Id: I2efbf3947066767945f96bf8456ef518d2149191 Task-number: QTBUG-11365 Reviewed-by: Denis Dzyubenko Reviewed-by: Ritt Konstantin
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-111-0/+10
|\ \ | |/
| * Don't reveal TextInput text on refocus in PasswordEchoOnEdit mode.Andrew den Exter2011-03-111-0/+10
| | | | | | | | | | | | | | | | | | | | | | In PasswordEchoOnEdit mode return the display text instead of the real text from inputMethodQuery() when not editing the password and clear old password if new input is received through an input method event. Change-Id: I7f24f510bf8e356e460900c3b9ff55ea16b32ab3 Task-number: QTBUG-17562 Reviewed-by: Joona Petrell
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-111-3/+177
|\ \ | |/ | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| * Fix failing testsBea Lam2011-03-101-0/+4
| | | | | | | | | | | | | | | | | | RTL text-related tests were failing on mac since QApplication::keyboardInputDirection() is not always initialized when the QApplication instance is created. Change-Id: Ifa7214ffb1941d824a9425015b38aa77366381bb Reviewed-by: Martin Jones
| * Fix horizontal alignment of QTextDocument-based RTL textJoona Petrell2011-03-091-0/+9
| | | | | | | | | | | | | | Task-number: QTBUG-15880 Reviewed-by: Martin Jones Change-Id: If537d7c795dec46eedee62511e75bab862676ef1
| * Fix TextInput key navigation for RTL textJoona Petrell2011-03-081-0/+40
| | | | | | | | | | | | | | Task-number: QTBUG-15882 Reviewed-by: Martin Jones Change-Id: I77c02de3bcd1a1d05dfcdd71327da45182050071
| * Base empty QML editor horizontal alignment on ↵Joona Petrell2011-03-081-3/+8
| | | | | | | | | | | | | | | | | | QApplication::keyboardInputDirection() Task-number: QTBUG-15880 Reviewed-by: Martin Jones Change-Id: I240d53c8572fd3d1222b555e93812a3ee38e2558
| * Merge branch '4.7' into qtquick11Joona Petrell2011-03-081-0/+38
| |\
| * | Reverse horizontal alignment of QML editors when the layout mirroring is enabledJoona Petrell2011-03-071-0/+30
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-15880 Reviewed-by: Martin Jones Change-Id: Ie9cebd7bc6d40f5f555bfd83ddc3a24a55c6cb4d
| * | Remove text alignment of empty QML editors following the layout directionJoona Petrell2011-03-041-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Merge branch '4.7' into qtquick11Joona Petrell2011-03-041-4/+134
| |\ \
| * | | Add a way to query the reading direction of QML editor textJoona Petrell2011-03-031-0/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17490 Reviewed-by: Martin Jones Change-Id: I3dd3854f820860d32e822605ed547150d5f17eb2
| * | | Merge branch '4.7' into qtquick11Martin Jones2011-03-011-8/+286
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativelistview.cpp Change-Id: Ic21311365c6139520ae337a379bdedb6ffe497db
| * | | | Make sure horizontal QML editor text aligment always returns the actual ↵Joona Petrell2011-03-011-3/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-091-0/+38
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Set correct initial value for TextEdit and TextInput canPaste propertyYann Bodson2011-03-071-0/+38
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Change-Id: Ied5b257305fa68db64fcf270ad2a42f691fbdca2 Task-number: QTBUG-17765 Reviewed-by: Martin Jones
* | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-041-1/+77
|\ \ \ \ | |/ / /
| * | | Fix TextInput auto test failure on mac.Andrew den Exter2011-03-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Fix word selection locking on string boundaries.Andrew den Exter2011-03-041-1/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Compensate for horizontal scroll in TextInput micro focus.Andrew den Exter2011-03-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return the adjusted cursore rectangle rather than the one returned by QLineControl. Change-Id: I343ecdb47ef2ea59519c8d155bbb9917d9c8ce56 Task-number: QTBUG-17864 Reviewed-by: Martin Jones
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-031-7/+124
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: src/openvg/qvg_symbian.cpp src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| * | | Position the TextInput cursor correctly after IM text is commited.Andrew den Exter2011-03-031-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Make the TextInput cursorRectangle relative to the item.Andrew den Exter2011-03-021-3/+39
| | |/ | |/| | | | | | | | | | | | | | | | | | | The rectangle returned was relative to the text and didn't adjust for horizontal scrolling. Change-Id: I09227d73bbd8b32d830744d5911d785246051c2f Reviewed-by: Martin Jones
| * | Don't return positions within preedit text from positionAt().Andrew den Exter2011-03-011-7/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Add an is input method composing property to TextEdit and TextInput.Andrew den Exter2011-03-011-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-011-0/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm src/opengl/qpixmapdata_gl.cpp src/opengl/qwindowsurface_gl.cpp src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def tests/auto/qtextlayout/tst_qtextlayout.cpp
| * | Add a 'CursorPosition' parameter to TextInput.positionAt().Andrew den Exter2011-02-241-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-231-1/+267
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac.mm src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def src/testlib/qtestcase.cpp
| * | Fix auto test failure on mac.Andrew den Exter2011-02-221-31/+30
| | | | | | | | | | | | | | | | | | | | | Allow for some error in the cursor position due to plaform specific offsets and the like. Change-Id: I2bef793596ab2a5e38cf77aee624bd9fdd5ca38c
| * | Hide the TextInput/Edit cursor when the view doesn't have focus.Andrew den Exter2011-02-211-0/+70
| | | | | | | | | | | | | | | | | | | | | | | | Only display a cursor if both the item and its scene have focus. Change-Id: I0c91ab4d533cd7d773ffc2489633e12c0d399ad9 Task-number: QTBUG-17365 Reviewed-by: Martin Jones
| * | Forward mouse events from TextInput and TextEdit to QInputContext.Andrew den Exter2011-02-211-1/+139
| |/ | | | | | | | | | | | | | | | | 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
| * Fix TextInput, TextEdit auto test failure on windows and mac.Andrew den Exter2011-02-161-0/+6
| | | | | | | | | | | | | | Micro focus is only updated on X11, QWS and Symbian platforms. Change-Id: Id02655cba79429e91022593ff0d1d6b8068c84ec Reviewed-by: Martin Jones
generated by cgit v0.12 at 2025-01-09 15:38:40 (GMT)