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

Timestamp:

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

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/qdoc3/test/qmake.qdocconf (modified) (3 diffs)

trunk/tools/qdoc3/test/qmake.qdocconf

@@ -7 +7 @@
 project                 = QMake
 description             = QMake Manual
-url                     = http://doc.trolltech.com/4.5
+url                     = http://qt.nokia.com/doc/4.6
 
 indexes                 = $QT_BUILD_TREE/doc-build/html-qt/qt.index
@@ -14 +14 @@
 
 qhp.qmake.file                = qmake.qhp
-qhp.qmake.namespace           = com.trolltech.qmake.451
+qhp.qmake.namespace           = com.trolltech.qmake.460
 qhp.qmake.virtualFolder       = qdoc
 qhp.qmake.indexTitle          = QMake Manual
 qhp.qmake.extraFiles          = classic.css images/qt-logo.png images/trolltech-logo.png
-qhp.qmake.filterAttributes    = qt 4.5.1 tools qmake
+qhp.qmake.filterAttributes    = qt 4.6.1 tools qmake
 qhp.qmake.customFilters.qmake.name = qmake Manual
 qhp.qmake.customFilters.qmake.filterAttributes = qt tools qmake
@@ -28 +28 @@
 language                = Cpp
 
-sources                 = $QT_SOURCE_TREE/doc/src/qmake-manual.qdoc
+sources                 = $QT_SOURCE_TREE/doc/src/development/qmake-manual.qdoc
 
 sources.fileextensions  = "*.cpp *.qdoc"