diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2015-06-24 02:41:02 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@petroules.com> | 2015-06-30 16:47:56 +0000 |
| commit | 38b82191f0787e18dcf328720ad870862fdd03e9 (patch) | |
| tree | b2f18107ad5984b0f7a6bac685e7a54fe3ef5767 /doc | |
| parent | 4e911630443c72376e7aa5334b9a7c96fc083dc7 (diff) | |
Automatically detect JDK in the Java module.
Change-Id: I33e8ecf3e08a402fd4b1e836c28818c91bc6f61d
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/reference/modules/java-module.qdoc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/doc/reference/modules/java-module.qdoc b/doc/reference/modules/java-module.qdoc index 32f1fb2de..e7d5e2cdc 100644 --- a/doc/reference/modules/java-module.qdoc +++ b/doc/reference/modules/java-module.qdoc @@ -125,8 +125,16 @@ \li jdkPath \li path \li 1.4 - \li undefined - \li The base path of Java-related tools. + \li determined automatically + \li The base path of the Java Development Kit (JDK). This is equivalent to the \c JAVA_HOME + environment variable, and by default will be determined automatically from one of the + following: + \list + \li \c JAVA_HOME environment variable (all platforms) + \li Registry (Windows) + \li \c java_home tool (OS X) + \li Known JDK paths (other Unix platforms) + \endlist \row \li languageVersion \li string |