diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qdoc3/test/linguist.qdocconf | 1 | ||||
| -rw-r--r-- | tools/qdoc3/test/qmake.qdocconf | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf index 9a9c5b0..f4ee211 100644 --- a/tools/qdoc3/test/linguist.qdocconf +++ b/tools/qdoc3/test/linguist.qdocconf @@ -18,7 +18,6 @@ qhp.Linguist.virtualFolder = qdoc qhp.Linguist.indexTitle = Qt Linguist Manual qhp.Linguist.extraFiles = classic.css images/qt-logo.png images/trolltech-logo.png qhp.Linguist.filterAttributes = qt 4.6.0 tools linguist ->>>>>>> 4.5:tools/qdoc3/test/linguist.qdocconf qhp.Linguist.customFilters.Linguist.name = Qt Linguist Manual qhp.Linguist.customFilters.Linguist.filterAttributes = qt tools linguist qhp.Linguist.subprojects = manual examples diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf index 62cd4ff..642e3be 100644 --- a/tools/qdoc3/test/qmake.qdocconf +++ b/tools/qdoc3/test/qmake.qdocconf @@ -18,7 +18,6 @@ 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.6.0 tools qmake ->>>>>>> 4.5:tools/qdoc3/test/qmake.qdocconf qhp.qmake.customFilters.qmake.name = qmake Manual qhp.qmake.customFilters.qmake.filterAttributes = qt tools qmake qhp.qmake.subprojects = manual |