4 files changed, 58 insertions, 14 deletions
diff --git a/src/webengine/api/qquickwebenginehistory.cpp b/src/webengine/api/qquickwebenginehistory.cpp
index 27081703b..483fa86f9 100644
--- a/src/webengine/api/qquickwebenginehistory.cpp
+++ b/src/webengine/api/qquickwebenginehistory.cpp
@@ -234,7 +234,7 @@ QQuickWebEngineHistoryPrivate::~QQuickWebEngineHistoryPrivate()
     The data models can also be used to create a menu, as illustrated by the following code
     snippet:
 
-    \quotefromfile quicknanobrowser/browserwindow.qml
+    \quotefromfile webengine/quicknanobrowser/browserwindow.qml
     \skipto ToolBar
     \printuntil onObjectRemoved
     \printuntil }
diff --git a/src/webengine/doc/qtwebengine.qdocconf b/src/webengine/doc/qtwebengine.qdocconf
index f833cf0d2..e277f4190 100644
--- a/src/webengine/doc/qtwebengine.qdocconf
+++ b/src/webengine/doc/qtwebengine.qdocconf
@@ -4,7 +4,7 @@ project                 = QtWebEngine
 description             = Qt WebEngine Reference Documentation
 version                 = $QT_VERSION
 
-examplesinstallpath     = webengine
+examplesinstallpath     =
 
 qhp.projects            = QtWebEngine
 
@@ -44,21 +44,24 @@ depends += qtcore \
            qtquickcontrols \
            qtdoc \
            qtwebchannel \
-           qtwebenginewidgets
+           qtwidgets
 
-headerdirs  += . \
-               ../api \
-               ../../core/api
+headerdirs  += .. \
+               ../../core \
+               ../../webenginewidgets
 
-sourcedirs  += . \
-               ../api \
-               ../../core/api \
-               ../../core/doc/src
+sourcedirs  += .. \
+                ../../core/ \
+               ../../webenginewidgets \
 
 exampledirs +=  . \
-                ../../../examples/webengine \
+                ../../../examples \
                 snippets \
-                ../../core/doc/snippets
+                ../../core/doc/snippets \
+                ../../webenginewidgets/doc/snippets
+
+
+imagedirs += images
 
 navigation.landingpage = "Qt WebEngine"
 navigation.cppclassespage = "Qt WebEngine C++ Classes"
diff --git a/src/webengine/doc/src/qtwebengine-index.qdoc b/src/webengine/doc/src/qtwebengine-index.qdoc
index 2c3737b7d..e67bd43fd 100644
--- a/src/webengine/doc/src/qtwebengine-index.qdoc
+++ b/src/webengine/doc/src/qtwebengine-index.qdoc
@@ -84,8 +84,7 @@
     \section1 API References
 
     \list
-        \li \l{Qt WebEngine Core C++ Classes}
-        \li \l{Qt WebEngine Widgets C++ Classes}
+        \li \l{Qt WebEngine C++ Classes}
         \li \l{Qt WebEngine QML Types}
     \endlist
 */
diff --git a/src/webengine/doc/src/qtwebengine-modules.qdoc b/src/webengine/doc/src/qtwebengine-modules.qdoc
new file mode 100644
index 000000000..2e1b4c947
--- /dev/null
+++ b/src/webengine/doc/src/qtwebengine-modules.qdoc
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qtwebengine-modules.html
+    \title Qt WebEngine C++ Classes
+    \brief Provides functionality for rendering regions of dynamic web content.
+
+    \e {Qt WebEngine} provides functionality for rendering regions of dynamic web content.
+
+    \section1 Classes
+
+    \section2 Qt WebEngineCore Module
+    \generatelist {classesbymodule QtWebEngineCore}
+
+    \section2 Qt WebEngineWidgets Module
+    \generatelist {classesbymodule QtWebEngineWidgets}
+*/