Skip to content

Commit a0b4f06

Browse files
committed
Fix bugged syntax 'equals(size(var),value)' and replace with 'listSize = size(var) equals(listSize,value)'
1 parent 3958252 commit a0b4f06

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

packagedependencies.pri

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ for(depfile, packagedepsfiles) {
9797
pkgInfoList = $$split(pkgInformation, $$LITERAL_HASH)
9898
pkg.name = $$member(pkgInfoList,0)
9999
pkg.channel = "stable"
100-
equals(size(pkgInfoList),2) {
100+
pkgInfoListSize = $$size(pkgInfoList)
101+
equals(pkgInfoListSize,2) {
101102
pkg.channel = $$member(pkgInfoList,1)
102103
}
103104
pkg.version = $$member(dependencyMetaInf,1)
@@ -106,7 +107,8 @@ for(depfile, packagedepsfiles) {
106107
pkgTypeInfoList = $$split(pkgTypeInformation, @)
107108
pkg.identifier = $$member(pkgTypeInfoList,0)
108109
pkg.repoType = $${pkg.identifier}
109-
equals(size(pkgTypeInfoList),2) {
110+
pkgTypeInfoListSize = $$size(pkgTypeInfoList)
111+
equals(pkgTypeInfoListSize,2) {
110112
pkg.repoType = $$member(pkgTypeInfoList,1)
111113
} else {
112114
equals(pkg.identifier,"bcomBuild")|equals(pkg.identifier,"thirdParties") {
@@ -177,6 +179,7 @@ for(depfile, packagedepsfiles) {
177179
pkgCfgLibVars = "--libs $${libName}"
178180
}
179181
equals(pkg.repoType,"conan") {# conan system package handling
182+
message(" --> ["$${pkg.repoType}"] adding " $${pkg.name} " dependency")
180183
remakenConanDeps += $${pkg.name}/$${pkg.version}@$${pkg.identifier}/$${pkg.channel}
181184
sharedLinkMode = False
182185
equals(pkg.linkMode,shared) {

populateSubDependencies.pri

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ defineReplace(populateSubDependencies) {
1717
pkgInfoList = $$split(pkgInformation, $$LITERAL_HASH)
1818
pkgName = $$member(pkgInfoList,0)
1919
pkgChannel = "stable"
20-
equals(size(pkgInfoList),2) {
20+
pkgInfoListSize = $$size(pkgInfoList)
21+
equals(pkgInfoListSize,2) {
2122
pkgChannel = $$member(pkgInfoList,1)
2223
}
2324
pkgVersion = $$member(dependencyMetaInf,1)
@@ -26,7 +27,8 @@ defineReplace(populateSubDependencies) {
2627
pkgTypeInfoList = $$split(pkgTypeInformation, @)
2728
pkgCategory = $$member(pkgTypeInfoList,0)
2829
pkgRepoType = $${pkgCategory}
29-
equals(size(pkgTypeInfoList),2) {
30+
pkgTypeInfoListSize = $$size(pkgTypeInfoList)
31+
equals(pkgTypeInfoListSize,2) {
3032
pkgRepoType = $$member(pkgTypeInfoList,1)
3133
} else {
3234
equals(pkgCategory,"bcomBuild")|equals(pkgCategory,"thirdParties") {

0 commit comments

Comments
 (0)