From bc06a04dd845d039ba802f94b5eae57519ec63a8 Mon Sep 17 00:00:00 2001 From: Robert Griebl Date: Mon, 21 Mar 2022 23:42:44 +0100 Subject: Handle an empty or invalid documentDir correctly Not specifying the documentDir, but enabling the installer would - unexpectedly - use $PWD as documentDir. The code does now follow the documentation: if not set, no document directories will be created on package installation. Also, we now fail early if the documentDir and installationDir are sub-directories of each other, as that would lead to mayhem on PackageManager::cleanupBrokenInstallations(). Change-Id: Id8d89f82bf0d63c771f3d86a963c66681f43f195 Fixes: QTBUG-101881 Pick-to: 6.3 6.2 5.15 Reviewed-by: Bernd Weimer --- doc/configuration.qdoc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc') diff --git a/doc/configuration.qdoc b/doc/configuration.qdoc index 171997c2..fa1935b4 100644 --- a/doc/configuration.qdoc +++ b/doc/configuration.qdoc @@ -192,6 +192,9 @@ ui: \li string \li The base directory for per-package document storage directories. (default: empty/disabled) + + Please note, that if you do not set a \c documentDir here, no per-application + document directories will be created when installing new packages. \row \li [\c applications/installationDirMountPoint] \li string -- cgit v1.2.1