1 files changed, 15 insertions, 1 deletions
diff --git a/share/qbs/module-providers/Qt/setup-qt.js b/share/qbs/module-providers/Qt/setup-qt.js
index 70acc753c..5cf1bcb44 100644
--- a/share/qbs/module-providers/Qt/setup-qt.js
+++ b/share/qbs/module-providers/Qt/setup-qt.js
@@ -267,6 +267,10 @@ function getQtProperties(qmakeFilePath, qbs) {
         qtProps.mkspecBasePath = FileInfo.joinPaths
                 (pathQueryValue(queryResult, "QT_INSTALL_DATA"), "mkspecs");
     }
+
+    if (Utilities.versionCompare(qtProps.qtVersion, "6") >= 0)
+        qtProps.libExecPath = pathQueryValue(queryResult, "QT_INSTALL_LIBEXECS");
+
     if (!File.exists(qtProps.mkspecBasePath))
         throw "Cannot extract the mkspecs directory.";
 
@@ -514,8 +518,13 @@ function isFramework(modInfo, qtProps) {
     if (!qtProps.frameworkBuild || modInfo.isStaticLibrary)
         return false;
     var modulesNeverBuiltAsFrameworks = [
-        "bootstrap", "openglextensions", "platformsupport", "qmldevtools", "uitools", "harfbuzzng"
+        "bootstrap", "openglextensions", "platformsupport", "qmldevtools", "harfbuzzng"
     ];
+
+    if (qtProps.qtMajorVersion <= 5) {
+        modulesNeverBuiltAsFrameworks.push("uitools"); // is framework since qt6
+    }
+
     return !modulesNeverBuiltAsFrameworks.contains(modInfo.qbsName);
 }
 
@@ -1334,6 +1343,7 @@ function replaceSpecialValues(content, module, qtProps, abi) {
         binPath: ModUtils.toJSLiteral(qtProps.binaryPath),
         installPath: ModUtils.toJSLiteral(qtProps.installPath),
         libPath: ModUtils.toJSLiteral(qtProps.libraryPath),
+        libExecPath: ModUtils.toJSLiteral(qtProps.libExecPath),
         pluginPath: ModUtils.toJSLiteral(qtProps.pluginPath),
         incPath: ModUtils.toJSLiteral(qtProps.includePath),
         docPath: ModUtils.toJSLiteral(qtProps.documentationPath),
@@ -1536,6 +1546,8 @@ function setupOneQt(qmakeFilePath, outputBaseDir, uniquify, location, qbs) {
                                  allFiles);
                 copyTemplateFile("qdoc.js", qbsQtModuleDir, qtProps, androidAbis[a], location,
                                  allFiles);
+                copyTemplateFile("rcc.js", qbsQtModuleDir, qtProps, androidAbis[a], location,
+                                 allFiles);
             } else if (module.qbsName === "gui") {
                 moduleTemplateFileName = "gui.qbs";
             } else if (module.qbsName === "scxml") {
@@ -1559,6 +1571,8 @@ function setupOneQt(qmakeFilePath, outputBaseDir, uniquify, location, qbs) {
                 moduleTemplateFileName = "quick.qbs";
                 copyTemplateFile("quick.js", qbsQtModuleDir, qtProps, androidAbis[a], location,
                                  allFiles);
+                copyTemplateFile("rcc.js", qbsQtModuleDir, qtProps, androidAbis[a], location,
+                                 allFiles);
             } else if (module.isPlugin) {
                 moduleTemplateFileName = "plugin.qbs";
             } else {