From 47869340b97686a4bf852f94edc3bae1e50d7053 Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Wed, 31 Oct 2018 12:52:27 +0100 Subject: 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 --- src/widgets/doc/images/gridlayout.png | Bin 1445 -> 0 bytes src/widgets/doc/images/qgridlayout.png | Bin 0 -> 1445 bytes src/widgets/kernel/qgridlayout.cpp | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 src/widgets/doc/images/gridlayout.png create mode 100644 src/widgets/doc/images/qgridlayout.png diff --git a/src/widgets/doc/images/gridlayout.png b/src/widgets/doc/images/gridlayout.png deleted file mode 100644 index ae76c0487b..0000000000 Binary files a/src/widgets/doc/images/gridlayout.png and /dev/null differ diff --git a/src/widgets/doc/images/qgridlayout.png b/src/widgets/doc/images/qgridlayout.png new file mode 100644 index 0000000000..ae76c0487b Binary files /dev/null and b/src/widgets/doc/images/qgridlayout.png differ 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 -- cgit v1.2.3