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ø --- tools/configure/configureapp.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'tools/configure') 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"); -- cgit v1.2.3