Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
external
Qt
QtBase
Commits
295cd87c
Commit
295cd87c
authored
6 years ago
by
Qt Forward Merge Bot
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I66c7f18a2abd13601da0947919436f7da3549ae9
parents
35ebdeb8
3bac18da
dev
5.12
5.12.1
5.12.10
5.12.11
5.12.12
5.12.2
5.12.3
5.12.4
5.12.5
5.12.6
5.12.7
5.12.8
5.12.9
5.13
5.13.0
5.13.1
5.13.2
5.14
5.14.0
5.14.1
5.14.2
5.15
5.15.0
5.15.1
5.15.2
6.0
6.0.0
6.1
6.1.0
6.1.1
6.1.2
6.1.3
6.2
6.2.0
6.2.1
6.2.2
wip/cmake
v5.15.0-alpha1
v5.14.1
v5.14.0
v5.14.0-rc2
v5.14.0-rc1
v5.14.0-beta3
v5.14.0-beta2
v5.14.0-beta1
v5.14.0-alpha1
v5.13.2
v5.13.1
v5.13.0
v5.13.0-rc3
v5.13.0-rc2
v5.13.0-rc1
v5.13.0-beta4
v5.13.0-beta3
v5.13.0-beta2
v5.13.0-beta1
v5.13.0-alpha1
v5.12.7
v5.12.6
v5.12.5
v5.12.4
v5.12.3
v5.12.2
v5.12.1
v5.12.0
v5.12.0-rc2
v5.12.0-rc1
v5.12.0-beta4
v5.12.0-beta3
v5.12.0-beta2
v5.12.0-beta1
v5.12.0-alpha1
No related merge requests found
Changes
26
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
examples/vulkan/hellovulkancubes/renderer.cpp
+1
-1
examples/vulkan/hellovulkancubes/renderer.cpp
examples/vulkan/hellovulkantexture/hellovulkantexture.cpp
+1
-1
examples/vulkan/hellovulkantexture/hellovulkantexture.cpp
examples/vulkan/shared/trianglerenderer.cpp
+2
-2
examples/vulkan/shared/trianglerenderer.cpp
examples/widgets/tools/treemodelcompleter/mainwindow.cpp
+1
-1
examples/widgets/tools/treemodelcompleter/mainwindow.cpp
src/3rdparty/pcre2/LICENCE-SLJIT
+22
-0
src/3rdparty/pcre2/LICENCE-SLJIT
src/3rdparty/pcre2/qt_attribution.json
+19
-0
src/3rdparty/pcre2/qt_attribution.json
src/3rdparty/pixman/qt_attribution.json
+1
-0
src/3rdparty/pixman/qt_attribution.json
src/corelib/doc/snippets/code/src_corelib_tools_qeasingcurve.cpp
+13
-2
...elib/doc/snippets/code/src_corelib_tools_qeasingcurve.cpp
src/corelib/doc/snippets/qstring/main.cpp
+1
-1
src/corelib/doc/snippets/qstring/main.cpp
src/corelib/tools/qeasingcurve.cpp
+4
-13
src/corelib/tools/qeasingcurve.cpp
src/dbus/doc/src/qtdbus-module.qdoc
+2
-0
src/dbus/doc/src/qtdbus-module.qdoc
src/gui/doc/src/qtgui.qdoc
+4
-1
src/gui/doc/src/qtgui.qdoc
src/gui/painting/qdrawhelper.cpp
+49
-9
src/gui/painting/qdrawhelper.cpp
src/gui/vulkan/qvulkanwindow.cpp
+5
-9
src/gui/vulkan/qvulkanwindow.cpp
src/network/doc/src/qtnetwork.qdoc
+3
-0
src/network/doc/src/qtnetwork.qdoc
src/opengl/doc/src/qtopengl-index.qdoc
+2
-0
src/opengl/doc/src/qtopengl-index.qdoc
src/opengl/doc/src/qtopengl-module.qdoc
+2
-0
src/opengl/doc/src/qtopengl-module.qdoc
src/plugins/platforms/windows/uiautomation/qwindowsuiautils.cpp
+18
-4
...ugins/platforms/windows/uiautomation/qwindowsuiautils.cpp
src/printsupport/doc/src/qtprintsupport-module.qdoc
+2
-0
src/printsupport/doc/src/qtprintsupport-module.qdoc
src/sql/doc/src/qtsql.qdoc
+2
-0
src/sql/doc/src/qtsql.qdoc
with
154 additions
and
44 deletions
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets