[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d
vestbo at webkit.org
vestbo at webkit.org
Thu Dec 3 13:35:39 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit d79d640ad2c85f6d43c87ef4e64c6aeb4da81eb2
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 13 13:12:35 2009 +0000
Use correct install-path when running qdoc3
Reviewed by Simon Hausmann.
* docs/docs.pri:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50936 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 7cf9958..39ffa95 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-13 Tor Arne Vestbø <tor.arne.vestbo at nokia.com>
+
+ Reviewed by Simon Hausmann.
+
+ Use correct install-path when running qdoc3
+
+ * docs/docs.pri:
+
2009-11-12 Shinichiro Hamaji <hamaji at chromium.org>
Reviewed by Darin Adler.
diff --git a/WebKit/qt/docs/docs.pri b/WebKit/qt/docs/docs.pri
index 4a8c165..804817b 100644
--- a/WebKit/qt/docs/docs.pri
+++ b/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 {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list