Changeset 561 for trunk/tools/qdoc3/test/qt.qdocconf

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/qdoc3/test/qt.qdocconf (modified) (7 diffs)

trunk/tools/qdoc3/test/qt.qdocconf

@@ -7 +7 @@
 project                 = Qt
 versionsym              =
-version                 = 4.5.1
+version                 = 4.6.1
 description             = Qt Reference Documentation
-url                     = http://doc.trolltech.com/4.5
+url                     = http://qt.nokia.com/doc/4.6
 
-edition.Console.modules = QtCore QtDBus QtNetwork QtScript QtSql QtXml \
-                          QtXmlPatterns QtTest
 edition.Desktop.modules = QtCore QtDBus QtGui QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg \
                           QtWebKit QtXml QtXmlPatterns Qt3Support QtHelp \
@@ -23 +21 @@
 
 qhp.Qt.file                = qt.qhp
-qhp.Qt.namespace           = com.trolltech.qt.451
+qhp.Qt.namespace           = com.trolltech.qt.460
 qhp.Qt.virtualFolder       = qdoc
 qhp.Qt.indexTitle          = Qt Reference Documentation
@@ -32 +30 @@
 qhp.Qt.extraFiles          = classic.css \
                              images/qt-logo.png \
-                             images/trolltech-logo \
                              images/taskmenuextension-example.png \
                              images/coloreditorfactoryimage.png \
@@ -38 +35 @@
                              images/stylesheet-coffee-plastique.png
 
-qhp.Qt.filterAttributes    = qt 4.5.1 qtrefdoc
-qhp.Qt.customFilters.Qt.name = Qt 4.5.1
-qhp.Qt.customFilters.Qt.filterAttributes = qt 4.5.1
+qhp.Qt.filterAttributes    = qt 4.6.1 qtrefdoc
+qhp.Qt.customFilters.Qt.name = Qt 4.6.1
+qhp.Qt.customFilters.Qt.filterAttributes = qt 4.6.1
 qhp.Qt.subprojects         = classes overviews examples
 qhp.Qt.subprojects.classes.title = Classes
@@ -99 +96 @@
                           $QTDIR/src/3rdparty/phonon/ds9 \
                           $QTDIR/src/3rdparty/phonon/qt7 \
+                          $QTDIR/src/3rdparty/phonon/mmf \
                           $QTDIR/src/3rdparty/phonon/waveout
 
 sources.fileextensions  = "*.cpp *.qdoc *.mm"
 examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp"
+examples.imageextensions = "*.png"
 
 exampledirs             = $QTDIR/doc/src \
@@ -108 +107 @@
                           $QTDIR/examples/tutorials \
                           $QTDIR \
-                          $QTDIR/qmake/examples
+                          $QTDIR/qmake/examples \
+                          $QTDIR/src/3rdparty/webkit/WebKit/qt/docs
 imagedirs               = $QTDIR/doc/src/images \
                           $QTDIR/examples
@@ -114 +114 @@
 tagfile                 = $QTDIR/doc/html/qt.tags
 base                    = file:$QTDIR/doc/html
+
+HTML.generatemacrefs    = "true"