diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-11 15:33:51 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-12 11:59:44 +0200 |
| commit | 6914f0a1ac3f1a03d1ce812b3a20ebea3191a6c0 (patch) | |
| tree | 454cd0dbc03e15ce4fdb0655e4b75eaf29951460 /src | |
| parent | 69da135f971c2e80236fcf060b387c26bc6e7cd6 (diff) | |
Update docs after modularization of docs
The global files now live in qtbase only, and are made available to the
other modules via the $QT_INSTALL_DOCS variable.
Change-Id: I131408e27fec5b722ac1dece8e1ccf421fdaad67
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/doc/qtqml.qdocconf | 5 | ||||
| -rw-r--r-- | src/qml/qml.pro | 4 | ||||
| -rw-r--r-- | src/quick/doc/qtquick.qdocconf | 5 | ||||
| -rw-r--r-- | src/quick/quick.pro | 5 |
4 files changed, 8 insertions, 11 deletions
diff --git a/src/qml/doc/qtqml.qdocconf b/src/qml/doc/qtqml.qdocconf index 57fd5386c6..8d6a6129e2 100644 --- a/src/qml/doc/qtqml.qdocconf +++ b/src/qml/doc/qtqml.qdocconf @@ -1,5 +1,5 @@ -include(../../../doc/global/qt-html-templates-offline.qdocconf) -include(../../../doc/global/qt-module-defaults.qdocconf) +include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf) +include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtQml description = Qt QML Reference Documentation @@ -29,7 +29,6 @@ qhp.QtQml.subprojects.examples.title = Qt QML Examples qhp.QtQml.subprojects.examples.indexTitle = Qt QML Examples qhp.QtQml.subprojects.examples.selectors = fake:example -outputdir = ../../../doc/qtqml tagfile = ../../../doc/qtqml/qtqml.tags depends += qtcore qtxmlpatterns diff --git a/src/qml/qml.pro b/src/qml/qml.pro index 4b2cb20362..4f55b83e14 100644 --- a/src/qml/qml.pro +++ b/src/qml/qml.pro @@ -13,10 +13,10 @@ exists("qqml_enable_gcov") { LIBS += -lgcov } -load(qt_module) - QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf +load(qt_module) + HEADERS += qtqmlglobal.h \ qtqmlglobal_p.h diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf index cb5c340fc9..45d695bb24 100644 --- a/src/quick/doc/qtquick.qdocconf +++ b/src/quick/doc/qtquick.qdocconf @@ -1,5 +1,5 @@ -include(../../../doc/global/qt-html-templates-offline.qdocconf) -include(../../../doc/global/qt-module-defaults.qdocconf) +include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf) +include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtQuick description = Qt Quick Reference Documentation @@ -30,7 +30,6 @@ qhp.QtQuick.subprojects.examples.title = Qt Quick Examples qhp.QtQuick.subprojects.examples.indexTitle = Qt Quick Examples qhp.QtQuick.subprojects.examples.selectors = fake:example -outputdir = ../../../doc/qtquick tagfile = ../../../doc/qtquick/qtquick.tags depends += qtcore qtxmlpatterns qtqml diff --git a/src/quick/quick.pro b/src/quick/quick.pro index 4d271fcb15..3eece29152 100644 --- a/src/quick/quick.pro +++ b/src/quick/quick.pro @@ -14,10 +14,9 @@ exists("qqml_enable_gcov") { LIBS += -lgcov } -load(qt_module) - QMAKE_DOCS = $$PWD/doc/qtquick.qdocconf -QMAKE_DOCS_INDEX = ../../doc + +load(qt_module) include(util/util.pri) include(scenegraph/scenegraph.pri) |