aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@digia.com>2013-12-03 13:39:47 +0100
committerUlf Hermann <ulf.hermann@digia.com>2013-12-03 14:01:53 +0100
commitb7ac243c3b91557fc9c55894706a678eefe87265 (patch)
tree76c1a21bab4eb6fe5a87f61b057b69e369875540
parentafb0f8772b0d585ae77373c26515a2750e99cfe1 (diff)
WelcomeScreen: Avoid loading of invalid pictures
Apparently the QML engine also loads pictures for invisible Image objects. The pictures icons for examples and tutorials on the welcome screen thus always try to load an extra video icon, which always fails. By setting the URL to an empty string if the example or tutorial being loaded is no video we can avoid that. Change-Id: Ibafc11ed233f386bbbf1e7a4830fcb34bc1cd55d Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
-rw-r--r--share/qtcreator/welcomescreen/widgets/CustomizedGridView.qml4
1 files changed, 2 insertions, 2 deletions
diff --git a/share/qtcreator/welcomescreen/widgets/CustomizedGridView.qml b/share/qtcreator/welcomescreen/widgets/CustomizedGridView.qml
index 4317bd2f5d..bbe6b03109 100644
--- a/share/qtcreator/welcomescreen/widgets/CustomizedGridView.qml
+++ b/share/qtcreator/welcomescreen/widgets/CustomizedGridView.qml
@@ -47,8 +47,8 @@ GridView {
property string mockupSource: model.imageSource
property string helpSource: model.imageUrl !== "" ? sourcePrefix + encodeURI(model.imageUrl) : ""
- imageSource: model.imageSource === undefined ? helpSource : mockupSource
- videoSource: model.imageSource === undefined ? model.imageUrl : mockupSource
+ imageSource: isVideo ? "" : (model.imageSource === undefined ? helpSource : mockupSource)
+ videoSource: isVideo ? (model.imageSource === undefined ? model.imageUrl : mockupSource) : ""
caption: model.name;
description: model.description