summaryrefslogtreecommitdiffstats
path: root/src/gui/util
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5'Thiago Macieira2009-05-111-1/+1
|\
| * Fix QCompleter with UnfilteredPopupCompletionJoão Abecasis2009-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | Fixes regression introduced in a794ded85f74516239a08cf848e6b4f8b6dcac6a. When using UnfilteredPopupCompletion the matchCount is always zero and completion was being skipped. By adding the check for showAll we still avoid the assert but retain correct behavior. Task-number: 253125 Reviewed-by: jasplin
* | introduce Q_WS_WINCEMaurice Kalinowski2009-04-292-10/+10
| | | | | | | | | | | | | | | | | | | | | | Task-number: 246130 Reviewed-by: joerg Introduce Q_WS_WINCE for Windows CE only windowing parts. So far we decided to stick with Q_WS_WIN32, but having a separate define makes the code more readable. In addition Q_WS_WINCE_WM is available for Windows Mobile only parts, where we do not check for the OS on runtime.
* | Merge branch '4.5'Thiago Macieira2009-04-201-1/+1
|\ \ | |/ | | | | | | Conflicts: tests/auto/qaction/tst_qaction.cpp
| * Get rid of compiler warning.jasplin2009-04-201-1/+1
| | | | | | | | Reviewed-by: TrustMe
* | Merge branch '4.5'Thiago Macieira2009-04-031-0/+7
|\ \ | |/
| * Fix focus policy propagation bug in QCompleter.jasplin2009-04-031-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 4a00810cc394b7da99ddb2d13eb045352ede25d3 ensures that setting the focus policy of a widget applies to its proxy (if any) as well. This propagation effect is however unfortunate for a QCompleter in PopupCompletion mode. The client widget (typically a QLineEdit or a QTextEdit) acts as the focus proxy to the popup menu. Internally, the completer sets the focus policy of the popup menu to NoFocus, but this should not affect the focus policy of the editor. Reviewed-by: janarve Task-number: 250064
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-011-0/+5
|\ \ | |/ | | | | | | Conflicts: src/gui/inputmethod/qximinputcontext_x11.cpp
| * Doc: Added a code snippet to illustrate the opening of local files.David Boddie2009-03-301-0/+5
| | | | | | | | | | Task-number: 223087 Reviewed-by: TrustMe
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-03-251-2/+2
|\ \ | |/
| * Fix assertion failure in QCompleter::setCompletionPrefix().jasplin2009-03-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | Calling setCompletionPrefix() on a QCompleter from a slot connected to the editingFinished() signal of the corresponding QLineEdit could in some cases alter the internal state of the completer in such a way that an assertion would fail. The fix prevents the asserting code from being called in this particular state. Reviewed-by: janarve Task-number: 246056
| * Long live Qt 4.5!Lars Knoll2009-03-2324-0/+8690
|
* Long live Qt!Lars Knoll2009-03-2324-0/+8690