aboutsummaryrefslogtreecommitdiffstats
path: root/src/templates/qquickbutton_p.h
Commit message (Collapse)AuthorAgeFilesLines
* Replace Q_DECLARE_TYPEINFO(T, Q_COMPLEX_TYPE) by QML_DECLARE_TYPE(T)J-P Nurmi2015-12-211-2/+2
| | | | | | | | | | | 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>
* Promote Button::highlighted to AbstractButtonJ-P Nurmi2015-12-031-13/+0
| | | | | Change-Id: I0e17a6c25dfd89fdb547720e9a626c2ec9d7765a Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Added defaultFont() for QQuickControl and etcLiang Qi2015-12-011-0/+3
| | | | | | | | | | | | | | | The map between controls and QPlatformTheme::Font: * QQuickControl and etc: SystemFont * QQuickButton: PushButtonFont * QQuickToolButton: ToolButtonFont * QQuickCheckBox: CheckBoxFont * QQuickRadioButton: RadioButtonFont * QQuickLabel: LabelFont * QQuickGroupBox: MdiSubWindowTitleFont (tmp) * QQuickTabButton: DockWidgetTitleFont (tmp) Change-Id: If8c0239ece673941164fd97f52240ef27d97b950 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Button: add highlighted propertyMitch Curtis2015-11-131-0/+7
| | | | | | | | Since our focus is on embedded, this will be used as an alternative to the "isDefault" property that exists in Qt Quick Controls. Change-Id: I9b6612e3c3b30040295aeea6d217e90a17af4ebe Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename QtQuick.Templates 2.0 to Qt.labs.templates 1.0J-P Nurmi2015-10-011-3/+3
| | | | | | Change-Id: I3263a600065dfa2bfe7334ec44a74e2dca83aa36 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Rename libQtQuickControls to libQtQuickTemplatesJ-P Nurmi2015-09-161-0/+73
Change-Id: I1e663bb7be2be8b3d4edf0c038862cc2150aec40 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>