diff options
author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2012-11-20 10:17:47 +0100 |
---|---|---|
committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2012-11-20 10:19:32 +0100 |
commit | 5e975a312412b63cb4993931923360bfe5a105b4 (patch) | |
tree | 5d8f3b4ffe05ed5fb036b84ec1b7820fdab0964a /src/qml | |
parent | 48b2d386399341307027efb151f59873c5372407 (diff) | |
parent | 61d35829eed6661c1371d397bbb316ea2f636c50 (diff) |
Merge branch 'newdocs'
Change-Id: Idd7a9837e4f6a1358edf9accdcdc3c71822f4c25
Diffstat (limited to 'src/qml')
-rw-r--r-- | src/qml/doc/qtqml.qdocconf | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/qml/doc/qtqml.qdocconf b/src/qml/doc/qtqml.qdocconf index 8d6a6129e2..ae4965cbc0 100644 --- a/src/qml/doc/qtqml.qdocconf +++ b/src/qml/doc/qtqml.qdocconf @@ -1,4 +1,3 @@ -include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf) include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtQml |