AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2013-06-11 16:21:01 +02:00 committed by The Qt Project
parent 0d463c05fc
commit 23d8a7fb23
3 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -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

2
mkspecs/features/qt_docs.prf
View File

@ -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 {

8
tools/configure/configureapp.cpp
View File

@ -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");