aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* Say hello to the Fusion styleJ-P Nurmi2017-05-3087-11/+5787
| | | | | | | | [ChangeLog][Controls] Introduced a Fusion style that offers a platform agnostic desktop-oriented look'n'feel. Change-Id: Id1c1baf10f4b3a79e89bcc72f6d170ed0b2cc8b0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickComboBox: update highlighted index on mouse hoverJ-P Nurmi2017-05-303-3/+0
| | | | | | | | | | | | | | This is the expected behavior on desktop. NOTE: We can no longer rely on ListView.ApplyRange, because if ListView adjusts the content position while key navigating or scrolling, "wrong" items may get hovered and the highlighted index gets set incorrectly leading to a hovered->highlight->hovered loop. Therefore we force ListView.NoHighlightRange to keep existing styles working without modifications. Change-Id: I57fe3de1230dd6348d01c1785cd09d4fb184d28a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add QQuickDefaultThemeJ-P Nurmi2017-05-294-3/+128
| | | | | | | | | The Default style will be changed to use palettes, and it will be also possible to define the default fonts and palettes for any style in the qqc2.conf file, so the Default style needs its own proxy theme. Change-Id: I0262f7a1f783daa62ca4afbdf3c8fe29d989ca36 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Cleanup whitespaceJ-P Nurmi2017-05-272-2/+2
| | | | | Change-Id: I453ec5ac798bb5904495b82c6e0e06c40b3a9a70 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Add support for propagating palettesJ-P Nurmi2017-05-261-0/+3
| | | | | Change-Id: Icd965d8a79f022f4375e2134621cbc3897014015 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add QQuickPalette value typeJ-P Nurmi2017-05-264-0/+253
| | | | | Change-Id: Id4dfb4939d3ea720fe46a4a5171d3e068c8f1fd3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-05-232-0/+2
|\ | | | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickstackview.cpp tests/auto/controls/data/tst_stackview.qml Change-Id: I9ff4854be8f3c4a0ab943199ae475f3352147965
| * Enable build time QML caching for the Material & Universal stylesJ-P Nurmi2017-05-202-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | We had troubles enabling Qt Quick Compiler support for these styles, because we wouldn't be able to select style-specific .qml files from the resources of an unloaded/uninstantiated plugin. Build-time QML caching doesn't seem to be a problem because the .qmlc files are not built into resources but are available on the file system. Task-number: QTBUG-58571 Change-Id: I93e7a82a72c4bcf3a92c7ca12186f24a22d4d342 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | QtQuick.Templates: fix QQuickDialog revision for 2.3J-P Nurmi2017-05-231-1/+1
| | | | | | | | | | Change-Id: Ide9fb970a70cef2949dd6ed7d5a2d82e96ddbb1a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-05-2011-15/+22
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/ApplicationWindow.qml src/imports/controls/material/ApplicationWindow.qml src/imports/controls/universal/ApplicationWindow.qml src/imports/templates/qtquicktemplates2plugin.cpp Change-Id: I9041c69f4ce5dab1d1b994d2318feddb696e56bf
| * Enable the use of QML caching at build timeSimon Hausmann2017-05-192-0/+4
| | | | | | | | | | | | Task-number: QTBUG-58571 Change-Id: Ia6aeb27d4af695fcfc987e944c73d49364fd440e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Doc: add missing "is" to the Default style docsJ-P Nurmi2017-05-191-1/+1
| | | | | | | | | | Change-Id: I85d28c1a0651317a684b2cc34f1f032e8221b27c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * qtquickcontrols2-styles.qdoc: align indentationJ-P Nurmi2017-05-191-1/+1
| | | | | | | | | | Change-Id: I42bbc0f491653f45a19455a2e4c5afbd7be008ef Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * ApplicationWindow: fix access to revisioned members in base classesJ-P Nurmi2017-05-184-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The inheritance hierarcy is: QWindow <- QQuickWindow <- QQuickWindowQmlImpl <- QQuickAppWindow Each base class has its own set of revisioned members. Import the revisioned members in the base classes to the templates/controls namespace by calling qmlRegisterRevision() with the revision of the base class and the respective templates/controls version. Task-number: QTBUG-60893 Change-Id: I6d91209dc5b2eb17c2b3845675a5ddbffb7e8b72 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * controls.pri: cleanup a superfluous backslashJ-P Nurmi2017-05-151-1/+1
| | | | | | | | | | Change-Id: Ie762b157591f200624c4393246478edb67a9077e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Doc: make the list of topic pages lighter to readJ-P Nurmi2017-05-151-9/+9
| | | | | | | | | | Change-Id: I9b46b32f0f2dc48c45c4e83d44cdc8bf3fc56184 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Default: fix typo in RangeSlider::second.handleJ-P Nurmi2017-05-151-1/+1
| | | | | | | | | | Change-Id: If09b6ecd7426ddfd5a80fc33acf17894bf9e7af5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add missing QQuickDialog::standardButton() invokable methodJ-P Nurmi2017-05-191-0/+1
| | | | | | | | | | | | | | | | [ChangeLog][Controls][Dialog] Added a standardButton() method for accessing the standard buttons in the dialog's button box. Change-Id: I7a92a0176985e1bc2c1a82f4bc9e78b813eee802 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickDialogButtonBox: add missing signalsJ-P Nurmi2017-05-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | There were no convenience signals for Apply, Reset, and Discard. [ChangeLog][Controls][DialogButtonBox] Added missing applied(), reset(), and discarded() signals. Task-number: QTBUG-59423 Change-Id: I49ccc60672fadf64283ff3a6e043c3892cd291ba Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickDefaultBusyIndicator: allow specifying pen and fill separatelyJ-P Nurmi2017-05-164-15/+40
| | | | | | | | | | | | | | | | | | One color is enough for the current Default style, but if we allow configuring the colors, it must be possible to have them separately to be able to get decent looks. Change-Id: Ibbe6b73142edc9829ca75603cd2e86654ae824b0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Plugins: add missing override keywordsJ-P Nurmi2017-05-163-4/+4
| | | | | | | | | | Change-Id: Ic43604fdb601769e93618cac30d839cc524f1394 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Give all styles access to PaddedRectangleJ-P Nurmi2017-05-125-1/+6
| | | | | | | | | | | | | | Promote it from QtQuick.Controls.Material.impl to QtQuick.Controls.impl. Change-Id: I8260ee85b633544f9e76f6419f8aa26b03c500c6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: add Qt 5.10 to the version tableJ-P Nurmi2017-05-121-0/+5
| | | | | | | | | | Change-Id: I14d29514e75d9f0821106261380d6cd28f6450fc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Default: sync the implicit with of ComboBox with SpinBoxJ-P Nurmi2017-05-121-1/+1
| | | | | | | | | | Change-Id: I6a2f8a515520c297cd1f38ec73026c3111cde702 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Default: sync SwipeDelegate's implicit size with other delegatesJ-P Nurmi2017-05-121-0/+2
| | | | | | | | | | Change-Id: Ic2fed53bd008de35c1622f764d0eb299763e9f54 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Default: visually indicate Slider's "progress"J-P Nurmi2017-05-121-0/+9
| | | | | | | | | | | | | | | | 8732b06 added similar visual indication for RangeSlider's range. Apply the same for Slider to keep the two visually the same. Change-Id: Id959ca0e504f98938e185e100ddf0e5e4ab92fe2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Default: fix range highlight for horizontal RangeSliderJ-P Nurmi2017-05-121-4/+4
| | | | | | | | | | | | | | | | The parent no longer has an "orientation" property. It was added to the API of the control. Change-Id: I11664fb730ea1498253452b24bdb4bdd523d614d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Default: pass busy indicator and progress bar colors from QMLJ-P Nurmi2017-05-127-5/+49
| | | | | | | | | | | | | | | | | | Default.textColor (also used in eg. RangeSlider to fill the range) is equal to the color that was previously hard-coded in qquickdefaultbusyindicator.cpp and qquickdefaultprogressbar.cpp. Change-Id: I8f0749862def31667b6ef2ab3b4c6ea71a590755 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Default: rename QQuickDialRing to QQuickDefaultDialJ-P Nurmi2017-05-126-26/+26
| | | | | | | | | | | | | | | | This is consistent with the other existing internal Default style visuals QQuickDefaultBusyIndicator and QQuickDefaultProgressBar. Change-Id: I3a84edfdd6fb8bbd8a040c633c5b6411dd5350d8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Default: remove unnecessary notify signals from the internal visualsJ-P Nurmi2017-05-124-16/+4
| | | | | | | | | | | | | | | | | | Nothing is creating QML bindings that depends on these properties, only assigning values from QML, so we can save a few CPU cycles by not going through the meta-object system to activate unused signals. Change-Id: If8d46807ad3046414dcc7a7888f08b6110fe7f88 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-05-112-2/+9
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5c6398e4146e62109bef231fe358b7ed69fa9488
| * Fix unresolved external symbols for -no-feature-shortcutStephan Binner2017-05-061-0/+8
| | | | | | | | | | Change-Id: I3ddef9df6100b8837d1bdc81f3fd1dc7cf37babf Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Cleanup obsolete references to doc/snippets/screenshotsJ-P Nurmi2017-05-041-2/+1
| | | | | | | | | | Change-Id: Ia631cd493d695aaac44d612f234756b4e5b558dd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: improve the button icon docsJ-P Nurmi2017-05-111-0/+6
| | | | | | | | | | Change-Id: I597e133146f5a7f2c6bc26a43361391f80a44fdd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Make QQuickIcon a value typeJ-P Nurmi2017-05-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QQuickIcon no longer inherits QObject, but becomes a light-weight implicitly shared Q_GADGET-type, that is passed by value the same way fonts and colors are. Before: SUB: OS: Fedora 25 (Workstation Edition) SUB: QPA: xcb SUB: GL_VENDOR: Intel Open Source Technology Center SUB: GL_RENDERER: Mesa DRI Intel(R) Haswell Desktop SUB: GL_VERSION: 3.0 Mesa 13.0.4 SUB: running: benchmarks/auto/creation/controls/delegates_buttoncontrol2.qml SUB: 110 frames SUB: 109 frames SUB: 109 frames SUB: 109 frames SUB: 109 frames SUB: Average: SUB: 109.2 frames; using samples; MedianAll=109; StdDev=0.447214, CoV=0.00409536 After: [...] SUB: running: benchmarks/auto/creation/controls/delegates_buttoncontrol2.qml SUB: 123 frames SUB: 124 frames SUB: 124 frames SUB: 122 frames SUB: 125 frames SUB: Average: SUB: 123.6 frames; using samples; MedianAll=124; StdDev=1.14018, CoV=0.00922472 Change-Id: I604532204fb94fc0726d0c9b8b6097f9ebc265e8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | SwipeDelegate: make icon color match text colorJ-P Nurmi2017-05-103-3/+3
| | | | | | | | | | | | Task-number: QTBUG-60502 Change-Id: I5078eeebf90d92ddb7e0278eb8f81dcee2d360ca Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-05-0392-5/+8
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/universal/CheckDelegate.qml src/imports/controls/universal/RadioDelegate.qml src/imports/controls/universal/Switch.qml src/imports/controls/universal/SwitchDelegate.qml Change-Id: I9bca4b8d9ce3f6c5c7589daa0ced7d0353f42efc
| * tst_snippets: take screenshots only when requestedJ-P Nurmi2017-05-0383-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | The component loading code has been adjusted so that it can load snippets that use either a Window root element too. This speeds up the test a lot in the CI, and allows us to flatten the snippet-structure. Set SCREENSHOTS=1 environment variable to take screenshots. Change-Id: Ibd9e76befe62044dd1374899f18ea3d8c7ad454b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Use strict comparisonFrederik Schwarzer2017-05-032-2/+2
| | | | | | | | | | Change-Id: I4829480765c96cf7a2ad94a223f9078f70703db4 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Universal: add missing importsStephan Binner2017-04-294-0/+4
| | | | | | | | | | | | | | | | | | | | All types that use internal types (such as XxxIndicator) must explicitly import the namespace. Otherwise the QML engine might end up doing an implicit import, which leads to URI mismatch. Task-number: QTBUG-57618 Change-Id: Ie803d32bdef287f076be233777d8fe933d5f50e2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Material: fix editor cursor visibilityJ-P Nurmi2017-04-291-2/+2
| | | | | | | | | | | | | | | | The cursor should not be visible for read-only editors. Task-number: QTBUG-58797 Change-Id: I9e0fb0fd1c0afac31ab202e7e4ea0f8bde19372c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Default: make icon color match text colorMitch Curtis2017-05-029-9/+14
| | | | | | | | | | | | Task-number: QTBUG-60502 Change-Id: Id877eb72bfda6ca8877002b69ffdbb85ceb901fc Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Universal: make icon color match text colorMitch Curtis2017-05-028-8/+8
| | | | | | | | | | | | Task-number: QTBUG-60502 Change-Id: Ib5824c50aacddd6d0fefadfe7efb4836bb1b9925 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Material: make icon color match text colorMitch Curtis2017-05-028-8/+12
| | | | | | | | | | | | Task-number: QTBUG-60502 Change-Id: Ia861155b0728cf5f8d1815dc2ff2af94a68b6b8f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Add ButtonGroup::exclusiveJ-P Nurmi2017-04-282-0/+2
| | | | | | | | | | | | | | | | [ChangeLog][Controls][ButtonGroup] Added exclusive property to allow creating non-exclusive button groups. Change-Id: Ic2f3f4bac852f03e5c25f9010993d62234a71e0b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-04-271-1/+1
|\| | | | | | | Change-Id: I47fbec425594386f529623f2dcbddd7ec7a09ee7
| * Material: fix elevation of the RoundButtonNikita Krupenko2017-04-261-1/+1
| | | | | | | | | | | | | | | | | | In accordance with Material Design guidelines, elevation for resting and pressed states of the raised FAB should be 6 and 12 accordingly. Change-Id: I526bb8579aa760c60e25cbeb071b912a30293615 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Material: use Android button layout for dialogsNikita Krupenko2017-04-251-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | It used macOS layout before, but now there is more appropriate layout added to the QtGui. [ChangeLog][Important Behavior Changes] DialogButtonBox with Material theme now uses Android button layout. Task-number: QTBUG-58060 Change-Id: I1caa56c532078e09c93c101ce5e6f562b7773c88 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | TabBar: remove hard-coded content heightsJ-P Nurmi2017-04-243-4/+0
| | | | | | | | | | | | | | | | | | | | Since 24acfca, QQuickTabBar calculates the content height (the maximum height of the tab buttons). By removing the old hard-coded height, TabBar adjusts its height accordingly when using display:TextUnderIcon for TabButtons. Change-Id: Ib3520760fcfac46437169a1549efad166a27cffc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | TabButton: add support for iconsJ-P Nurmi2017-04-243-17/+42
| | | | | | | | | | | | Task-number: QTBUG-49820 Change-Id: I9ab7044d5f5809c8b922c5a8a4f1fa9eb2233139 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>