aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@digia.com>2014-03-27 17:50:58 +0100
committerEike Ziller <eike.ziller@digia.com>2014-03-31 12:30:11 +0200
commit29b0c1022c2b8b978903e9efed519504bf6613e6 (patch)
tree09f3dcaa9d17bef2da7f612db47cf9088da73dcc /share
parent8dcd44ad35d3e1283b4e2c8d66740a0fba04e589 (diff)
WelcomePage: Support additional (non-qt) example sets
Added with setting "Help/InstalledExamples" which is a string list, each string is a triple of (display name, manifest parse path, examples path), joined with '|'. If a documentationPath for a Qt version is already added through the InstalledExamples setting, we do not show an extra combo box item for it. That makes it possible for an installer to register a single example set for the same Qt version in different variants (e.g. iOS, Android x86, Android arm) Change-Id: I42dd8f9ca9cb6cee247e3dc8ce9d014e56852e79 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'share')
-rw-r--r--share/qtcreator/welcomescreen/examples.qml12
1 files changed, 6 insertions, 6 deletions
diff --git a/share/qtcreator/welcomescreen/examples.qml b/share/qtcreator/welcomescreen/examples.qml
index 07c98f7bbc..2509922ce6 100644
--- a/share/qtcreator/welcomescreen/examples.qml
+++ b/share/qtcreator/welcomescreen/examples.qml
@@ -68,7 +68,7 @@ Rectangle {
width: 200
anchors.rightMargin: 80
anchors.right: parent.right
- model: qtVersionModel
+ model: exampleSetModel
textRole: "text"
@@ -76,16 +76,16 @@ Rectangle {
if (comboBox.model === undefined)
return;
- examplesModel.filterForQtById(comboBox.model.getId(currentIndex))
+ examplesModel.filterForExampleSet(currentIndex)
}
- property int qtIndex: examplesModel.qtVersionIndex
+ property int theIndex: examplesModel.exampleSetIndex
- onQtIndexChanged: {
+ onTheIndexChanged: {
if (comboBox.model === undefined)
return;
- if (qtIndex != currentIndex)
- currentIndex = qtIndex;
+ if (theIndex != currentIndex)
+ currentIndex = theIndex;
}
}