diff options
author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2016-05-03 11:44:55 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2016-05-03 11:44:55 +0200 |
commit | 9f303234d3bed1770d8b8fd17deb209d19eac1b7 (patch) | |
tree | 3fa994e1abae6beeada4d492e0b7b32b556f5165 /doc | |
parent | a16582bd37475773f6c5ba7f1f643484cf5c3271 (diff) | |
parent | 5c9171ca2ef5bc538967c29246d5f35bf01cfea7 (diff) |
Merge remote-tracking branch 'origin/1.5'
Conflicts:
src/lib/corelib/jsextensions/environmentextension.cpp
src/lib/corelib/language/scriptengine.h
Change-Id: I77e4626218612656d0963d1bfc643d9f9e7f4edd
Diffstat (limited to 'doc')
-rw-r--r-- | doc/reference/modules/java-module.qdoc | 28 | ||||
-rw-r--r-- | doc/reference/modules/qt-modules.qdoc | 165 |
2 files changed, 185 insertions, 8 deletions
diff --git a/doc/reference/modules/java-module.qdoc b/doc/reference/modules/java-module.qdoc index dd1647b83..708d5b63a 100644 --- a/doc/reference/modules/java-module.qdoc +++ b/doc/reference/modules/java-module.qdoc @@ -181,4 +181,32 @@ \li If this property is enabled, the compiler will abort where it would normally emit a warning. \endtable + + \section1 Relevant File Tags + + \table + \header + \li Tag + \li Auto-tagged File Names + \li Since + \li Description + \row + \li \c{"java.class"} + \li - + \li 1.4 + \li This tag is attached to the output artifacts of the rule that runs the + \c javac tool. + \row + \li \c{"java.jar"} + \li - + \li 1.4 + \li This tag is attached to the output artifacts of the rule that runs the + \c jar tool. + \row + \li \c{"java.java"} + \li \c{*.java} + \li 1.4 + \li Source files with this tag serve as inputs to the rule running the \c javac tool. + \endtable + */ diff --git a/doc/reference/modules/qt-modules.qdoc b/doc/reference/modules/qt-modules.qdoc index 60e70fb87..3bea872fe 100644 --- a/doc/reference/modules/qt-modules.qdoc +++ b/doc/reference/modules/qt-modules.qdoc @@ -80,10 +80,17 @@ For more information on the properties you can specify, see \l{core Properties}. + + For more information on the relevant file tags, see + \l {core File Tags}. \row \li dbus \li Qt D-Bus - \li + \li For more information on the properties you can specify, see + \l{dbus Properties}. + + For more information on the relevant file tags, see + \l {dbus File Tags}. \row \li declarative \li Qt Quick 1 @@ -100,7 +107,11 @@ \row \li gui \li Qt GUI - \li For more information, see \l {gui Properties}. + \li For more information on the properties you can specify, + see \l {gui Properties}. + + For more information on the relevant file tags, see + \l {gui File Tags}. \row \li help \li Qt Help @@ -182,10 +193,14 @@ \li \endtable - \section1 core Properties + \section1 Module Properties + + The following sections describe the properties of Qt modules that can be + interesting to users. + + \section2 core Properties - As opposed to most other \c Qt modules, \c core defines a number of properties that can be - interesting to users. Some of them only need to be defined if the respective installation + Some of the following properties only need to be defined if the respective installation of Qt was built in some unusual way, for instance by setting non-default \c configure flags. \table @@ -332,7 +347,32 @@ \li The Qt patch level. \endtable - \section1 declarative Properties + \section2 dbus Properties + + \table + \header + \li Property + \li Type + \li Default + \li Description + \row + \li xml2cppName + \li \c{string} + \li \c{"qdbusxml2cpp"} + \li The base name of the \c qdbusxml2cpp tool. Set this if your system uses a different name. + \row + \li xml2CppHeaderFlags + \li \c{stringList} + \li empty list + \li Additional flags when running the \c qdbusxml2cpp tool to create header files. + \row + \li xml2CppSourceFlags + \li \c{stringList} + \li empty list + \li Additional flags when running the \c qdbusxml2cpp tool to create source files. + \endtable + + \section2 declarative Properties \table \header @@ -358,7 +398,7 @@ This property is undefined for Qt4. \endtable - \section1 gui Properties + \section2 gui Properties \table \header @@ -373,7 +413,7 @@ \li The base name of the \c uic tool. Set this if your system uses a name such as "uic-qt4". \endtable - \section1 quick Properties + \section2 quick Properties \table \header @@ -397,5 +437,114 @@ \li set by \c{qbs-setup-qt} \li The absolute path to the directory where Qt's QML files are installed. This property is undefined for Qt4. + + \endtable + + \section1 Relevant File Tags + + The following sections describe the file tags that are relevant for the Qt + modules. + + \section2 core File Tags + + \table + \header + \li Tag + \li Auto-tagged File Names + \li Since + \li Description + \row + \li \c{"qch"} + \li n/a + \li 1.1 + \li This tag is attached to the output artifacts of the rule that runs the + \c qhelpgenerator tool. + \row + \li \c{"qdoc"} + \li \c{*.qdoc} + \li 1.1 + \li Source files with this tag trigger a re-execution of the rule running the \c qdoc + tool when their timestamp changes. + \row + \li \c{"qdocconf"} + \li \c{*.qdocconf} + \li 1.1 + \li Source files with this tag trigger a re-execution of the rule running the \c qdoc + tool when their timestamp changes. + \row + \li \c{"qdocconf-main"} + \li - + \li 1.1 + \li Source files with this tag serve as inputs to the rule running the \c qdoc tool. + \row + \li \c{"qdoc-output"} + \li n/a + \li 1.5 + \li Use this tag to match all \c qdoc outputs, for instance in a \l{Group Item}{Group} + using the \c fileTagsFilter property. + \row + \li \c{"qhp"} + \li \c{*.qhp} + \li 1.1 + \li Files with this tag serve as inputs to the rule running the \c qhelpgenerator tool. + Such files are created by \c qdoc, but can also appear as source files. + \row + \li \c{"qm"} + \li n/a + \li 1.1 + \li This tag is attached to the output artifacts of the rule that runs the \c lrelease tool. + \row + \li \c{"qrc"} + \li \c{*.qrc} + \li 1.0 + \li Files with this tag serve as inputs to the rule running the \c rcc tool. + \row + \li \c{"qt_plugin_metadata"} + \li - + \li 1.0 + \li Source files with this tag trigger a re-execution of the rule running the \c moc + tool when their timestamp changes. + \row + \li \c{"ts"} + \li \c{*.ts} + \li 1.0 + \li Files with this tag serve as inputs to the rule running the \c lrelease tool. + \endtable + + \section2 dbus File Tags + + \table + \header + \li Tag + \li Auto-tagged File Names + \li Since + \li Description + \row + \li \c{"qt.dbus.adaptor"} + \li - + \li 1.5 + \li Source files with this tag serve as inputs to the rule running the \c qdbusxml2cpp tool, + which will create an adaptor class. + \row + \li \c{"qt.dbus.interface"} + \li - + \li 1.5 + \li Source files with this tag serve as inputs to the rule running the \c qdbusxml2cpp tool, + which will create an interface class. + \endtable + + \section2 gui File Tags + + \table + \header + \li Tag + \li Auto-tagged File Names + \li Since + \li Description + \row + \li \c{"ui"} + \li \c{*.ui} + \li 1.0 + \li Source files with this tag serve as inputs to the rule running the \c uic tool. \endtable */ |