From dfb6798d3162ba5fb5f3b8eb8fbc40eb672a66c9 Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Mon, 8 Feb 2016 01:53:06 +0100 Subject: [PATCH] Fix path to Qt5 TAGFILES refs #544 --- docs/Doxyfile.qmake | 12 +++++------- docs/docs.pro | 10 +++++++--- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/docs/Doxyfile.qmake b/docs/Doxyfile.qmake index f2fed4d01..442b527be 100644 --- a/docs/Doxyfile.qmake +++ b/docs/Doxyfile.qmake @@ -2022,13 +2022,11 @@ SKIP_FUNCTION_MACROS = YES # http://stackoverflow.com/questions/22244779/doxygen-generated-documentation-with-auto-generated-links-to-qt-project # https://blog.qt.io/blog/2014/08/13/qt-weekly-17-linking-qt-classes-in-documentation-generated-with-doxygen/ -TAGFILES = qtcore.tags=http://doc.qt.io/qt-5/ qtgui.tags=http://doc.qt.io/qt-5/ \ - qtwidgets.tags=http://doc.qt.io/qt-5/ qtxml.tags=http://doc.qt.io/qt-5/ \ - qtnetwork.tags=http://doc.qt.io/qt-5/ - -# TAGFILES = qtcore.tags=qthelp://org.qt-project.qtcore/qtcore/ \ -# qtgui.tags=qthelp://org.qt-project.qtgui/qtgui/ \ -# qtxml.tags=qthelp://org.qt-project.qtxml/qtxml/ +TAGFILES = $(QDOC_PATH)/qtcore/qtcore.tags=http://doc.qt.io/qt-5/ \ + $(QDOC_PATH)/qtgui/qtgui.tags=http://doc.qt.io/qt-5/ \ + $(QDOC_PATH)/qtwidgets/qtwidgets.tags=http://doc.qt.io/qt-5/ \ + $(QDOC_PATH)/qtxml/qtxml.tags=http://doc.qt.io/qt-5/ \ + $(QDOC_PATH)/qtnetwork/qtnetwork.tags=http://doc.qt.io/qt-5/ # When a file name is specified after GENERATE_TAGFILE, doxygen will create a # tag file that is based on the input files it reads. See section "Linking to diff --git a/docs/docs.pro b/docs/docs.pro index 7cd24a936..5d295fdd6 100644 --- a/docs/docs.pro +++ b/docs/docs.pro @@ -10,17 +10,21 @@ DOXYFILE = Doxyfile.qmake DOXY_INPUT = . win32-g++ { - doxy.commands = set DOXY_SRC_ROOT=$$SourceRoot\\src & \ + doxy.commands = set DOXY_SRC_ROOT=$$SourceRoot\\src & \ + set QDOC_PATH=$$[QT_INSTALL_DOCS] & \ doxygen $$PWD/$$DOXYFILE } else:win32 { - doxy.commands = set DOXY_SRC_ROOT=$$SourceRoot\\src & \ + doxy.commands = set DOXY_SRC_ROOT=$$SourceRoot\\src & \ + set QDOC_PATH=$$[QT_INSTALL_DOCS] & \ doxygen $$PWD\\$$DOXYFILE } else { - doxy.commands = DOXY_SRC_ROOT="$$SourceRoot/src" \ + doxy.commands = DOXY_SRC_ROOT="$$SourceRoot/src" \ + QDOC_PATH="$$[QT_INSTALL_DOCS]" \ doxygen $$PWD/$$DOXYFILE } + doxy.CONFIG = no_link target_predeps doxy.depends = $$PWD/$$DOXYFILE doxy.input = DOXY_INPUT