aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/doc/src
Commit message (Collapse)AuthorAgeFilesLines
* Doc: update the type comparison tableJ-P Nurmi2017-04-111-3/+1
| | | | | | | ComboBox::editable was added in Qt Quick Controls 2.2 in Qt 5.9. Change-Id: I5db1a6448a23d0e4f539f11c074270670b83899f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Doc: highlight the Wearable Demo on the index pageJ-P Nurmi2017-04-061-0/+1
| | | | | Change-Id: Ib7eb50df859ea598aac806dbd44f150f2b77e4e1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: replace "released" with "introduced" on the index pageJ-P Nurmi2017-04-031-1/+1
| | | | | | | | To use the same "was introduced in Qt 5.7" phrasing already used at the top of the page. Change-Id: I3736a1c3e87aa91e7fa3b8a41370f4b2252e793d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: add style screenshots on the index pageJ-P Nurmi2017-04-031-0/+30
| | | | | | | To make it more clear what the controls are and how they look. Change-Id: I6ce9a56a1692d90900952be798d7b254bc067dbb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: merge controls & styles columns in the version tableJ-P Nurmi2017-04-031-7/+3
| | | | | | | | | | The version table added in c9cd624 looked fine in locally generated docs, but it seems to get a bit too wide in the online snapshots (the table becomes horizontally scrollable). => Merge the controls and styles columns that all have the same version. Change-Id: Icb8387f95211ddee030cb410594adc9a6fad5c97 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: Correct two link errorsv5.9.0-beta1Nico Vertriest2017-03-301-2/+2
| | | | | | | | qtquickcontrols2-customize.qdoc:28: Can't link to 'Creating Qt Quick Projects' qtquickcontrols2-customize.qdoc:28: warning: Can't link to 'Creating C++ Classes' Change-Id: I5ddc57215fd65fa6a80819ee694b5e031676f5a7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: list available import versions in each Qt releaseJ-P Nurmi2017-03-291-0/+42
| | | | | Change-Id: I5bce83d66615f11588988947d088d4b6ce5240b2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Improve qtquickcontrols2-buttons.qdocMitch Curtis2017-03-061-8/+5
| | | | | Change-Id: Ie417f6377016e1a28122efefcc9fcef5e642d027 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Improve qtquickcontrols2-popups.qdocMitch Curtis2017-03-061-1/+1
| | | | | Change-Id: Iaf3159b993ada20a30a8208f7cfe92731966a3f7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Update license headers to silence qtqa/tst_license warningsJ-P Nurmi2017-02-2426-104/+104
| | | | | | | | | | 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>
* Doc: add missing information to "Attached properties" sectionMitch Curtis2017-02-021-15/+61
| | | | | | | | | A lot of details were left out, which makes it hard to follow along. Task-number: QTBUG-56013 Change-Id: Ia21dd43e0d6e260463a2a91b28c248b962dd3401 Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Merge dev into 5.9Oswald Buddenhagen2017-02-013-8/+19
|\ | | | | | | Change-Id: I816cc71d81ee6435ff9a58aff2d538698f9f8072
| * Add ScrollViewJ-P Nurmi2017-01-273-8/+19
| | | | | | | | | | | | | | | | [ChangeLog][Controls][ScrollView] Added ScrollView. Change-Id: I5d68799f0246e04b519bf6a0ec7bc7e5625f50e7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | Doc: correct PageIndicator descriptionMitch Curtis2017-01-311-3/+4
|/ | | | | | | | The BusyIndicator and PageIndicator sections got mixed up in f043b64c3. Task-number: QTBUG-58343 Change-Id: I08d8d7319660923aa4333739882ae376bf368abb Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2017-01-1126-26/+26
|\ | | | | | | Change-Id: If797ac58344b20e8de4379343131c097247ba2f2
| * Welcome to 2017J-P Nurmi2017-01-0926-26/+26
| | | | | | | | | | Change-Id: If68cff4efacc7dc5719c8b8e61937e85e9076870 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add DelayButtonJ-P Nurmi2017-01-023-1/+26
| | | | | | | | | | | | | | [ChangeLog][Controls][DelayButton] Added DelayButton. Change-Id: I94820dfb41ba9b90f0a29cda01ac476b54cf3de8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2016-12-011-95/+399
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/SpinBox.qml src/imports/controls/material/SpinBox.qml src/imports/controls/universal/SpinBox.qml tests/auto/controls/data/tst_swipedelegate.qml Change-Id: Ie1d1f487890f0a9f80a00df5e813e1d2e8303fe5
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-281-5/+11
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc sync.profile Change-Id: I554c40516030075142f9af1dd5c66fdca2b78b9a
| | * Doc: clarify the feature comparison tableJ-P Nurmi2016-11-231-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | Changing styles at runtime is not possible in QQC2. Add also footnotes that QQC1 may not provide optimal performance on embedded and mobile. Change-Id: Iea691116eacdcf73482ecd52fd1e9c945a788f9a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Doc: refactor the type comparison tableJ-P Nurmi2016-11-251-90/+388
| | | | | | | | | | | | | | | Change-Id: I2267dcd15bcbcbdee8708208dc5f92eb69b745d6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Add ComboBox::editableJ-P Nurmi2016-11-241-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Controls][ComboBox] Added editable property Task-number: QTBUG-53876 Change-Id: I1cb035b3bb4c63f7935f08298814005fad51b5eb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Doc: update module import versionsJ-P Nurmi2016-11-234-5/+5
| | | | | | | | | | | | | | | Change-Id: Idd25490d453e5a8aa270b45de48ca4f51d92196e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2016-11-171-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/quickcontrols2/qquickstyle.cpp src/quicktemplates2/qquickslider.cpp Change-Id: Ie12132690680706def6f516334a6ef0ba27336b3
| * | Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-11-171-2/+2
| |\| | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/controls/data/tst_button.qml Change-Id: I5c97b3c1944e52dba44fd3c7d6d9a255c5e08cf7
| | * Doc: rephase the "logical position" propertiesJ-P Nurmi2016-11-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The previous phrasing was poor and somewhat confusing. The logical position is expressed as a fraction of the value, in the range 0-1. Change-Id: I6c2a4cbb1385af69392d214dd02224ec876131e5 Task-number: QTBUG-57069 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Add support for a QT_QUICK_CONTROLS_STYLE_PATH environment variableJ-P Nurmi2016-11-161-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Controls][Styles] Added support for a QT_QUICK_CONTROLS_STYLE_PATH environment variable, which can be used to specify lookup paths for Qt Quick Controls 2 styles. This allows device manufacturers and Linux distributions to specify a system-wide style installation folder that may be located outside the Qt installation tree. Change-Id: Ic004d693bf6206971da6319d0cc13061b8fd1566 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2016-11-031-0/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/BusyIndicator.qml src/imports/controls/ProgressBar.qml src/quicktemplates2/qquickpopup.cpp src/quicktemplates2/qquickpopup_p_p.h src/quicktemplates2/qquickstackview.cpp Change-Id: I9a1028a991de9fc3e26d3f973106301e9ada631c
| * | Doc: add RoundButton to the guidelines for buttonsJ-P Nurmi2016-11-021-0/+18
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-55904 Change-Id: I0c2343238e95a318d97e6d01584714e034696512 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Whitespace cleanupsJ-P Nurmi2016-11-033-3/+0
|/ / | | | | | | | | Change-Id: Ia075694a7dc43d72d07221b569467fcebdb411fb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: fallback styleJ-P Nurmi2016-10-262-2/+8
| | | | | | | | | | Change-Id: I03996d592de4b7db29b671fa73ab44036a80fa2f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: QT_QUICK_CONTROLS_HOVER_ENABLEDJ-P Nurmi2016-10-261-0/+4
| | | | | | | | | | Change-Id: I91b578e6e7956feadb0a9f874fa0c1f4d97f02bf Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-10-258-151/+425
|\| | | | | | | | | | | | | | | | | | | 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: remove a redundant QQuickStyle exampleJ-P Nurmi2016-10-251-17/+4
| | | | | | | | | | | | | | | | | | The "Styling Qt Quick Controls 2" -page is already overloaded with content. Give a minimal one-liner example and link to QQuickStyle for more details, which contains the same snippet that was removed. Change-Id: I77e196aeb8d407fcf05a264232dd83c2e28f97b7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Doc: configuration fileJ-P Nurmi2016-10-258-43/+178
| | | | | | | | | | Change-Id: I3de16850673488a8c67afc6b45a79d5bb86f9013 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Doc: supported environment variablesJ-P Nurmi2016-10-257-49/+138
| | | | | | | | | | Change-Id: I2ad1767c1066a07a86e0f5889b350aa4500d685e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Doc: add snippets and screenshots for the Universal attached propertiesJ-P Nurmi2016-10-241-26/+47
| | | | | | | | | | | | | | | | | | Ideas and descriptions shamelessly stolen from f26f855, which did the same for the Material style. Change-Id: Ibab47d1370c56de4104dc2bf549870335c639257 Task-number: QTBUG-55904 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>
* | Doc: promote also the Text Editor example on the landing pageJ-P Nurmi2016-10-241-0/+1
| | | | | | | | | | | | | | This example is so nice that it deserves to be promoted... :) Change-Id: I82212803aea4239ad39b52ecd8d1b494bdc87c33 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-10-194-1/+36
|\| | | | | | | | | | | | | | | Conflicts: src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml src/imports/controls/material/qquickmaterialstyle.cpp Change-Id: I00b533e28407f87a31588e92109a468a5bfb4cc8
| * ComboBox: fix documentation review findingsMitch Curtis2016-10-141-1/+1
| | | | | | | | | | | | Change-Id: Iba9bdd74ab5b9865a2314ccc460fa44b9ea35be5 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * ProgressBar: add section to Indicator Controls page and link to itMitch Curtis2016-10-131-0/+7
| | | | | | | | | | | | Change-Id: Ib6744c59f775aba3bc5132ad4ce721c71c3932dd Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Share Control::focusReason notes with TextArea and TextFieldMitch Curtis2016-10-131-0/+15
| | | | | | | | | | | | Change-Id: Icf4feb1e29c40f10f483be63581f178fdc1cbd12 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Share Control::background notes with TextArea and TextFieldMitch Curtis2016-10-131-0/+13
| | | | | | | | | | | | Change-Id: I4150dbbc272d63cd842e19a30138c9b734d260ee 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-074-16/+39
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-disabled.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-normal.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-checked.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-disabled.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-focused.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-normal.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-disabled.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-first-handle-focused.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-normal.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-second-handle-focused.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-second-handle.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-disabled.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-focused.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-normal.qml src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tabbar-explicit.qml src/quicktemplates2/qquickmenu.cpp tests/auto/controls/data/tst_buttongroup.qml tests/auto/controls/data/tst_swipedelegate.qml Change-Id: Ib6042a0ad716f557927e7412d17ea8957d06c015
| * Slider: fix documentation review findingsMitch Curtis2016-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | Expand detailed description. Also updated the GIF after the styling changes, and removed the PNGs. Change-Id: I6dee232f6766d6ee9595b1043a4bca78c2a09d78 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Fix some of the ApplicationWindow documentation review findingsMitch Curtis2016-10-071-0/+32
| | | | | | | | | | | | Change-Id: Ifa4ae65923f3073ced1c46dd56725e00b34a689d Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * ScrollIndicator: replace PNGs with GIFsMitch Curtis2016-10-061-1/+1
| | | | | | | | | | | | Change-Id: I04d55b0e2e089cb55c26b921409ff2e5e58f55d9 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Improve CheckBox GIF and add RadioButton GIFMitch Curtis2016-10-061-2/+2
| | | | | | | | | | | | | | | | | | - Make the presses a bit more obvious. - Remove unused QML/PNG files. Change-Id: Id5e64c737d4c2c72aeca953f8e876c287f5e426d Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>