diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-16 15:29:09 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-16 15:29:09 +0200 |
| commit | e9fffaa5e11c941e363114412b562d67c97ee145 (patch) | |
| tree | 5713e73ac6aa25cd95941ab98b697625fb035e97 /src/controls/Private | |
| parent | 13d66e8ae27761abfd0b81577c2aa2c7ab3e39c5 (diff) | |
| parent | 6a7a824b970d12471f9219c84a57eb91231c59fe (diff) | |
| download | qtquickcontrols-e9fffaa5e11c941e363114412b562d67c97ee145.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
.qmake.conf
src/controls/Styles/Base/ComboBoxStyle.qml
Change-Id: Iaf45bc77be0bd80d21af49a5663dc9fba3caa0da
Diffstat (limited to 'src/controls/Private')
| -rw-r--r-- | src/controls/Private/Style.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/Private/Style.qml b/src/controls/Private/Style.qml index 53497517..519ea958 100644 --- a/src/controls/Private/Style.qml +++ b/src/controls/Private/Style.qml @@ -48,6 +48,6 @@ import QtQuick.Controls.Private 1.0 */ AbstractStyle { - /*! The control attached to this style */ + /*! The control this style is attached to. */ readonly property Item control: __control } |