Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/tools/qdoc3/test/assistant.qdocconf

    r2 r561  
    77project                 = Qt Assistant
    88description             = Qt Assistant Manual
    9 url                     = http://doc.trolltech.com/4.5
     9url                     = http://qt.nokia.com/doc/4.6
    1010
    1111indexes                 = $QT_BUILD_TREE/doc-build/html-qt/qt.index
     
    1414
    1515qhp.Assistant.file                = assistant.qhp
    16 qhp.Assistant.namespace           = com.trolltech.assistant.451
     16qhp.Assistant.namespace           = com.trolltech.assistant.460
    1717qhp.Assistant.virtualFolder       = qdoc
    1818qhp.Assistant.indexTitle          = Qt Assistant Manual
    1919qhp.Assistant.extraFiles          = classic.css images/qt-logo.png images/trolltech-logo.png
    20 qhp.Assistant.filterAttributes    = qt 4.5.1 tools assistant
     20qhp.Assistant.filterAttributes    = qt 4.6.1 tools assistant
    2121qhp.Assistant.customFilters.Assistant.name = Qt Assistant Manual
    2222qhp.Assistant.customFilters.Assistant.filterAttributes = qt tools assistant
     
    3232language                = Cpp
    3333
    34 sources                 = $QT_SOURCE_TREE/doc/src/assistant-manual.qdoc \
     34sources                 = $QT_SOURCE_TREE/doc/src/development/assistant-manual.qdoc \
    3535                          $QT_SOURCE_TREE/doc/src/examples/simpletextviewer.qdoc
    3636
Note: See TracChangeset for help on using the changeset viewer.