aboutsummaryrefslogtreecommitdiffstats
path: root/src/templates/qquickradiobutton.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-12-02 19:32:35 +0100
committerLiang Qi <liang.qi@theqtcompany.com>2015-12-02 19:32:35 +0100
commit1c7daa22ebfb4682e18c8afb911e8c784127ade3 (patch)
tree56633d70f422fde85741382ab4fde847de78c7e7 /src/templates/qquickradiobutton.cpp
parent0b11c7f5f4bd913abbc1362e71a2b68dc29a8ffe (diff)
parentcd4467753105e69b967d3aad8e6d890609dc830b (diff)
Merge remote-tracking branch 'origin/5.6' into dev
Diffstat (limited to 'src/templates/qquickradiobutton.cpp')
-rw-r--r--src/templates/qquickradiobutton.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/templates/qquickradiobutton.cpp b/src/templates/qquickradiobutton.cpp
index 92a14394..9aca5808 100644
--- a/src/templates/qquickradiobutton.cpp
+++ b/src/templates/qquickradiobutton.cpp
@@ -35,6 +35,9 @@
****************************************************************************/
#include "qquickradiobutton_p.h"
+#include "qquickcontrol_p_p.h"
+
+#include <QtGui/qpa/qplatformtheme.h>
QT_BEGIN_NAMESPACE
@@ -81,7 +84,7 @@ QT_BEGIN_NAMESPACE
}
\endcode
- \sa ExclusiveGroup, {Customizing RadioButton}, {Button Controls}
+ \sa ButtonGroup, {Customizing RadioButton}, {Button Controls}
*/
QQuickRadioButton::QQuickRadioButton(QQuickItem *parent) :
@@ -91,6 +94,11 @@ QQuickRadioButton::QQuickRadioButton(QQuickItem *parent) :
setAutoExclusive(true);
}
+QFont QQuickRadioButton::defaultFont() const
+{
+ return QQuickControlPrivate::themeFont(QPlatformTheme::RadioButtonFont);
+}
+
#ifndef QT_NO_ACCESSIBILITY
QAccessible::Role QQuickRadioButton::accessibleRole() const
{