Title: [126998] trunk/Source
- Revision
- 126998
- Author
- [email protected]
- Date
- 2012-08-29 06:40:15 -0700 (Wed, 29 Aug 2012)
Log Message
[Qt] Fix doc generation with make docs
https://bugs.webkit.org/show_bug.cgi?id=95340
Reviewed by Kenneth Rohde Christiansen.
Fix doc target, similar to what the other Qt 5 modules are using and comment out the indexes
line, because cross-referencing doesn't work right now and the use of the QTDIR environment
is wrong, too.
* docs/docs.pri:
* docs/qtwebkit.qdocconf:
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (126997 => 126998)
--- trunk/Source/WebKit/qt/ChangeLog 2012-08-29 13:15:26 UTC (rev 126997)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-08-29 13:40:15 UTC (rev 126998)
@@ -1,3 +1,17 @@
+2012-08-29 Simon Hausmann <[email protected]>
+
+ [Qt] Fix doc generation with make docs
+ https://bugs.webkit.org/show_bug.cgi?id=95340
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Fix doc target, similar to what the other Qt 5 modules are using and comment out the indexes
+ line, because cross-referencing doesn't work right now and the use of the QTDIR environment
+ is wrong, too.
+
+ * docs/docs.pri:
+ * docs/qtwebkit.qdocconf:
+
2012-08-22 Simon Hausmann <[email protected]>
[Qt] REGRESSION(r125428): fast/profiler/nested-start-and-stop-profiler.html fails
Modified: trunk/Source/WebKit/qt/docs/docs.pri (126997 => 126998)
--- trunk/Source/WebKit/qt/docs/docs.pri 2012-08-29 13:15:26 UTC (rev 126997)
+++ trunk/Source/WebKit/qt/docs/docs.pri 2012-08-29 13:40:15 UTC (rev 126998)
@@ -1,13 +1,12 @@
-unix {
- QDOC = SRCDIR=$$PWD/../../.. OUTPUT_DIR=$${ROOT_BUILD_DIR} $$(QTDIR)/bin/qdoc3
-} else {
- QDOC = $$(QTDIR)\\bin\\qdoc3.exe
-}
+QDOC = $$QT.core.bins/qdoc
-unix {
- docs.commands = $$QDOC $$PWD/qtwebkit.qdocconf
+$$unixstyle {
} else {
- docs.commands = \"$$QDOC $$PWD/qtwebkit.qdocconf\"
+ QDOC = $$replace(QDOC, "qdoc", "qdoc3.exe")
}
+QDOC = SRCDIR=$$PWD/../../.. OUTPUT_DIR=$${ROOT_BUILD_DIR} $$QDOC
+
+docs.commands = $$QDOC $$PWD/qtwebkit.qdocconf
+
QMAKE_EXTRA_TARGETS += docs
Modified: trunk/Source/WebKit/qt/docs/qtwebkit.qdocconf (126997 => 126998)
--- trunk/Source/WebKit/qt/docs/qtwebkit.qdocconf 2012-08-29 13:15:26 UTC (rev 126997)
+++ trunk/Source/WebKit/qt/docs/qtwebkit.qdocconf 2012-08-29 13:40:15 UTC (rev 126998)
@@ -11,7 +11,7 @@
exampledirs = $SRCDIR/WebKit/qt/docs
imagedirs = $SRCDIR/WebKit/qt/docs
-indexes = $QTDIR/doc/html/qt.index
+#indexes = $QTDIR/doc/html/qt.index
# macros.qdocconf
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (126997 => 126998)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-08-29 13:15:26 UTC (rev 126997)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-08-29 13:40:15 UTC (rev 126998)
@@ -1450,15 +1450,10 @@
}
/*!
- \qmlclass WebView QWebView
+ \qmltype WebView
\inqmlmodule QtWebKit 3.0
*/
-/*!
- \qmlmethod WebView(Item parent)
- \brief Constructs a WebView with a parent.
-*/
-
QQuickWebView::QQuickWebView(QQuickItem* parent)
: QQuickFlickable(parent)
, d_ptr(createPrivateObject(this))
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
