diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2017-05-24 09:02:32 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2017-05-24 09:02:32 +0300 |
| commit | 4d37184b10b69ef27048232377724533a4b5fac5 (patch) | |
| tree | 3bd3909b986270b76ceb2da4ad211969b1317436 /doc | |
| parent | 97498e486ac2d1d25206d4151613693dcf69e571 (diff) | |
| parent | d7d0974f9cdc2359b6b3ca0e359f2fe05ad437c4 (diff) | |
Merge remote-tracking branch 'origin/3.0' into master
Conflicts:
dist/config/config.xml
dist/packages/org.qtproject.ifw.binaries/meta/package.xml
dist/packages/org.qtproject.ifw/meta/package.xml
installerfw.pri
Change-Id: Ifaac76cd06737167a908baba5e554bedddd0e5ae
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/installerfw.qdoc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc index cf80de028..2edd4358c 100644 --- a/doc/installerfw.qdoc +++ b/doc/installerfw.qdoc @@ -691,8 +691,7 @@ \li Checkable \li Set to \c false if you want to hide the checkbox for an item. This is useful when only a few subcomponents should be selected instead of all. Optional. - \note The content from the data directory is not installed if \c Checkable - is \c false unless \c ForcedInstallation is set to \c true. + \endtable \section2 Component Dependencies |