aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@petroules.com>2015-02-02 22:38:55 -0800
committerJake Petroules <jake.petroules@petroules.com>2015-07-22 13:24:09 +0000
commitd6e5db9d8f3771023465e13757e35fc752d7126c (patch)
tree86bae84d74ff004de9377bf50891f25edfaff9a3 /doc
parenta3cb59b277698ba92cdfde0ccc215e93b96ae92f (diff)
Add manifest support in Java module.
The existing manifest property was never declared, so this never worked in the first place. Additionally, add aggregation capabilities similar to how Info.plist is handled in the DarwinGCC module. Change-Id: I93e35936bdfd271adc2892bf2288d2f66d4f87a8 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/reference/modules/java-module.qdoc24
1 files changed, 24 insertions, 0 deletions
diff --git a/doc/reference/modules/java-module.qdoc b/doc/reference/modules/java-module.qdoc
index e7d5e2cdc..dd1647b83 100644
--- a/doc/reference/modules/java-module.qdoc
+++ b/doc/reference/modules/java-module.qdoc
@@ -150,6 +150,30 @@
\li The version of the Java runtime to generate compatible bytecode for. If undefined,
the compiler will use its default.
\row
+ \li manifest
+ \li object
+ \li 1.4.2
+ \li undefined
+ \li The properties to add to the manifest file when building a JAR.
+ The contents of this property will be aggregated with the values from \c{manifestFile}.
+ If \c{manifest} and \c{manifestFile} contain the same key, the former will take
+ precedence. If undefined, will not be taken into account.
+ \row
+ \li manifestFile
+ \li path
+ \li 1.4.2
+ \li undefined
+ \li The manifest file to embed when building a JAR.
+ The contents of this file will be aggregated with the values in \c{manifest}.
+ If \c{manifestFile} and \c{manifest} contain the same key, the latter will take
+ precedence. If undefined, will not be taken into account.
+ \row
+ \li manifestClassPath
+ \li stringList
+ \li 1.4.2
+ \li undefined
+ \li The entries to add to the manifest's Class-Path when building a JAR.
+ \row
\li warningsAsErrors
\li bool
\li 1.4