aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Material: remove qdoc markersJ-P Nurmi2016-06-0836-173/+0
| | | | | | | | | | | | | The original plan was to include the default implementation (of all styles, if we could make the snippets collapsiple) in the customization docs. Since the default implementations tend to include internal types, in the end we went the other way and wrote dedicated example snippets for the customization docs. Therefore these markers no longer server a purpose, but just add unnecessary extra bytes for the QML parser to read. Change-Id: Ic511d7ce7a032429626ee75517d69d21b21412a3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Universal: remove qdoc markersJ-P Nurmi2016-06-0835-167/+0
| | | | | | | | | | | | | The original plan was to include the default implementation (of all styles, if we could make the snippets collapsiple) in the customization docs. Since the default implementations tend to include internal types, in the end we went the other way and wrote dedicated example snippets for the customization docs. Therefore these markers no longer server a purpose, but just add unnecessary extra bytes for the QML parser to read. Change-Id: I5740192b0a3e80614a795d32dabeb753f86bbd68 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: update \sa statements ControlsNico Vertriest2016-06-085-4/+6
| | | | | Change-Id: Ifb2b62302e965a685ee57297aada883c7277610c Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Doc: Collect a list of guidelines pagesNico Vertriest2016-06-0710-0/+88
| | | | | Change-Id: Ie64486275b7fc39005cc6f86f33f04444474c07e Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@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>
* Update QML Designer supportJ-P Nurmi2016-06-079-2/+64
| | | | | Change-Id: I916ab905ade9c6c83cf4cb8bcf121bdd99e84974 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: Updated doc on usage Controls 2.Nico Vertriest2016-06-027-14/+81
| | | | | | Change-Id: If256dafc53d63b174b5cfd03eb91635e062d7c69 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Material: fix disabled and tristate CheckBoxJ-P Nurmi2016-05-311-5/+21
| | | | | | | | Somehow these changes went missing when CheckIndicator was introduced in bb06d89. It was probably a copy-paste from an outdated CheckBox.qml. Change-Id: I9e5f3801f627de71f80620b5615771f7730b906c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.7.0' into 5.7J-P Nurmi2016-05-308-24/+175
|\ | | | | | | Change-Id: Idbb9ab39b53136cd90c5c9ed564f02eaa0fb231b
| * Doc: update the "differences" pagesJ-P Nurmi2016-05-302-22/+105
| | | | | | | | | | | | | | | | | | Add missing types, use mdash instead of "no equivalent" to make it easier to spot the differences. Change-Id: Ic096bc7192929343b9546da8b198a3e9c1c9995e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * Doc: fix misspelling in qtquickcontrols2-styles.qdocv5.7.0-rc1J-P Nurmi2016-05-281-1/+1
| | | | | | | | | | Change-Id: Ib24a8f431955a8653070e2746b51a6c82d0ce9a0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Templates: add missing QML type registrationsJ-P Nurmi2016-05-271-0/+6
| | | | | | | | | | Change-Id: Ida61ff0290e92fd1df230636b558480d4831051f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Material: prevent ElevationEffect access out of boundsJ-P Nurmi2016-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The elevation shadows are defined in a JS array for elevations between 0-24. Clamp the user-defined elevation number to prevent access out of bounds: Button { Material.elevation: 100 // ElevationEffect.qml: TypeError: // Cannot read property '0' of undefined } Change-Id: I6b5a915042081be54101fd700b52c8eea96aa05d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Doc: add "see also" links between the stylesJ-P Nurmi2016-05-273-0/+6
| | | | | | | | | | Change-Id: If7977592783756855a81bdaee5875a630de143ad Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Doc: Material.color() and Universal.color()J-P Nurmi2016-05-273-0/+56
| | | | | | | | | | Change-Id: I01bc1ec6ae769f8b6c9856b70a5305dfb361f1bc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Remove unused images and snippetsJ-P Nurmi2016-05-27119-2189/+0
| | | | | | | | | | Change-Id: I941c86ddecf6e76a3d6cdf547a3b8738a140f1c5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: completed overview page popupsNico Vertriest2016-05-272-3/+32
|/ | | | | Change-Id: I6cf17b655b89ac588f1bc7700c50baaf9359af62 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Doc: update screenshots generated by tst_snippetsJ-P Nurmi2016-05-26136-0/+0
| | | | | | | The default style screenshots were outdated. Change-Id: Ia36230b8ba678b782276f54840cc3652c4c56841 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: add screenshots on the Styling Qt Quick Controls 2 -pageJ-P Nurmi2016-05-261-5/+40
| | | | | Change-Id: I8dfd4ead179ee790ac670a3cf9047109b357825e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Material: fix the reset of primary and accentLiang Qi2016-05-261-2/+8
| | | | | | | | | Also fix a test in dev(see 44ac831c). Done-with: J-P Nurmi <jpnurmi@qt.io> Task-number: QTBUG-53556 Change-Id: I0b156727b07ed8c135c4a7bb6bb31fb2b280d4ec Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Doc: update the screenshots of the stylesJ-P Nurmi2016-05-263-0/+0
| | | | | Change-Id: Ib2d0b79b73bb4bccd04291c425c4041a830dccf9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: reduce excessive margins from qqc2-customize-buttons.pngJ-P Nurmi2016-05-261-0/+0
| | | | | Change-Id: I1679d25ee8450ee4775a4525d3dbec5b62fabc13 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: fix SwipeDelegate link errorsJ-P Nurmi2016-05-261-10/+10
| | | | | Change-Id: Ied20555722cbd91a24e3c6a183efc8c0fd06f1e3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: add missing \since 5.7 tagsJ-P Nurmi2016-05-2547-3/+47
| | | | | Change-Id: Ie4680c5dfadc95278215b688f4fc28577f557933 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* SpinBox: disable up and down indicators when appropriateMitch Curtis2016-05-248-23/+85
| | | | | | Change-Id: I6fbfde582723632c9b955a6e7ee380179b7b6a32 Task-number: QTBUG-53519 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>
* Add missing QQuickPopup::forceActiveFocus()J-P Nurmi2016-05-232-0/+18
| | | | | | Change-Id: I06da62fa3804ee9d67bfb3feb8a11faa1fd3850e Task-number: QTBUG-53519 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Make Overlay.modal and modeless ComponentsJ-P Nurmi2016-05-236-100/+87
| | | | | | | | | | | | | | | | This way we can simply instantiate a visual overlay for each modal or dimming popup without having tricky problems with overlay's stacking order. It makes also sense to not instantiate the overlays for hidden popups. Coincidentally, this change also fixes a problem that the overlay turned out to be _always_ visible since a hidden overlay background was always instantiated no matter if there were open popups, or popups at all. Change-Id: Ieb64a72c827d0a005418027428378ebe04f41117 Task-number: QTBUG-53519 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix typename in .metainfo fileThomas Hartmann2016-05-231-23/+23
| | | | | | | The module name is QtQuick.Controls not Qt.Quick.Controls. Change-Id: I0de337aaec6ea2e133d9f59a63ca468e499ad622 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Fix grammar in position docsMitch Curtis2016-05-231-2/+2
| | | | | Change-Id: Ic185915af229bf598557bf6af0c23efc7f339447 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* ItemDelegate: Document how to use highlighted with ListView.isCurrentItemMitch Curtis2016-05-231-1/+14
| | | | | Change-Id: Ia77e4ddf52dc2e39b95ac8acfdada629b18b0696 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Update plugins.qmltypesMitch Curtis2016-05-231-10/+10
| | | | | Change-Id: I289b31aa989ef1b3eb172394a94ce9ae81e02098 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* SwipeDelegate: rename exposure to swipe, active to completeMitch Curtis2016-05-235-149/+149
| | | | | | | | | "swipe" is both shorter and easier to understand. "complete" is easier to understand. Task-number: QTBUG-53519 Change-Id: I87ecba4ac878f033111ee56fa618b80b227858a7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Doc: cleanup a TODO comment from AbstractButtonJ-P Nurmi2016-05-231-1/+1
| | | | | | | | ButtonGroup is pretty extensively documented, so its usage doesn't need to be explained in AbstractButton docs. Just link to ButtonGroup. Change-Id: I961cc4a81cfadc46da473dd456a603b22946ded7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix QQuickToolBar base classJ-P Nurmi2016-05-232-6/+6
| | | | | | Change-Id: I0802a16ee704d81d690cc642d3b62445ec2147e8 Task-number: QTBUG-53519 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Doc: fix AbstractButton::toggle()J-P Nurmi2016-05-231-1/+1
| | | | | Change-Id: I112719af6cca8f74457b80b6cf55fb32780b8c23 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickStackView: fix buildLiang Qi2016-05-212-0/+4
| | | | | | | Added some includes because the private header cleanup in qtdeclarative. Change-Id: Ic7580377c7c38966ba51bc08f1f6c37dc8c7616c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Doc: updated doc on Qt Quick Controls2 buttons usageNico Vertriest2016-05-201-17/+103
| | | | | Change-Id: I818128293ea3f0bab4fce00ec8f5eedc9d4d694c Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* ComboBox: increase/decrease() => increment/decrementCurrentIndex()J-P Nurmi2016-05-203-20/+20
| | | | | | | | | ComboBox does not have a value-property, unlike Slider, SpinBox, Dial, and ScrollBar. Change-Id: I9832ef8df1532d4cb85b981b164c7c85e8a82135 Task-number: QTBUG-53519 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Liang Qi2016-05-206-6/+6
|\
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-196-6/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/imports/controls/doc/qtlabscontrols.qdocconf src/imports/controls/doc/qtquickcontrols2.qdocconf src/imports/controls/material/qtlabsmaterialstyleplugin.cpp src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp src/imports/controls/qtlabscontrolsplugin.cpp src/imports/controls/qtquickcontrols2plugin.cpp src/imports/templates/qtlabstemplatesplugin.cpp src/imports/templates/qtquicktemplates2plugin.cpp Change-Id: I6159e681b77e4a0a293b6bd7fb11a46d58873da0
| | * Doc: Remove repository name from examplesinstallpathTopi Reinio2016-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Examples in binary packages now directly match the install path. Change-Id: Ia37e1223008592f0d410155611e41918825f55fd Task-number: QTBUG-52953 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| | * Cleanup QQmlExtensionInterface usageJ-P Nurmi2016-05-065-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Use the pre-defined macro. Change-Id: Ie2b5a93f0b6ed16276b80fcb9e118a49a055194c Task-number: QTBUG-53208 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | QQuickStackView: fix buildLiang Qi2016-05-202-1/+4
|/ / | | | | | | | | | | | | error: no matching function for call to 'QQmlComponentPrivate::initializeObjectWithInitialProperties(QV4::ScopedValue&, QQuickItem*&)' Change-Id: Ied1bd7b73b60c69c73e42b82209f10f2448ce7b0 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Remove frames from certain controls and lighten othersMitch Curtis2016-05-198-36/+32
| | | | | | | | | | | | | | | | | | E.g. Button and Popups look awkward with frames. Other controls need them, but they're currently too dark. This patch gives them gentler shades. Change-Id: I1c3c486935180300b8233a028d25742fe8535995 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Respect the modal property for DrawerMarco Martin2016-05-191-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | Even if Drawers default to modal true, is still possible to set them to non modal at any time. When the modal property is set to false in a Drawer instance, the dimming gets disabled as expected, but it continues to steal clicks for the whole area of the application window. This makes the handling of the click on the overlay to check for the modal property before deciding to steal the click. Change-Id: I082453a0cc6dd5c1a3e0a123abc4ff018d56c789 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Controls: update all paddings to relative value with paddingLiang Qi2016-05-1921-70/+60
| | | | | | | | | | Change-Id: I7bf3a7fb9ca97e5c7ddf34f8f921d5d4be733861 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Don't restore focus to contentItem when a focusless popup was closedMitch Curtis2016-05-192-6/+15
| | | | | | | | | | | | | | | | | | For example, a ToolTip shouldn't affect focus when it closes. Task-number: QTBUG-53420 Task-number: QTBUG-53451 Change-Id: Ic945e98a2ffd86e9f9f06724b16e5f240c3f94de Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Don't use QFont::exactMatch() for fonts comparisonNikita Krupenko2016-05-182-4/+9
| | | | | | | | | | | | | | | | | | This function can return false even if the font found. Compare fonts by QFontInfo::family() instead. Change-Id: I519dd11ef7cba7395ca5b815d3973ddf585c439a Task-number: QTBUG-53377 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | StackView: reset size of the content without explicit one on pop()Nikita Krupenko2016-05-181-0/+4
| | | | | | | | | | | | | | | | | | This allows for item to be properly risezed by StackView when it'd be pushed onto stack again. Task-number: QTBUG-53067 Change-Id: I911026022a987ed5632ae5411d63221d743a6aca Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 01:20:54 +0000