aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Replace tst_styles with tst_material & tst_universalJ-P Nurmi2016-06-1410-58/+107
| | | | | | | | | | The CI was not able to catch failures in tst_styles, because the test results were output by separate child processes. This change builds three different versions of tst_controls, which each run with the appropriate style. Change-Id: I95b2bdd90221579a3176e827802236d80d9f1a09 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickScrollBar & Indicator: cleanup item change listenersJ-P Nurmi2016-06-142-12/+32
| | | | | | | | | | It's a bit uncertain how it managed to slip through the CI, but tst_controls is currently crashing consistently on Windows (MSVC 2015) during the cleanup of ScrollBar::test_mirrored(). This patch fixes the crash, which happens due to dangling listener pointers. Change-Id: I0a3640786f01f98e9a2bcb600913a7d5fbfe4823 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: adapted images to new style/color requirementsNico Vertriest2016-06-142-0/+0
| | | | | | | Change-Id: I78da942e29915b3aa67b7e06e8a0f8d78cb44302 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Nico Vertriest <nico.vertriest@theqtcompany.com>
* Rename tst_material and tst_universalJ-P Nurmi2016-06-1312-17/+17
| | | | | | | | | | These test specificly the QQuickMaterialStyle and QQuickUniversalStyle implementations, so rename appropriately to make room for the upcoming tst_material and tst_universal tests. See the next commit for more details about that. Change-Id: I08d6116d6219084f6087682b7e712f8499a0e945 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Material: fix elevation effect for Frame, GroupBox, Pane & TabBarJ-P Nurmi2016-06-134-2/+22
| | | | | | | | [ChangeLog][Material] Fixed (optional) elevation effects for Frame, GroupBox, Pane, and TabBar. Change-Id: Ic725049d7023175a6c00765fb85b944bc250c4c6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Material: increase ScrollBar's touch areaJ-P Nurmi2016-06-131-0/+3
| | | | | | | | | | | 8px is hard to hit on touch. A total padding of 16px, so a total size of 20px is still nowhere near the Material design minimum touch target size 48px, but that feels so massive area stealing touches on the screen edge that let's try something a little bit smaller first... Task-number: QTBUG-51527 Change-Id: I2d095d8aa851e99a406286640d2b835cac52c47f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickScrollBar: fix layouting of mirrored vertical scrollbarJ-P Nurmi2016-06-132-2/+23
| | | | | Change-Id: I19630dc54f275ba2f8034c1ef45e5243586a8d23 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Material: fix sliders to respect minimum touch target size 48pxJ-P Nurmi2016-06-132-8/+8
| | | | | Change-Id: If3674854264b1941002c61bba7f42792ea50de68 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Sliders: fix implicit size calculationsJ-P Nurmi2016-06-136-30/+18
| | | | | | | | Background size was in the bindings twice: once without and once with paddings. Change-Id: I863d1fe29f1d79017bad410b31f961e4d1238e3b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix Slider to react if only clickedJ-P Nurmi2016-06-132-11/+15
| | | | | | | | | | | | | The idea was to avoid accidental value changes while flicking over a slider, but that case should be covered well enough by handling mouseUngrabEvent(). [ChgangeLog][Important Behavior Changes] Slider has been fixed to react to clicks. Task-number: QTBUG-53846 Change-Id: I0d52f805af8867655945c57ad77ccb85704a4462 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Drawer: avoid millions of warnings in auto tests and benchmarksJ-P Nurmi2016-06-101-3/+5
| | | | | | | | tst_sanity, tst_creationtime, tst_objectcount are the problematic tests, because they don't create a window. Change-Id: Ia0131477f08a164c015ee7c27110950ec287e264 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: Additional updates \sa statements Controls 2Nico Vertriest2016-06-083-3/+3
| | | | | Change-Id: Ifcb7a7146b49c2dad61c3cf9cb1112852b95e11d Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* 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>
* tests: fix accent and background color in tst_materialLiang Qi2016-06-011-8/+16
| | | | | | | | | | They are also affected by theme. Note: dev CI could verify this. Task-number: QTBUG-53556 Change-Id: Id7cecab2baafe91b198b20f92bb881cc4b531807 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.6' into 5.7Liang Qi2016-05-310-0/+0
|\ | | | | | | Change-Id: I8a837b59b92b966613f58d9bd58f6dc5970effb6
| * Merge remote-tracking branch 'origin/5.6.1' into 5.6Liang Qi2016-05-310-0/+0
| |\ | | | | | | | | | Change-Id: I60fa2daaf08b89567bcc645a5dc0654720273418
| | * QQuickStackView: fix buildv5.6.1-1v5.6.1Liang Qi2016-05-252-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | error: no matching function for call to 'QQmlComponentPrivate::initializeObjectWithInitialProperties(QV4::ScopedValue&, QQuickItem*&)' (cherry picked from commit 6fe784b9696fc19eb8f2ba24f187d2cea4434c53) Change-Id: Ic3db50f44912d9e5cdb71f6712fff554fc76505e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | QQuickStackView: fix buildLiang Qi2016-05-202-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | error: no matching function for call to 'QQmlComponentPrivate::initializeObjectWithInitialProperties(QV4::ScopedValue&, QQuickItem*&)' (cherry picked from commit 6fe784b9696fc19eb8f2ba24f187d2cea4434c53) Change-Id: Ic175bb290dcfbb944fee7545d3b97be8a202896a Reviewed-by: J-P Nurmi <jpnurmi@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>
* | | | Add a simple manual test for taking screenshots in style docsJ-P Nurmi2016-05-275-0/+170
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib5a985796d56b66c5842f2e1ab0e460420f62b54 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>
* | | | Merge remote-tracking branch 'origin/5.7.0' into 5.7J-P Nurmi2016-05-27242-614/+2767
|\| | | | | | | | | | | | | | | Change-Id: Ia0d47da87122e00993b02b2170ef8fa67212bf4d
| * | | 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>
| * | | Gallery: update logos, icons, colors & screenshotsJ-P Nurmi2016-05-2426-3/+13
| | | | | | | | | | | | | | | | | | | | Change-Id: I4b1bec349b3141cabd1882ae28a5ad53ae2cb029 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | | SpinBox: disable up and down indicators when appropriateMitch Curtis2016-05-249-29/+184
| | | | | | | | | | | | | | | | | | | | | | | | 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-238-148/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>