aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add support for propagating palettesJ-P Nurmi2017-05-2631-4/+1394
| | | | | Change-Id: Icd965d8a79f022f4375e2134621cbc3897014015 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Add QQuickPalette value typeJ-P Nurmi2017-05-267-0/+744
| | | | | Change-Id: Id4dfb4939d3ea720fe46a4a5171d3e068c8f1fd3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Gallery: remove unneeded Material-specific iconsJ-P Nurmi2017-05-2412-0/+0
| | | | | | | | | ToolButton was changed to tint the icon so that it always follows the foreground color. Thus, it's no longer necessary to ship white versions of the icons for the Material style. Change-Id: Ibe5accc1b39559c9dfc2f94fbf3c9c323b91fe63 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickStackView: fix emptyChanged()J-P Nurmi2017-05-234-19/+58
| | | | | | | Don't emit emptyChanged() when popping down to 1 element. Change-Id: Iff1e29567d1d6171cea0f158955325389c03800c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-05-238-5/+32
|\ | | | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickstackview.cpp tests/auto/controls/data/tst_stackview.qml Change-Id: I9ff4854be8f3c4a0ab943199ae475f3352147965
| * QQuickSpinBox: set "editable" accessible propertyJ-P Nurmi2017-05-222-0/+11
| | | | | | | | | | | | Change-Id: I8b627757f27e861d5f46c72631e6ad554551f607 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * QQuickComboBox: set "editable" accessible propertyJ-P Nurmi2017-05-221-1/+4
| | | | | | | | | | | | Change-Id: I6db93b5bbf46a8356ebb03f4e9c814cd00642026 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * Make tst_pageindicator::test_interactive() more reliableJ-P Nurmi2017-05-221-4/+1
| | | | | | | | | | | | | | | | | | | | | | PageIndicator uses Row internally, and changing its spacing triggers an asynchronous relayout. Instead of waiting for the Row to relayout, just pass the padding and spacing at construction time to ensure that the Row has suitable layout for testing mouse clicks between the row items. Change-Id: I9c25c6b57042abb0363bdfe73ebac047cff0fcc7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * tst_combobox: make test_highlightRange() more reliableJ-P Nurmi2017-05-221-0/+1
| | | | | | | | | | | | | | | | | | | | This test is failing with the upcoming Fusion style, perhaps because the combo delegates are a bit heavier. Give the Popup and ListView some time to layout themselves, before attempting to find a list item at the bottom. Change-Id: Ib8486bb7dbc4a43eb3549e2e7ca7ad1be5bad4a0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * QQuickStackView::clear(): don't emit depthChanged() when already emptyJ-P Nurmi2017-05-222-0/+15
| | | | | | | | | | Change-Id: Ib20995b86e776cb64a3d1fa6dea01dee4a802426 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * 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>
* | Add StackView::empty for convenienceJ-P Nurmi2017-05-235-5/+41
| | | | | | | | | | | | | | "stack.empty" looks cleaner in bindings than "stack.depth === 0" Change-Id: Ia99ea8ff2a8cf76a752917c239874d24d2103312 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | StackView::clear() allow specifying a transitionJ-P Nurmi2017-05-233-4/+40
| | | | | | | | | | | | | | | | | | | | | | This turns out to be a useful feature wanted for the Coffee Machine demo, which is being cleaned up. [ChangeLog][Controls][StackView] Allowed specifying a transition when clearing the stack view. Change-Id: I12ed18ca24c247980bab1fe93e1810c0d25d85e7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | tst_menuitem::test_display(): allow constant padding for checkboxesJ-P Nurmi2017-05-231-4/+5
| | | | | | | | | | | | | | | | | | Allow styles to reserve a fixed padding for checkboxes, regardless of whether they are checkable or not. This is typical for desktop styles such as the upcoming Fusion style. Change-Id: Ie54a23a1ae8017409e3d4e65c1997aff7653e38d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: fix Dialog::done()J-P Nurmi2017-05-231-1/+1
| | | | | | | | | | Change-Id: Ib694601d82e85c0bc1df71e7bb37f15c42bd6325 Reviewed-by: Mitch Curtis <mitch.curtis@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-2017-96/+130
|\| | | | | | | | | | | | | | | | | | | 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>
| * ScrollView: fix default Flickable content item creationJ-P Nurmi2017-05-193-21/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Short version: do not emit contentItemChanged() while contentItem() is being called to avoid binding loops. Long version: ScrollView is a thin wrapper around Flickable, and when necessary, instantiates a Flickable behind the scenes. However, ScrollView cannot instantiate one unconditionally, because it has to work with existing Flickables, such as ListView and GridView, too. ScrollView { Item { } } // creates a Flickable ScrollView { Flickable { } } // does not create a Flickable ScrollView { contentItem: Flickable { } } // does not create a Flickable When a Flickable is created behind the scenes, it is assigned as the contentItem of the ScrollView. However, when the Flickable is created lazily as a result of ScrollView::contentItem being accessed, it must NOT emit contentItemChanged() while the contentItem() getter is being called, because that results to a binding loop. This problem was exposed by the recent attempts to enable QML caching at build time (QTBUG-58571). Change-Id: I712f2f30da454a6c22a722afe8a00ae240733571 Reviewed-by: Mitch Curtis <mitch.curtis@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-185-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * tst_objectcount: use setBenchmarkResult() instead of printLiang Qi2017-05-161-13/+6
| | | | | | | | | | Change-Id: Ieb435b6ac929da753cfff0b157d18d4218cb50d9 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * tst_objectcount: data-driven qobjects vs. qquickitemsJ-P Nurmi2017-05-161-50/+29
| | | | | | | | | | Change-Id: Ia1f9f0fe9d0d907b16159e964573ba1273cc75b9 Reviewed-by: Liang Qi <liang.qi@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>
| * tst_snippets: inject the style name to image file namesJ-P Nurmi2017-05-121-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For example, qtquickcontrols2-label.qml outputs: - qtquickcontrols2-label.png (Default) - qtquickcontrols2-material-label.png (Material) - qtquickcontrols2-universal-label.png (Universal) This allows us to take screenshots with different styles without overlapping names and error-prone manual renaming. Change-Id: Ic475ee0d95539a1122e37780f8cec038e2fc9446 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickStyleSelector: fix built-in file selectorsJ-P Nurmi2017-05-206-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While selecting style files, the standard built-in platform and local file selectors ("+linux", "+macos", "+windows"...) must be prefixed with the standard file selector indicator ("+"). Previously the style selector would not pick up platform-specific style files unless they were supplied without the prefix. [ChangeLog][Controls][Styles] Fixed the style selection mechanism so that now it is possible to organize platform and locale-specific files into sub-directories, such as "+linux", "+macos", and "+windows". Change-Id: Ia44b6f14fd0247943486fd27609147827bda9666 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | QQuickDialog: add missing standard button signalsJ-P Nurmi2017-05-195-9/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were no signals at all for the following standard buttons: - Apply - Discard - Help - Reset/RestoreDefaults [ChangeLog][Controls][Dialog] Added missing applied(), discarded(), helpRequested(), and reset() signals that are emitted when the respective standard buttons are clicked. Task-number: QTBUG-59423 Change-Id: I744a445be2c3506470bdd023e6909f483cc2520a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add missing QQuickDialog::standardButton() invokable methodJ-P Nurmi2017-05-193-0/+19
| | | | | | | | | | | | | | | | [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-194-6/+49
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Incorporate QQuickDialog::result from QQuickPlatformDialogJ-P Nurmi2017-05-184-8/+67
| | | | | | | | | | | | | | | | | | | | | | | | The experimental QQuickPlatformDialog in Qt.labs.platform had a bit more elaborate accepted vs. rejected dialog result handling. Copy the same logic to QQuickDialog in QtQuick.Controls. [ChangeLog][Controls][Dialog] Added "result" property that holds whether the dialog was previously accepted or rejected. Change-Id: I2c55848b5eeaad2130d32a337c2590212736f22c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickTabBar: introduce index/tabBar/position attached propertiesJ-P Nurmi2017-05-183-0/+270
| | | | | | | | | | | | | | | | | | | | | | | | The upcoming Fusion style tab buttons are visually different depending on whether the tab bar is at the top or at the bottom. Let styles access the tab bar via attached properties to be able to visualize such things. [ChangeLog][Controls][TabBar] Added index/tabBar/position attached properties. Change-Id: I1ff8105ac8600dad3ed5c6aafc6d85cf06283bed Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | QQuickSwipeView: update attached properties without listenersJ-P Nurmi2017-05-182-137/+65
| | | | | | | | | | | | | | | | | | Utilize QQuickContainer::itemAdded(), itemMoved(), and itemRemoved() to update the attached view and index properties without the need of installing item change listeners. Change-Id: I4983b0fa00f334a4abface302820a6c244c29514 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add QQuickContainer::itemMoved()J-P Nurmi2017-05-183-5/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | This allows the container implementations to easily update their attached properties etc. when items are moved due to being directly moveItem()'d or while being indirectly moved due to insertions or removals. This change will be extensively tested by tst_swipeview.qml and tst_tabbar.qml when they start utilizing itemMoved(). Change-Id: If868d763478541b957b4a3d5da041e6cd095ea0b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | testbench: add options for mirroring and disabling the contentsJ-P Nurmi2017-05-161-81/+125
| | | | | | | | | | Change-Id: Ic1dca59435635bb3056cce8f5fd7e533c13939f9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | testbench: more tweaksJ-P Nurmi2017-05-161-14/+66
| | | | | | | | | | | | | | | | | | | | | | - add missing tri-state checkboxes - connect slider & progressbar for testing the latter - make scrollbars and indicators larger - give dials a value to see the painted arc - make item delegates focusable Change-Id: Ifd3cc134db70e09f4ba6c2ff2a45090027609e4e 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>
* | QQuickIconLabel: ensure that icon color changes are respectedMitch Curtis2017-05-154-10/+98
| | | | | | | | | | | | | | | | | | | | | | updateIcon() is no longer called, so we can move its contents into syncImage(), which is called by updateOrSyncImage(), which is called by QQuickIconLabel::setIcon().. which is called each time any of the icon properties change (now that it's a value type). Task-number: QTBUG-60807 Change-Id: Id1ff875e0855bd76755d49466f82c2eac36ffd09 Reviewed-by: J-P Nurmi <jpnurmi@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>
* | Refactor testbenchJ-P Nurmi2017-05-121-243/+218
| | | | | | | | | | | | | | | | | | | | Add missing checked+disabled states, and replace "Normal" with the control's name where feasible to make it clear which control is it. Furthermore, kill some Item-wrappers by utilizing Layout attached properties and Pane's content size. Change-Id: Ida76215ff7a00836b754efde458302fe90c46b02 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 15:45:56 +0000