aboutsummaryrefslogtreecommitdiffstats
path: root/qbs-resources/imports
diff options
context:
space:
mode:
Diffstat (limited to 'qbs-resources/imports')
-rw-r--r--qbs-resources/imports/QbsLibrary.qbs3
-rw-r--r--qbs-resources/imports/QbsProduct.qbs2
-rw-r--r--qbs-resources/imports/QbsUnittest.qbs13
3 files changed, 4 insertions, 14 deletions
diff --git a/qbs-resources/imports/QbsLibrary.qbs b/qbs-resources/imports/QbsLibrary.qbs
index f0769dd6c..1538735e4 100644
--- a/qbs-resources/imports/QbsLibrary.qbs
+++ b/qbs-resources/imports/QbsLibrary.qbs
@@ -5,7 +5,7 @@ QbsProduct {
Depends { name: "cpp" }
Depends { name: "Exporter.pkgconfig"; condition: generatePkgConfigFile }
Depends { name: "Exporter.qbs"; condition: generateQbsModule }
- Depends { name: "cpp" }
+ Depends { name: "span" }
property string visibilityType: staticBuild ? "static" : "dynamic"
property string headerInstallPrefix: "/include/qbs"
@@ -59,6 +59,7 @@ QbsProduct {
Export {
Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["core"] }
+ Depends { name: "span" }
Properties {
condition: exportingProduct.hasExporter
diff --git a/qbs-resources/imports/QbsProduct.qbs b/qbs-resources/imports/QbsProduct.qbs
index 5df694dd8..ea8516736 100644
--- a/qbs-resources/imports/QbsProduct.qbs
+++ b/qbs-resources/imports/QbsProduct.qbs
@@ -2,7 +2,7 @@ Product {
Depends { name: "qbsbuildconfig" }
Depends { name: "qbsversion" }
Depends { name: "Qt.core"; versionAtLeast: minimumQtVersion }
- property string minimumQtVersion: "5.14.0"
+ property string minimumQtVersion: "5.15.2"
property bool install: true
property string targetInstallDir
cpp.defines: {
diff --git a/qbs-resources/imports/QbsUnittest.qbs b/qbs-resources/imports/QbsUnittest.qbs
index 5b54b9a51..c956d5480 100644
--- a/qbs-resources/imports/QbsUnittest.qbs
+++ b/qbs-resources/imports/QbsUnittest.qbs
@@ -6,16 +6,5 @@ QbsAutotest {
name: "Qt.core5compat";
condition: Utilities.versionCompare(Qt.core.version, "6.0.0") >= 0
}
- Depends {
- name: "Qt.script"
- condition: !qbsbuildconfig.useBundledQtScript
- required: false
- }
- Depends {
- name: "qbsscriptengine"
- condition: qbsbuildconfig.useBundledQtScript || !Qt.script.present
- }
- property stringList bundledQtScriptIncludes: qbsbuildconfig.useBundledQtScript
- || !Qt.script.present ? qbsscriptengine.includePaths : []
- cpp.includePaths: base.concat(bundledQtScriptIncludes)
+ Depends { name: "quickjs"; cpp.link: false }
}