don't copy/symlink doc/global to build dir

instead, use the files directly from the source dir.

Change-Id: I03b728c66de6e03cade6dc153dcc78cea8e3f606
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

3 files changed, 1 insertions, 13 deletions

diff --git a/configure b/configure
index b551eedb2a..3826d14305 100755
--- a/configure
+++ b/configure
@@ -2399,10 +2399,6 @@ if [ "$OPT_SHADOW" = "yes" ]; then
     [ -d "$outpath/bin" ] || mkdir -p "$outpath/bin"
 
     mkdir -p "$outpath/mkspecs"
-
-    # Prepare doc directory
-    mkdir -p "$outpath/doc"
-    ln -f -s "$relpath"/doc/global "$outpath/doc"
 fi
 
 # symlink fonts to be able to run application from build directory
diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf
index 5b42cfcac8..a0f765b67f 100644
--- a/mkspecs/features/qt_docs.prf
+++ b/mkspecs/features/qt_docs.prf
@@ -33,7 +33,7 @@ qtmver.value = $$replace(qtver.value, ^(\\d+\\.\\d+).*$, \\1)
 qtvertag.name = QT_VERSION_TAG
 qtvertag.value = $$replace(qtver.value, \.,)
 qtdocs.name = QT_INSTALL_DOCS
-qtdocs.value = $$[QT_INSTALL_DOCS/get]
+qtdocs.value = $$[QT_INSTALL_DOCS/src]
 qtAddToolEnv(QDOC, qtver qtmver qtvertag qtdocs)
 doc_command = $$QDOC $$QMAKE_DOCS
 prepare_docs {
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 6457f742a9..3e91e85882 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -157,17 +157,9 @@ Configure::Configure(int& argc, char** argv)
             exit(0); // Exit cleanly for Ctrl+C
         }
 
-        cout << "Preparing build tree..." << endl;
         QDir(buildPath).mkpath("bin");
 
         buildDir.mkpath("mkspecs");
-
-        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");