diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-11 14:16:23 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-11 15:47:41 +0200 |
| commit | ea49fb971145d66f2b58df63fb1c0a95fe59db6a (patch) | |
| tree | e1b8defbd78aed312fa6a0972e4260a5266152fd /src | |
| parent | 375a6e8204aab89873185e023b414a0669c93cb2 (diff) | |
| download | qtscript-ea49fb971145d66f2b58df63fb1c0a95fe59db6a.tar.gz | |
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: Ia10e092bb6780d379dacafe0a10a6b78ce7f9a6c
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/script/doc/qtscript.qdocconf | 5 | ||||
| -rw-r--r-- | src/script/script.pro | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/script/doc/qtscript.qdocconf b/src/script/doc/qtscript.qdocconf index a099c5e..cdb5273 100644 --- a/src/script/doc/qtscript.qdocconf +++ b/src/script/doc/qtscript.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 = QtScript description = Qt Script Reference Documentation @@ -45,7 +45,6 @@ headers.fileextensions = "*.ch *.h *.h++ *.hh *.hpp *.hxx" examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml *.css" examples.imageextensions = "*.png" -outputdir = ../../../doc/qtscript tagfile = ../../../doc/qtscript/qtscript.tags HTML.generatemacrefs = "true" diff --git a/src/script/script.pro b/src/script/script.pro index 19f7888..7891513 100644 --- a/src/script/script.pro +++ b/src/script/script.pro @@ -6,12 +6,12 @@ DEFINES += QT_NO_USING_NAMESPACE DEFINES += QLALR_NO_QSCRIPTGRAMMAR_DEBUG_INFO #win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 ### FIXME +QMAKE_DOCS = $$PWD/doc/qtscript.qdocconf + load(qt_module) CONFIG += building-libs -QMAKE_DOCS = $$PWD/doc/qtscript.qdocconf - WEBKITDIR = $$PWD/../3rdparty/javascriptcore GENERATED_SOURCES_DIR = generated |