diff --git a/configure b/configure
index 72b1fd64b7a..2b8b4031efa 100755
--- a/configure
+++ b/configure
@@ -2528,6 +2528,7 @@ fi
 if [ "$PLATFORM" != "$XPLATFORM" ]; then
     QT_CROSS_COMPILE=yes
     QMAKE_CONFIG="$QMAKE_CONFIG cross_compile"
+    QTCONFIG_CONFIG="$QTCONFIG_CONFIG cross_compile"
 fi
 
 if [ "$BUILD_ON_MAC" = "yes" ]; then
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index eafe547063c..dea7415d439 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2367,8 +2367,10 @@ void Configure::generateOutputVars()
         }
     }
 
-    if (dictionary.contains("XQMAKESPEC") && (dictionary["QMAKESPEC"] != dictionary["XQMAKESPEC"]))
+    if (dictionary.contains("XQMAKESPEC") && (dictionary["QMAKESPEC"] != dictionary["XQMAKESPEC"])) {
             qmakeConfig += "cross_compile";
+            dictionary["CROSS_COMPILE"] = "yes";
+    }
 
     // Directories and settings for .qmake.cache --------------------
 
@@ -2605,6 +2607,8 @@ void Configure::generateCachefile()
             configStream << " no_plugin_manifest";
         if (dictionary["QPA"] == "yes")
             configStream << " qpa";
+        if (dictionary["CROSS_COMPILE"] == "yes")
+            configStream << " cross_compile";
 
         if (dictionary["DIRECTWRITE"] == "yes")
             configStream << "directwrite";