diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-11-09 10:34:33 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-11-09 10:34:33 +0100 |
| commit | bc07958f922519bca1acc5930498ee0273576699 (patch) | |
| tree | d5fda8e4458c2543458dbaeb7f4830c6d4750954 /examples/widgets | |
| parent | b01a53fe328b37324c6e3ab38c50f156c93c6afe (diff) | |
| parent | dec7961709c90f6977d2447f7fa6c6625af41cb2 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
.qmake.conf
qmake/Makefile.unix
src/gui/text/qtextdocument.cpp
src/gui/text/qtextdocument.h
Change-Id: Iba26da0ecbf2aa4ff4b956391cfb373f977f88c9
Diffstat (limited to 'examples/widgets')
| -rw-r--r-- | examples/widgets/mainwindows/application/images/save.png | bin | 1187 -> 2699 bytes |
| -rw-r--r-- | examples/widgets/mainwindows/mdi/images/save.png | bin | 1187 -> 2699 bytes |
| -rw-r--r-- | examples/widgets/mainwindows/sdi/images/save.png | bin | 1187 -> 2699 bytes |
| -rw-r--r-- | examples/widgets/richtext/textedit/images/mac/exportpdf.png | bin | 1215 -> 12637 bytes |
| -rw-r--r-- | examples/widgets/richtext/textedit/images/mac/filesave.png | bin | 1206 -> 2699 bytes |
| -rw-r--r-- | examples/widgets/richtext/textedit/images/win/exportpdf.png | bin | 1059 -> 1215 bytes |
6 files changed, 0 insertions, 0 deletions
diff --git a/examples/widgets/mainwindows/application/images/save.png b/examples/widgets/mainwindows/application/images/save.png Binary files differindex daba865faf..e65a29d5f1 100644 --- a/examples/widgets/mainwindows/application/images/save.png +++ b/examples/widgets/mainwindows/application/images/save.png diff --git a/examples/widgets/mainwindows/mdi/images/save.png b/examples/widgets/mainwindows/mdi/images/save.png Binary files differindex daba865faf..e65a29d5f1 100644 --- a/examples/widgets/mainwindows/mdi/images/save.png +++ b/examples/widgets/mainwindows/mdi/images/save.png diff --git a/examples/widgets/mainwindows/sdi/images/save.png b/examples/widgets/mainwindows/sdi/images/save.png Binary files differindex daba865faf..e65a29d5f1 100644 --- a/examples/widgets/mainwindows/sdi/images/save.png +++ b/examples/widgets/mainwindows/sdi/images/save.png diff --git a/examples/widgets/richtext/textedit/images/mac/exportpdf.png b/examples/widgets/richtext/textedit/images/mac/exportpdf.png Binary files differindex ebb44e6b88..9e199407af 100644 --- a/examples/widgets/richtext/textedit/images/mac/exportpdf.png +++ b/examples/widgets/richtext/textedit/images/mac/exportpdf.png diff --git a/examples/widgets/richtext/textedit/images/mac/filesave.png b/examples/widgets/richtext/textedit/images/mac/filesave.png Binary files differindex b41ecf5319..e65a29d5f1 100644 --- a/examples/widgets/richtext/textedit/images/mac/filesave.png +++ b/examples/widgets/richtext/textedit/images/mac/filesave.png diff --git a/examples/widgets/richtext/textedit/images/win/exportpdf.png b/examples/widgets/richtext/textedit/images/win/exportpdf.png Binary files differindex eef5132928..ebb44e6b88 100644 --- a/examples/widgets/richtext/textedit/images/win/exportpdf.png +++ b/examples/widgets/richtext/textedit/images/win/exportpdf.png |
