diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-04-21 21:03:06 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-04-21 21:03:06 (GMT) |
| commit | db4e2a600c53ad857d7fa3f7d84ac995215ecf93 (patch) | |
| tree | 88ca89842925080cf18eb9f796310a89216828b0 /tools/qdoc3/test/qt.qdocconf | |
| parent | 4f64ff3e8902529700336c7ad3aa9fccf5ca3e0b (diff) | |
| parent | c36ff16f66ffd65839ba1e254ac557e491db6bf4 (diff) | |
| download | Qt-db4e2a600c53ad857d7fa3f7d84ac995215ecf93.zip Qt-db4e2a600c53ad857d7fa3f7d84ac995215ecf93.tar.gz Qt-db4e2a600c53ad857d7fa3f7d84ac995215ecf93.tar.bz2 | |
Merge branch '4.5'
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
Diffstat (limited to 'tools/qdoc3/test/qt.qdocconf')
| -rw-r--r-- | tools/qdoc3/test/qt.qdocconf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf index e07882c..78a667f 100644 --- a/tools/qdoc3/test/qt.qdocconf +++ b/tools/qdoc3/test/qt.qdocconf @@ -25,7 +25,7 @@ qhp.Qt.file = qt.qhp qhp.Qt.namespace = com.trolltech.qt.451 qhp.Qt.virtualFolder = qdoc qhp.Qt.indexTitle = Qt Reference Documentation -qhp.Qt.indexRoot = +qhp.Qt.indexRoot = # Files not referenced in any qdoc file (last four are needed by qtdemo) # See also extraimages.HTML @@ -35,7 +35,7 @@ qhp.Qt.extraFiles = classic.css \ images/taskmenuextension-example.png \ images/coloreditorfactoryimage.png \ images/dynamiclayouts-example.png \ - images/stylesheet-coffee-plastique.png + images/stylesheet-coffee-plastique.png qhp.Qt.filterAttributes = qt 4.6.0 qtrefdoc qhp.Qt.customFilters.Qt.name = Qt 4.6.0 |