diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2017-04-20 15:57:39 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-04-28 15:09:40 +0000 |
commit | b60004ea8ae2e0717e6fab2f40bfe90bac7cf6b7 (patch) | |
tree | f994c11f8f024abe56a97df6533235e21844c141 /doc | |
parent | 985ed0fa89a1bdf5ced4ab0d15bf8b182e722e2d (diff) |
Qt.qml: Link against QML plugins when using a static Qt
Task-number: QBS-1121
Change-Id: Id1da9786d4535a350eed72062848c2745cf8a73b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/reference/modules/qt-modules.qdoc | 42 |
1 files changed, 41 insertions, 1 deletions
diff --git a/doc/reference/modules/qt-modules.qdoc b/doc/reference/modules/qt-modules.qdoc index 72124d3a5..44b516af7 100644 --- a/doc/reference/modules/qt-modules.qdoc +++ b/doc/reference/modules/qt-modules.qdoc @@ -147,7 +147,11 @@ \row \li qml \li Qt QML - \li + \li For more information on the properties you can specify, see + \l{qml Properties}. + + For more information on the relevant file tags, see + \l {qml File Tags}. \row \li script \li Qt Script @@ -495,6 +499,27 @@ \endtable + \section2 qml Properties + + \table + \header + \li Property + \li Type + \li Default + \li Description + \row + \li qmlImportScannerName + \li \c{string} + \li \c{"qmlimportscanner"} + \li The base name of the QML import scanner. Set this if your system uses a different name. + \row + \li qmlPath + \li \c{string} + \li set by \c{qbs-setup-qt} + \li The absolute path to the directory where Qt's QML files are installed. + \endtable + + \section2 scxml Properties \table @@ -635,6 +660,21 @@ \li Source files with this tag serve as inputs to the rule running the \c uic tool. \endtable + \section2 qml File Tags + + \table + \header + \li Tag + \li Auto-tagged File Names + \li Since + \li Description + \row + \li \c{"qt.qml.qml"} + \li \c{*.qml} + \li 1.8 + \li Source files with this tag serve as inputs to the QML plugin scanner. + \endtable + \section2 scxml File Tags \table |