aboutsummaryrefslogtreecommitdiffstats
path: root/src/templates/qquicklabel.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Store explicit and resolved font separatelyJ-P Nurmi2016-03-151-23/+15
| | | | | | | Change-Id: I80bd45244077cd75f24c4ca1af6485f4c6a23b39 Task-number: QTBUG-50984 Task-number: QTBUG-51696 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Fix font comparisonsJ-P Nurmi2016-03-111-3/+9
| | | | | | | | | | | | | | | | | | | | When inheritance of explicitly set font attributes is involved, it is important to compare the resolve mask in addition to comparing the attribute values to avoid losing the information whether a specific attribute is set explicitly. For example, QFont::operator==() returns true for two fonts that are both bold regardless of whether only one of them has explicit weight set. Therefore, setFont() must not ignore fonts resolve mask. Furthermore, the fontChanged() notifier must be emitted only if the actual attribute values change, not if only the resolve mask changes. Change-Id: I2eb7a071c0eaecd2f8d2f6074c4ce6ed6764a6e9 Task-number: QTBUG-50984 Task-number: QTBUG-51696 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Docs: add notes about the Qt.labs moduleJ-P Nurmi2016-01-191-0/+2
| | | | | Change-Id: I65c37f661689bf30e7a9119bb877dce68eeb634c Reviewed-by: Topi Reiniƶ <topi.reinio@theqtcompany.com>
* Control: resolve the font a bit earlierLiang Qi2015-12-011-0/+15
| | | | | | | Also applied to QQuickLabel, QQuickTextArea and QQuickTextField. Change-Id: Icf10500905980445809eb2375e8957db2c41e03c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Added QQuickControl::accessibleRole() and etcLiang Qi2015-10-291-3/+2
| | | | | | | | * m_accessibleRole was removed * also applied to QQuickLabel, QQuickTextArea and QQuickTextField Change-Id: I4b487f32cccfba0e16b3dba7e39882e8cd7ea616 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* QQuickControl: dynamically create a11y attached objectLiang Qi2015-10-211-14/+39
| | | | | | | Using QAccessible::ActivationObserver approach. Change-Id: Ib99c1f9b7b0c37a3e8a4747db265c9df77acc1f8 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Docs: LabelJ-P Nurmi2015-10-141-0/+30
| | | | | Change-Id: I744f622edbc6589e9371518f82431220b667e03e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Rename QtQuick.Templates 2.0 to Qt.labs.templates 1.0J-P Nurmi2015-10-011-1/+1
| | | | | | Change-Id: I3263a600065dfa2bfe7334ec44a74e2dca83aa36 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Templates: fix font rendering in Label, TextArea and TextFieldLiang Qi2015-09-181-5/+10
| | | | | Change-Id: I264e0b86dcf54623b545d695f1a23f7d4a08972b Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename libQtQuickControls to libQtQuickTemplatesJ-P Nurmi2015-09-161-0/+166
Change-Id: I1e663bb7be2be8b3d4edf0c038862cc2150aec40 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>