Fix the documentation to build again

- Switch to Qt 4.7.4/4.8 compatible style (from Qt Creator)
- add make docs target directly to the installerfw.pro file
- subsequently remove doc.pro (which was wrong to begin with)

Change-Id: I3bfdd18780074df9566217fb4c0029fd122c14f0
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>

1 files changed, 11 insertions, 205 deletions

diff --git a/doc/installerfw.qdocconf b/doc/installerfw.qdocconf
index 8bc6fb70d..943f11546 100644
--- a/doc/installerfw.qdocconf
+++ b/doc/installerfw.qdocconf
@@ -1,14 +1,6 @@
-# Run qdoc from the directory that contains this file.
-include(qt-html-templates.qdocconf)
-
-project     = installerfw
+project     = "installerfw"
 description = "Qt Installer Framework Manual"
 
-headers =
-#    $$SIMULATOR_DEPENDENCY_PATH/include/remotecontrolwidget/locationui.h
-sources =
-#    $$SRCDIR/../src/ui/sensorsui.cpp \
-
 headerdirs =
 sourcedirs = $SRCDIR
 imagedirs = $SRCDIR/images $SRCDIR/templates/images
@@ -16,216 +8,30 @@ outputdir = $OUTDIR
 exampledirs = $SRCDIR
 indexes                 = qt.index
 
-include(qt-defines.qdocconf)
-
-sources.fileextensions  = "installerfw.qdoc scripting.qdoc tutorial.qdoc noninteractive.qdoc operations.qdoc"
+include(config/qt-html-templates.qdocconf)
+include(config/compat.qdocconf)
+include(config/macros.qdocconf)
+include(config/qt-cpp-ignore.qdocconf)
+include(config/qt-defines.qdocconf)
 
+sources.fileextensions         = "*.qdoc"
 
 qhp.projects            = InstallerFramework
 qhp.InstallerFramework.file             = installerfw.qhp
 qhp.InstallerFramework.namespace        = com.nokia.qt.installerfw.121
 qhp.InstallerFramework.virtualFolder    = doc
 qhp.InstallerFramework.indexTitle       = Qt Installer Framework Manual
-qhp.InstallerFramework.indexRoot        =
-qhp.InstallerFramework.filterAttributes = installerfw
-qhp.InstallerFramework.customFilters.InstallerFramework.name = Qt Installer Framework 1.2.1
+qhp.InstallerFramework.filterAttributes = installerfw 121
+qhp.InstallerFramework.customFilters.InstallerFramework.name = Installer Framework
 qhp.InstallerFramework.customFilters.InstallerFramework.filterAttributes = installerfw
+qhp.InstallerFramework.indexRoot        =
 
-qhp.InstallerFramework.subprojects         = scripting manual
-qhp.InstallerFramework.subprojects.scripting.title = Scripting
-qhp.InstallerFramework.subprojects.scripting.indexTitle = Installer Framework Scripting
-qhp.InstallerFramework.subprojects.scripting.selectors = class
-qhp.InstallerFramework.subprojects.scripting.sortPages = true
-
-
+qhp.InstallerFramework.subprojects = manual
 qhp.InstallerFramework.subprojects.manual.title = Qt Installer Framework Manual
 qhp.InstallerFramework.subprojects.manual.indexTitle = Qt Installer Framework Manual
 qhp.InstallerFramework.subprojects.manual.type = manual
 
