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/corelib/corelib.pro | |
| 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/corelib/corelib.pro')
| -rw-r--r-- | src/corelib/corelib.pro | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index d65ed4aa9f..b83b2bac1e 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -14,10 +14,9 @@ irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused # otherwise mingw headers do not declare common functions like putenv win32-g++*:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x -load(qt_module) - QMAKE_DOCS = $$PWD/doc/qtcore.qdocconf -QMAKE_DOCS_INDEX = ../../doc + +load(qt_module) include(animation/animation.pri) include(arch/arch.pri) |