summaryrefslogtreecommitdiff
path: root/qmake/qmakelibraryinfo.cpp
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2021-03-05 17:16:35 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2021-03-11 09:59:56 +0100
commit3c12ab974ffa7aa51ca157989997f6e10c1c2259 (patch)
tree821375150b29868db26cf0f9dac7ab4d1f15ede7 /qmake/qmakelibraryinfo.cpp
parentc651e7ba18e094a0cb7bd46ea5ec6cad49ca3220 (diff)
downloadqtbase-3c12ab974ffa7aa51ca157989997f6e10c1c2259.tar.gz
Pass target and host mkspec as defines to QMakeLibraryInfo
Change-Id: If07055286496c507310c0dbb3a06f1a42d643596 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'qmake/qmakelibraryinfo.cpp')
-rw-r--r--qmake/qmakelibraryinfo.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/qmake/qmakelibraryinfo.cpp b/qmake/qmakelibraryinfo.cpp
index 937f0811dd..365e72e0fc 100644
--- a/qmake/qmakelibraryinfo.cpp
+++ b/qmake/qmakelibraryinfo.cpp
@@ -163,6 +163,10 @@ static LocationInfo defaultLocationInfo(int loc)
result.key = QStringLiteral("Sysroot");
} else if (loc == QMakeLibraryInfo::SysrootifyPrefixPath) {
result.key = QStringLiteral("SysrootifyPrefix");
+ } else if (loc == QMakeLibraryInfo::TargetSpecPath) {
+ result.key = QStringLiteral("TargetSpec");
+ } else if (loc == QMakeLibraryInfo::HostSpecPath) {
+ result.key = QStringLiteral("HostSpec");
} else if (unsigned(loc) < sizeof(qtConfEntries) / sizeof(qtConfEntries[0])) {
result.key = QLatin1String(qtConfEntries[loc].key);
result.defaultValue = QLatin1String(qtConfEntries[loc].value);
@@ -192,6 +196,10 @@ static QString storedPath(int loc)
// empty result
} else if (loc == QMakeLibraryInfo::SysrootifyPrefixPath) {
result = QStringLiteral("false");
+ } else if (loc == QMakeLibraryInfo::TargetSpecPath) {
+ result = QT_TARGET_MKSPEC;
+ } else if (loc == QMakeLibraryInfo::HostSpecPath) {
+ result = QT_HOST_MKSPEC;
} else if (unsigned(loc)
<= sizeof(qt_configure_str_offsets) / sizeof(qt_configure_str_offsets[0])) {
path = qt_configure_strs + qt_configure_str_offsets[loc - 1];