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
c7170915
Commit
c7170915
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
d2b2511f
c97eb3e1
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.10.1
No related merge requests found
Changes
65
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
mkspecs/features/android/android_deployment_settings.prf
+1
-1
mkspecs/features/android/android_deployment_settings.prf
src/corelib/global/qglobal.cpp
+3
-3
src/corelib/global/qglobal.cpp
src/corelib/global/qlogging.cpp
+2
-2
src/corelib/global/qlogging.cpp
src/corelib/global/qoperatingsystemversion.cpp
+2
-2
src/corelib/global/qoperatingsystemversion.cpp
src/corelib/global/qrandom.cpp
+4
-4
src/corelib/global/qrandom.cpp
src/corelib/io/io.pri
+1
-1
src/corelib/io/io.pri
src/corelib/kernel/kernel.pri
+1
-1
src/corelib/kernel/kernel.pri
src/corelib/kernel/qcoreapplication.cpp
+3
-3
src/corelib/kernel/qcoreapplication.cpp
src/corelib/plugin/qlibrary.cpp
+21
-8
src/corelib/plugin/qlibrary.cpp
src/corelib/tools/qsimd_p.h
+1
-1
src/corelib/tools/qsimd_p.h
src/corelib/tools/qstring.cpp
+5
-1
src/corelib/tools/qstring.cpp
src/corelib/tools/qtimezone.cpp
+4
-4
src/corelib/tools/qtimezone.cpp
src/corelib/tools/qtimezoneprivate_p.h
+3
-3
src/corelib/tools/qtimezoneprivate_p.h
src/corelib/tools/tools.pri
+1
-1
src/corelib/tools/tools.pri
src/gui/kernel/qguiapplication.cpp
+2
-2
src/gui/kernel/qguiapplication.cpp
src/gui/kernel/qopenglcontext.cpp
+1
-0
src/gui/kernel/qopenglcontext.cpp
src/network/ssl/qsslsocket_openssl.cpp
+2
-0
src/network/ssl/qsslsocket_openssl.cpp
src/network/ssl/qsslsocket_p.h
+1
-1
src/network/ssl/qsslsocket_p.h
src/network/ssl/ssl.pri
+1
-1
src/network/ssl/ssl.pri
src/platformsupport/eglconvenience/qeglplatformcontext.cpp
+2
-2
src/platformsupport/eglconvenience/qeglplatformcontext.cpp
with
61 additions
and
41 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