diff options
| author | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2013-02-04 10:28:16 +0100 |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2013-02-04 14:08:37 +0100 |
| commit | a6c8628c126a0f00cf0edca77edd09b59ffddcb1 (patch) | |
| tree | cd7c0e593b5c213f584493d39755e23f13ed786f /lib | |
| parent | fa3b69d7a9cd0d534051d02f25f07124f54e6c0d (diff) | |
| download | qt-creator-a6c8628c126a0f00cf0edca77edd09b59ffddcb1.tar.gz | |
WelcomePage: add combox to filer Qt versions
Task-number: QTCREATORBUG-8377
Change-Id: I6693d4ed9cf3791e4cd791463a1b00a23dc4ffff
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/qtcreator/qtcomponents/custom/ChoiceList.qml | 2 | ||||
| -rw-r--r-- | lib/qtcreator/qtcomponents/custom/private/ChoiceListPopup.qml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/qtcreator/qtcomponents/custom/ChoiceList.qml b/lib/qtcreator/qtcomponents/custom/ChoiceList.qml index dcb7416dc1..571ce5fc70 100644 --- a/lib/qtcreator/qtcomponents/custom/ChoiceList.qml +++ b/lib/qtcreator/qtcomponents/custom/ChoiceList.qml @@ -61,7 +61,7 @@ Item { property alias styledItem: choiceList sourceComponent: background anchors.fill: parent - property string currentItemText: model.get(currentIndex).text + property string currentItemText: model.get(currentIndex) } Private.ChoiceListPopup { diff --git a/lib/qtcreator/qtcomponents/custom/private/ChoiceListPopup.qml b/lib/qtcreator/qtcomponents/custom/private/ChoiceListPopup.qml index c8b66e3552..ec0d2567c1 100644 --- a/lib/qtcreator/qtcomponents/custom/private/ChoiceListPopup.qml +++ b/lib/qtcreator/qtcomponents/custom/private/ChoiceListPopup.qml @@ -55,7 +55,7 @@ MouseArea { property int previousCurrentIndex: -1 property alias model: listView.model property alias currentIndex: listView.currentIndex - property string currentText: model && currentIndex >= 0 ? model.get(currentIndex).text : "" + property string currentText: model && currentIndex >= 0 ? model.get(currentIndex) : "" // buttonPressed will be true when the mouse press starts // while the popup is closed. At that point, this component can be @@ -241,7 +241,7 @@ MouseArea { property alias index: itemDelegate.theIndex property Item styledItem: choiceList property bool highlighted: theIndex == listView.highlightedIndex - property string itemText: popup.model.get(theIndex).text + property string itemText: text sourceComponent: listItem } |