diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-08-02 23:00:56 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-08-04 16:05:40 +0000 |
| commit | 313381e1f75e2d09437f3d007927f72c5c16fae9 (patch) | |
| tree | cd738ab60fd2142df85da5fd7f5dbd0ba2d4685b | |
| parent | a9c10cad3d265a39650e56384ec550ae3035f310 (diff) | |
Android SDK module: allow product.packageName property to be empty
This is useful when adding a dependency on the Android SDK module from a
Java JAR file in order to apply the correct Java language versions and
other properties necessary for Android JARs.
This is also needed for a subsequent patch.
Change-Id: I4c66f9259394a707cb86a3b29d3d69078d1380ac
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | share/qbs/modules/Android/sdk/sdk.qbs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qbs/modules/Android/sdk/sdk.qbs b/share/qbs/modules/Android/sdk/sdk.qbs index bca52a203..1574b626e 100644 --- a/share/qbs/modules/Android/sdk/sdk.qbs +++ b/share/qbs/modules/Android/sdk/sdk.qbs @@ -84,7 +84,7 @@ Module { "android.jar") property path generatedJavaFilesBaseDir: FileInfo.joinPaths(product.buildDirectory, "gen") property path generatedJavaFilesDir: FileInfo.joinPaths(generatedJavaFilesBaseDir, - product.packageName.split('.').join('/')) + (product.packageName || "").split('.').join('/')) Depends { name: "java" } java.languageVersion: platformJavaVersion |