diff options
Diffstat (limited to 'share/qbs/module-providers/Qt')
| -rw-r--r-- | share/qbs/module-providers/Qt/setup-qt.js | 2 | ||||
| -rw-r--r-- | share/qbs/module-providers/Qt/templates/android_support.qbs | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/share/qbs/module-providers/Qt/setup-qt.js b/share/qbs/module-providers/Qt/setup-qt.js index f4ec55328..c7b722563 100644 --- a/share/qbs/module-providers/Qt/setup-qt.js +++ b/share/qbs/module-providers/Qt/setup-qt.js @@ -107,7 +107,7 @@ function readFileContent(filePath) { // TODO: Don't do the split every time... function configVariable(configContent, key) { var configContentLines = configContent.split('\n'); - var regexp = new RegExp("\\s*" + key + "\\s*\\+{0,1}=(.*)"); + var regexp = new RegExp("^\\s*" + key + "\\s*\\+{0,1}=(.*)"); for (var i = 0; i < configContentLines.length; ++i) { var line = configContentLines[i]; var match = regexp.exec(line); diff --git a/share/qbs/module-providers/Qt/templates/android_support.qbs b/share/qbs/module-providers/Qt/templates/android_support.qbs index 2835a9336..410b05ff9 100644 --- a/share/qbs/module-providers/Qt/templates/android_support.qbs +++ b/share/qbs/module-providers/Qt/templates/android_support.qbs @@ -102,9 +102,8 @@ Module { targetArchitecture = theBinary.Android.ndk.abi; continue; } - if (theBinary.product.name === product.name - && candidate.product.name !== product.name) { - continue; // We already have a better match. + if (candidate.product.name !== product.name) { + continue; // This is not going to be a match } if (candidate.product.name === product.name && theBinary.product.name !== product.name) { |