feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

use qt's qdoc templates when building against qt5

Browse Source 
Change-Id: Id49e7808b0e8e83c54d573766fcb8c25bfe6728b
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
This commit is contained in:
Oswald Buddenhagen
2013-02-14 14:44:49 +01:00
parent 6b1c306b13
commit 853194370f
9 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/api/qtcreator-dev-online-qt4.qdocconf
+2 -2
View File
@@ -1,4 +1,4 @@
# Run qdoc from the directory that contains this file.
include(../config/compat.qdocconf)
include(qtcreator-dev-online.qdocconf)
include(../config/qtcreator-developer.qdocconf)
include(../config/qt-html-templates-online.qdocconf)
doc/api/qtcreator-dev-online.qdocconf
+1 -1
View File
@@ -1,4 +1,4 @@
# Run qdoc from the directory that contains this file.
include(../config/qtcreator-developer.qdocconf)
include(../config/qt-html-templates-online.qdocconf)
include($QT_INSTALL_DOCS/global/qt-html-templates-online.qdocconf)
doc/api/qtcreator-dev-qt4.qdocconf
+2 -1
View File
@@ -1,3 +1,4 @@
# Run qdoc from the directory that contains this file.
include(../config/compat.qdocconf)
include(qtcreator-dev.qdocconf)
include(../config/qtcreator-developer.qdocconf)
include(../config/qt-html-templates.qdocconf)
doc/api/qtcreator-dev.qdocconf
+1 -1
View File
@@ -1,3 +1,3 @@
# Run qdoc from the directory that contains this file.
include(../config/qtcreator-developer.qdocconf)
include(../config/qt-html-templates.qdocconf)
include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf)
doc/doc.pri
+1 -1
View File
@@ -21,7 +21,7 @@ defineReplace(cmdEnv) {
}
defineReplace(qdoc) {
return("$$cmdEnv(SRCDIR=$$PWD OUTDIR=$$1 QTC_VERSION=$$QTCREATOR_VERSION QTC_VERSION_TAG=$$VERSION_TAG) $$QDOC_BIN")
return("$$cmdEnv(SRCDIR=$$PWD OUTDIR=$$1 QTC_VERSION=$$QTCREATOR_VERSION QTC_VERSION_TAG=$$VERSION_TAG QT_INSTALL_DOCS=$$[QT_INSTALL_DOCS]) $$QDOC_BIN")
}
QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp
doc/qtcreator-online-qt4.qdocconf
+2 -1
View File
@@ -1,3 +1,4 @@
# Run qdoc from the directory that contains this file.
include(config/compat.qdocconf)
include(qtcreator-online.qdocconf)
include(config/qtcreator-project.qdocconf)
include(config/qt-html-templates-online.qdocconf)
doc/qtcreator-online.qdocconf
+1 -2
View File
@@ -1,4 +1,3 @@
# Run qdoc from the directory that contains this file.
include(config/qtcreator-project.qdocconf)
include(config/qt-html-templates-online.qdocconf)
include($QT_INSTALL_DOCS/global/qt-html-templates-online.qdocconf)
doc/qtcreator-qt4.qdocconf
+2 -1
View File
@@ -1,3 +1,4 @@
# Run qdoc from the directory that contains this file.
include(config/compat.qdocconf)
include(qtcreator.qdocconf)
include(config/qtcreator-project.qdocconf)
include(config/qt-html-templates.qdocconf)
doc/qtcreator.qdocconf
+1 -1
View File
@@ -1,3 +1,3 @@
# Run qdoc from the directory that contains this file.
include(config/qtcreator-project.qdocconf)
include(config/qt-html-templates.qdocconf)
include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf)