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
QtWebEngine
Commits
028bd20e
Commit
028bd20e
authored
7 years ago
by
Oswald Buddenhagen
Browse files
Options
Download
Plain Diff
Merge 5.9 into 5.9.0
Change-Id: If450c073521057241f34ed9b9a7f9965c6752a15
parents
4ea591e7
b24a6419
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.15.3
5.15.4
5.15.5
5.15.6
5.15.7
5.9
5.9.8
6.2
6.2.0
6.2.1
6.2.2
wip/qtpdf
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
No related merge requests found
Changes
54
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
.qmake.conf
+0
-2
.qmake.conf
config.tests/alsa/alsa.pro
+0
-0
config.tests/alsa/alsa.pro
config.tests/alsa/alsatest.cpp
+0
-0
config.tests/alsa/alsatest.cpp
config.tests/khr/khr.cpp
+0
-0
config.tests/khr/khr.cpp
config.tests/khr/khr.pro
+0
-0
config.tests/khr/khr.pro
config.tests/libvpx/libvpx.cpp
+0
-0
config.tests/libvpx/libvpx.cpp
config.tests/libvpx/libvpx.pro
+0
-0
config.tests/libvpx/libvpx.pro
config.tests/snappy/snappy.cpp
+0
-0
config.tests/snappy/snappy.cpp
config.tests/snappy/snappy.pro
+0
-0
config.tests/snappy/snappy.pro
config.tests/srtp/srtp.cpp
+0
-0
config.tests/srtp/srtp.cpp
config.tests/srtp/srtp.pro
+0
-0
config.tests/srtp/srtp.pro
config.tests/winversion/winversion.cpp
+0
-0
config.tests/winversion/winversion.cpp
config.tests/winversion/winversion.pro
+0
-0
config.tests/winversion/winversion.pro
configure.json
+20
-9
configure.json
configure.pri
+41
-0
configure.pri
examples/webengine/quicknanobrowser/ApplicationRoot.qml
+9
-9
examples/webengine/quicknanobrowser/ApplicationRoot.qml
examples/webengine/quicknanobrowser/BrowserWindow.qml
+69
-68
examples/webengine/quicknanobrowser/BrowserWindow.qml
examples/webengine/quicknanobrowser/DownloadView.qml
+6
-6
examples/webengine/quicknanobrowser/DownloadView.qml
examples/webengine/quicknanobrowser/FullScreenNotification.qml
+6
-6
...les/webengine/quicknanobrowser/FullScreenNotification.qml
examples/webenginewidgets/markdowneditor/document.h
+1
-1
examples/webenginewidgets/markdowneditor/document.h
with
152 additions
and
101 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