summaryrefslogtreecommitdiff
path: root/src/controls/doc
Commit message (Collapse)AuthorAgeFilesLines
* Note that iconName requires QApplicationMitch Curtis2017-03-011-0/+3
| | | | | | Task-number: QTBUG-37083 Change-Id: I3091776f4b4643136e67c9521efddb5462657d06 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.75.7.1Liang Qi2016-11-121-2/+2
|\ | | | | | | Change-Id: Idef60aa2d7b55600cca618f0f622e8e18e77f3de
| * qtquickcontrols-tableview.qdoc: unify wording of documentationFrederik Schwarzer2016-10-061-2/+2
| | | | | | | | | | | | | | This way it fits better to the other entries. Change-Id: I099ceaec4ecf80d267cb431815d63597e004fef1 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-272-4/+4
|\ \ | |/ | | | | | | | | | | Conflicts: tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp Change-Id: I0b6018fdac65a5385136e4c3561fba1c52ecd32e
| * Fix typo (word repetition) in documentationFrederik Schwarzer2016-08-181-1/+1
| | | | | | | | | | Change-Id: I6242fa1ab805d13753678feb5929da67ae0f4385 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Fix typo in documentationFrederik Schwarzer2016-08-181-2/+2
| | | | | | | | | | Change-Id: Ibd33614206e8d770bd7ee0888a8806662e3a1a73 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Doc: Change instances of 'OS X' to 'macOS'Topi Reinio2016-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | As of version 10.12 (Sierra), the name of Apple's desktop operating system will be macOS. Change all occurrences where the platform is discussed to use the macro \macos (defined in the documentation configuration in qtbase). Change-Id: I5ca47e4d830c12df297ee298ed22fd2d41dee739 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-013-8/+9
|\ \ | |/ | | | | Change-Id: I316bcbbc5308fda27728df15db1e780aa073da2a
| * Doc: Fix documentation warningsTopi Reinio2016-06-174-9/+10
| | | | | | | | | | | | | | | | | | | | | | src/controls/doc/src/qtquickcontrols-examples.qdoc:90: warning: Unable to parse QML snippet: "Expected token `{'" at line 1, column 10 src/controls/doc/src/qtquickcontrols-examples.qdoc:116: warning: Unable to parse QML snippet: "Expected a qualified name id" at line 1, column 1 src/controls/doc/src/qtquickcontrols-tableview.qdoc:299: warning: Unrecognizable QML module/component qualifier for TableView::section src/controls/doc/src/qtquickcontrols-treeview.qdoc:138: warning: Unrecognizable QML module/component qualifier for TreeView::section (multiple) warning: Can't link to 'DropShadow' Change-Id: Ic5e2dcbe9810486290e164f561ecba969f57df78 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | Doc: added qtgraphicaleffects to qdocconfNico Vertriest2016-07-011-1/+1
| | | | | | | | | | | | | | | | Corrected link issue with DropShadow in PieBoxStyle.qml Change-Id: I66821c69f392b016a0ea1a699a26990d7aad5140 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: Add missing \qmlmodule and \inqmlmodule commandsTopi Reinio2016-06-221-0/+4
| | | | | | | | | | | | | | | | These are not strictly necessary as they are for internal types, but it makes it easier for QDoc to resolve the type inheritance. Change-Id: If4a2650fab5251081ae74b109bfb97220c25751c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Revert "Fix Controls 1 types linking to Controls 2"Topi Reinio2016-06-222-2/+0
| | | | | | | | | | | | | | | | | | | | | | This reverts commit b5a8306bf6d4949066872ac2afc8d0a01f716bd7. The incorrect \inherits commands caused property documentation from base types go missing. Task-number: QTBUG-54150 Change-Id: I0bbe604a6fe904d8e6a4596777262255a794ec62 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Fix Controls 1 types linking to Controls 2v5.7.0-rc1v5.7.05.7.0Mitch Curtis2016-05-262-0/+2
| | | | | | | | | | | | Task-number: QTBUG-53529 Change-Id: I4933a03c49dee4e3edc56dd406f67073da341ac1 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-191-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia45d6b4318ffe60c386c8548de7bb3f07c4cd6f9
| * Doc: Remove repository name from examplesinstallpathTopi Reinio2016-05-121-1/+1
| | | | | | | | | | | | | | | | Examples in binary packages now directly match the install path. Change-Id: Icd9ae9ef887b99b96177ec7b590fc3f35da18c82 Task-number: QTBUG-52953 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-101-3/+3
|\ \ | |/ | | | | | | | | | | | | Conflicts: examples/quickcontrols/extras/flat/main.cpp src/controls/Private/qquickcontrolsettings.cpp Change-Id: I9eb9342a2ee994611f3cb18daab6dd89eb924ccc
| * fix example installsOswald Buddenhagen2016-04-281-2/+2
| | | | | | | | | | | | | | this includes renaming the first-level subdir of examples/. Change-Id: Idf14164533c247e5c0cc5acdb405ac97f7c33ac5 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * qtquickcontrols.qdocconf: Fix path to qquickabstractstyle_p.h.Friedemann Kleint2016-04-181-1/+1
| | | | | | | | | | | | | | | | | | Fix qdoc-warning: qtquickcontrols/src/controls/doc/qtquickcontrols.qdocconf:50: warning: Cannot find file or directory: ../Private/qquickabstractstyle.h / Change-Id: If4548ebc2a33a42fd756f8a67d83e64c8dc8d638 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Add support for QT_QUICK_CONTROLS_1_STYLEJ-P Nurmi2016-04-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Takes priority over QT_QUICK_CONTROLS_STYLE to allow specifying system wide style name preferences separately for Qt Quick Controls 1 and 2. [ChangeLog][Controls] Added support for a QT_QUICK_CONTROLS_1_STYLE environment variable, which takes priority over the existing variable QT_QUICK_CONTROLS_STYLE. This allows specifying system wide style name preferences separately for Qt Quick Controls 1 and 2. Change-Id: I0e40c2790c24b7ef66b1995b8337e573bb2f75a2 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | qtquickcontrols-examples.qdoc: Remove Basic Layouts Example.Friedemann Kleint2016-04-181-14/+0
| | | | | | | | | | | | | | | | | | | | | | Amends change 1c5f765658432a08ed52523c3a4547ab2b4a58f1, fixing qdoc-warnings: ../qtquickcontrols/src/controls/doc/src/qtquickcontrols-examples.qdoc:127: warning: Cannot find file 'basiclayouts/basiclayouts.pro' or 'basiclayouts/basiclayouts.qmlproject' ../qtquickcontrols/src/controls/doc/src/qtquickcontrols-examples.qdoc:127: warning: EXAMPLE PATH DOES NOT EXIST: basiclayouts Change-Id: I0bacabb2b611bfb0095ae216532bcc490747d092 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-085-0/+0
|\ \ | |/ | | | | Change-Id: Ic78345c599719f3dd80b1d6a6004d46a085da4af
| * Purge sRGB chunks from PNGs in documentation.Edward Welbourne2016-03-225-0/+0
| | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Change-Id: I88acc450a8af929b011286d2ba2f81e75ed0faa9 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-162-0/+2
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: .qmake.conf src/dialogs/qquickabstractfiledialog.cpp src/dialogs/qquickfiledialog.cpp Change-Id: I60aab7c7e819f82f82fc30f473b36a7a57d9a91a
| * Doc: Added qmlpropertygroup statementsNico Vertriest2016-02-032-0/+2
| | | | | | | | | | | | | | Change-Id: Ia5aa9889dba5d2b38f20b2dc9ee6dc29efa184a5 Task-number: QTBUG-43810 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com> Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
* | Unify license header usageAntti Kokko2016-02-0419-95/+95
|/ | | | | | | Updated FDL license headers Change-Id: I867e7f1cb551f2141a4344d505bbf5d694df4720 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2016-01-072-3/+3
|\ | | | | | | Change-Id: Id9c8ce5b56ecd279daaebef2923ea90d4bfc0447
| * Doc: fix wrong description of doubleClicked() signal in TreeViewNikita Krupenko2016-01-011-2/+2
| | | | | | | | | | Change-Id: I2183a869aef2c949dc1528e7b97e08c7b035c315 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Doc: fix a typo in TableViewNikita Krupenko2015-12-311-1/+1
| | | | | | | | | | Change-Id: Id7908e45b04358387bf0e3ffd418ea6842ff889d Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Doc: Update examplesinstallpath to include the repository nameTopi Reinio2015-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The examplesinstallpath variable in .qdocconf files defines the path under QT_INSTALL_EXAMPLES where examples are found. To match the way examples are packaged in Qt 5.6, prefix the install path with the repository name. Task-number: QTBUG-48736 Change-Id: I5630d8d7a566d57fea84447ca6099d8ab95bc681 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | Doc: minor link issuesNico Vertriest2015-09-081-2/+2
| | | | | | | | | | | | Change-Id: I20d89adb638b80a42da8f53bdc0597d3bcb5f512 Task-number: QTBUG-43810 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Doc: Create proper QHP TOC entries for QML types, examples and tutorialsTopi Reinio2015-08-056-21/+20
| | | | | | | | | | | | | | | | | | | | QDoc now supports using a \group name as a selector for QHP subprojects. Use this to have the correct division of Qt Quick Controls and Controls Styles QML types, as well as a TOC entry for examples and tutorials. Change-Id: I8e4b44c8876fd6bb3b2baebd956d6dc5d5223715 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Allow any platform to have isMobile trueMarco Martin2015-07-291-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | don't hardcode the isMobile property of the controls settings. Allow other platforms such as plain Linux or Windows to behave as full mobile controls using the QT_QUICK_CONTROLS_MOBILE environmant variable [ChangeLog][QtQuick.Controls] introducing QT_QUICK_CONTROLS_MOBILE makes possible for normal Linux systems to have QtQuickControls behaving as a mobile platform Change-Id: I4c96104334864855e9cf0a8f71125102f178b423 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* | TreeView: Add rootIndex propertyGabriel de Dietrich2015-07-271-0/+13
|/ | | | | | | | | | | | | | | Its purpose is the same as QAbstractItemView::rootIndex and allows to display only the part of the model data that is descendant of this index. The filesystembrowser example has been updated to only show files reachable from the user's home directory. [ChangeLog][TreeView] Added rootIndex property Change-Id: Ib8d9af4ce9d1f341ab509de3cc991773830ba9f4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Doc: Refactor TableViewStyle, TreeViewStyleGabriel de Dietrich2015-04-203-5/+151
| | | | | Change-Id: I9099073bc4095d6060162689ca17c4999124f254 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
* TableView, TreeView: Refactor documentationGabriel de Dietrich2015-04-163-0/+580
| | | | | | | | | | | The problematic property is itemDelegate which has different properties attached in both cases. But it seems we can't over- ride a property documentation blob unless we use .qdoc files. We also update TreeViewStyle documentation. Change-Id: Ie358e17767f67737b9fbf8ef96d8e646063fdca9 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-03-173-0/+2
|\ | | | | | | | | | | | | Conflicts: examples/quick/extras/gallery/qml/PieMenuDefaultStyle.qml Change-Id: I87f52fa9bdde0d74bfb3a9844c01fadab7a2e3e2
| * Doc: Fix Command '\printto' failed at end of file 'gallery/main.qml'Sergio Ahumada2015-03-121-0/+0
| | | | | | | | | | | | | | | | | | SystemPalette was removed in commit cc174637d Update the image to match the example code. Change-Id: I449e431ace566b0062018d3a8103f5332401f748 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
| * Doc: Added brief statement to views groupNico Vertriest2015-03-092-0/+2
| | | | | | | | | | | | Task-number: QTBUG-42682 Change-Id: Ic3058ad7fb847da492bb8e63c6c94fc4e8832a25 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Examples: Adding ui forms exampleThomas Hartmann2015-03-162-0/+61
| | | | | | | | | | Change-Id: I36ee43ff94e72ca22af597cea11c13bdae683678 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | Doc: Fix qtdoc warningsCaroline Chao2015-03-062-8/+8
| | | | | | | | | | | | | | | | | | Mostly link errors and missing documentation. And removed useless references to {QtQuick.Controls.Styles} in the doc. Change-Id: Iad211a574c0bd23c84e067e0cbcc18c3e719cde7 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Merge Extras' styling system into Controls'.Mitch Curtis2015-03-0227-3/+619
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removes the duplicated style settings functionality in Extras and simplifies the installed styles directory structure. - Extras' Base style is now part of Controls' Base style, eliminating the need for a separate QtQuick.Extras.Styles import. The cost of doing this should be negligible: a few QML files and two images. If we didn't merge Extras' Baste style into Controls', we'd need extras-specific code in qquickcontrolssettings, as the default style search path is: qml/QtQuick/Controls/Styles/ Whereas the Extras Base style would be in: qml/QtQuick/Extras/Styles/ The Extras Base style can't go into Controls' Base style directory, either, because otherwise we'd have two qmldir files there. The Flat style doesn't have this problem because it is all contained in one plugin and gets installed into its own Flat/ folder. - Documentation now lists the Extras controls as \since QtQuick.Extras 1.4. - Adds the customcontrolsstyle auto test to ensure that custom styling is tested. Change-Id: I19ca7a8b7e1c1daa85b272f4ccf9a2f05c76e0d9 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Doc: Fix code sample in overview pageCaroline Chao2015-02-251-0/+3
| | | | | | | | | | | | Task-number: QTBUG-43906 Change-Id: I41c51bccc69a940fc863cd6ee47bb032c2225651 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Doc: Update import version to 1.4Caroline Chao2015-02-132-6/+6
| | | | | | | | | | | | | | For QtQuick.Controls and QtQuick.Controls.Styles Change-Id: I45ea3c83e14b992760914c068603e6519e7ed7c4 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Introducing TreeViewGabriel de Dietrich2015-02-133-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The TreeView, as currently implemented, extends the TableView by adding support for hierarchical models. In the broad sense, it remains a list view with columns, like TableView. The main architecture is based on TreeModelAdaptor, that wraps the hierarchical model. It keeps track of which items are expanded or collapsed, and also relays model changes to the view. (TreeModelAdaptor is a private type and should be considered as an implementation detail.) The TreeView only supports QAbstractItemModels for the time being, and, just like TableView, relies on roles to pass the data to the view. This also means that model columns are not supported. Selection is supported by ItemSelectionModel which exposes part of the API of QItemSelectionModel. For this, support has been added for QModelIndex and related classes. This requires importing QtQml.Models 2.2 should an actual usage of the TreeView use selection. In the same way, TreeViewStyle currently extends TableViewStyle with the relevant features, like branch indicator. [ChangeLog][QtQuick.Controls] Introducing TreeView With-Help-From: Caroline Chao <caroline.chao@theqtcompany.com> Change-Id: Id3dba240a732744571e4a646b7b98678ab522da6 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
* | Docs: update license headersJ-P Nurmi2015-02-1110-62/+60
|/ | | | | | Change-Id: I2c181d880e88c16a169c87b9260423db093d9ce8 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
* Document how to select a specific Android themeJ-P Nurmi2014-12-012-1/+20
| | | | | | | Change-Id: If6d72a65b01453e2f2ea76026ec158c98e80421e Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Doc: added brief statement for group menusNico Vertriest2014-11-181-0/+1
| | | | | | Task-number: QTBUG-40362 Change-Id: I94d869e9d38c5d958df4abd1e17f219cfa3ce16a Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Corrected brief statements for overview pagesNico Vertriest2014-11-143-0/+3
| | | | | | Task-number: QTBUG-42682 Change-Id: I14b60415f5a1bfdc0874013de707560a944c0824 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Fixed the \image referenceVenu2014-11-131-1/+1
| | | | | | | | An earlier commit renamed the image that was referred but this reference was not updated. Change-Id: Ic4b6e9d6d1e01835e53a4fd4640ae45b105898fd Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/5.4' into 5.4.0" into ↵Jani Heikkinen2014-11-114-24/+33
|\ | | | | | | refs/staging/5.4.0
View Lorry Controller Status