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
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