fix doc references to webkit
we can't derive the doc index paths from QMAKEMODULES, as the mkspecs dir may not live at the repo's top level. instead, explicitly announce the repo's top level build dirs in QTREPOS, and use that accordingly. Task-number: QTBUG-38862 Change-Id: I643ad2bf63c8fca0ffc44ce3457dbe8a16dcab07 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>bb10
parent
650e214d3d
commit
f2619db300
|
|
@ -34,8 +34,12 @@ QMAKE_DIR_REPLACE_SANE = PRECOMPILED_DIR OBJECTS_DIR MOC_DIR RCC_DIR UI_DIR
|
|||
|
||||
!build_pass:!isEmpty(_QMAKE_SUPER_CACHE_):force_independent {
|
||||
# When doing a -prefix build of top-level qt5/qt.pro, we need to announce
|
||||
# this repo's module pris' location to the other repos.
|
||||
isEmpty(MODULE_QMAKE_OUTDIR): MODULE_QMAKE_OUTDIR = $$shadowed($$dirname(_QMAKE_CONF_))
|
||||
# this repo's output dir to the other repos.
|
||||
MODULE_BASE_OUTDIR = $$shadowed($$dirname(_QMAKE_CONF_))
|
||||
!contains(QTREPOS, $$MODULE_BASE_OUTDIR): \
|
||||
cache(QTREPOS, add super, MODULE_BASE_OUTDIR)
|
||||
# This repo's module pris' location needs to be made known to qmake.
|
||||
isEmpty(MODULE_QMAKE_OUTDIR): MODULE_QMAKE_OUTDIR = $$MODULE_BASE_OUTDIR
|
||||
modpath = $$MODULE_QMAKE_OUTDIR/mkspecs/modules
|
||||
!contains(QMAKEMODULES, $$modpath): \
|
||||
cache(QMAKEMODULES, add super, modpath)
|
||||
|
|
|
|||
|
|
@ -23,8 +23,9 @@ QDOC += -outputdir $$QMAKE_DOCS_OUTPUTDIR
|
|||
!build_online_docs: \
|
||||
QDOC += -installdir $$[QT_INSTALL_DOCS]
|
||||
DOC_INDEXES =
|
||||
for(qmod, QMAKEMODULES): \
|
||||
DOC_INDEXES += -indexdir $$section(qmod, /, 0, -3)/doc
|
||||
for(qrep, QTREPOS): \
|
||||
exists($$qrep/doc): \
|
||||
DOC_INDEXES += -indexdir $$qrep/doc
|
||||
qtver.name = QT_VERSION
|
||||
qtver.value = $$VERSION
|
||||
isEmpty(qtver.value): qtver.value = $$MODULE_VERSION
|
||||
|
|
|
|||
Loading…
Reference in New Issue