Fix documentation

There where some missing configurations and leftovers from earlier that
caused the doc generation to fail. This is only a quick build /
infrastructure change.

Change-Id: Iebcad3f654361c5d27bc4b1ee370f6e802378531
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>

6 files changed, 52 insertions, 48 deletions

diff --git a/examples/webview/webview.pro b/examples/webview/webview.pro
index 38985c5..67a295a 100644
--- a/examples/webview/webview.pro
+++ b/examples/webview/webview.pro
@@ -1,2 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS += webview
+EXAMPLE_FILES += webview
diff --git a/examples/webview/webview/doc/images/qtwebview-example.png b/examples/webview/webview/doc/images/webview-example.png
index 40f2611..40f2611 100644
--- a/examples/webview/webview/doc/images/qtwebview-example.png
+++ b/examples/webview/webview/doc/images/webview-example.png
diff --git a/examples/webview/webview/doc/src/webview.qdoc b/examples/webview/webview/doc/src/webview.qdoc
index 034be45..d677b64 100644
--- a/examples/webview/webview/doc/src/webview.qdoc
+++ b/examples/webview/webview/doc/src/webview.qdoc
@@ -27,9 +27,9 @@
 
 /*!
     \title Qt WebView Examples - WebView
-    \example qtwebview
+    \example webview
     \brief WebView is an example that demonstrates how to use the Qt WebView module with Qt Quick.
-    \image qtwebview-example.png
+    \image webview-example.png
     \ingroup qtwebview-examples
 
     The WebView example creates a simple browser using Qt Quick Controls
diff --git a/src/webview/doc/qtwebview.qdocconf b/src/webview/doc/qtwebview.qdocconf
new file mode 100644
index 0000000..c53d0a8
--- /dev/null
+++ b/src/webview/doc/qtwebview.qdocconf
@@ -0,0 +1,46 @@
+include($QT_INSTALL_DOCS/global/macros.qdocconf)
+include($QT_INSTALL_DOCS/global/qt-cpp-defines.qdocconf)
+include($QT_INSTALL_DOCS/global/compat.qdocconf)
+include($QT_INSTALL_DOCS/global/fileextensions.qdocconf)
+include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf)
+
+project                                            = QtWebView
+description                                        = Qt WebView Reference Documentation
+url                                                = http://qt-project.org/doc/qt-$QT_VER
+version                                            = $QT_VERSION
+
+qhp.projects                                       = QtWebView
+
+qhp.QtWebView.file                              = qtwebview.qhp
+qhp.QtWebView.namespace                         = org.qt-project.qtmultimedia.$QT_VERSION_TAG
+qhp.QtWebView.virtualFolder                     = qtwebview
+qhp.QtWebView.indexTitle                        = Qt WebView
+qhp.QtWebView.indexRoot                         =
+qhp.QtWebView.filterAttributes                  = qtwebview 1.0 qtrefdoc
+qhp.QtWebView.customFilters.Qt.name             = QtWebView 1.0
+qhp.QtWebView.customFilters.Qt.filterAttributes = qtwebview 1.0
+
+qhp.QtWebView.subprojects                       = qmltypes classes examples
+qhp.QtWebView.subprojects.qmltypes.title        = QML Types
+qhp.QtWebView.subprojects.qmltypes.indexTitle   = Qt WebView QML Types
+qhp.QtWebView.subprojects.qmltypes.selectors    = fake:qmlclass
+qhp.QtWebView.subprojects.qmltypes.sortPages    = true
+qhp.QtWebView.subprojects.examples.title        = Examples
+qhp.QtWebView.subprojects.examples.indexTitle   = Qt WebView Examples
+qhp.QtWebView.subprojects.examples.selectors    = fake:example
+
+indexes +=  $QT_INSTALL_DOCS/qtqml/qtqml.index \
+            $QT_INSTALL_DOCS/qtquick/qtquick.index \
+            $QT_INSTALL_DOCS/qtdoc/qtdoc.index \
+            $QT_INSTALL_DOCS/qtquickcontrols/qtquickcontrols.index
+
+headerdirs += ../ ../../imports/ ../
+sourcedirs += ../ ../../imports/ ../
+exampledirs += ../../../examples
+imagedirs  += images
+
+examplesinstallpath = webview
+depends = qtcore qtdoc qtquick qtqml
+
+navigation.landingpage    = "Qt WebView"
+navigation.qmltypespage   = "Qt WebView QML Types"
diff --git a/src/webview/doc/webview.qdocconf b/src/webview/doc/webview.qdocconf
deleted file mode 100644
index ec6a99c..0000000
--- a/src/webview/doc/webview.qdocconf
+++ /dev/null
@@ -1,46 +0,0 @@
-include($QT_INSTALL_DOCS/global/macros.qdocconf)
-include($QT_INSTALL_DOCS/global/qt-cpp-defines.qdocconf)
-include($QT_INSTALL_DOCS/global/compat.qdocconf)
-include($QT_INSTALL_DOCS/global/fileextensions.qdocconf)
-include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf)
-
-project                                            = QtWebView
-description                                        = Qt WebView Reference Documentation
-url                                                = http://qt-project.org/doc/qt-$QT_VER
-version                                            = $QT_VERSION
-
-qhp.projects                                       = QtWebView
-
-qhp.QtPurchasing.file                              = qtwebview.qhp
-qhp.QtPurchasing.namespace                         = org.qt-project.qtmultimedia.$QT_VERSION_TAG
-qhp.QtPurchasing.virtualFolder                     = qtwebview
-qhp.QtPurchasing.indexTitle                        = Qt WebView
-qhp.QtPurchasing.indexRoot                         =
-qhp.QtPurchasing.filterAttributes                  = qtwebview 1.0 qtrefdoc
-qhp.QtPurchasing.customFilters.Qt.name             = QtWebView 1.0
-qhp.QtPurchasing.customFilters.Qt.filterAttributes = qtwebview 1.0
-
-qhp.QtPurchasing.subprojects                       = qmltypes classes examples
-qhp.QtPurchasing.subprojects.qmltypes.title        = QML Types
-qhp.QtPurchasing.subprojects.qmltypes.indexTitle   = Qt WebView QML Types
-qhp.QtPurchasing.subprojects.qmltypes.selectors    = fake:qmlclass
-qhp.QtPurchasing.subprojects.qmltypes.sortPages    = true
-qhp.QtPurchasing.subprojects.examples.title        = Examples
-qhp.QtPurchasing.subprojects.examples.indexTitle   = Qt WebView Examples
-qhp.QtPurchasing.subprojects.examples.selectors    = fake:example
-
-indexes +=  $QT_INSTALL_DOCS/qtqml/qtqml.index \
-            $QT_INSTALL_DOCS/qtquick/qtquick.index \
-            $QT_INSTALL_DOCS/qtdoc/qtdoc.index \
-            $QT_INSTALL_DOCS/qtquickcontrols/qtquickcontrols.index
-
-headerdirs += ../ ../../imports/ ../
-sourcedirs += ../ ../../imports/ ../
-exampledirs += ../../../examples/webview
-imagedirs  += images
-
-examplesinstallpath = webview
-depends = qtcore qtdoc qtquick qtqml
-
-navigation.landingpage    = "Qt WebView"
-navigation.qmltypespage   = "Qt WebView QML Types"
diff --git a/src/webview/webview.pro b/src/webview/webview.pro
index 20b9fed..9af7c79 100644
--- a/src/webview/webview.pro
+++ b/src/webview/webview.pro
@@ -6,4 +6,7 @@ TARGET = QtWebView
 
 QT += quick qml
 
+QMAKE_DOCS = \
+             $$PWD/doc/qtwebview.qdocconf
+
 load(qt_module)