aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/plugins.qmltypes
Commit message (Collapse)AuthorAgeFilesLines
* Update plugins.qmltypes for 5.14Kai Koehne2019-10-211-1/+220
| | | | | | Task-number: QTBUG-78690 Change-Id: I0e421232f4335a7a351562f23134eccdd0b1c674 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update plugins.qmltypes for QtQuick.ControlsKai Koehne2019-04-111-1/+1
| | | | | | | This amends 1693a19fd557c857ef4f43ab303ea1056790481e Change-Id: I70ef68de56405eb705d1c79be4eed8925def319a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update plugins.qmltypes for Qt 5.13Kai Koehne2019-03-071-1829/+9
| | | | | | | Task-number: QTBUG-73484 Change-Id: I5c6019ec015a7d423dcc103d1acf23383c5b6239 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1Qt Forward Merge Bot2019-02-021-17/+56
|\ | | | | | | Change-Id: I13c6458d7a7f92daf58c12e4c120d99a1f56cbfa
| * Update Qt Creator-related filesMitch Curtis2019-01-311-17/+56
| | | | | | | | | | | | | | | | | | - Add Dial's new inputMode property to DialSpecifics.qml - Update plugins.qmltypes files Fixes: QTBUG-73412 Change-Id: Id9e3818db49d6d130da1256d3019a5074902c66d Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QQuickIcon: Add support to cache a pixmapMikhail Svetkin2019-01-221-0/+1
|/ | | | | | | [ChangeLog][Controls] Added cache property to icon. Change-Id: I9b3410e74ab8962d039939a8e005a2aff8e026cb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update plugins.qmltypesJ-P Nurmi2018-04-251-16/+93
| | | | | Change-Id: I17278688f2ad33536701878c5ac74986a3b52b34 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update plugins.qmltypesJ-P Nurmi2018-04-061-30/+110
| | | | | Change-Id: Ia2d3c5ce96ea30838ef69ed7df03db49b3f3a339 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update plugins.qmltypesJ-P Nurmi2018-04-041-1/+1
| | | | | | Change-Id: I54225f958a16151f24a8c773489017d5b0a22d54 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Ensure that QQuickIcon is properly registeredThomas Hartmann2018-04-041-0/+10
| | | | | | | | | | | | | This is required to avoid false positives about e.g. icon.source. Note: I had issues when dumping controls. Certain types were not part of plugins.qmltypes anymore. I fixed that manually. Task-number: QTBUG-66625 Change-Id: I802b427efee5c27720c99c537ddb4690f74449fd Reviewed-by: Marco Benelli <marco.benelli@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Update plugins.qmltypesJ-P Nurmi2018-02-261-40/+103
| | | | | Change-Id: I3b98e4c2159ba37b0b8d0ef5099b93308c84db11 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update plugins.qmltypesv5.10.0-beta4J-P Nurmi2017-11-061-36/+52
| | | | | Change-Id: I792cd065a70aaabf2349e1fe2c5b5dc41e29d1d3 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Default: merge SwitchIndicator back to Switch & SwitchDelegateJ-P Nurmi2017-11-021-9/+0
| | | | | | | | | | | | | | | | | | | See the previous commit (CheckIndicator) for more details. Before: running: /home/jpnurmi/Projects/qmlbench/benchmarks/auto/creation/quick.controls2/delegates_switch.qml [...] Average: 87.8 frames; using samples; MedianAll=87; StdDev=2.16795, CoV=0.0246919 After: running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_switch.qml [...] Average: 92.6 frames; using samples; MedianAll=92; StdDev=2.19089, CoV=0.0236597 Change-Id: Iea9e88e4e771ac27d336c2c87232704d33a226ec Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: merge RadioIndicator back to RadioButton & RadioDelegateJ-P Nurmi2017-11-021-9/+0
| | | | | | | | | | | | | | | | | | | See the previous commit (CheckIndicator) for more details. Before: running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_radiobutton.qml [...] Average: 91.6 frames; using samples; MedianAll=91; StdDev=1.51658, CoV=0.0165565 After: running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_radiobutton.qml [...] Average: 95.8 frames; using samples; MedianAll=96; StdDev=2.04939, CoV=0.0213924 Change-Id: Ic185241767d0b9422e86919356e3155e00803e56 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: merge CheckIndicator back to CheckBox & CheckDelegateJ-P Nurmi2017-11-021-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | The internal CheckIndicator helper was introduced together with CheckDelegate in 1acb34a, because we naturally wanted to share the indicator instead of duplicating it. This change is controversial, because it leads to duplicate code, but keeping the indicator definitions inline is clearly faster. This is not seen as a huge problem for the Default style, because the indicator is not too complicated. Basically, this fixes a ~5% performance regression introduced by 1acb34a. Before: running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_checkbox.qml [...] Average: 72.8 frames; using samples; MedianAll=73; StdDev=1.48324, CoV=0.0203742 After: running: qmlbench/benchmarks/auto/creation/quick.controls2/delegates_checkbox.qml [...] Average: 77 frames; using samples; MedianAll=77; StdDev=1.41421, CoV=0.0183664 Change-Id: Ibee0e29e83a64ee4a6a772a90b1784a9c8c715bb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update plugins.qmltypesJ-P Nurmi2017-10-251-1/+119
| | | | | Change-Id: Ie5b9a513baa70e88ade9cc4980b81fe6a363edf6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: replace remaining Default.focusColor with palette.highlightJ-P Nurmi2017-09-261-1/+0
| | | | | | Task-number: QTBUG-63369 Change-Id: I37c1f4298fa01b907dfcb28757cd5d7ded182192 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: make separators use palettesJ-P Nurmi2017-09-261-1/+0
| | | | | | | | | Not the exact same color it was before, but it is now the same color Frame uses. Task-number: QTBUG-63369 Change-Id: I5b850d85d756d03b2502a8f56e972ed7ff5959a9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: make popups and windows use palettesJ-P Nurmi2017-09-261-2/+0
| | | | | | Task-number: QTBUG-63369 Change-Id: Iabdb22852f319c1c7370b724f806523fcb1f1b91 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: make PageIndicator use palettesJ-P Nurmi2017-09-221-1/+0
| | | | | | Task-number: QTBUG-63369 Change-Id: I545b267cb69b4fd76e42c17d436362ee4e06c45a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: make ProgressBar use palettesJ-P Nurmi2017-09-221-1/+0
| | | | | | Task-number: QTBUG-63369 Change-Id: Icf2204f9395798ccdca2448a26e0a2c9c4826a33 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: pick selection & selected text color from the paletteJ-P Nurmi2017-09-221-1/+0
| | | | | | Task-number: QTBUG-63331 Change-Id: I14c2b05bbf7654b298a69cdc72fc4d8756a340d0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: palette-based Label.linkColorJ-P Nurmi2017-09-221-1/+0
| | | | | | Task-number: QTBUG-63331 Change-Id: Iad940e2260b96f81282779e5029a498895a2da44 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update plugins.qmltypesJ-P Nurmi2017-06-221-1/+61
| | | | | Change-Id: Id63b835d4590b08c80eee725fdc02c562590b605 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Update plugins.qmltypesJ-P Nurmi2017-06-061-54/+171
| | | | | Change-Id: Ibe6d36867c5509e30277d1ae213cf55e9faad0c9 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* QQuickDefaultBusyIndicator: allow specifying pen and fill separatelyJ-P Nurmi2017-05-161-1/+2
| | | | | | | | | 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>
* Default: pass busy indicator and progress bar colors from QMLJ-P Nurmi2017-05-121-0/+2
| | | | | | | | | 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-121-9/+9
| | | | | | | | 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>
* Update plugins.qmltypesJ-P Nurmi2017-04-211-10/+199
| | | | | Change-Id: Iaef074c14f3113496128efab68032f53e29eb330 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Update plugins.qmltypesJ-P Nurmi2017-04-211-5/+10
| | | | | Change-Id: I106f1efad34b74af68dc59323aa6739212a78976 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Add ScrollViewJ-P Nurmi2017-01-271-0/+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>
* Update plugins.qmltypesJ-P Nurmi2017-01-241-47/+166
| | | | | Change-Id: Ic16c8e0796178bd99fc7dd8c965c0ed1de8da9d3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Restore AbstractButton::checkableJ-P Nurmi2016-11-161-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | In 7a8f055, we hid the checkable property from QQuickAbstractButton and exposed it only in QQuickButton and QQuickMenuItem. The reasoning was that QQuickCheckBox, QQuickRadioButton, QQuickSwitch and their delegate counterparts are inherently checkable, so having the checkable property available in QML didn't seem to make sense. While this still holds true, there are other factors to take into consideration. AbstractButton is meant to be a generic base class for all types of buttons, but the lack of a checkable property makes it unusable as a base class for custom QML-based checkable buttons. If we want to a hide the checkable property from CheckBox, RadioButton, and Switch to avoid having it popup in the auto-completion list, we can probably do it in a less disruptive way via tooling. [ChangeLog][Controls][AbstractButton] The checkable property has been made accessible from QML. Previously it was only exposed for Button and MenuItem, but it is now available for any AbstractButton to make it possible to create custom QML-based checkable buttons. Task-number: QTBUG-51554 Change-Id: I19e29fc87cd15811c43c9b9ebb29701d66cde72f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Update plugins.qmltypesJ-P Nurmi2016-11-011-5/+14
| | | | | Change-Id: I859bcc03f3f980fd37df756c2922378c0d8c0827 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Update plugins.qmltypesJ-P Nurmi2016-10-051-11/+57
| | | | | Change-Id: I276dbd1464577fdee9c6920deb38e890c1a18daf Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Update .qmltypesMarco Benelli2016-09-121-873/+0
| | | | | Change-Id: I9551e7606cb1bda67058295cccd4a418a418bd24 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Update plugins.qmltypesJ-P Nurmi2016-09-031-14/+67
| | | | | Change-Id: I0a2996deb02d873dc970f15ce6f6416b64baeab7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Update plugins.qmltypes for templates and controlsJ-P Nurmi2016-07-221-400/+454
| | | | | | | | | | | | | | | | | | | | | For src/imports/templates, simply running 'make qmltypes' does the job. With src/imports/controls, we must help qmlplugindump a bit: - pass the correct dependencies in a JSON file (or else qmlimportscanner will find .impl imports, which qmlplugindump will fail to import as stand-alone modules) - merge with the plugins.qmltypes from templates to achieve proper type hierarchy The full command for dumping QtQuick.Controls 2.1 types, also seen at the top of src/imports/controls/plugins.qmltypes: qmlplugindump -nonrelocatable QtQuick.Controls 2.1 \ -merge ../templates/plugins.qmltypes \ -dependencies dependencies.json Change-Id: I2d8a24e47e70dd8dd27a2f48fe640faeea8761e2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Tumbler: add wrap propertyMitch Curtis2016-06-281-1/+2
| | | | | | | | | [ChangeLog][Tumbler] Added wrap property to control whether or not tumbler wraps when it reaches the top and bottom. Change-Id: I27c543d98f7bc574bc5dc882a130abe0dcc13cea Task-number: QTBUG-53587 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Merge remote-tracking branch 'origin/5.7.0' into 5.7Liang Qi2016-06-161-167/+1
|\ | | | | | | Change-Id: I5954150d06519d7058716124580ee7fe73afb810
| * Update plugins.qmltypes to avoid race condition in code modelv5.7.0Thomas Hartmann2016-06-011-167/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The duplicated definition of QQuickItem creates a race condition in Qt Creator and the prototype chain of types is not resolved correctly. The prototype becomes QtQuick.Templates.QQuickItem instead of QtQuick.Item. Also the explicit dependency on QtQuick 2.7 is required to resolve the prototype chain in all cases. Qt Quick Designer only shows items derived from QtQuick.Item and will ignore items that are reported as derived from QtQuick.Templates.QQuickItem. Task-number: QTCREATORBUG-16371 Change-Id: I4dede55a2753e5d807ceb837cc4cd7e4d2f02d06 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Adding "forwards" for ApplicationWindowThomas Hartmann2016-06-071-0/+236
|/ | | | | | | | | | | | Without these declarations from QtQuick.Window 2.0 the code model will not know about the properties of ApplicationWindow. Because of the high visibility we should fix this. Change-Id: Icce7ef1c60731045e1b7a4dfda5f39361c872100 Reviewed-by: Marco Benelli <marco.benelli@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Adjust plugins.qmltypes for controlsThomas Hartmann2016-05-231-8/+1847
| | | | | | | | | Qt Creator 4.1 will be able to handle dependencies, but Qt 5.7 will ship with Qt Creator 4.0.2. Therefore we once again need the forward declarations. Change-Id: I5e2257ccfccdd5ee9b77583e5702bc321be57f24 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Update plugins.qmltypesJ-P Nurmi2016-04-211-1778/+151
| | | | | Change-Id: I38729bb888c4a8df797dfac056c5b025a6d9a67f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7J-P Nurmi2016-04-201-0/+239
|\ | | | | | | Change-Id: Ia8879787703c32db44119b25be10adc83adc40bb
| * Adding prototypes for ApplicationWindow for code modelThomas Hartmann2016-04-131-0/+239
| | | | | | | | | | | | | | | | | | Those have to be manually added until dependecies work in Qt Creator. Change-Id: I416065bd3a1d074bd7f5119cfc635a73e384f354 Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com> Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* | Remove RangeSlider::track in favor of Control::backgroundJ-P Nurmi2016-03-211-1/+0
| | | | | | | | | | | | | | In the series of minimalizing the delegate APIs. Change-Id: I11e519f5226bf44d18b42fd31276c5528b18ec46 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Remove Slider::track in favor of Control::backgroundJ-P Nurmi2016-03-211-1/+0
| | | | | | | | | | | | | | In the series of minimalizing the delegate APIs. Change-Id: I664f4227ff55876be2594c8855dacc7c92eddc94 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | ProgressBar: use contentItem instead of indicatorJ-P Nurmi2016-03-211-1/+0
| | | | | | | | | | Change-Id: I8bd21b32b6f3d333c119d77b629b46fe411c06eb Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | ScrollBar: add increase(), decrease() and stepSizeJ-P Nurmi2016-03-211-0/+3
| | | | | | | | | | Change-Id: I052b650fee7ae94cc826446d285d653a41bd1e75 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>