onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-05-10 11:05:06 +02:00
Code Issues Releases Wiki Activity

fix: qbs: use correct version string

Browse Source
This commit is contained in:
Sirius Bakke
2018-09-12 20:59:56 +02:00
parent 80c9296910
commit 946831ae59
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/doc.qbs
View File

@@ -17,7 +17,7 @@ FWBProduct {
"README.*" "README.*"
] ]
qbs.install: qbs.targetOS.contains("linux") || qbs.targetOS.contains("windows") qbs.install: qbs.targetOS.contains("linux") || qbs.targetOS.contains("windows")
qbs.installDir: qbs.targetOS.contains("unix") ? "share/doc/fwbuilder-"+versionStr : "doc" qbs.installDir: qbs.targetOS.contains("unix") ? "share/doc/fwbuilder-"+project.version : "doc"
} }
Group { Group {

2
fwbuilder.qbs
View File

@@ -7,7 +7,7 @@ Project {
Git { id: git } Git { id: git }
property string version: git.version || "5.99.1" property string version: git.version || "6.0.0-beta"
property string xmlVersion: "24" property string xmlVersion: "24"
property string installPrefix: (qbs.installPrefix ? qbs.installPrefix : '/usr') property string installPrefix: (qbs.installPrefix ? qbs.installPrefix : '/usr')
property string resourcesDir: { property string resourcesDir: {

2
src/libfwbuilder/etc/etc.qbs
View File

@@ -24,7 +24,7 @@ FWBProduct {
else if (qbs.targetOS.contains("windows")) else if (qbs.targetOS.contains("windows"))
return "resources"; return "resources";
else else
return "share/fwbuilder-"+versionStr; return "share/fwbuilder-"+project.version;
} }
} }
} }

2
src/libfwbuilder/migration/migration.qbs
View File

@@ -18,7 +18,7 @@ FWBProduct {
else if (qbs.targetOS.contains("windows")) else if (qbs.targetOS.contains("windows"))
return "resources" return "resources"
else else
return "share/fwbuilder-"+versionStr return "share/fwbuilder-"+project.version
} }
qbs.installSourceBase: ".." qbs.installSourceBase: ".."
} }

2
src/res/res.qbs
View File

@@ -12,7 +12,7 @@ FWBProduct {
else if (qbs.targetOS.contains("windows")) else if (qbs.targetOS.contains("windows"))
return "resources" return "resources"
else else
return "share/fwbuilder-"+versionStr return "share/fwbuilder-"+project.version
} }
Group { Group {