diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-29 12:37:15 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-29 12:37:15 (GMT) |
| commit | 86b4c125372f02c21be81fff376817852c28afa9 (patch) | |
| tree | 65988a37ffaa6c75a72395365aa695c052df2149 /tools/qdoc3/test/qmake.qdocconf | |
| parent | 36304a764fb4ee0cc7cc26033c05c8d70c87b4b5 (diff) | |
| parent | 82ad1edea9fd6d6955ab9e3f661c625f7ba5ed78 (diff) | |
| download | Qt-86b4c125372f02c21be81fff376817852c28afa9.zip Qt-86b4c125372f02c21be81fff376817852c28afa9.tar.gz Qt-86b4c125372f02c21be81fff376817852c28afa9.tar.bz2 | |
Merge branch '4.6'
Conflicts:
doc/src/qt4-intro.qdoc
Diffstat (limited to 'tools/qdoc3/test/qmake.qdocconf')
| -rw-r--r-- | tools/qdoc3/test/qmake.qdocconf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf index f6e8b2e..76e7012 100644 --- a/tools/qdoc3/test/qmake.qdocconf +++ b/tools/qdoc3/test/qmake.qdocconf @@ -27,7 +27,7 @@ qhp.qmake.subprojects.manual.selectors = fake:page 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" |