summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets/qlinecontrol.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-09-271-2/+2
|\ | | | | | | | | | | Conflicts: configure src/corelib/global/qglobal.h
| * Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-091-1/+1
| |\
| * \ Merge commit 'staging-1/4.7' into doc-4.7Morten Engvoldsen2010-09-031-4/+2
| |\ \
| * \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7Morten Engvoldsen2010-09-021-2/+2
| |\ \ \
| | * | | Fixed spelling, broken links, and missing default values.Jerome Pasion2010-08-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Tasks: QTBUG-13271, QTBUG-13212, QTBUG-12321 Reviewer: David Boddie
* | | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-09-131-2/+2
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/corelib/global/qglobal.h src/corelib/tools/qsimd.cpp
| * | | | Cursor is misplaced in the editors text areaSami Merila2010-09-091-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QInputMethodEvent::Cursor with value 0 is sent to QLineEdit, cursor is still visible. QLineControl (text control widget inside QLineEdit) handles the internal state of cursor visibility correctly and then promptly ignores the state when drawing the text. Issue is corrected by checking the cursor visibility state when drawing the cursor into widget. Task-number: QT-3670 Reviewed-by: axis
| * | | Revert "QLineEdit cursor is shown when asked to be non-visible"axis2010-09-021-3/+1
| | | | | | | | | | | | | | | | This reverts commit 9ef61d3d1e53d32dc2568cbfb9f8ff5b19cb4ffc.
| * | | Merge branch 'variousFixes' into 4.7-s60axis2010-09-011-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Revert "Long-press shortcuts for symbols on QWERTY keyboard don't work"axis2010-09-011-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 05eacd9ad40f8adb5aaa12a8b90113a73b43f642. Conflicts: src/gui/inputmethod/qcoefepinputcontext_p.h src/gui/inputmethod/qcoefepinputcontext_s60.cpp
| * | QLineEdit cursor is shown when asked to be non-visibleSami Merila2010-08-271-1/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | | | If QLineEdit is sent a QInputMethodEvent::Cursor event with value zero, widget still shows blinking cursor. This is due to that QLineControl ignores its internal state variable m_hideCursor value. As a fix, m_hideCursor is now considered when drawing the cursor. Additionally, the cursor blinking timer is stopped when cursor is hidden. Task-number: QT-3670 Reviewed-by: axis
* | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-05-101-0/+2
|\ \ | |/ | | | | | | | | Conflicts: src/gui/egl/egl.pri src/gui/painting/qwindowsurface_p.h
| * Pass double clicks like other mouse events.Warwick Allison2010-04-201-0/+2
| | | | | | | | Task-number: QTBUG-9940
* | Merge remote branch 'origin/4.7' into lighthouseJørgen Lind2010-04-211-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/gui/kernel/qapplication.cpp src/gui/painting/qbackingstore.cpp src/opengl/qgl.cpp src/opengl/qgl_p.h src/plugins/plugins.pro tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir tools/tools.pro
| * Do not beep on Mac when pressing some keys.Denis Dzyubenko2010-03-171-1/+0
| | | | | | | | | | | | | | | | | | When a key event is delivered to widgets, we should accept the event if the widget reacted to it in any way - if either the current item has changed or if the widget scrolled. Task-number: QTBUG-6444 Reviewed-by: Prasanth
* | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-03-181-4/+10
|\ \ | |/
| * Make QTextControl-based classes and QLineEdit understand Ctrl+Shift+InsertThiago Macieira2010-03-101-4/+10
| | | | | | | | | | | | | | | | On X11, this key is reserved for pasting the text selection (a.k.a. the PRIMARY selection). KDE apps already honour this, not all GNOME ones do, but it was agreed with them on xdg@freedesktop.org. Reviewed-By: mae <qt-info@nokia.com>
* | Merge remote branch 'origin/4.7' into 4.7-lighthouseJørgen Lind2010-03-111-3/+3
|\ \ | |/ | | | | | | | | | | Conflicts: src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/kernel/qwidget.cpp
| * Always redraw the complete control when an input event comes in.Robert Griebl2010-03-031-3/+3
| | | | | | | | | | | | | | | | | | The problem here is that a pre-edit string won't be detected by updateDisplayText(), so the control thinks nothing has changed when a new pre-edit string is set. Reviewed-By: Simon Hausmann (cherry picked from commit 16f30906f6eea3e00351478555f153697a6e186d)
* | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-03-011-0/+2
|\ \ | |/ | | | | | | | | | | Conflicts: configure src/gui/egl/qegl.cpp src/gui/kernel/qdnd_p.h
| * QLineEdit: regression: read-only line edits would eat shortcuts.Olivier Goffart2010-02-081-0/+2
| | | | | | | | | | | | | | Restore Qt 4.5 behaviour. Task-number: QTBUG-7395 Reviewed-by: Thierry
* | Merge remote branch 'remotes/qt/4.6' into lighthousePaul Olav Tvete2010-02-101-5/+10
|\ \ | |/ | | | | | | | | Conflicts: configure tests/auto/qwidget/tst_qwidget.cpp
| * Make sure cursor is painted at the correct position when we are using IM.Jan-Arve Sæther2010-01-211-1/+4
| | | | | | | | | | | | | | | | | | When the line edit was refactored into a line control this regression was introduced. This regression was introduced by change fb7d86cf23227302d48db279ec589221d11a1f6a. Task-number: QTBUG-4789 Reviewed-by: Alan Alpert
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Alan Alpert2010-01-141-1/+1
| |\
| * | Make input mask cursor blinkAlan Alpert2010-01-141-4/+6
| | | | | | | | | | | | | | | Task-number: QTBUG-7174 Reviewed-by: Leo
* | | Merge remote branch 'origin/4.6' into lighthousePaul Olav Tvete2010-01-141-8/+17
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: configure src/corelib/global/qglobal.cpp src/gui/dialogs/dialogs.pri
| * | Update copyright year to 2010Jason McDonald2010-01-061-1/+1
| |/ | | | | | | Reviewed-by: Trust Me
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-271-1/+6
| |\
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-11-251-1/+6
| | |\
| | | * Make paste + undo behave in QLineEdit as it does in QTextEditThierry Bastian2009-11-241-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | On the undo/redo stack, it needs to be treated as a separate command Task-number: QTBUG-5786 Reviewed-by: ogoffart
| * | | On Mac OS X, QLineEdit should handle MoveToStart/EndOfBlockBenjamin Poulain2009-11-261-4/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Mac OS X, with a QLineEdit, QKeySequence::MoveToStartOfBlock should move the cursor to the beginning of the input, and QKeySequence::MoveToEndOfBlock to the end of the block Same for selection. The shortcuts also had to be updated. Task-number: QTBUG-4679 Reviewed-by: Olivier Goffart
| * | QLineEdit fix for macDenis Dzyubenko2009-11-241-2/+6
| |/ | | | | | | | | | | | | | | On the Mac Up/Down arrow keys move the cursor to the beginning/end of the lineedit. The fix is to make sure the corresponding keyevent will be accepted by the QLineEdit and not propagated to parent widgets (resulting in a beep). Reviewed-by: Prasanth
* | Merge remote branch 'origin/4.6' into lighthousePaul Olav Tvete2009-11-191-15/+18
|\ \ | |/ | | | | | | | | Conflicts: configure src/plugins/graphicssystems/graphicssystems.pro
| * Long-press shortcuts for symbols on QWERTY keyboard don't workJouni Hiltunen2009-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt key event was not handled properly in the case of long key press. With long key press, QCoeFepInputContext::commitCurrentString gets called 3 times("q", "", "1"). (Normal key press is causing one call). This is how aknfep works, so commitCurrentString was modified to replace first character if long key press event detected. E.g. "q" is replaced with "1". qlinecontrol modified to keep cursor position correct. Signed-off-by: axis <qt-info@nokia.com>
| * Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-051-1/+2
| |\
| | * Fixed an input method bug when erasing the last character.axis2009-11-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we didn't update the editor contents if the new preedit string was empty. However, it could be empty because the user just erased it, so the bug was fixed by checking whether the preedit string in the event and in the editor are different. RevBy: Denis Dzyubenko
| * | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-041-1/+2
| |\ \ | | |/
| | * Fix LIBRARY and ICONJørgen Lind2009-10-291-1/+2
| | | | | | | | | | | | | | | | | | However, compiling with QT_NO_ICON will still not work :( Reviewed-by: tom
| * | Pressing return in a QWizard would erase the active password entry.Gabriel de Dietrich2009-11-031-11/+12
| |/ | | | | | | | | | | | | | | | | When echo mode was set to PasswordEchoOnEdit in a QLineEdit, and its text selected, pressing the return key would erase the text and start editing it instead of validating the password. Auto-test included. Reviewed-by: Olivier Task-number: QTBUG-4401
| * Signal for an update when the cursor is visibleAlan Alpert2009-10-151-1/+1
| | | | | | | | | | | | | | The bug against QFxTextInput is actually due to a bug in QLineControl. Task-number: QT-2319 Reviewed-by: Martin Jones
* | Merge branch '4.6' into lighthousePaul Olav Tvete2009-09-301-4/+4
|\ \ | |/ | | | | | | | | | | | | Conflicts: configure src/gui/image/qpixmapdatafactory.cpp src/gui/kernel/qapplication_p.h src/gui/painting/qgraphicssystem.cpp
| * Update license headers again.Jason McDonald2009-09-091-4/+4
| | | | | | | | Reviewed-by: Trust Me
* | Please welcome the Lighthouse Research Project!Paul Olav Tvete2009-09-071-2/+2
|/ | | | | | | | | | | Lighthouse is a lighter, nimbler version of Qt/Embedded, which does not contain a window system. Instead, it uses graphics system plugins to provide the necessary functionality or interface with existing window systems. The first version was written by Rhys. Squashed commit.
* Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-311-13/+13
| | | | Reviewed-by: Trust Me
* Merge commit 'qt/master'Jason Barron2009-08-131-1/+1
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: examples/opengl/samplebuffers/glwidget.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer.cpp src/gui/gui.pro tests/auto/qhttp/tst_qhttp.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp
| * Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Redid 7b95b70bc307 for QLineControl.axis2009-08-121-5/+34
|/
* Make sure cursorPositionChanged is emitted when cursor position changesEskil Abrahamsen Blomfeldt2009-08-061-0/+1
| | | | | | | | | | | When selecting the text and setting the cursor position, we need to emit the cursorPositionChanged signal. This seems to be a copy-paste error from refactoring QLineEdit, as the function call is there in the original version of setSelection(). The effect was two test breakages in tst_QDateTimeEdit, because the section and cursor position of the QDateTimeEdit would be out of sync. Reviewed-by: Gunnar
* Compile Fix for QT_KEYPAD_NAVIGATIONAlan Alpert2009-08-061-5/+5
|
* Fix obsolete license headersJason McDonald2009-08-041-2/+2
| | | | Reviewed-by: Trust Me
generated by cgit v0.12 at 2025-01-18 12:16:30 (GMT)