Skip to content
GitLab
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
QtWebEngine
Commits
e66a1125
Commit
e66a1125
authored
10 years ago
by
Oswald Buddenhagen
Browse files
Options
Download
Plain Diff
Merge 5.4 into 5.4.1
Change-Id: I772c9710d8b01efd385a54e5f642ae2b62702a0e
parents
79773ecf
ae657b91
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
src/3rdparty
+1
-1
src/3rdparty
src/core/core_gyp_generator.pro
+1
-2
src/core/core_gyp_generator.pro
src/core/web_engine_context.cpp
+1
-0
src/core/web_engine_context.cpp
src/core/web_engine_library_info.cpp
+12
-2
src/core/web_engine_library_info.cpp
src/src.pro
+19
-23
src/src.pro
sync.profile
+4
-4
sync.profile
tools/buildscripts/gyp_qtwebengine
+1
-1
tools/buildscripts/gyp_qtwebengine
tools/qmake/config.tests/libcap/libcap.cpp
+44
-0
tools/qmake/config.tests/libcap/libcap.cpp
tools/qmake/config.tests/libcap/libcap.pro
+3
-0
tools/qmake/config.tests/libcap/libcap.pro
tools/qmake/mkspecs/features/configure.prf
+31
-0
tools/qmake/mkspecs/features/configure.prf
tools/qmake/mkspecs/features/default_post.prf
+8
-0
tools/qmake/mkspecs/features/default_post.prf
tools/qmake/mkspecs/features/default_pre.prf
+7
-0
tools/qmake/mkspecs/features/default_pre.prf
tools/qmake/mkspecs/features/functions.prf
+14
-6
tools/qmake/mkspecs/features/functions.prf
with
146 additions
and
39 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