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

Find qmake in the right location for Qt 4.6+

Browse Source
This commit is contained in:
Daniel Molkentin
2009-08-21 12:52:54 +02:00
parent 2095658e2c
commit a4ff2aa725
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
doc/doc.pri
View File

@@ -1,8 +1,16 @@
QDOC_BIN = $$(QTDIR)/bin/qdoc3
win32:QDOC_BIN = $$replace(QDOC_BIN, "/", "\\")
!exists( $$QDOC_BIN ) {
QDOC_BIN = $$(QTDIR)/tools/qdoc3/qdoc3
win32:QDOC_BIN = $$replace(QDOC_BIN, "/", "\\")
}
unix { unix {
QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html $$(QTDIR)/tools/qdoc3/qdoc3 QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html $$QDOC_BIN
HELPGENERATOR = $$(QTDIR)/bin/qhelpgenerator HELPGENERATOR = $$(QTDIR)/bin/qhelpgenerator
} else { } else {
QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& $$(QTDIR)\tools\qdoc3\release\qdoc3.exe QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& $$QDOC_BIN
HELPGENERATOR = $$(QTDIR)\bin\qhelpgenerator.exe HELPGENERATOR = $$(QTDIR)\bin\qhelpgenerator.exe
} }