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
70558b68
Commit
70558b68
authored
9 years ago
by
Liang Qi
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: Id512a24a77e2ae1126d39bc004f0920ff3561dbc
parents
20a9f509
76c7af60
Changes
280
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
.gitignore
+0
-1
.gitignore
LICENSE.GPLv3
+686
-0
LICENSE.GPLv3
LICENSE.LGPLv3
+12
-0
LICENSE.LGPLv3
dist/changes-5.5.1
+47
-0
dist/changes-5.5.1
examples/examples.pro
+1
-1
examples/examples.pro
examples/webengine/quicknanobrowser/BrowserWindow.qml
+29
-0
examples/webengine/quicknanobrowser/BrowserWindow.qml
examples/webenginewidgets/browser/browser.rc
+0
-1
examples/webenginewidgets/browser/browser.rc
examples/webenginewidgets/demobrowser/Info_mac.plist
+0
-0
examples/webenginewidgets/demobrowser/Info_mac.plist
examples/webenginewidgets/demobrowser/addbookmarkdialog.ui
+0
-0
examples/webenginewidgets/demobrowser/addbookmarkdialog.ui
examples/webenginewidgets/demobrowser/autosaver.cpp
+0
-0
examples/webenginewidgets/demobrowser/autosaver.cpp
examples/webenginewidgets/demobrowser/autosaver.h
+0
-0
examples/webenginewidgets/demobrowser/autosaver.h
examples/webenginewidgets/demobrowser/bookmarks.cpp
+0
-0
examples/webenginewidgets/demobrowser/bookmarks.cpp
examples/webenginewidgets/demobrowser/bookmarks.h
+0
-0
examples/webenginewidgets/demobrowser/bookmarks.h
examples/webenginewidgets/demobrowser/bookmarks.ui
+0
-0
examples/webenginewidgets/demobrowser/bookmarks.ui
examples/webenginewidgets/demobrowser/browserapplication.cpp
+77
-6
examples/webenginewidgets/demobrowser/browserapplication.cpp
examples/webenginewidgets/demobrowser/browserapplication.h
+17
-2
examples/webenginewidgets/demobrowser/browserapplication.h
examples/webenginewidgets/demobrowser/browsermainwindow.cpp
+0
-0
examples/webenginewidgets/demobrowser/browsermainwindow.cpp
examples/webenginewidgets/demobrowser/browsermainwindow.h
+0
-0
examples/webenginewidgets/demobrowser/browsermainwindow.h
examples/webenginewidgets/demobrowser/chasewidget.cpp
+0
-0
examples/webenginewidgets/demobrowser/chasewidget.cpp
examples/webenginewidgets/demobrowser/chasewidget.h
+0
-0
examples/webenginewidgets/demobrowser/chasewidget.h
with
869 additions
and
11 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