diff options
author | Nico Vertriest <nico.vertriest@qt.io> | 2018-10-31 12:52:27 +0100 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2018-11-02 12:41:10 +0000 |
commit | 47869340b97686a4bf852f94edc3bae1e50d7053 (patch) | |
tree | 76790baf96a6453b79d06b4f156e887886c9f041 | |
parent | afba8fcc4914b80be7733a059b26411bdde510eb (diff) |
Doc: Solve issue with gridlayout image file
Due to name conflict with file from qtdeclarative
Task-number: QTBUG-65769
Change-Id: I9ebf237701ce76b424f528feacb24e4158f06c0d
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
-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/kernel/qgridlayout.cpp | 2 |
2 files changed, 1 insertions, 1 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/kernel/qgridlayout.cpp b/src/widgets/kernel/qgridlayout.cpp index db8ef89477..f1c6c96a6d 100644 --- a/src/widgets/kernel/qgridlayout.cpp +++ b/src/widgets/kernel/qgridlayout.cpp @@ -1029,7 +1029,7 @@ QRect QGridLayoutPrivate::cellRect(int row, int col) const This illustration shows a fragment of a dialog with a five-column, three-row grid (the grid is shown overlaid in magenta): - \image gridlayout.png A grid layout + \image qgridlayout.png A grid layout Columns 0, 2 and 4 in this dialog fragment are made up of a QLabel, a QLineEdit, and a QListBox. Columns 1 and 3 are |