diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 18:09:08 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 18:09:08 +0100 |
commit | b1153753221513aa5687001c84a1c9ed69925dc6 (patch) | |
tree | 3569ad54e433fee8244effe558ca52e567b6890d /src/webenginewidgets/api/qwebenginepage.cpp | |
parent | 4d6b2dc88bda15ade9d04e54d80b7e4693d59832 (diff) | |
parent | c2687689ba42d6021ae3f220d9fd240609489d3a (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/3rdparty
src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
Change-Id: I90728e965399e51b626d538924de955f9abab5fe
Diffstat (limited to 'src/webenginewidgets/api/qwebenginepage.cpp')
-rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 27ed7fca6..7f7cba431 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -503,6 +503,7 @@ QWebEnginePage::QWebEnginePage(QObject* parent) /*! \enum QWebEnginePage::RenderProcessTerminationStatus + \since 5.6 This enum describes the status with which the render process terminated: @@ -518,6 +519,7 @@ QWebEnginePage::QWebEnginePage(QObject* parent) /*! \fn QWebEnginePage::renderProcessTerminated(RenderProcessTerminationStatus terminationStatus, int exitCode) + \since 5.6 This signal is emitted when the render process is terminated with a non-zero exit status. \a terminationStatus is the termination status of the process and \a exitCode is the status code |