diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-03-05 17:16:35 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-03-11 09:59:56 +0100 |
| commit | 3c12ab974ffa7aa51ca157989997f6e10c1c2259 (patch) | |
| tree | 821375150b29868db26cf0f9dac7ab4d1f15ede7 /qmake | |
| parent | c651e7ba18e094a0cb7bd46ea5ec6cad49ca3220 (diff) | |
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')
| -rw-r--r-- | qmake/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | qmake/qmakelibraryinfo.cpp | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index 2eca639576..fff80b6b19 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -57,6 +57,8 @@ qt_internal_add_tool(${target_name} QT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR} # special case QT_VERSION_MINOR=${PROJECT_VERSION_MINOR} # special case QT_VERSION_PATCH=${PROJECT_VERSION_PATCH} # special case + QT_HOST_MKSPEC="${QT_QMAKE_HOST_MKSPEC}" + QT_TARGET_MKSPEC="${QT_QMAKE_TARGET_MKSPEC}" INCLUDE_DIRECTORIES generators generators/mac 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]; |