From 087efb572ace9cbb864c1aab7357916cb7b0428b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 8 Oct 2012 17:19:14 +0200 Subject: Modularize documenation build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ø --- src/opengl/doc/qtopengl.qdocconf | 5 ++--- src/opengl/opengl.pro | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'src/opengl') 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 \ -- cgit v1.2.3