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/webengine/doc/qtwebengine.qdocconf | |
| 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/webengine/doc/qtwebengine.qdocconf')
| -rw-r--r-- | src/webengine/doc/qtwebengine.qdocconf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webengine/doc/qtwebengine.qdocconf b/src/webengine/doc/qtwebengine.qdocconf index d2b8980c4..baa4a9859 100644 --- a/src/webengine/doc/qtwebengine.qdocconf +++ b/src/webengine/doc/qtwebengine.qdocconf @@ -70,7 +70,7 @@ exampledirs += . \ imagedirs += images navigation.landingpage = "Qt WebEngine" -navigation.cppclassespage = "Qt WebEngine C++ Classes" +navigation.cppclassespage = "Qt WebEngine C++ Classes and Namespaces" navigation.qmltypespage = "Qt WebEngine QML Types" Cpp.ignoretokens += Q_WEBENGINE_EXPORT QWEBENGINEWIDGETS_EXPORT |