diff options
| -rw-r--r-- | src/controls/CheckBox.qml | 3 | ||||
| -rw-r--r-- | src/controls/RadioButton.qml | 2 | ||||
| -rw-r--r-- | src/controls/controls.pro | 1 | ||||
| -rw-r--r-- | src/private/AbstractCheckable.qml (renamed from src/controls/AbstractCheckable.qml) | 15 | ||||
| -rw-r--r-- | src/private/private.pro | 1 | ||||
| -rw-r--r-- | src/private/qmldir | 1 |
6 files changed, 12 insertions, 11 deletions
diff --git a/src/controls/CheckBox.qml b/src/controls/CheckBox.qml index 8d693c70..c9f1b8f1 100644 --- a/src/controls/CheckBox.qml +++ b/src/controls/CheckBox.qml @@ -40,9 +40,10 @@ import QtQuick 2.0 import QtQuick.Controls 1.0 -import "Styles/Settings.js" as Settings import QtQuick.Controls.Private 1.0 +import "Styles/Settings.js" as Settings + /*! \qmltype CheckBox \inqmlmodule QtQuick.Controls 1.0 diff --git a/src/controls/RadioButton.qml b/src/controls/RadioButton.qml index d5b60291..cee7d2c6 100644 --- a/src/controls/RadioButton.qml +++ b/src/controls/RadioButton.qml @@ -40,6 +40,8 @@ import QtQuick 2.0 import QtQuick.Controls 1.0 +import QtQuick.Controls.Private 1.0 + import "Styles/Settings.js" as Settings // jb : Size should not depend on background, we should make it consistent diff --git a/src/controls/controls.pro b/src/controls/controls.pro index 1324aa51..507dda4f 100644 --- a/src/controls/controls.pro +++ b/src/controls/controls.pro @@ -7,7 +7,6 @@ QT += qml quick widgets gui-private core-private QMAKE_DOCS = $$PWD/doc/qtquickcontrols.qdocconf QML_FILES = \ - AbstractCheckable.qml \ ApplicationWindow.qml \ Button.qml \ CheckBox.qml \ diff --git a/src/controls/AbstractCheckable.qml b/src/private/AbstractCheckable.qml index 9bf5342e..ff65ab57 100644 --- a/src/controls/AbstractCheckable.qml +++ b/src/private/AbstractCheckable.qml @@ -40,7 +40,6 @@ import QtQuick 2.0 import QtQuick.Controls 1.0 -import QtQuick.Controls.Private 1.0 /*! \qmltype AbstractCheckable @@ -95,8 +94,6 @@ Control { property bool activeFocusOnPress: false /*! - \qmlproperty ExclusiveGroup AbstractCheckable::exclusiveGroup - This property stores the ExclusiveGroup that the control belongs to. */ property ExclusiveGroup exclusiveGroup: null @@ -109,12 +106,6 @@ Control { /*! \internal */ property var __cycleStatesHandler: cycleRadioButtonStates - /*! \internal */ - onExclusiveGroupChanged: { - if (exclusiveGroup) - exclusiveGroup.bindCheckable(abstractCheckable) - } - MouseArea { id: mouseArea focus: true @@ -135,6 +126,12 @@ Control { } } + /*! \internal */ + onExclusiveGroupChanged: { + if (exclusiveGroup) + exclusiveGroup.bindCheckable(abstractCheckable) + } + Keys.onPressed: { if (event.key === Qt.Key_Space && !event.isAutoRepeat && !mouseArea.pressed) mouseArea.keyPressed = true; diff --git a/src/private/private.pro b/src/private/private.pro index 6f4caaaf..d36c08e2 100644 --- a/src/private/private.pro +++ b/src/private/private.pro @@ -24,6 +24,7 @@ OTHER_FILES += \ # private qml files QML_FILES += \ + AbstractCheckable.qml \ TabBar.qml \ BasicButton.qml \ Control.qml \ diff --git a/src/private/qmldir b/src/private/qmldir index 788e341e..19886b2d 100644 --- a/src/private/qmldir +++ b/src/private/qmldir @@ -1,5 +1,6 @@ module QtQuick.Controls.Private plugin privateplugin +AbstractCheckable 1.0 AbstractCheckable.qml Control 1.0 Control.qml FocusFrame 1.0 FocusFrame.qml BasicButton 1.0 BasicButton.qml |