| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| | |
Change-Id: I4aa031fb14b232c102e94c5a5f1c5be2885ed2d4
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| | |
Change-Id: Ib24a8f431955a8653070e2746b51a6c82d0ce9a0
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I8dfd4ead179ee790ac670a3cf9047109b357825e
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: If96157e6331ab5c870b5d84e8297d386dd55bf6c
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
|
|
|
|
| |
Change-Id: Ie903d3491b03d4ec05dd28462a19ee464331d2a2
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I40f149be98406b5f9e5d1e59fb2cc359ba864107
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
Replaced all remaining instances of "Qt Labs Controls"
Change-Id: Iad784417b9b4ce015c11b4737dab2105b338ff5f
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
|
|
|
| |
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>
|
|
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>
|