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
37a55e88
Commit
37a55e88
authored
9 years ago
by
Liang Qi
Committed by
The Qt Project
9 years ago
Browse files
Options
Download
Plain Diff
Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6
parents
eddb938c
8c57e8c0
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
5.6
5.7
5.8
5.9
5.9.8
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/lite
wip/nacl
wip/remac
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
v5.9.9
v5.9.8
v5.9.7
v5.9.6
v5.9.5
v5.9.4
v5.9.3
v5.9.2
v5.9.1
v5.9.0
v5.9.0-rc2
v5.9.0-rc1
v5.9.0-beta4
v5.9.0-beta3
v5.9.0-beta2
v5.9.0-beta1
v5.9.0-alpha1
v5.8.0
v5.8.0-rc1
v5.8.0-beta1
v5.8.0-alpha1
v5.7.1
v5.7.0
v5.7.0-rc1
v5.7.0-beta1
v5.7.0-alpha1
v5.6.3
v5.6.2
v5.6.1
v5.6.1-1
v5.6.0
v5.6.0-rc1
v5.6.0-beta1
No related merge requests found
Changes
18
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow.cpp
+7
-1
...le/src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow.cpp
src/angle/patches/0010-ANGLE-D3D11-Suppress-keyboard-handling-of-DXGI.patch
+36
-0
...0010-ANGLE-D3D11-Suppress-keyboard-handling-of-DXGI.patch
src/corelib/arch/arch.pri
+0
-1
src/corelib/arch/arch.pri
src/corelib/io/qstandardpaths_mac.mm
+1
-1
src/corelib/io/qstandardpaths_mac.mm
src/gui/painting/qplatformbackingstore.cpp
+9
-2
src/gui/painting/qplatformbackingstore.cpp
src/network/socket/qnativesocketengine.cpp
+19
-17
src/network/socket/qnativesocketengine.cpp
src/network/socket/qnativesocketengine_p.h
+7
-5
src/network/socket/qnativesocketengine_p.h
src/network/ssl/qsslsocket_mac.cpp
+293
-86
src/network/ssl/qsslsocket_mac.cpp
src/network/ssl/qsslsocket_mac_p.h
+17
-5
src/network/ssl/qsslsocket_mac_p.h
src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp
+11
-0
...port/platformcompositor/qopenglcompositorbackingstore.cpp
src/platformsupport/platformcompositor/qopenglcompositorbackingstore_p.h
+1
-0
...port/platformcompositor/qopenglcompositorbackingstore_p.h
src/plugins/generic/generic.pro
+5
-1
src/plugins/generic/generic.pro
src/plugins/platforms/ios/qiostextresponder.mm
+1
-1
src/plugins/platforms/ios/qiostextresponder.mm
src/printsupport/kernel/qprintengine_win.cpp
+1
-1
src/printsupport/kernel/qprintengine_win.cpp
src/widgets/dialogs/qfiledialog.cpp
+2
-0
src/widgets/dialogs/qfiledialog.cpp
src/widgets/kernel/qapplication.cpp
+4
-2
src/widgets/kernel/qapplication.cpp
src/widgets/kernel/qwidget.cpp
+35
-11
src/widgets/kernel/qwidget.cpp
tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
+9
-0
tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
with
458 additions
and
134 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