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
75aea3ff
Commit
75aea3ff
authored
8 years ago
by
Liang Qi
Committed by
The Qt Project
8 years ago
Browse files
Options
Download
Plain Diff
Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8
parents
433e5ccf
cdb56c42
Changes
47
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
bin/syncqt.pl
+4
-4
bin/syncqt.pl
dist/changes-5.6.2
+47
-0
dist/changes-5.6.2
doc/global/macros.qdocconf
+1
-0
doc/global/macros.qdocconf
mkspecs/features/uikit/xcodebuild.mk
+7
-1
mkspecs/features/uikit/xcodebuild.mk
qmake/generators/mac/pbuilder_pbx.cpp
+30
-18
qmake/generators/mac/pbuilder_pbx.cpp
src/corelib/global/qlogging.cpp
+1
-0
src/corelib/global/qlogging.cpp
src/gui/kernel/qguiapplication.cpp
+0
-6
src/gui/kernel/qguiapplication.cpp
src/gui/kernel/qwindow.cpp
+1
-1
src/gui/kernel/qwindow.cpp
src/gui/opengl/qopenglshaderprogram.cpp
+12
-2
src/gui/opengl/qopenglshaderprogram.cpp
src/gui/painting/qdrawhelper.cpp
+4
-3
src/gui/painting/qdrawhelper.cpp
src/gui/text/qrawfont.cpp
+16
-0
src/gui/text/qrawfont.cpp
src/network/doc/src/ssl.qdoc
+4
-2
src/network/doc/src/ssl.qdoc
src/network/kernel/qnetworkinterface_unix.cpp
+3
-0
src/network/kernel/qnetworkinterface_unix.cpp
src/network/ssl/qsslsocket_mac.cpp
+1
-1
src/network/ssl/qsslsocket_mac.cpp
src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
+7
-1
...msupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
src/plugins/platforms/android/qandroidplatformtheme.cpp
+0
-3
src/plugins/platforms/android/qandroidplatformtheme.cpp
src/plugins/platforms/cocoa/qcocoaintegration.mm
+0
-2
src/plugins/platforms/cocoa/qcocoaintegration.mm
src/plugins/platforms/cocoa/qnsview.mm
+9
-9
src/plugins/platforms/cocoa/qnsview.mm
src/plugins/platforms/windows/qwindowsfontdatabase.cpp
+17
-2
src/plugins/platforms/windows/qwindowsfontdatabase.cpp
src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp
+15
-3
...ugins/platforms/windows/qwindowsfontenginedirectwrite.cpp
with
179 additions
and
58 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