diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-03-02 09:26:13 +1000 |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-03-02 09:26:13 +1000 |
| commit | 95814418f9d6adeba365c795462e8afb00138211 (patch) | |
| tree | f7528ae97d136474ae300daa513acc0250f02d4e /tools/qdoc3/test/qt-webxml.qdocconf | |
| parent | 88253db8a7d7910e1393b1948fb3747117538c92 (diff) | |
| parent | 119a8ddcd7c8de0607309b37f9ef83439b607f17 (diff) | |
Merge branch '4.7' into qtquick11
Conflicts:
src/declarative/graphicsitems/qdeclarativelistview.cpp
Change-Id: Ic21311365c6139520ae337a379bdedb6ffe497db
Diffstat (limited to 'tools/qdoc3/test/qt-webxml.qdocconf')
| -rw-r--r-- | tools/qdoc3/test/qt-webxml.qdocconf | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/tools/qdoc3/test/qt-webxml.qdocconf b/tools/qdoc3/test/qt-webxml.qdocconf deleted file mode 100644 index 80ced42b68..0000000000 --- a/tools/qdoc3/test/qt-webxml.qdocconf +++ /dev/null @@ -1,12 +0,0 @@ -include(qt.qdocconf) - -quotinginformation = true -imagedirs = $QTDIR/doc/src/images \ - $QTDIR/examples \ - $QTDIR/doc/src/template/images - -outputdir = $QTDIR/doc/webxml -outputformats = WebXML - -generateindex = true -url = . |