diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-08 17:19:14 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-10 23:27:03 +0200 |
| commit | 087efb572ace9cbb864c1aab7357916cb7b0428b (patch) | |
| tree | 4896cf5091cff4c40291d23c94b2a1cf445338f2 /src/opengl | |
| parent | 9adf7fb708963c7bb27dc1fd54aa879395f6cf57 (diff) | |
Modularize documenation build
qdocconf files can now reference $QT_INSTALL_DOCS to pick up e.g. global
includes, instead of using relative paths. Qt modules will automatically
get a doc target that builds and installs into the right place (including
supporting shadow-builds) if they set QMAKE_DOCS before loading(qt_module).
Change-Id: Ia408385199e56e3ead0afa45645a059d1a8b0d48
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/doc/qtopengl.qdocconf | 5 | ||||
| -rw-r--r-- | src/opengl/opengl.pro | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/opengl/doc/qtopengl.qdocconf b/src/opengl/doc/qtopengl.qdocconf index 9ec43d7fd1..eef1f0f5ba 100644 --- a/src/opengl/doc/qtopengl.qdocconf +++ b/src/opengl/doc/qtopengl.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 = QtOpenGL description = Qt OpenGL Reference Documentation @@ -29,7 +29,6 @@ qhp.QtOpenGL.subprojects.examples.title = Qt OpenGL Examples qhp.QtOpenGL.subprojects.examples.indexTitle = Qt OpenGL Examples qhp.QtOpenGL.subprojects.examples.selectors = fake:example -outputdir = ../../../doc/qtopengl tagfile = ../../../doc/qtopengl/qtopengl.tags depends += qtcore qtgui qtwidgets diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index 2adb2e09ce..dfc342c5dd 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -8,6 +8,8 @@ win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x63000000 solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused +QMAKE_DOCS = $$PWD/doc/qtopengl.qdocconf + load(qt_module) contains(QT_CONFIG, opengl):CONFIG += opengl @@ -15,9 +17,6 @@ contains(QT_CONFIG, opengles1):CONFIG += opengles1 contains(QT_CONFIG, opengles2):CONFIG += opengles2 contains(QT_CONFIG, egl):CONFIG += egl -QMAKE_DOCS = $$PWD/doc/qtopengl.qdocconf -QMAKE_DOCS_INDEX = ../../doc - HEADERS += qgl.h \ qgl_p.h \ qglcolormap.h \ |