diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-02-26 17:01:51 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-03-01 17:37:03 +0100 |
| commit | 5dab1e931d20f87fb35812fb64f6a2e344290cfa (patch) | |
| tree | bffa7f9b7a5251680db03d6e3abf0787c158c03a /qmake/qmakelibraryinfo.h | |
| parent | d1101c460e173e3554fa4e5c800ab3e82ddc3aad (diff) | |
Improve QMakeLibraryInfo encapsulation
QMakeLibraryInfo uses external data to produce paths. This causes
issues when trying to use it out of the existing qmake environment.
Add data fields that contain the path to the binary that uses
QMakeLibraryInfo and manually specified qtconf.
Task-number: QTBUG-75870
Change-Id: Ic6fa274ede3a9287826ff66c79f155b10d0d455c
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'qmake/qmakelibraryinfo.h')
| -rw-r--r-- | qmake/qmakelibraryinfo.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/qmake/qmakelibraryinfo.h b/qmake/qmakelibraryinfo.h index 69b62e9876..a198395127 100644 --- a/qmake/qmakelibraryinfo.h +++ b/qmake/qmakelibraryinfo.h @@ -75,6 +75,13 @@ struct QMakeLibraryInfo static void reload(); static bool haveGroup(PathGroup group); static void sysrootify(QString &path); + + static QString binaryAbsLocation; + static QString qtconfManualPath; + +private: + static QString getPrefix(); + static QString libraryInfoFile(); }; QT_END_NAMESPACE |