aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix style inheritance for popupsJ-P Nurmi2016-01-085-32/+43
| | | | | | Change-Id: I7bc36cb68e8d668fff2270e018de7eb1c71ccd20 Task-number: QTBUG-50347 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Material style: hide implementation detailsJ-P Nurmi2016-01-082-2/+5
| | | | | Change-Id: Ib797d34014c5faddc05e93f6fc5c4f95c5664997 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* ApplicationWindow: don't delete old headers and footersJ-P Nurmi2016-01-071-2/+4
| | | | | | Change-Id: I6df97edff6f034d79cbd95828a17d5f48dbf1d46 Task-number: QTBUG-50332 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Material: sync ProgressBar height with AndroidJ-P Nurmi2016-01-071-2/+2
| | | | | Change-Id: I4e7864e39fcf6dc8f3f0f821e2c9129a472967ba Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Material: fix BusyIndicator on high DPIJ-P Nurmi2016-01-071-4/+7
| | | | | | | Take the device pixel ratio into account Change-Id: Icd2aa70018254975675d284ce77f6db02af9517a Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Fix plugins.qmltypes for designerThomas Hartmann2016-01-071-154/+0
| | | | | | | | | Multiple definitions of "QQuickItem" break the inheritance hierarchy required for Qt Quick Designer. Change-Id: I867a2fa7cdbb0054518c566ae31d8d9dc859b7a1 Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Implement default ProgressBar according to designsMitch Curtis2016-01-065-30/+424
| | | | | Change-Id: I7f973deec7453c4b80c03b3dc063f4d0dbe850c5 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Correct TextArea/TextField visualsMitch Curtis2016-01-062-1/+2
| | | | | Change-Id: I812f36c5ff7ca0e5cf3c7e8f866a756584a1a220 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Doc: remove obsolete reference to Pushing Items from Qt Quick ControlsNikita Krupenko2016-01-051-1/+0
| | | | | Change-Id: If94d9ffcfc17ea87a95205bc689fd916f22ddc70 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Doc: fix code snippets in StackViewNikita Krupenko2016-01-051-2/+2
| | | | | Change-Id: I73e1d49dcdde1ac0ca69ab3d1502489e20352cb3 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add title property to MenuBogDan Vatra2016-01-053-0/+30
| | | | | | Task-number: QTBUG-50203 Change-Id: Iad54bfdab06681aabe457d19a26273c3846c44ef Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Busy animators: fix access to childContainerNode()J-P Nurmi2016-01-052-10/+34
| | | | | | | | | Accessing QQuickItemPrivate::childContainerNode() in updateCurrentTime(), which is executed in render thread context, is not safe and may cause random crashes. Change-Id: Ibbdf387f7e8d593740452e56b819a6d7fd9341e6 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Material: declare dependency on QtGraphicalEffectsJ-P Nurmi2016-01-051-0/+1
| | | | | Change-Id: I5c79641b2f4e4eb39acc8d102e7d9494f71a9dd1 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* MenuItem: specify baseline offsetJ-P Nurmi2016-01-053-0/+3
| | | | | | Change-Id: I55eaf9d49785377c50d6c5dff6923c90a304d6bc Task-number: QTBUG-49468 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Material: add missing MenuItemJ-P Nurmi2016-01-052-0/+155
| | | | | Change-Id: I0cb591f6c5e09328b34df98772178b7fd6aa6035 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Docs: templatesJ-P Nurmi2016-01-053-0/+118
| | | | | | Change-Id: I4b28b2c847869a3768e40ba835cda04191ca18d6 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* StackView: fix stack clear on replace of the topmost itemNikita Krupenko2016-01-041-1/+1
| | | | | | | | | | | | | | | On item replace, StackView pops the topmost item (to use in transition) and call QQuickStackViewPrivate::replaceElements(), which delete items until it find the target item. When replacing the topmost item, it just clear the whole stack, as the target item not in the stack already and it procced to the bottom of the stack. This commit changes StackView to use pushElements() for replacing the topmost item, as there is nothing to replace. Task-number: QTBUG-50274 Change-Id: Iff2e1177ee2f8b2d4518b519b450ae4e89a4c963 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Universal: fix resources prefixJ-P Nurmi2016-01-042-2/+2
| | | | | Change-Id: I57f53777cba9f15e75722bbbad2a083dc3d0141a Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* SpinBox: specify baseline offsetJ-P Nurmi2016-01-043-0/+3
| | | | | | Change-Id: I81c8ea1dd8086cb2913998c5c91339b9b0ad0247 Task-number: QTBUG-49468 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* ItemDelegate: specify baseline offsetJ-P Nurmi2016-01-043-0/+3
| | | | | | Change-Id: I5bbcd762f2a70822262490835bf46caaa95f4c07 Task-number: QTBUG-49468 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Doc: fix attached property name in StackViewNikita Krupenko2016-01-041-1/+1
| | | | | Change-Id: I2d93803ddf64beb3fdc96b4ca76d58dbcba3bcdb Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Make sure that Dial is always circularMitch Curtis2016-01-043-17/+21
| | | | | | Task-number: QTBUG-49958 Change-Id: Ifbb14987e503aaa59651e65a2b8cfd99f2907154 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Remove unused Material::primaryJ-P Nurmi2015-12-252-62/+0
| | | | | Change-Id: Ied4c732ed9147f6f8f03b7165057e74a17274b7f Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Universal: add support for user-defined accent colorsJ-P Nurmi2015-12-2519-85/+108
| | | | | | Change-Id: I23863519269deddb3a6007657fc93e83f33be842 Task-number: QTBUG-50103 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Material ToolBar backgroundJ-P Nurmi2015-12-251-2/+10
| | | | | | Change-Id: I214c646de05b95d04a1b759820b93d02006c9206 Task-number: QTBUG-50025 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* ComboBox: fix displayText initializationJ-P Nurmi2015-12-231-1/+1
| | | | | | | | | Make ComboBox::textAt(idx) call ObjectModel::object(idx) to force initialization of the model items. Change-Id: If99c9263fa00ae6d21a92f11a45caf6e1f6b731c Task-number: QTBUG-50143 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Material: sync overlay background dimming with popup animsJ-P Nurmi2015-12-232-29/+44
| | | | | Change-Id: I709ce35ae21cf105d6328071cf8408e1f21e5d42 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Docs: high-DPI supportJ-P Nurmi2015-12-232-1/+64
| | | | | | | Change-Id: Id4308c610669bfff92d09f88eb90cdc240238cd9 Task-number: QTBUG-50002 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Doc: GalleryJ-P Nurmi2015-12-235-2/+70
| | | | | Change-Id: If8ec0bfef5db602472c54745102d6d20b61e5e47 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* QQuickStyleSelector: don't include an empty style name as a selectorJ-P Nurmi2015-12-231-1/+4
| | | | | | | | | | | | | | | | | | | This solves the recently surfaced QML import issue: ASSERT failure in QQmlImportDatabase::importDynamicPlugin: "Internal error: Plugin imported previously with different uri", file /home/qt/work/qt/qtdeclarative/src/qml/qml/qqmlimport.cpp, line 1947 Because QQuickStyleSelector included double slashes, the path ("Qt/labs/controls//") got converted to a uri with an extra dot in the end ("Qt.labs.controls."), which conflicted with the actual uri "Qt.labs.controls". Somehow related to qtbase commit 2e1de7f which changed QUrl behavior with local files. Change-Id: I8236a685a68dcffcd5f03c439236b2e8ea04492e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* QQuickApplicationWindow: add locale propertyLiang Qi2015-12-213-0/+33
| | | | | Change-Id: I1292d1fb856710e38add8d77ae6e3dac28137cd9 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Control: implement locale inheritanceLiang Qi2015-12-213-10/+71
| | | | | Change-Id: I2f16141b53dd44e471050ef6901ddc480c77895f Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Material: set default transitions for PopupJ-P Nurmi2015-12-215-1/+99
| | | | | Change-Id: I3844718c4a6fa0410f6d8670390878e4521976c0 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Drawer: fix regressionJ-P Nurmi2015-12-211-7/+8
| | | | | | | Avoid coordinate mapping issues by using QMouseEvent::windowPos(). Change-Id: I13be33c1bd4f3c0a40c955ee2bddf74e899c2728 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Replace Q_DECLARE_TYPEINFO(T, Q_COMPLEX_TYPE) by QML_DECLARE_TYPE(T)J-P Nurmi2015-12-2163-142/+103
| | | | | | | | | | | Q_COMPLEX_TYPE tells Qt containers that the type has a ctor/dtor and that it may not be moved in memory using memcpy(). QML types are never stored by value in Qt containers (non-copyable QObjects), so the type info declaration is superfluous. QML_DECLARE_TYPE, however, is useful (QTBUG-49920) and consistently used for all QtQuick types. Change-Id: I3bd1718b306fa7af85a623fa7a17e1b9653d2152 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Doc: stylesJ-P Nurmi2015-12-216-35/+189
| | | | | | Change-Id: I9d1beb753ec8525a3b1f1ce2a7afdc2621bc86af Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* Material: increase ToolBar sizeJ-P Nurmi2015-12-202-3/+3
| | | | | | | | Android has 46dp in portrait, 40dp in landscape. We had 26, which felt very small. Increase to 40 and see if it feels better. Change-Id: Iaf3152e3688e3288712f78247a1396c83ae42f89 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Drawer: tweak thresholds & offsetsJ-P Nurmi2015-12-201-10/+9
| | | | | | | | | | | This makes the drawer behave much better. Use increased threshold only for dragging, not for presses (steals too large area from the side). When closing by dragging from the outside of the drawer, set the offset so that the drawer starts moving when the finger reaches the drawer, not before. Change-Id: Ibb8bf8f67f490e0706b6230080907bb185bd25bc Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Use QFileSelector for qtlabscontrols.confJ-P Nurmi2015-12-191-1/+3
| | | | | | | | | | | Allows setting different defaults for different platforms, for example: qtlabscontrols.conf:Style=Default +android/qtlabscontrols.conf:Style=Material +windows/qtlabscontrols.conf:Style=Universal Change-Id: Ie84408f996bd665c343c2d73d5ec26c37c6c2491 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Allow closing an opening popupJ-P Nurmi2015-12-191-2/+2
| | | | | Change-Id: I4937808275c138fca09fa866b5df4d54d084357d Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Material: set transitions for ComboBox popupJ-P Nurmi2015-12-191-1/+15
| | | | | Change-Id: I24b7a05224073d5094b92f49ef7f1c908dac806b Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* QQuickApplicationWindowAttached: give full access to the overlayJ-P Nurmi2015-12-192-3/+3
| | | | | Change-Id: I704bec5ff8f59bebe100ebc19f322b0b556d2586 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Just tidy up QQuickPopup a bitJ-P Nurmi2015-12-194-48/+41
| | | | | Change-Id: Ibc8097299f0796f943682f0c1de628a8da87e430 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename Popup transitionsJ-P Nurmi2015-12-196-53/+55
| | | | | | | | | Use Android-inspired enter & exit, which eliminates the need of using a "transition" suffix, and also less prone to appear in auto-completion when new users try to open/show/close/hide popups. Change-Id: I3a448d3e9be33fbfffbf08488858aa63a70233f2 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Material: use QRgb instead of color namesJ-P Nurmi2015-12-191-318/+318
| | | | | | | | | | Constructing colors from QRgb (typedef unsigned int) is an order of magnitude faster than parsing named color strings. The same change was applied to Universal in 87a4d34. Change-Id: I3d44e913fe48a8fb2b7c1caf5f84e3291e60945d Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* StackView: update Material style transitionsJ-P Nurmi2015-12-181-6/+18
| | | | | Change-Id: I5d294424d526e6082d2e5f23e69ed0e1f8dfe212 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* SpinBox: fix behavior on touch devicesJ-P Nurmi2015-12-182-16/+48
| | | | | | Change-Id: Ic56f7882bc6070c85f87ab171ee7feb6dd0b260d Task-number: QTBUG-50033 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Fix laggy background fading for DrawersJ-P Nurmi2015-12-181-4/+15
| | | | | Change-Id: I01bfff39f0018694f0ac4109733a2a441d90da31 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Universal: set larger touch areas for SpinBox buttonsJ-P Nurmi2015-12-181-9/+11
| | | | | | Change-Id: Id7b6bb25b69deb1d0a7a12bb7d2416faf5a3adba Task-number: QTBUG-50033 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Material: show/hide transition for MenuJ-P Nurmi2015-12-181-0/+13
| | | | | Change-Id: I710aa7d12353374b852078379738c755073c5da3 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>