projects
/
platform
/
upstream
/
qtmultimedia.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dcf79d4
)
Locate qdoc on Windows correctly.
author
Friedemann Kleint
<Friedemann.Kleint@nokia.com>
Thu, 28 Jun 2012 10:10:07 +0000
(12:10 +0200)
committer
Qt by Nokia
<qt-info@nokia.com>
Thu, 28 Jun 2012 11:48:12 +0000
(13:48 +0200)
Change-Id: I1a7ac5293f76b62e467208b59948d58032c2a2cf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
doc/config/qtmultimedia_doc.pri
patch
|
blob
|
history
diff --git
a/doc/config/qtmultimedia_doc.pri
b/doc/config/qtmultimedia_doc.pri
index 8aab323106699230ca6633c91db89911e28b5d06..caa803291144beff11498a12df6137f375829ef6 100644
(file)
--- a/
doc/config/qtmultimedia_doc.pri
+++ b/
doc/config/qtmultimedia_doc.pri
@@
-7,15
+7,8
@@
win32:!win32-g++ {
unixstyle = true
}
-system(which qdoc) {
- QDOC = qdoc
-} else {
- exists($$QT.core.bins/qdoc3) {
- QDOC = $$QT.core.bins/qdoc3
- } else {
- warning("No qdoc executable found.")
- }
-}
+qtPrepareTool(QDOC, qdoc)
+isEmpty(QDOC): warning("No qdoc executable found.")
ONLINE_CONF = $$PWD/qtmultimedia.qdocconf
DITA_CONF = $$PWD/qtmultimedia-dita.qdocconf