diff options
| author |   Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-28 01:00:39 +0100 |
|---|---|---|
| committer |   Liang Qi <liang.qi@qt.io> | 2020-01-28 14:14:20 +0000 |
| commit | 558fc903acc610769279da2737ad679aa9fd728d (patch) | |
| tree | ebe36deb140e47ca32fea9b0753cde06f465a0fa /tests/manual/rhi/mrt/mrt.frag.qsb | |
| parent | Sync behavior and documentation of QFoo::setItemDelegate() (diff) | |
| parent | QThread::setPriority() Warn about invalid parameter on all platforms (diff) | |
| download | qtbase-558fc903acc610769279da2737ad679aa9fd728d.tar.xz qtbase-558fc903acc610769279da2737ad679aa9fd728d.zip | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/corelib/io/qsettings.cpp
src/corelib/kernel/qvariant.cpp
src/corelib/serialization/qjsoncbor.cpp
src/corelib/serialization/qjsonvalue.cpp
src/corelib/tools/tools.pri
src/gui/image/qimage.cpp
src/gui/kernel/qguivariant.cpp
src/widgets/kernel/qshortcut.cpp
tests/auto/tools/moc/allmocs_baseline_in.json
tests/auto/tools/moc/tst_moc.cpp
src/opengl/qglframebufferobject.cpp
Done-With: Edward Welbourne <edward.welbourne@qt.io>
Done-With: Leander Beernaert <leander.beernaert@qt.io>
Change-Id: Ie7f5fa646c607fe70c314bf7195f7578ded1d271
Diffstat (limited to 'tests/manual/rhi/mrt/mrt.frag.qsb')
| -rw-r--r-- | tests/manual/rhi/mrt/mrt.frag.qsb | bin | 1934 -> 1594 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/manual/rhi/mrt/mrt.frag.qsb b/tests/manual/rhi/mrt/mrt.frag.qsb Binary files differindex 389b6affa3..0c83b71ee6 100644 --- a/tests/manual/rhi/mrt/mrt.frag.qsb +++ b/tests/manual/rhi/mrt/mrt.frag.qsb |