diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-02-12 15:53:02 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-02-12 15:53:02 +0100 |
| commit | 1a5413df3d9a0602f074562e2e92751df369d016 (patch) | |
| tree | 461a56ee176e873bee441fe4d899d7a683deca9d /src/controls/Private/AbstractCheckable.qml | |
| parent | a2f81b85d5dfa7fbd3b11557fe38de649a1f6914 (diff) | |
| parent | 9af9dabe3c88baa87befe5a4591d7f3508888307 (diff) | |
| download | qtquickcontrols-1a5413df3d9a0602f074562e2e92751df369d016.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/controls/TableView.qml
tests/auto/controls/data/tst_gridlayout.qml
Change-Id: I030bc50dc8fcf7b6b00e183dc3a67c3cd012f3fb
Diffstat (limited to 'src/controls/Private/AbstractCheckable.qml')
| -rw-r--r-- | src/controls/Private/AbstractCheckable.qml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/controls/Private/AbstractCheckable.qml b/src/controls/Private/AbstractCheckable.qml index 0e685dea..42abebe5 100644 --- a/src/controls/Private/AbstractCheckable.qml +++ b/src/controls/Private/AbstractCheckable.qml @@ -36,6 +36,7 @@ import QtQuick 2.2 import QtQuick.Controls 1.2 +import QtQuick.Controls.Private 1.0 /*! \qmltype AbstractCheckable @@ -109,7 +110,7 @@ Control { id: mouseArea focus: true anchors.fill: parent - hoverEnabled: true + hoverEnabled: Settings.hoverEnabled enabled: !keyPressed property bool keyPressed: false |