diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-05-22 14:56:58 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-05-28 12:33:22 +0200 |
| commit | 978987981ac1ad0689e042cc241c1732496b59bb (patch) | |
| tree | 3ee50e42ea495e3d7efc9d2d011b935428924f34 /src/corelib/global/qlibraryinfo.h | |
| parent | b9f96cacc99c8a242f45f4581843a6b1c67501f4 (diff) | |
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 <oliver.wolff@qt.io>
Diffstat (limited to 'src/corelib/global/qlibraryinfo.h')
| -rw-r--r-- | src/corelib/global/qlibraryinfo.h | 1 |
1 files changed, 1 insertions, 0 deletions
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); |