diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-04-06 22:13:27 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-06 22:13:27 +0200 |
| commit | 2784902b9b42de127c0903c3d6b076297cf47a07 (patch) | |
| tree | 3b95b5cdf61c951f7d54fccf47b14a0ccbce7e6c /src/quicktemplates2/qquickabstractbutton.cpp | |
| parent | 0a96b436d9845899888f7c7d153f0d9909ce4c06 (diff) | |
| parent | f8224c9c9e3dfc1fd4cc3bff915e7e2d1c411d05 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/imports/templates/qtquicktemplates2plugin.cpp
Change-Id: I4a07d331163a85a0fb98a5f58f3970863f8da0fc
Diffstat (limited to 'src/quicktemplates2/qquickabstractbutton.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickabstractbutton.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp index c0d8101e..9b1a51fb 100644 --- a/src/quicktemplates2/qquickabstractbutton.cpp +++ b/src/quicktemplates2/qquickabstractbutton.cpp @@ -342,6 +342,9 @@ QQuickAbstractButton::QQuickAbstractButton(QQuickItem *parent) setActiveFocusOnTab(true); setFocusPolicy(Qt::StrongFocus); setAcceptedMouseButtons(Qt::LeftButton); +#if QT_CONFIG(cursor) + setCursor(Qt::ArrowCursor); +#endif } QQuickAbstractButton::QQuickAbstractButton(QQuickAbstractButtonPrivate &dd, QQuickItem *parent) @@ -350,6 +353,9 @@ QQuickAbstractButton::QQuickAbstractButton(QQuickAbstractButtonPrivate &dd, QQui setActiveFocusOnTab(true); setFocusPolicy(Qt::StrongFocus); setAcceptedMouseButtons(Qt::LeftButton); +#if QT_CONFIG(cursor) + setCursor(Qt::ArrowCursor); +#endif } QQuickAbstractButton::~QQuickAbstractButton() |