diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-11-10 11:36:18 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-11-10 11:38:40 +0100 |
| commit | 58437fb125f60c11ba8e97c914fa8db8c89c7373 (patch) | |
| tree | f47ed59073984ec76034155bc04d3d987b192d2e /examples | |
| parent | 76bb804405f424708fffec502788995ea91206b8 (diff) | |
| parent | b20c15f2041205a1cab98fbaf9560a3e2e0d6367 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/corelib/serialization/qcborcommon.h
src/corelib/tools/qlocale_data_p.h
tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
Done-with: Edward Welbourne <edward.welbourne@qt.io>
Change-Id: Ibed987f6d77a0294f78f67d78625237616082416
Diffstat (limited to 'examples')
| -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/painting/composition/composition.cpp | 7 | ||||
| -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 |
7 files changed, 5 insertions, 2 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/painting/composition/composition.cpp b/examples/widgets/painting/composition/composition.cpp index 3bc31b1fce..e0abc5875c 100644 --- a/examples/widgets/painting/composition/composition.cpp +++ b/examples/widgets/painting/composition/composition.cpp @@ -358,10 +358,10 @@ void CompositionRenderer::paint(QPainter *painter) m_blitter.create(); int new_pbuf_size = m_pbuffer_size; - if (size().width() > m_pbuffer_size || size().height() > m_pbuffer_size) + while (size().width() > new_pbuf_size || size().height() > new_pbuf_size) new_pbuf_size *= 2; - if (size().width() < m_pbuffer_size/2 && size().height() < m_pbuffer_size/2) + while (size().width() < new_pbuf_size/2 && size().height() < new_pbuf_size/2) new_pbuf_size /= 2; if (!m_fbo || new_pbuf_size != m_pbuffer_size) { @@ -372,6 +372,9 @@ void CompositionRenderer::paint(QPainter *painter) if (size() != m_previous_size) { m_previous_size = size(); QPainter p(m_fbo.data()); + p.setCompositionMode(QPainter::CompositionMode_Source); + p.fillRect(QRect(QPoint(0, 0), size()), Qt::transparent); + p.setCompositionMode(QPainter::CompositionMode_SourceOver); drawBase(p); p.end(); m_base_tex = m_fbo->takeTexture(); 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 |