-qhp.InstallerFramework.extraFiles       = \
-                          style/OfflineStyle.css \
-                          style/style.css \
-                          style/style_ie6.css \
-                          style/style_ie7.css \
-                          style/style_ie8.css \
-                          images/qt-logo.png \
-                          scripts/functions.js \
-                          scripts/jquery.js \
-						  images/qt-logo \
-                          images/trolltech-logo \
-                          images/api_examples.png \
-                          images/api_lookup.png \
-                          images/arrow_down.png \
-                          images/bg_ll.png \
-                          images/bg_l.png \
-                          images/bg_lr.png \
-                          images/bg_r.png \
-                          images/bg_ul_blank.png \
-                          images/bg_ll_blank.png \
-                          images/bg_l_blank.png \
-                          images/breadcrumb.png \
-                          images/bullet_dn.png \
-                          images/bullet_gt.png \
-                          images/bullet_sq.png \
-                          images/box_bg.png \
-                          images/feedbackground.png \
-                          images/horBar.png \
-                          images/page_bg.png \
-						  images/page.png \
-                          images/sprites-combined.png \
-                          images/bullet_up.png
-# macros.qdocconf
-
-macro.aring.HTML        = "å"
-macro.Auml.HTML         = "Ä"
-macro.author            = "\\bold{Author:}"
-macro.br.HTML           = "<br />"
-macro.BR.HTML           = "<br />"
-macro.aacute.HTML       = "&aacute;"
-macro.eacute.HTML       = "&eacute;"
-macro.iacute.HTML       = "&iacute;"
-macro.gui               = "\\bold"
-macro.hr.HTML           = "<hr />"
-macro.key               = "\\bold"
-macro.menu              = "\\bold"
-macro.note              = "\\bold{Note:}"
-macro.oslash.HTML       = "&oslash;"
-macro.ouml.HTML         = "&ouml;"
-macro.QA                = "\\e{Qt Assistant}"
-macro.QD                = "\\e{Qt Designer}"
-macro.QL                = "\\e{Qt Linguist}"
-macro.param             = "\\e"
-macro.raisedaster.HTML  = "<sup>*</sup>"
-macro.reg.HTML          = "<sup>&reg;</sup>"
-macro.return            = "Returns"
-macro.starslash         = "\\c{*/}"
-macro.uuml.HTML         = "&uuml;"
-macro.mdash.HTML        = "&mdash;"
-
-# compat.qdocconf
-
-alias.i				= e
-alias.include			= input
-
-macro.0                         = "\\\\0"
-macro.b                         = "\\\\b"
-macro.n                         = "\\\\n"
-macro.r                         = "\\\\r"
-macro.i                         = "\\o"
-macro.i11                       = "\\o{1,1}"
-macro.i12                       = "\\o{1,2}"
-macro.i13                       = "\\o{1,3}"
-macro.i14                       = "\\o{1,4}"
-macro.i15                       = "\\o{1,5}"
-macro.i16                       = "\\o{1,6}"
-macro.i17                       = "\\o{1,7}"
-macro.i18                       = "\\o{1,8}"
-macro.i19                       = "\\o{1,9}"
-macro.i21                       = "\\o{2,1}"
-macro.i31                       = "\\o{3,1}"
-macro.i41                       = "\\o{4,1}"
-macro.i51                       = "\\o{5,1}"
-macro.i61                       = "\\o{6,1}"
-macro.i71                       = "\\o{7,1}"
-macro.i81                       = "\\o{8,1}"
-macro.i91                       = "\\o{9,1}"
-macro.img                       = "\\image"
-macro.endquote                  = "\\endquotation"
-spurious			= "Missing comma in .*" \
-				  "Missing pattern .*"
-
 # Doxygen compatibility commands
 
 macro.see                       = "\\sa"
 macro.function                  = "\\fn"
