diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-31 10:03:31 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-31 10:03:31 +0200 |
| commit | ce9519593a0b3deb99d1dd2529770f7e9fffef92 (patch) | |
| tree | c9bca05230dd68f49494240ae930bad1fe0c5956 /src/corelib/global/qnamespace.qdoc | |
| parent | 509f77cca28aa3edea5523c5869bae4412ed2ccc (diff) | |
| parent | 7baaec17edb06634f1d6235a55c7adbd112cba3e (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
mkspecs/android-g++/qmake.conf
qmake/generators/unix/unixmake2.cpp
src/gui/image/qimage_conversions.cpp
Change-Id: Ib76264b8c2d29a0228438ec02bd97d4b97545be0
Diffstat (limited to 'src/corelib/global/qnamespace.qdoc')
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 669bc7a17a..ea174abca9 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -2126,7 +2126,8 @@ regardless of whether the parent widget is embedded in a scene or not. - \value WindowShadeButtonHint + \value WindowShadeButtonHint Adds a shade button in place of the minimize + button if the underlying window manager supports it. \value WindowStaysOnTopHint Informs the window system that the window should stay on top of all other windows. Note that @@ -2448,8 +2449,9 @@ Flags that alter the behavior: - \value ImhHiddenText Characters should be hidden, as is typically used when entering passwords. + \value ImhHiddenText The input method should not show the characters while typing. This is automatically set when setting QLineEdit::echoMode to \c Password. + Note that setting \c ImhHiddenText does not change the echo mode. \value ImhSensitiveData Typed text should not be stored by the active input method in any persistent storage like predictive user dictionary. \value ImhNoAutoUppercase The input method should not try to automatically switch to upper case |