summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@trolltech.com>2009-04-23 12:11:36 (GMT)
committerJoerg Bornemann <joerg.bornemann@trolltech.com>2009-04-23 12:33:42 (GMT)
commitaa234610048a741cddc991be25b84d235f40e345 (patch)
treeab98dad1f97cb5015e34db22eb715af91470b54b
parentbc5995bd76dc665aab343263b51185cdfc9fd086 (diff)
downloadQt-aa234610048a741cddc991be25b84d235f40e345.zip
Qt-aa234610048a741cddc991be25b84d235f40e345.tar.gz
Qt-aa234610048a741cddc991be25b84d235f40e345.tar.bz2
use qdoc3 debug version only when it is available
By default there is no debug version built of qdoc3. In this case we should call the release build. Reviewed-by: kh
-rw-r--r--doc/doc.pri2
-rw-r--r--tools/qdoc3/qdoc3.pro7
2 files changed, 1 insertions, 8 deletions
diff --git a/doc/doc.pri b/doc/doc.pri
index 46df3cb..a4c77fe 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -4,7 +4,7 @@
win32 {
QT_WINCONFIG = release/
- CONFIG(debug, debug|release) {
+ !CONFIG(release, debug|release) {
QT_WINCONFIG = debug/
}
}
diff --git a/tools/qdoc3/qdoc3.pro b/tools/qdoc3/qdoc3.pro
index 3268585..2bba8fb 100644
--- a/tools/qdoc3/qdoc3.pro
+++ b/tools/qdoc3/qdoc3.pro
@@ -99,10 +99,3 @@ SOURCES += apigenerator.cpp \
webxmlgenerator.cpp \
yyindent.cpp
-
-win32 {
- QT_WINCONFIG = release
- CONFIG(debug, debug|release) {
- QT_WINCONFIG = debug
- }
-}