diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 10:52:33 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 10:52:33 +0100 |
| commit | c2687689ba42d6021ae3f220d9fd240609489d3a (patch) | |
| tree | e96236e1590d9197200c4c51a1a353197a9de385 /src/webengine/doc/qtwebengine.qdocconf | |
| parent | 6d5b9ba008bba20f1c0a1642af5f5b7182f3e890 (diff) | |
| parent | 5c4ae298b0a3d75c4c5ea8aef0595914ab25607f (diff) | |
| download | qtwebengine-c2687689ba42d6021ae3f220d9fd240609489d3a.tar.gz | |
Merge remote-tracking branch 'origin/5.6.0' into 5.6
Conflicts:
src/3rdparty
Change-Id: Icbe7ea849b6ccdcee1ea1beccf86309ffb1ed578
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 2fbdef93e..e151b78a4 100644 --- a/src/webengine/doc/qtwebengine.qdocconf +++ b/src/webengine/doc/qtwebengine.qdocconf @@ -69,7 +69,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 |