diff --git a/cmake/QtQmakeHelpers.cmake b/cmake/QtQmakeHelpers.cmake
index d1cd17f7cad..02e60ac3825 100644
--- a/cmake/QtQmakeHelpers.cmake
+++ b/cmake/QtQmakeHelpers.cmake
@@ -57,8 +57,6 @@ function(qt_generate_qconfig_cpp in_file out_file)
     qt_add_string_to_qconfig_cpp("${INSTALL_LIBEXECDIR}")
     qt_add_string_to_qconfig_cpp("${INSTALL_LIBDIR}")
     qt_add_string_to_qconfig_cpp("${hostdatadir}")
-    qt_add_string_to_qconfig_cpp("${QT_QMAKE_TARGET_MKSPEC}")
-    qt_add_string_to_qconfig_cpp("${QT_QMAKE_HOST_MKSPEC}")
 
     # Save second part.
     set(QT_CONFIG_STR_OFFSETS_SECOND "${QT_CONFIG_STR_OFFSETS}")
diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt
index 2eca639576b..fff80b6b191 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 937f0811ddc..365e72e0fc2 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];