diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-02-12 17:36:29 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-02-12 17:36:29 +0100 |
| commit | 56aadc407d7becadec794e660ae7d7c20e820e0c (patch) | |
| tree | c9aad23933bc6b0c68406e64e359f57143ef54d8 /doc | |
| parent | 9926fc2ab12ccaa02b7f03b416c54cd58ef30b31 (diff) | |
| parent | 28971701fd4baa99f294d9393650b83c40754e18 (diff) | |
| download | qt-creator-56aadc407d7becadec794e660ae7d7c20e820e0c.tar.gz | |
Merge remote-tracking branch 'origin/3.3'
Conflicts:
src/plugins/debugger/watchhandler.cpp
src/plugins/projectexplorer/kitmodel.cpp
src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
src/shared/qbs
Change-Id: I6a68090993a264e93ac7850858cc24ba6bdb5602
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/qtcreator-documentation.qdoc | 9 | ||||
| -rw-r--r-- | doc/src/qtquick/qtquick-ui-forms.qdoc | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/doc/api/qtcreator-documentation.qdoc b/doc/api/qtcreator-documentation.qdoc index 2ec78a2c4d..32cb491f58 100644 --- a/doc/api/qtcreator-documentation.qdoc +++ b/doc/api/qtcreator-documentation.qdoc @@ -258,7 +258,7 @@ changed over time, so they differ between Qt and \QC versions. Since \QC version 3.3, only Qt 5 is supported for building documentation. The templates to use are defined by the - \c qt5\qtbase\doc\global\qt-html-templates-offline.qdocconf} and + \c {qt5\qtbase\doc\global\qt-html-templates-offline.qdocconf} and \c {qt5\qtbase\doc\global\qt-html-templates-online.qdocconf} configuration file. They are fetched from Qt sources by adding the following lines to the qdocconf file: @@ -266,11 +266,14 @@ \list \li \c {include ($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf)} - for publishing on the web - \li \c {include ($QT_INSTALL_DOCS/global/qt-html-templates-online.qdocconf)} for help files + \li \c {include ($QT_INSTALL_DOCS/global/qt-html-templates-online.qdocconf)} + for publishing on the web \endlist + \note To have the correct fonts loaded for the online version, you must be + running it on a web server. + \note If the styles look wrong to you when reading help files in \QC or \QA, you might be looking at them in the QTextBrowser instead of the WebKit browser. This happens if you build \QC and \QA with a self-built Qt and did diff --git a/doc/src/qtquick/qtquick-ui-forms.qdoc b/doc/src/qtquick/qtquick-ui-forms.qdoc index 2c9a309ba6..1aa46f3827 100644 --- a/doc/src/qtquick/qtquick-ui-forms.qdoc +++ b/doc/src/qtquick/qtquick-ui-forms.qdoc @@ -34,6 +34,9 @@ You can use \QC wizards to create UI forms that have the filename extension \e .ui.qml. The UI forms contain a purely declarative subset of the QML language. It is recommended that you edit the forms in the \uicontrol Design mode. + However, exporting items as alias properties is a commercial only feature, + and therefore you must use the \uicontrol Edit mode to do it if you are + using the open source version of \QC. \QC enforces the use of the supported QML features by displaying error messages. |