From 978987981ac1ad0689e042cc241c1732496b59bb Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 22 May 2019 14:56:58 +0200 Subject: Automatically sysrootify $$[FOO/get] properties If automatic sysrootification is in effect (SysrootifyPrefix=true in qt.conf) then the qmake property variants $$[FOO] and $$[FOO/get] must be sysrootified. The latter was never sysrootified. All other variants (src, dev, raw) are supposed to be without sysroot. Flesh out a sysrootify function and readabilitify the code a bit while we're at it. Fixes: QTBUG-71673 Change-Id: Ifcbce8c035b9da447da9d6937edd5a4aa84573ba Reviewed-by: Oliver Wolff --- src/corelib/global/qlibraryinfo.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/corelib/global/qlibraryinfo.h') diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h index 80fc5bd4fc..9414af9b7d 100644 --- a/src/corelib/global/qlibraryinfo.h +++ b/src/corelib/global/qlibraryinfo.h @@ -107,6 +107,7 @@ public: enum PathGroup { FinalPaths, EffectivePaths, EffectiveSourcePaths, DevicePaths }; static QString rawLocation(LibraryLocation, PathGroup); static void reload(); + static void sysrootify(QString *path); #endif static QStringList platformPluginArguments(const QString &platformName); -- cgit v1.2.3