diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-08-16 16:20:58 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-10-19 14:52:38 +0000 |
| commit | 54c1cb6bc37c82cbfa688e360e880c2e72198785 (patch) | |
| tree | df8e59b0051921646d01802dc895bb221a50be42 /share/qbs | |
| parent | 4ebb16fa78277d23a1f571cc3485ce178588983d (diff) | |
Android: Convert to new-style property access syntax
Change-Id: Ie8a6972b5daf5cd1ef98bde65ed4db856ad4a735
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'share/qbs')
| -rw-r--r-- | share/qbs/modules/Android/sdk/sdk.qbs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/share/qbs/modules/Android/sdk/sdk.qbs b/share/qbs/modules/Android/sdk/sdk.qbs index 9b684736b..79ec9ad81 100644 --- a/share/qbs/modules/Android/sdk/sdk.qbs +++ b/share/qbs/modules/Android/sdk/sdk.qbs @@ -275,9 +275,8 @@ Module { var resources = inputs["android.resources"]; if (resources && resources.length) { artifacts.push({ - filePath: FileInfo.joinPaths( - ModUtils.moduleProperty(product, "generatedJavaFilesDir"), - "R.java"), + filePath: FileInfo.joinPaths(product.Android.sdk.generatedJavaFilesDir, + "R.java"), fileTags: ["java.java"] }); } @@ -293,7 +292,7 @@ Module { multiplex: true Artifact { - filePath: FileInfo.joinPaths(ModUtils.moduleProperty(product, "generatedJavaFilesDir"), + filePath: FileInfo.joinPaths(product.Android.sdk.generatedJavaFilesDir, "BuildConfig.java") fileTags: ["java.java"] } @@ -302,8 +301,7 @@ Module { var cmd = new JavaScriptCommand(); cmd.description = "Generating BuildConfig.java"; cmd.sourceCode = function() { - var debugValue = product.moduleProperty("qbs", "buildVariant") === "debug" - ? "true" : "false"; + var debugValue = product.qbs.buildVariant === "debug" ? "true" : "false"; var ofile = new TextFile(output.filePath, TextFile.WriteOnly); ofile.writeLine("package " + product.Android.sdk.packageName + ";") ofile.writeLine("public final class BuildConfig {"); |