aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/doc/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * RangeSlider: update GIFs and replace PNGs with themMitch Curtis2016-10-061-1/+1
| | | | | | | | | | | | Change-Id: Iafc4c1b088cfa51aee7bf1a91c165b74bf2da599 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * ScrollBar: replace PNGs with GIFsMitch Curtis2016-10-061-1/+1
| | | | | | | | | | | | Change-Id: I0c0f23b88c0ce36d43bc31321371508ec63c2903 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Replace image state table with GIF in buttons docMitch Curtis2016-10-031-10/+1
| | | | | | | | | | | | Change-Id: I8b09b2e1c96fe2dec21bb0aa7b4f8ce4a2a862ab Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-10-032-2/+30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/quickcontrols2/gallery/gallery.qrc src/imports/calendar/doc/snippets/qtlabscalendar-calendarmodel.qml src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow.qml src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid-layout.qml src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid.qml src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn.qml src/imports/controls/doc/qtquickcontrols2.qdocconf src/imports/controls/doc/snippets/qtlabscalendar-calendarmodel.qml src/imports/controls/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml src/imports/controls/doc/snippets/qtlabscalendar-dayofweekrow.qml src/imports/controls/doc/snippets/qtlabscalendar-monthgrid-layout.qml src/imports/controls/doc/snippets/qtlabscalendar-monthgrid.qml src/imports/controls/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml src/imports/controls/doc/snippets/qtlabscalendar-weeknumbercolumn.qml src/imports/controls/doc/snippets/screenshots/qtlabscalendar-calendarmodel.qml src/imports/controls/doc/snippets/screenshots/qtlabscalendar-dayofweekrow-layout.qml src/imports/controls/doc/snippets/screenshots/qtlabscalendar-dayofweekrow.qml src/imports/controls/doc/snippets/screenshots/qtlabscalendar-monthgrid-layout.qml src/imports/controls/doc/snippets/screenshots/qtlabscalendar-monthgrid.qml src/imports/controls/doc/snippets/screenshots/qtlabscalendar-weeknumbercolumn-layout.qml src/imports/controls/doc/snippets/screenshots/qtlabscalendar-weeknumbercolumn.qml src/imports/controls/qtquickcontrols2plugin.cpp src/quicktemplates2/qquicktooltip.cpp src/quicktemplates2/qquicktooltip_p.h src/quicktemplates2/qquicktumbler.cpp tests/auto/controls/data/tst_spinbox.qml tests/auto/controls/data/tst_tumbler.qml tests/auto/qquickmaterialstyle/data/tst_material.qml Change-Id: I25b7473b47739043b6f768603bece30b18021318
| * Doc: cleanup the mention of 'indicator' in 'Customizing ItemDelegate'J-P Nurmi2016-10-021-2/+2
| | | | | | | | | | | | | | | | | | | | The explicit mention 'indicator' in the ItemDelegate customization docs is a remainder from the early days when it still had a check indicator built into. Then at some point we decided to provide separate type of checkable delegates. Change-Id: I710318d3828ffae1ceb0877a67fe128460653bc1 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Popup: fix some of the documentation review findingsMitch Curtis2016-09-272-0/+28
| | | | | | | | | | | | Change-Id: I69b60faab1588a45e005ba721c9796680bad6ac1 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-261-4/+6
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: examples/quickcontrols2/gallery/gallery.qrc src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc src/quicktemplates2/qquickstackview_p.cpp src/quicktemplates2/qquickstackview_p_p.h tests/auto/controls/data/tst_stackview.qml Change-Id: If451fe0e5653572d305b4de90a6d5cb878463e8d
| * Doc: improve the .conf docsJ-P Nurmi2016-09-231-4/+5
| | | | | | | | | | Change-Id: I4aa031fb14b232c102e94c5a5f1c5be2885ed2d4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-09-144-34/+47
|\| | | | | | | | | | | | | | | 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-132-35/+35
| | | | | | | | | | | | | | | | | | | | 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>
| * Doc: update the list of supported Universal style env variablesJ-P Nurmi2016-09-131-0/+8
| | | | | | | | | | Change-Id: I26de6f195750f640d9565a22d8004733ac1c4357 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Doc: add missing SplitView in the type comparison tableJ-P Nurmi2016-09-131-0/+3
| | | | | | | | | | Change-Id: Idf2c7fb22be31e806fbd33875f199dd693ccfd9a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Doc: highlight examples on the index pageJ-P Nurmi2016-09-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | This looks nicer that an "Examples" section with a bullet list that only contains a lonely "Qt Quick Controls 2 Examples" link. Manually listing those two examples that we currently have in the 5.7 branch together with an "All Examples" link may seem a bit silly for the time being, but the idea is that later on we highlight a few examples manually and the rest are accessible through the "All Examples" link. Change-Id: I329d812b7d269de607fa141552e35bae76041176 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@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>
* | Add RoundButtonMitch Curtis2016-09-021-0/+6
| | | | | | | | | | | | | | | | [ChangeLog][Controls] Added RoundButton. Change-Id: I30a8b9e942a61089e87fb1aa248432e42caf0d20 Task-number: QTBUG-54967 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-08-271-1/+1
|\| | | | | | | | | | | | | | | Conflicts: src/imports/controls/TabBar.qml src/imports/controls/material/TabBar.qml Change-Id: I290091558f7ae94d44be2a117b16867dddb53cb3
| * Fix typo in deployment documentationMitch Curtis2016-08-241-1/+1
| | | | | | | | | | Change-Id: If80bbdc82efed0451c27650d59c2bee5ad44c765 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Add MenuSeparator and ToolSeparator to Differences doc pageMitch Curtis2016-08-241-0/+6
| | | | | | | | | | Change-Id: Ica132eeac20a5d276abfb7d74eba07d638ba288e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Remove 'No hover effects' note from qtquickcontrols2-differences.qdocMitch Curtis2016-08-241-3/+1
| | | | | | | | | | | | | | This is no longer true. Change-Id: I70b36cfaf96be1d332e801499ca23de144df76ac Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-08-232-2/+4
|\| | | | | | | | | | | | | | | | | | | | | 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-192-2/+4
| | | | | | | | | | Change-Id: I88fbebfc672d4c8d398a45b5dfe0c61fa307a9e7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/devJ-P Nurmi2016-08-093-41/+99
|\ \
| * | Merge remote-tracking branch 'origin/5.7' into devJ-P Nurmi2016-08-093-41/+99
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickpage.cpp Change-Id: I4c8b62fb1d7c20c6d3c870eb47e0402a20051098
| | * Add SwipeDelegate to Delegate Controls documentationMitch Curtis2016-08-081-0/+7
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-55174 Change-Id: I28397af09d6d4134a59449c76f15ec9a65cd9b4e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| | * Fix attached property linking for Material styleMitch Curtis2016-08-042-40/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-032-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Restructure the docs to separate the experimental labs QML typesJ-P Nurmi2016-08-091-0/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Including the experimental Qt Labs Calendar docs to qqc2.qdocconf leads to Qt Creator's help contents being mixed with QML types from both modules. Move the Qt Labs Calendar to its own .qdocconf the same way it's done for Qt Labs Platform, and just link to both from the index page. This also ensures that the index-search offers "Calendar" from "Qt Quick Controls (1)" and "Qt Labs Calendar" instead of "Qt Quick Controls 2". Change-Id: Iaf5e7df6d3013657c774d65bf76fb7bc2f80aa71 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Add MenuSeparatorMitch Curtis2016-07-252-0/+27
| | | | | | | | | | | | | | | | | | [ChangeLog][Controls] Added MenuSeparator to visually distinguish between groups of items in a menu. Change-Id: I7a52910b19633ed1188c90ca56c92346a28d4d5c Task-number: QTBUG-54862 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Doc: use the new .pro syntax for RESOURCESJ-P Nurmi2016-07-211-12/+3
| | | | | | | | | | | | | | | | A .qrc file is no longer mandatory. One can list resources directly in the RESOURCES variable. Change-Id: I172b6cfa0a16c3296794888bd2f40a4273739c32 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add ToolSeparatorMitch Curtis2016-07-212-0/+63
| | | | | | | | | | | | | | | | | | | | ToolSeparator is used to visually distinguish between groups of items in a toolbar by separating them with a line. It can be used in horizontal or vertical toolbars. Task-number: QTBUG-54862 Change-Id: Ie68e680510428ad19e7f80268063af07b61100eb Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into devJ-P Nurmi2016-07-201-2/+3
|\| | | | | | | Change-Id: Idf19dd882ba3015be2afda6988cac1e95a4912fa
| * differences.qdoc: clarify Button.qml exampleMitch Curtis2016-07-191-2/+3
| | | | | | | | | | | | | | | | import "controls" was supposed to refer to a directory named "controls". Change-Id: I6e977354fa1ce01b1c14dda378d077b1003cb21a Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into devJ-P Nurmi2016-07-151-0/+5
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickswipedelegate.cpp tests/auto/controls/data/tst_swipedelegate.qml tests/auto/controls/data/tst_textarea.qml tests/auto/controls/data/tst_textfield.qml Change-Id: I244f4ead4d14238c41db0bd965d7a2938f2ea8fc
| * SwipeDelegate: document which items can be used in left/right/behindMitch Curtis2016-07-111-0/+5
| | | | | | | | | | | | Task-number: QTBUG-54658 Change-Id: Ie8bb1fa6669c7dd1cd18199d01c773a1854edad4 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Bump up all controls and templates imports to version 2.1J-P Nurmi2016-07-084-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | 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: improve the module descriptionsJ-P Nurmi2016-06-291-1/+2
| | | | | | | | | | | | | | | | | | Mention the Qt version that each QML module was introduced in, and emphasize the experimental status of the Qt Labs Calendar module. Qt Labs Platform already does both of these. Change-Id: I103e564b6f7746116a3d40eefb7f2f978e644546 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Tumbler: add wrap propertyMitch Curtis2016-06-281-0/+9
| | | | | | | | | | | | | | | | | | [ChangeLog][Tumbler] Added wrap property to control whether or not tumbler wraps when it reaches the top and bottom. Change-Id: I27c543d98f7bc574bc5dc882a130abe0dcc13cea Task-number: QTBUG-53587 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Reorganize templates & calendar docsJ-P Nurmi2016-06-214-226/+0
| | | | | | | | | | Change-Id: I0e7a20805fe4823564ee2b312a635d08fa978327 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Doc: bump import versions to 2.1J-P Nurmi2016-06-216-7/+7
| | | | | | | | | | Change-Id: Ia7a1ed2df09c58d052e67a611c3fd18f1d188dc3 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Doc: move the basic example snippet to gettingstarted.qdocJ-P Nurmi2016-06-211-1/+16
| | | | | | | | | | Change-Id: Id6e80f4966f164bd767fe0c0930665015205745e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into devJ-P Nurmi2016-06-202-0/+5
|\| | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickcontainer.cpp Change-Id: I7c41619a81b4fdd0d8ccaa4f0bb489a9b84e3865
| * Document the equivalent of MenuBarMitch Curtis2016-06-171-0/+3
| | | | | | | | | | | | Task-number: QTBUG-54173 Change-Id: I740dcc0edd2d7abb617fef8249a03264df3418c2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Doc: add missing link to "Container Controls" on the guidelines pageJ-P Nurmi2016-06-151-0/+2
| | | | | | | | | | Change-Id: I27ad7904c3c099a1cfd4b0666a5d368a8ee748a1 Reviewed-by: Nico Vertriest <nico.vertriest@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-1111-14/+169
|\| | | | | | | Change-Id: If502b986cc8d6729ebea64cedfdf97b9b612e7c0
| * Doc: Collect a list of guidelines pagesNico Vertriest2016-06-0710-0/+88
| | | | | | | | | | Change-Id: Ie64486275b7fc39005cc6f86f33f04444474c07e Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * Doc: Updated doc on usage Controls 2.Nico Vertriest2016-06-027-14/+81
| | | | | | | | | | | | Change-Id: If256dafc53d63b174b5cfd03eb91635e062d7c69 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-018-35/+235
|\| | | | | | | | | | | | | | | | | | | | | 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
| * Merge remote-tracking branch 'origin/5.7.0' into 5.7J-P Nurmi2016-05-305-22/+158
| |\ | | | | | | | | | Change-Id: Idbb9ab39b53136cd90c5c9ed564f02eaa0fb231b
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 16:52:44 +0000