aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/templates/doc
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Make sure import is highlightedKai Koehne2020-03-201-3/+3
| | | | | | | | | | | | | | Use \qml ... \endqml to allow qdoc highlighting the import as QML. Also parameterize the example import QtQuick.Templates import so that it always uses the last import version. Change-Id: I3fecc8b301c58a89769caf5aa3a764551ff683b3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: Fix import statement for QtQuick.TemplatesKai Koehne2019-10-291-1/+1
| | | | | | | | | | Always show the latest Qt Minor version in the import statements for modules in QtQuick.Templates. For QtQuick.Controls this was fixed in commit b395f94. Fixes: QTBUG-76077 Change-Id: I0d63337f572fd23f0122df151f01bef2c8eab1dd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: Replace the "Qt Quick Controls 2" instancesVenugopal Shivashankar2019-08-222-3/+3
| | | | | | | | | Now that Controls 1 is deprecated, it's ideal to use "Qt Quick Controls" instead of "Qt Quick Controls 2". Task-number: QTBUG-70333 Change-Id: Ie745db4b61071ddb5e06150d4e739cda74c59f41 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Tie minor version of all imports to Qt's minor versionMitch Curtis2018-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes all Qt Quick Controls 2 imports match the current Qt minor version, which is 12 as of this patch. It also updates all other Qt Quick imports to match. This will also make future version bumps easier as all version numbers in existing code/docs will match. The following commands were used to verify that no old versions remain: for i in `seq 0 11`; do git grep "import QtGraphicalEffects.*1.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick 2.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick.Layouts 1.$i$"; done for i in `seq 0 5`; do git grep "import QtQuick.Controls.*2.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick.Templates 2.$i as T$"; done [ChangeLog] From Qt 5.12 onwards, all import versions in Qt Quick Controls 2 follow the same minor version as Qt's minor version number. For example, the import version for Qt 5.12 is: "import QtQuick.Controls 2.12". Change-Id: I6d87573f20912e041d9c3b7c773cc7bf7b152ec3 Fixes: QTBUG-71095 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Bump module versionsJ-P Nurmi2018-03-011-2/+2
| | | | | Change-Id: Ifcb0b333769be58263ec5ed662520b97cfc2f79c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update versions in the docs and .prosJ-P Nurmi2018-02-261-2/+2
| | | | | Change-Id: I5b4af1ddfe8c4583731f5a90082d803298bdf9bd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-03-012-8/+8
|\ | | | | | | Change-Id: Ia4c692552e6573b33b2e0f6b43b2a482a78ad970
| * Update license headers to silence qtqa/tst_license warningsJ-P Nurmi2017-02-242-8/+8
| | | | | | | | | | | | | | | | | | | | Sync with the qtbase/header.XXX. The license headers were matching qtbase/header.XXX-OLD, which makes qtqa/tst_license flood warnings: Old license being used for foo.qdoc Change-Id: I199bf303a2d648e0d5f7bc01cb0814a5f945eeff Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Update the QML module versions from 2.2 to 2.3J-P Nurmi2017-02-201-2/+2
|/ | | | | Change-Id: Iefb73973e7950246cd364dbb7e47dc096508e4d4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update QtQuick.Templates import versions in the docsJ-P Nurmi2017-01-241-2/+2
| | | | | Change-Id: I5ad6841a507c2488618ec3bf694249fb3b8b4d1c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Welcome to 2017J-P Nurmi2017-01-092-2/+2
| | | | | Change-Id: If68cff4efacc7dc5719c8b8e61937e85e9076870 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Reorganize templates & calendar docsJ-P Nurmi2016-06-212-0/+117
Change-Id: I0e7a20805fe4823564ee2b312a635d08fa978327 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>