summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/WebKit/qt/docs/docs.pri
diff options
context:
space:
mode:
authorJustin McPherson <justin.mcpherson@nokia.com>2009-11-17 22:56:58 (GMT)
committerJustin McPherson <justin.mcpherson@nokia.com>2009-11-17 22:56:58 (GMT)
commite22ca6088407987cb69ccd03f162b431d5c2bf99 (patch)
tree12bb1de5c59670ad2c966cea60b9fd4d28dead2e /src/3rdparty/webkit/WebKit/qt/docs/docs.pri
parentf2b02ed855f7149afca0cc2e046c09c54a2d4444 (diff)
parenta61adccf96a8ceefbf1150966adda3f6d226ec6d (diff)
downloadQt-e22ca6088407987cb69ccd03f162b431d5c2bf99.zip
Qt-e22ca6088407987cb69ccd03f162b431d5c2bf99.tar.gz
Qt-e22ca6088407987cb69ccd03f162b431d5c2bf99.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt/docs/docs.pri')
-rw-r--r--src/3rdparty/webkit/WebKit/qt/docs/docs.pri4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/docs/docs.pri b/src/3rdparty/webkit/WebKit/qt/docs/docs.pri
index 4a8c165..804817b 100644
--- a/src/3rdparty/webkit/WebKit/qt/docs/docs.pri
+++ b/src/3rdparty/webkit/WebKit/qt/docs/docs.pri
@@ -1,9 +1,9 @@
include(../../../WebKit.pri)
unix {
- QDOC = SRCDIR=$$PWD/../../.. OUTPUT_DIR=$$OUTPUT_DIR $$(QTDIR)/tools/qdoc3/qdoc3
+ QDOC = SRCDIR=$$PWD/../../.. OUTPUT_DIR=$$OUTPUT_DIR $$(QTDIR)/bin/qdoc3
} else {
- QDOC = $$(QTDIR)\tools\qdoc3\release\qdoc3.exe
+ QDOC = $$(QTDIR)\bin\qdoc3.exe
}
unix {