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 /tools | |
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 'tools')
-rw-r--r-- | tools/configure/configureapp.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index f24782f2a7..b7442ebc4e 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -176,6 +176,13 @@ Configure::Configure(int& argc, char** argv) dictionary["DONE"] = "error"; return; } + + buildDir.mkpath("doc"); + if (!Environment::cpdir(sourcePath + "/doc/global", buildPath + "/doc/global")) { + cout << "Couldn't copy global documentation!" << sourcePath << " " << buildPath << endl; + dictionary["DONE"] = "error"; + return; + } } defaultBuildParts << QStringLiteral("libs") << QStringLiteral("tools") << QStringLiteral("examples"); |