diff options
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 7 |
2 files changed, 7 insertions, 1 deletions
@@ -3008,6 +3008,7 @@ fi if [ "$PLATFORM" != "$XPLATFORM" ]; then QT_CROSS_COMPILE=yes QMAKE_CONFIG="$QMAKE_CONFIG cross_compile" + QTCONFIG_CONFIG="$QTCONFIG_CONFIG cross_compile" fi if [ "$PLATFORM_MAC" = "yes" ]; then diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 7555479..142b2be 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2945,6 +2945,9 @@ void Configure::generateOutputVars() if (dictionary["QPA"] == "yes") qtConfig += "qpa"; + if (dictionary["CROSS_COMPILE"] == "yes") + configStream << " cross_compile"; + if (dictionary["NIS"] == "yes") qtConfig += "nis"; @@ -2992,8 +2995,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 -------------------- |