From 3c12ab974ffa7aa51ca157989997f6e10c1c2259 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 5 Mar 2021 17:16:35 +0100 Subject: Pass target and host mkspec as defines to QMakeLibraryInfo Change-Id: If07055286496c507310c0dbb3a06f1a42d643596 Reviewed-by: Alexey Edelev Reviewed-by: Alexandru Croitor --- qmake/qmakelibraryinfo.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'qmake/qmakelibraryinfo.cpp') 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]; -- cgit v1.2.1