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
71ec67a0
Commit
71ec67a0
authored
7 years ago
by
Liang Qi
Committed by
The Qt Project
7 years ago
Browse files
Options
Download
Plain Diff
Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging/5.10
parents
03bcf389
19dd2ca9
dev
5.10
5.11
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
wip/webassembly
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
v5.11.3
v5.11.2
v5.11.1
v5.11.0
v5.11.0-rc2
v5.11.0-rc1
v5.11.0-beta4
v5.11.0-beta3
v5.11.0-beta2
v5.11.0-beta1
v5.11.0-alpha1
v5.10.1
v5.10.0
v5.10.0-rc3
v5.10.0-rc2
v5.10.0-rc1
v5.10.0-beta4
v5.10.0-beta3
v5.10.0-beta2
v5.10.0-beta1
v5.10.0-alpha1
No related merge requests found
Changes
125
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
config_help.txt
+1
-0
config_help.txt
configure.json
+17
-0
configure.json
dist/changes-5.6.3
+288
-0
dist/changes-5.6.3
examples/opengl/hellogl2/glwidget.cpp
+5
-2
examples/opengl/hellogl2/glwidget.cpp
examples/opengl/hellogl2/glwidget.h
+4
-1
examples/opengl/hellogl2/glwidget.h
examples/opengl/hellogl2/main.cpp
+24
-3
examples/opengl/hellogl2/main.cpp
examples/opengl/hellowindow/main.cpp
+23
-4
examples/opengl/hellowindow/main.cpp
examples/opengl/qopenglwidget/main.cpp
+17
-2
examples/opengl/qopenglwidget/main.cpp
examples/opengl/threadedqopenglwidget/main.cpp
+14
-1
examples/opengl/threadedqopenglwidget/main.cpp
mkspecs/features/unix/ccache.prf
+19
-0
mkspecs/features/unix/ccache.prf
src/3rdparty/pcre2/import_from_pcre2_tarball.sh
+0
-1
src/3rdparty/pcre2/import_from_pcre2_tarball.sh
src/3rdparty/pcre2/pcre2.pro
+1
-2
src/3rdparty/pcre2/pcre2.pro
src/3rdparty/pcre2/src/pcre2_printint.c
+0
-831
src/3rdparty/pcre2/src/pcre2_printint.c
src/corelib/io/qfilesystemengine_win.cpp
+9
-4
src/corelib/io/qfilesystemengine_win.cpp
src/corelib/itemmodels/qabstractitemmodel.h
+1
-1
src/corelib/itemmodels/qabstractitemmodel.h
src/gui/kernel/qsimpledrag.cpp
+4
-4
src/gui/kernel/qsimpledrag.cpp
src/network/access/access.pri
+18
-7
src/network/access/access.pri
src/network/access/qftp.cpp
+0
-4
src/network/access/qftp.cpp
src/network/access/qftp_p.h
+2
-5
src/network/access/qftp_p.h
src/network/access/qnetworkaccesscachebackend.cpp
+2
-0
src/network/access/qnetworkaccesscachebackend.cpp
with
449 additions
and
872 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