diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-07-17 17:53:19 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-07-17 17:53:19 +0200 |
| commit | 68316e65849b3af4316268312254df79fa28f8c6 (patch) | |
| tree | 58d99a204fe8666b7de4d400af2ee4042635c0e9 /src/corelib/global | |
| parent | 954f0d93976362d29044439e4eaa11d2dff16624 (diff) | |
| parent | 4a1e5dbade4bab55f39bd368480dcca9a11e4b38 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
doc/global/manifest-meta.qdocconf
src/corelib/global/qnamespace.qdoc
src/corelib/io/qstorageinfo_unix.cpp
src/corelib/tools/qtools_p.h
src/sql/drivers/psql/qsql_psql.cpp
Change-Id: I23a15ac84e03ad61d865e3df872b013eb0752949
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 38ee8edb49..c6098007d1 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -2605,6 +2605,7 @@ (checked if all children are checked, unchecked if all children are unchecked, or partially checked if only some children are checked). \value ItemNeverHasChildren The item never has child items. + This is used for optimization purposes only. \value ItemIsUserTristate The user can cycle through three separate states. This value has been added in Qt 5.5. |