-
-# qt-cpp-ignore.qdocconf
-
-Cpp.ignoretokens        = QAXFACTORY_EXPORT \
-                          QDESIGNER_COMPONENTS_LIBRARY \
-                          QDESIGNER_EXTENSION_LIBRARY \
-                          QDESIGNER_SDK_LIBRARY \
-                          QDESIGNER_SHARED_LIBRARY \
-                          QDESIGNER_UILIB_LIBRARY \
-                          QM_EXPORT_CANVAS \
-                          QM_EXPORT_DNS \
-                          QM_EXPORT_DOM \
-                          QM_EXPORT_FTP \
-                          QM_EXPORT_HTTP \
-                          QM_EXPORT_ICONVIEW \
-                          QM_EXPORT_NETWORK \
-                          QM_EXPORT_OPENGL \
-                          QM_EXPORT_SQL \
-                          QM_EXPORT_TABLE \
-                          QM_EXPORT_WORKSPACE \
-                          QM_EXPORT_XML \
-                          QT_ASCII_CAST_WARN \
-                          QT_ASCII_CAST_WARN_CONSTRUCTOR \
-                          QT_BEGIN_HEADER \
-                          QT_DESIGNER_STATIC \
-                          QT_END_HEADER \
-                          QT_FASTCALL \
-                          QT_WIDGET_PLUGIN_EXPORT \
-                          Q_COMPAT_EXPORT \
-                          Q_CORE_EXPORT \
-                          Q_EXPLICIT \
-                          Q_EXPORT \
-                          Q_EXPORT_CODECS_CN \
-                          Q_EXPORT_CODECS_JP \
-                          Q_EXPORT_CODECS_KR \
-                          Q_EXPORT_PLUGIN \
-                          Q_GFX_INLINE \
-                          Q_GUI_EXPORT \
-                          Q_GUI_EXPORT_INLINE \
-                          Q_GUI_EXPORT_STYLE_CDE \
-                          Q_GUI_EXPORT_STYLE_COMPACT \
-                          Q_GUI_EXPORT_STYLE_MAC \
-                          Q_GUI_EXPORT_STYLE_MOTIF \
-                          Q_GUI_EXPORT_STYLE_MOTIFPLUS \
-                          Q_GUI_EXPORT_STYLE_PLATINUM \
-                          Q_GUI_EXPORT_STYLE_POCKETPC \
-                          Q_GUI_EXPORT_STYLE_SGI \
-                          Q_GUI_EXPORT_STYLE_WINDOWS \
-                          Q_GUI_EXPORT_STYLE_WINDOWSXP \
-                          QHELP_EXPORT \
-                          Q_INLINE_TEMPLATE \
-                          Q_INTERNAL_WIN_NO_THROW \
-                          Q_NETWORK_EXPORT \
-                          Q_OPENGL_EXPORT \
-                          Q_OUTOFLINE_TEMPLATE \
-                          Q_SQL_EXPORT \
-                          Q_SVG_EXPORT \
-                          Q_SCRIPT_EXPORT \
-                          Q_TESTLIB_EXPORT \
-                          Q_TYPENAME \
-                          Q_XML_EXPORT \
-                          Q_XMLSTREAM_EXPORT \
-                          Q_XMLPATTERNS_EXPORT \
-                          QDBUS_EXPORT \
-                          QT_BEGIN_NAMESPACE \
-                          QT_BEGIN_INCLUDE_NAMESPACE \
-                          QT_END_NAMESPACE \
-                          QT_END_INCLUDE_NAMESPACE \
-                          PHONON_EXPORT \
-                          EXTENSIONSYSTEM_EXPORT \
-                          Q_INVOKABLE
-Cpp.ignoredirectives    = Q_DECLARE_HANDLE \
-                          Q_DECLARE_INTERFACE \
-                          Q_DECLARE_METATYPE \
-                          Q_DECLARE_OPERATORS_FOR_FLAGS \
-                          Q_DECLARE_PRIVATE \
-                          Q_DECLARE_PUBLIC \
-                          Q_DECLARE_SHARED \
-                          Q_DECLARE_TR_FUNCTIONS \
-                          Q_DECLARE_TYPEINFO \
-                          Q_DISABLE_COPY \
-                          QT_FORWARD_DECLARE_CLASS \
-                          Q_DUMMY_COMPARISON_OPERATOR \
-                          Q_ENUMS \
-                          Q_FLAGS \
-                          Q_INTERFACES \
-                          __attribute__ \
-                          K_DECLARE_PRIVATE \
-                          PHONON_OBJECT \
-                          PHONON_HEIR
-