From 3e095fcbf5534d868e39265e4bf87d2a2c258530 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 15 Oct 2012 17:51:51 +0200 Subject: Get rid of QT_MODULE_DOC_BASE/QT.foo.docs It was only needed by qt_module.pri anyways, to handle index lookup paths for qdoc when building documentation that depends on other modules. Change-Id: Ibf60e2504f388b1aed7231eee04d89d3ba31c6eb Hand-held-by: Oswald Buddenhagen Reviewed-by: Oswald Buddenhagen --- mkspecs/features/qt_module.prf | 15 +++++++++++++-- mkspecs/features/qt_module_fwdpri.prf | 3 +-- 2 files changed, 14 insertions(+), 4 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index ee5215dff3..23541930e3 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -89,7 +89,6 @@ MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules-inst/qt_$${MODULE}.pri "QT.$${MODULE}.libs = \$\$QT_MODULE_LIB_BASE" \ "QT.$${MODULE}.plugins = \$\$QT_MODULE_PLUGIN_BASE" \ "QT.$${MODULE}.imports = \$\$QT_MODULE_IMPORT_BASE$$MODULE_IMPORT_SUFFIX" \ - "QT.$${MODULE}.docs = \$\$QT_MODULE_DOC_BASE" \ "QT.$${MODULE}.depends =$$join(MODULE_DEPENDS, " ", " ")" \ $$module_privdep \ $$module_build_type \ @@ -122,7 +121,19 @@ CONFIG += qmake_cache target_qt CONFIG -= fix_output_dirs !isEmpty(QMAKE_DOCS) { - QMAKE_DOCS_OUTPUTDIR = $$eval(QT.$${MODULE}.docs)/qt$${MODULE} + doc_subdir = doc + + QTDIR = $$[QT_HOST_PREFIX] + !force_independent:exists($$QTDIR/.qmake.cache): \ + mod_component_base = $$QTDIR + else: \ + mod_component_base = $$MODULE_BASE_OUTDIR + + unset(QMAKE_DOCS_INDEX) + QMAKE_DOCS_OUTPUTDIR = $$mod_component_base/$$doc_subdir/qt$${MODULE} + for(qmod, QMAKEMODULES): \ + QMAKE_DOCS_INDEX += $$section(qmod, /, 0, -3)/$$doc_subdir + CONFIG += qt_install_module_docs } diff --git a/mkspecs/features/qt_module_fwdpri.prf b/mkspecs/features/qt_module_fwdpri.prf index 0bf5a7c883..5dc63ebdfd 100644 --- a/mkspecs/features/qt_module_fwdpri.prf +++ b/mkspecs/features/qt_module_fwdpri.prf @@ -68,7 +68,6 @@ "QT_MODULE_IMPORT_BASE = $$mod_component_base/imports" \ "QT_MODULE_LIB_BASE = $$mod_component_base/lib" \ "QT_MODULE_PLUGIN_BASE = $$mod_component_base/plugins" \ - "QT_MODULE_DOC_BASE = $$mod_component_base/doc" \ $$module_rpathlink \ $$module_rpathlink_priv \ "QT.$${MODULE}.rpath = $$MODULE_INSTALL_LIBS" \ @@ -86,7 +85,7 @@ include($$MODULE_FWD_PRI) for(var, $$list(VERSION MAJOR_VERSION MINOR_VERSION PATCH_VERSION \ name depends private_depends module_config CONFIG DEFINES sources \ - includes private_includes bins libs plugins imports docs \ + includes private_includes bins libs plugins imports \ )):defined(QT.$${MODULE}.$$var, var):cache(QT.$${MODULE}.$$var, transient) cache(QT_CONFIG, transient) -- cgit v1.2.3