diff options
author | Liang Qi <liang.qi@qt.io> | 2018-11-05 19:06:47 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-11-05 19:06:47 +0100 |
commit | eedb3a06cbaff1a3e100a0d68a578d15a0c9dd97 (patch) | |
tree | cc9c2677b63d99f87dfd60d7eb0aba138c026d06 /src/widgets/doc | |
parent | 73e7eb785fbf984e2b964be8c3acad788479dfa6 (diff) | |
parent | d24835a60c0c620a27c7a9830b89ed47312739a5 (diff) |
Merge remote-tracking branch 'origin/5.12.0' into 5.12
Change-Id: I12f26470e01a8582d0f02f51e20d5b742bd95d6f
Diffstat (limited to 'src/widgets/doc')
-rw-r--r-- | src/widgets/doc/images/qgridlayout.png (renamed from src/widgets/doc/images/gridlayout.png) | bin | 1445 -> 1445 bytes | |||
-rw-r--r-- | src/widgets/doc/snippets/code/doc_src_stylesheet.qdoc | 1 |
2 files changed, 1 insertions, 0 deletions
diff --git a/src/widgets/doc/images/gridlayout.png b/src/widgets/doc/images/qgridlayout.png Binary files differindex ae76c0487b..ae76c0487b 100644 --- a/src/widgets/doc/images/gridlayout.png +++ b/src/widgets/doc/images/qgridlayout.png diff --git a/src/widgets/doc/snippets/code/doc_src_stylesheet.qdoc b/src/widgets/doc/snippets/code/doc_src_stylesheet.qdoc index bf727dd380..9af04f6b4c 100644 --- a/src/widgets/doc/snippets/code/doc_src_stylesheet.qdoc +++ b/src/widgets/doc/snippets/code/doc_src_stylesheet.qdoc @@ -954,6 +954,7 @@ QLineEdit[echoMode="2"] { //! [119] QLineEdit:read-only { background: lightblue; +} //! [119] |