aboutsummaryrefslogtreecommitdiffstats
path: root/doc/reference
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2018-03-09 10:15:40 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2018-03-09 10:15:40 +0100
commitb608f25a930710dc146e9e4ed99104be36de1024 (patch)
tree07f4f767f09b731d1b166bbe39fff88e995b3936 /doc/reference
parente183c300f6daed0d000a2a70d46e9f001f97873f (diff)
parentabfc4c1b37d18515c8da0678a665886d7cb69af5 (diff)
Merge 1.11 into master
Diffstat (limited to 'doc/reference')
-rw-r--r--doc/reference/modules/qt-quick-module.qdoc12
1 files changed, 11 insertions, 1 deletions
diff --git a/doc/reference/modules/qt-quick-module.qdoc b/doc/reference/modules/qt-quick-module.qdoc
index d26c65480..8a39b92fc 100644
--- a/doc/reference/modules/qt-quick-module.qdoc
+++ b/doc/reference/modules/qt-quick-module.qdoc
@@ -62,7 +62,17 @@
Whether the Qt installation contains the Qt Quick compiler.
- \defaultvalue Determined by \l{setup-qt}.
+ \defaultvalue auto-detected
+ \since 1.10
+*/
+
+/*!
+ \qmlproperty bool Qt.quick::useCompiler
+
+ Whether to make use of the Qt Quick compiler.
+
+ \defaultvalue \l compilerAvailable
+ \since 1.11
*/
/*!