diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-05-03 15:36:03 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-19 16:39:58 +0200 |
| commit | 6a8f64136e7c38fa4e94c916a57b83856ded3a8d (patch) | |
| tree | 9c48605b999fc124d97cdd754b653da4c8f9ac0e /src/corelib/global/qlibraryinfo.h | |
| parent | ab0d55e361778177eed60964dcddbfe0809b9fbe (diff) | |
introduce /get property variants
properties are now split into a write location $$[FOO] and a read
location $$[FOO/get]. the write locations are hard-coded and configurable
via qt.conf/Paths as before, while the read locations are configured via
qt.conf/EffectivePaths.
this finally provides a clean solution to the problem that during the qt
build itself tools and libraries need to be taken from somewhere else
than they are installed to.
Change-Id: I956c43bd082afd465e690fe75d0bee3c2c0f7c25
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'src/corelib/global/qlibraryinfo.h')
| -rw-r--r-- | src/corelib/global/qlibraryinfo.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h index 5666afbad8..5861b4b8bd 100644 --- a/src/corelib/global/qlibraryinfo.h +++ b/src/corelib/global/qlibraryinfo.h @@ -90,7 +90,8 @@ public: }; static QString location(LibraryLocation); // ### Qt 6: consider renaming it to path() #ifdef QT_BUILD_QMAKE - static QString rawLocation(LibraryLocation); + enum PathGroup { FinalPaths, EffectivePaths }; + static QString rawLocation(LibraryLocation, PathGroup); #endif private: |