aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge QQuickPluginUtils to QQuickStylePluginJ-P Nurmi2016-04-198-152/+31
| | | | | | | | | | | Now that we have a common base class for the plugins, we don't need a separate utils namespace. QQuickStylePlugin::typeUrl() is based on the former QQuickPluginUtils::pluginBasePath(). It returns a URL to the internal composite types that must be explicitly registered for static builds. Change-Id: Icf28c27c84f6b58b1e7b34203dad39c852f0d362 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Doc: rename remaining qtlabscontrols groups and linksJ-P Nurmi2016-04-1913-13/+13
| | | | | Change-Id: I40f149be98406b5f9e5d1e59fb2cc359ba864107 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Update Default style ComboBox to match new design specsMitch Curtis2016-04-1910-21/+27
| | | | | | Change-Id: Iac0038c6854685b031d5343b651836d9b605a6d0 Task-number: QTBUG-50993 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Dial: add wrap propertyMitch Curtis2016-04-192-3/+50
| | | | | | | | | | | | | | | | | This works by preventing changes in position that are considered too large. A change is considered too large when the difference between the old and new positions is greater than or equal to 0.5 *and* the position of the mouse is below the center of the dial. This effectively makes it impossible to drag the dial from left to right when the mouse is below its center, but still allows doing so above its center. This is useful for applications such as volume dials, where a large change can be dangerous. Change-Id: I1d7800e5ba16dbe0642974b8e53d8fcd921a01d7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Move angle calculation to static global variable.Mitch Curtis2016-04-191-1/+3
| | | | | | | | | This also: - gives names to what were pretty odd looking expressions - rewrites those expressions to be easier to understand Change-Id: Ia06d5702590d10cc53b9ae939a6877b6c403e091 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Doc: cleanup the index pageJ-P Nurmi2016-04-191-8/+17
| | | | | | | | Organize things in a similar way than QtMultimedia does. Change-Id: I6df798afdd86c7b6773c4d0b6090678bc567cd00 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* Doc: setup subprojects for QML Types, C++ Classes and ExamplesJ-P Nurmi2016-04-193-33/+66
| | | | | Change-Id: If85c87f4b3948a7e25b9281329d3886f664f6c13 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* QQuickControlPrivate: move font to ExtraDataLiang Qi2016-04-182-6/+15
| | | | | Change-Id: Idc01a8a23dcddc271bb01d9ab57238a860dc1c84 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* .qdocconf: fix description and namespaceJ-P Nurmi2016-04-181-2/+2
| | | | | | | Avoid conflicting values with Qt Quick Controls 1.x Change-Id: Ib1503461cddaf5ddc11754ffb853f645d9f52ae1 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add deployment documentationMitch Curtis2016-04-183-0/+99
| | | | | | | | | | | 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>
* Universal: add foreground and background attached propertiesJ-P Nurmi2016-04-1827-31/+234
| | | | | | | | | | | | | | Same as b51e520f for Material. This has been a common request on the mailing lists and forums. Users want to customize the text color of various controls without having to replace whole delegates. This change makes it possible to specify both foreground (eg. Button text) and background (eg. ApplicationWindow, Page and Pane background) colors so that they propagate to children in the same way than accent and theme do. Change-Id: I55084c58f0c62e8088b270ed98437241e382ca15 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* ComboBox: respect currentIndex:-1J-P Nurmi2016-04-181-2/+4
| | | | | | | | Don't override explicitly set current index in Component.onCompleted. Task-number: QTBUG-52615 Change-Id: If5ce4ec1db29f8ac94d457d297910d61fb0b8a18 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Doc: visualize the pre-defined style colorsJ-P Nurmi2016-04-183-41/+44
| | | | | Change-Id: Iade9f17269d2702358449ed961592bc0f93c7aa3 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add QQuickUniversalStyle::variantToRgba()J-P Nurmi2016-04-182-20/+28
| | | | | | | Extracted from setAccent() - same as 8ed4c6c for QQuickMaterialStyle. Change-Id: Iadd791f3c2d9e5820a94bc8e84ce5d4c17156ae2 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Material: fill TabBar backgroundJ-P Nurmi2016-04-181-0/+6
| | | | | | | | TabBar is often used with flickable content (like in testbench), and the content below should not shine through the tab bar. Change-Id: I629a18e1c7c4436e3716aede3007c3edbbeb2f79 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Material: make highlighted buttons respect explicitly set foregroundJ-P Nurmi2016-04-181-0/+2
| | | | | | | | | Highlighted buttons are special and don't automatically inherit the foreground color from the parent, but this change makes it possible to change the color by setting it explicitly on a highlighted button. Change-Id: I2e2f90ca001cdfffb47e5cf29266715243d7dd18 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Remove references to non-existent ComboBox::downJ-P Nurmi2016-04-183-7/+4
| | | | | | | Such property doesn't exist, at least yet. Change-Id: I5d41997586e17a36d045648afc4c2fd4c64d10b8 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Doc: add section for C++ classes in overview pageNico Vertriest2016-04-174-3/+56
| | | | | Change-Id: I69a112f05b90e1296ad897da0e3d9b04b3e4af33 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Add invokable Universal.color() methodJ-P Nurmi2016-04-162-0/+7
| | | | | | | Material has it also. It's useful for getting the actual color values. Change-Id: I36de2e5802b3721179be95503b8b516d31682065 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* QQuickUniversalStyle: rename getColor() to systemColor()J-P Nurmi2016-04-162-26/+26
| | | | | Change-Id: I6b4799e929d032a3ddb5430acdbf6d816698d47a Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Rename QQuickUniversalStyle::Accent to ColorJ-P Nurmi2016-04-162-7/+7
| | | | | | | | The same enum will be supported by the upcoming foreground and background attributes and is no longer accent -specific. Change-Id: Id579a1f08bdee1d92fb94a22e68c0fab0dc4e7a5 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Universal: revise the internal light and dark color helper methodsJ-P Nurmi2016-04-161-5/+5
| | | | | | | | This makes it possible to use the helper methods for fetching default values for the upcoming foreground and background attributes. Change-Id: I5c1371ca1f8022b5f97ca4496ffa597bc3dd88f6 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Universal: rename member variablesJ-P Nurmi2016-04-162-11/+11
| | | | | | | | | | Prepare for foreground/background support, which needs both "explicit" and "has" flags separately. The former describes better the effect on inheritance (explicitly set attributes override inherited values) vs. the latter describes whether a value has been set (in any ancestor). Change-Id: I0a9c91b3b24221d7286cb10fb63a00c71eae9791 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Align QQuickUniversalStyle::SystemColor valuesJ-P Nurmi2016-04-162-2/+2
| | | | | | | Unlike BaseHigh, the others didn't have any Color-suffix. Change-Id: Iacd797c86330f3ad1eff8f83735172d7475c00e4 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Doc: fix ButtonGroup::checkedButtonJ-P Nurmi2016-04-161-1/+1
| | | | | | Task-number: QTBUG-52146 Change-Id: I40c823ac233872e099f045a5e3de8dcec9543dc4 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* ButtonGroup::buttons: avoid losing the checked button on re-assignmentJ-P Nurmi2016-04-162-6/+11
| | | | | | Task-number: QTBUG-52358 Change-Id: I405947215cdbc6e99fe02dbc85e31c40656fc11a Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Doc: fix ComboBox::highlightedIndex \readonly tagJ-P Nurmi2016-04-151-1/+1
| | | | | | | The tag slipped to wrong place in eae24fcc. Change-Id: I2d66a78fc1d5a698f6338811ec15e3a26ee32772 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Material: add foreground and background attached propertiesJ-P Nurmi2016-04-154-9/+246
| | | | | | | | | | | | This has been a common request on the mailing lists and forums. Users want to customize the text color of various controls without having to replace whole delegates. This change makes it possible to specify both foreground (eg. Button text) and background (eg. ApplicationWindow, Page and Pane background) colors so that they propagate to children in the same way than accent, primary and theme do. Change-Id: Idae52650ed8620beeff7bf4c8263ffdc1f6ef728 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add QQuickAbstractButton::downMitch Curtis2016-04-1542-78/+134
| | | | | | | | | | | | | | | | | This property will determine whether or not the button is visually pressed. Having such a distinction allows users more control over their controls. The patch also fixes the problem with ComboBox where pressing on the ComboBox when it's open would cause a delegate in the popup to show as being pressed. Unless explicitly set, this property follows the value of the pressed property. To return to the default value, set it to undefined. Change-Id: I29ecf325ed2ede125613f0c878b0427937599866 Task-number: QTBUG-51005 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* ToolTip: use QQmlInfo and don't crash with non-ItemsJ-P Nurmi2016-04-151-12/+17
| | | | | | | | | | | | | | Before: ToolTip must be attached to an Item QObject(0x239c3e0) The program has unexpectedly finished. After: qrc:/main.qml:8:5: QML QtObject: ToolTip must be attached to an Item Change-Id: I9a2bf317a13eb7408fc5851087457bbfbeca9f3f Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* ScrollBar|Indicator: use QQmlInfo and don't crash with non-FlickablesJ-P Nurmi2016-04-152-28/+36
| | | | | | | | | | | | | | Before: ScrollBar must be attached to a Flickable QQuickItem(0x1774640) The program has unexpectedly finished. After: qrc:/main.qml:9:5: QML : ScrollBar must be attached to a Flickable Change-Id: I689d70744f64e209eacb4cb743ad64e904f29cd4 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add QQuickMaterialStyle::variantToRgba()J-P Nurmi2016-04-152-42/+32
| | | | | | | Extracted from setAccent() and setPrimary() Change-Id: I2dff1d0f605cc210f6b86b5aa1a1f5ff284b20af Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Use font from theme for list delegatesNikita Krupenko2016-04-149-1/+27
| | | | | Change-Id: I48208fb6b5f7df6e1e824d36a256d9b1643cd16d Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Controls: update license headersJ-P Nurmi2016-04-14200-367/+367
| | | | | | | This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. Change-Id: Ib653135662bfd353a73290539995e8e5be211587 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Templates: update license headersJ-P Nurmi2016-04-14106-199/+199
| | | | | | | This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. Change-Id: I39ef9cbb00f55a32b7a43f11ffbdfbb40b84e124 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename .metainfo for QML DesignerJ-P Nurmi2016-04-142-24/+24
| | | | | Change-Id: I9b76da5ab1b4a56d78aa0b0beeb7e3d1428fce63 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Doc: cleanup broken links to non-existent AbstractButton::checkableJ-P Nurmi2016-04-133-5/+4
| | | | | Change-Id: Id1eaec0bef90b5c4e963c7868cace84db740e799 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Doc: add 2-suffix to the image assets and snippetsJ-P Nurmi2016-04-13346-189/+189
| | | | | Change-Id: Ib8050cb3baefe07d28c7e2dcec64af155d2d7c9b Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Controls: rename the plugin to QtQuickControls2PluginJ-P Nurmi2016-04-134-12/+12
| | | | | Change-Id: I7c7c11675f340ab8110f38041434a91f72c9552e Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Controls: rename the C++ module to qtquickcontrols2J-P Nurmi2016-04-1334-56/+56
| | | | | Change-Id: I087a39baebc296a340739161874636926adaa56c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Doc: add 2-suffix to the templates related pagesJ-P Nurmi2016-04-132-1/+1
| | | | | Change-Id: If482a20ec956e0ed01c00d5ada119b33d39de99f Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Templates: rename the plugin to QtQuickTemplates2PluginJ-P Nurmi2016-04-133-9/+9
| | | | | Change-Id: I1e17d682cfbd2c7b1d6246a9fedf805f5b514cb3 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Templates: rename the C++ module to qtquicktemplates2J-P Nurmi2016-04-13124-194/+194
| | | | | Change-Id: I146da903b46f5c2caf865e37291c25376b49021a Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add SwitchDelegateMitch Curtis2016-04-1331-125/+990
| | | | | | | | | | | SwitchDelegate is an item delegate that is used in lists, and can be checked and unchecked. It derives from QQuickItemDelegate and hence has background press effects. The order of the indicator and text is reversed (compared to Switch) to reflect what is most commonly seen on mobile. Change-Id: I6f8fca8d1a8c91f2cb9d8bbbb685ad163712dfa1 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Material: use CheckIndicator for MenuItem's indicatorMitch Curtis2016-04-131-68/+2
| | | | | Change-Id: I0a3fe3a5ded3467ca404bf5e632dad5f60b08e77 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Expose checkable where necessary, instead of in QQuickAbstractButtonMitch Curtis2016-04-1324-233/+69
| | | | | | | | | | | | | QQuickCheckBox, QQuickRadioButton and QQuickSwitch are inherently checkable, so having this property available to QML doesn't make sense. QQuickButton and QQuickMenuItem are the two classes that need to expose the property. Change-Id: Ic421c195295c4bef0fc934c98fa9e781d98c9b67 Task-number: QTBUG-51554 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* QQuickAbstractButton: fix the order of nextCheckState() vs. clicked()J-P Nurmi2016-04-121-4/+4
| | | | | | Task-number: QTBUG-52448 Change-Id: I4ee2c16f3dccc61e07268f9e8ced530a06d2adf3 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7J-P Nurmi2016-04-117-7/+7
|\
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-117-7/+7
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/ScrollBar.qml src/imports/controls/material/ScrollBar.qml src/imports/controls/universal/ScrollBar.qml src/templates/qquickscrollbar.cpp tests/auto/controls/data/tst_scrollbar.qml Change-Id: I646882e0563f72df682bac49f96875a08b1b0de9
| | * Doc: fix ButtonGroup::buttons typeJ-P Nurmi2016-04-111-1/+1
| | | | | | | | | | | | | | | Change-Id: Id78ef819c56d4639c33e7b4823c2c2600486befa Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 10:41:24 +0000