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

Do not require QTDIR to be set.

Browse Source 
Reviewed-By: Oswald Buddenhagen
This commit is contained in:
Daniel Molkentin
2009-10-26 15:35:37 +01:00
parent cd3435a983
commit c6e9c041a7
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/doc.pri
+3 -4
View File
@@ -1,15 +1,14 @@
unix:QDOC_BIN = $$(QTDIR)/bin/qdoc3
win32:QDOC_BIN = $$(QTDIR)/bin/qdoc3.exe
QDOC_BIN = $$[QT_INSTALL_BINS]/qdoc3
win32:QDOC_BIN = $$replace(QDOC_BIN, "/", "\\")
unix {
QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html $$QDOC_BIN
HELPGENERATOR = $$(QTDIR)/bin/qhelpgenerator
HELPGENERATOR = $$[QT_INSTALL_BINS]/qhelpgenerator
} else {
QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& $$QDOC_BIN
# Always run qhelpgenerator inside its own cmd; this is a workaround for
# an unusual bug which causes qhelpgenerator.exe to do nothing
HELPGENERATOR = cmd /C $$(QTDIR)\bin\qhelpgenerator.exe
HELPGENERATOR = cmd /C $$replace($$list($$[QT_INSTALL_BINS]/qhelpgenerator.exe), "/", "\\")
}
QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp