aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | 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>
* | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-011-6/+41
|\| | | | | | | | | | | | | | | | | | | | | 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: fix misspelling in qtquickcontrols2-styles.qdocv5.7.0-rc1J-P Nurmi2016-05-281-1/+1
| | | | | | | | | | Change-Id: Ib24a8f431955a8653070e2746b51a6c82d0ce9a0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Doc: add screenshots on the Styling Qt Quick Controls 2 -pageJ-P Nurmi2016-05-261-5/+40
| | | | | | | | | | Change-Id: I8dfd4ead179ee790ac670a3cf9047109b357825e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Introduce a 'System' theme to the styles.Friedemann Kleint2016-05-261-3/+3
|/ | | | | | | | | | | | | | | | 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>
* Make 'Usage' section of styles.qdoc easier to link toMitch Curtis2016-04-231-1/+1
| | | | | Change-Id: If96157e6331ab5c870b5d84e8297d386dd55bf6c Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Rename env vars (QT_LABS_CONTROLS_XXX -> QT_QUICK_CONTROLS_XXX)J-P Nurmi2016-04-221-2/+2
| | | | | Change-Id: Ie903d3491b03d4ec05dd28462a19ee464331d2a2 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Rename qtquickcontrols.conf to qtquickcontrols2.confJ-P Nurmi2016-04-211-2/+2
| | | | | | | | Use the 2-suffix consistently everywhere to avoid any potential confusion with the old controls. Change-Id: I83aa212a15ed78b8694fb7d3db80fc8430aea969 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Doc: rename remaining qtlabscontrols groups and linksJ-P Nurmi2016-04-191-1/+1
| | | | | Change-Id: I40f149be98406b5f9e5d1e59fb2cc359ba864107 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Add deployment documentationMitch Curtis2016-04-181-0/+1
| | | | | | | | | | | Now that static builds are properly supported, using file selectors to choose the correct, minimum set of files for a particular deployment target becomes more important. Change-Id: I29e52d47121f21490733b402e673e4799fc90984 Task-number: QTBUG-51002 Task-number: QTBUG-52466 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Doc: Rename Qt Labs Controls to Qt Quick Controls 2Venugopal Shivashankar2016-04-011-8/+8
| | | | | | | 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-3/+3
| | | | | | | | | | | | - 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/+1
| | | | | | | | 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/+149
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>