aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-10-251-54/+72
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/doc/src/qtquickcontrols2-material.qdoc src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc src/imports/controls/material/ComboBox.qml Change-Id: I2a57070f96691cb6bbdaae460fbc60a85be435de
| * Doc: configuration fileJ-P Nurmi2016-10-251-3/+9
| | | | | | | | | | Change-Id: I3de16850673488a8c67afc6b45a79d5bb86f9013 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Doc: supported environment variablesJ-P Nurmi2016-10-251-26/+5
| | | | | | | | | | Change-Id: I2ad1767c1066a07a86e0f5889b350aa4500d685e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Doc: minor tweaks to the Material style pageJ-P Nurmi2016-10-241-3/+3
| | | | | | | | | | | | | | | | | | | | Fix the value used in the foreground example, and mention the default accent value right after the brief description, before the example snippet, to make it more visible. The same order is used for all other properties. Change-Id: I10613b6ed2417eb886602d40e90cc74e2dbaf484 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Material: add snippets and screenshots for attached propertiesMitch Curtis2016-10-201-25/+58
| | | | | | | | | | | | Change-Id: I4b388f374452c6894fe47c4feb5779fea7776708 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-09-141-17/+15
|\| | | | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquicktextarea_p_p.h src/quicktemplates2/qquicktextfield_p_p.h Change-Id: Ie7b4a114ad27a4cad337c91e8ebcf696b0e845d7
| * Doc: align "pre-defined colors" in the style docsJ-P Nurmi2016-09-131-17/+15
| | | | | | | | | | | | | | | | | | | | Original problem: the Universal.color() method docs was linking to the pre-defined colors of the Material style. Present the list of Universal style's pre-defined colors the same way it is done for the Material style, and disambiguate the two. Change-Id: I3f3df608e80ca5c24034e2d75398e3126cf32b2d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-09-061-0/+11
|\| | | | | | | Change-Id: Ief98cd56abd13cfa4e30578e150207462a8243b8
| * Doc: mention Material.elevation in the docsJ-P Nurmi2016-09-051-0/+11
| | | | | | | | | | Change-Id: I514a784df656d2690c8c2cb285cec8d48102b3be Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-08-231-1/+2
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/material/qquickmaterialstyle.cpp src/imports/controls/universal/qquickuniversalstyle.cpp src/quicktemplates2/qquickpopup_p_p.h src/quicktemplates2/qquicktooltip.cpp tests/auto/auto.pro Change-Id: I88b347dd85278e14f7b2ca468e30648c6432b6f2
| * Document that style attributes set in QML have precedence over settingsMitch Curtis2016-08-191-1/+2
| | | | | | | | | | Change-Id: I88fbebfc672d4c8d398a45b5dfe0c61fa307a9e7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into devJ-P Nurmi2016-08-091-24/+72
|\| | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickpage.cpp Change-Id: I4c8b62fb1d7c20c6d3c870eb47e0402a20051098
| * Fix attached property linking for Material styleMitch Curtis2016-08-041-23/+23
| | | | | | | | | | | | | | | | | | Both styles' documentation pages were using e.g. "accent-attached-prop", causing one to unintentionally link to the other. Change-Id: I19bf79781fd4a771ff7ddffeadf71e936d1a7b82 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Document Material.Shade and the related parameter of Material.color()Mitch Curtis2016-08-041-4/+49
| | | | | | | | | | | | Change-Id: Id6c4e2051587129d5f76d000be5786bb560efa3f Task-number: QTBUG-54269 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Add a link to style usage docs from individual pagesMitch Curtis2016-08-031-0/+3
| | | | | | | | | | | | | | | | There is a "Related Information" link already, but that's at the bottom of the page. Change-Id: If8fd83ea240eb146e5781b697ad924071aba4156 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Bump up all controls and templates imports to version 2.1J-P Nurmi2016-07-081-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Controls must import templates version 2.1 in order to "inherit" 1-revisioned properties, methods, and signals. So far, this has been done case by case, but it's less error prone and more clear to change them all. For example, if you ever see a source file pasted/linked somewhere, it's easy to identify the version it belongs to. Change-Id: I41609ec1a22bc05ac3e79f953a147ca42d9e0786 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: bump import versions to 2.1J-P Nurmi2016-06-211-1/+1
| | | | | | | | | | Change-Id: Ia7a1ed2df09c58d052e67a611c3fd18f1d188dc3 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-011-1/+27
|\| | | | | | | | | | | | | | | | | | | | | Comparing colors in tst_material.qml works fine now. Conflicts: examples/quickcontrols2/gallery/qtquickcontrols2.conf tests/auto/material/data/tst_material.qml Task-number: QTBUG-53556 Change-Id: I59970442a09bd72bf0ce53fe838c560ca8daf325
| * Doc: add "see also" links between the stylesJ-P Nurmi2016-05-271-0/+2
| | | | | | | | | | Change-Id: If7977592783756855a81bdaee5875a630de143ad Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Doc: Material.color() and Universal.color()J-P Nurmi2016-05-271-0/+24
| | | | | | | | | | Change-Id: I01bc1ec6ae769f8b6c9856b70a5305dfb361f1bc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Doc: add missing \since 5.7 tagsJ-P Nurmi2016-05-251-1/+1
| | | | | | | | | | Change-Id: Ie4680c5dfadc95278215b688f4fc28577f557933 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | Introduce a 'System' theme to the styles.Friedemann Kleint2016-05-261-0/+5
|/ | | | | | | | | | | | | | | | Setting the theme to System chooses either the light or dark theme based on the system theme colors. However, when reading the value of the theme property, the value is never System, but the actual theme. [ChangeLog][Controls][Material] Added Material.System theme enum value, that can be used to let the Material style choose either the light or dark theme based on the system theme colors. [ChangeLog][Controls][Universal] Added Universal.System theme enum value, that can be used to let the Universal style choose either the light or dark theme based on the system theme colors. Change-Id: Ibfc9f01953cb8322b64d59413cfbaef9d4bb28fd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: Add \target to avoid incorrect linksVenugopal Shivashankar2016-04-231-1/+2
| | | | | | | | | | | | | "Detailed Description" is a very common link target that could confuse qdoc, leading to wrong links. Adding a \target under the section should resolve this problem by creating a unique link target. Change-Id: Iddb7e1482a352baf1ef72a2ef886f758f3b13dba Task-number: QTBUG-52919 Reviewed-by: Martin Smith <martin.smith@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Rename env vars (QT_LABS_CONTROLS_XXX -> QT_QUICK_CONTROLS_XXX)J-P Nurmi2016-04-221-5/+5
| | | | | Change-Id: Ie903d3491b03d4ec05dd28462a19ee464331d2a2 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Doc: cleanup remaining "labs" referencesJ-P Nurmi2016-04-211-2/+0
| | | | | Change-Id: I5b0015476c3ceef8f82b00d99b084b1ce3bfaa6f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Doc: rename Qt.labs.controls 1.0 to QtQuick.Controls 2.0J-P Nurmi2016-04-211-1/+1
| | | | | | Change-Id: Id6c476424fa359d222f027584278346fc0984069 Task-number: QTBUG-52549 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* import Qt.labs.controls 1.0 => QtQuick.Controls 2.0J-P Nurmi2016-04-211-4/+4
| | | | | | | | | Docs, resources, .metainfo and plugins.qmltypes will be updated in follow up commits. Change-Id: I4438c5bfb8802bff0fa15c56431cfd288f179861 Task-number: QTBUG-52549 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Doc: rename remaining qtlabscontrols groups and linksJ-P Nurmi2016-04-191-1/+1
| | | | | Change-Id: I40f149be98406b5f9e5d1e59fb2cc359ba864107 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Doc: visualize the pre-defined style colorsJ-P Nurmi2016-04-181-21/+21
| | | | | Change-Id: Iade9f17269d2702358449ed961592bc0f93c7aa3 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Material: add foreground and background attached propertiesJ-P Nurmi2016-04-151-4/+37
| | | | | | | | | | | | This has been a common request on the mailing lists and forums. Users want to customize the text color of various controls without having to replace whole delegates. This change makes it possible to specify both foreground (eg. Button text) and background (eg. ApplicationWindow, Page and Pane background) colors so that they propagate to children in the same way than accent, primary and theme do. Change-Id: Idae52650ed8620beeff7bf4c8263ffdc1f6ef728 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Doc: add 2-suffix to the image assets and snippetsJ-P Nurmi2016-04-131-3/+3
| | | | | Change-Id: Ib8050cb3baefe07d28c7e2dcec64af155d2d7c9b Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Doc: Rename Qt Labs Controls to Qt Quick Controls 2Venugopal Shivashankar2016-04-011-2/+2
| | | | | | | Replaced all remaining instances of "Qt Labs Controls" Change-Id: Iad784417b9b4ce015c11b4737dab2105b338ff5f Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Rename Qt Labs Controls to Qt Quick Controls 2 - doc updateVenugopal Shivashankar2016-03-291-2/+2
| | | | | | | | | | | | - Change \title, \page, and \l instances that used "qtlabs" instead of "qtquick". - Renamed the qdocconf file and changed the qch parameters in it to use "Qt Quick Controls 2". - Added "2" as output suffix for the html filenames. Change-Id: Ia2fdd1c835229e5216f42a2fdfa5f7e11965e21d Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* Add support for specifying theme, accent & primary via envJ-P Nurmi2016-03-241-0/+26
| | | | | | | | Environment values take presedence over the default values requested in qtquickcontrols.conf, the same way than style name. Change-Id: I4641317bdce320c33a89f3614f3c782883c9c843 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Rename Qt Labs Controls to Qt Quick Controls 2 - doc filenamesVenugopal Shivashankar2016-03-221-0/+207
Except the .qdocconf all .qdoc files are renamed to use "qtquickcontrols2" instead of "qtlabscontrols". Change-Id: I317a4e81ea4e78b63a0d4d849d7352f496824cb3 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 03:28:16 +0000