diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-09-27 11:41:38 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-09-27 11:41:38 +0200 |
commit | 2271315eb46665b0a9e61ff0525340713163c1b6 (patch) | |
tree | d0068e34924eca85eb6af4089b3f443a89c929f6 /tools/qdoc3/test/qt.qdocconf | |
parent | 33e7ee9d1866f12a9b92fe4b5549c31e30974d8e (diff) | |
parent | 53d010a989aed878c21522cbaf0d75c7cf821b42 (diff) |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
configure
src/corelib/global/qglobal.h
Diffstat (limited to 'tools/qdoc3/test/qt.qdocconf')
-rw-r--r-- | tools/qdoc3/test/qt.qdocconf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf index 3874915ebf..f50cb69524 100644 --- a/tools/qdoc3/test/qt.qdocconf +++ b/tools/qdoc3/test/qt.qdocconf @@ -103,6 +103,7 @@ excludedirs = $QTDIR/src/3rdparty/clucene \ $QTDIR/src/3rdparty/freetype \ $QTDIR/src/3rdparty/harfbuzz \ $QTDIR/src/3rdparty/kdebase \ + $QTDIR/src/3rdparty/libconninet \ $QTDIR/src/3rdparty/libjpeg \ $QTDIR/src/3rdparty/libmng \ $QTDIR/src/3rdparty/libpng \ |