diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-02-06 14:17:01 +0100 |
---|---|---|
committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2013-02-06 15:14:00 +0100 |
commit | 56d96cd665302d6d0d6a76a7074292096c78528f (patch) | |
tree | e5b01b43f66a797d65a85decf0ae6155cee9e18a | |
parent | 91dc7ddb283771d1d2a29fe327770d9f0080304c (diff) | |
download | qt-creator-56d96cd665302d6d0d6a76a7074292096c78528f.tar.gz |
QML-Designer: Fix crash when loading form.
Change-Id: Ia540636acf13744a631e097377650d002fdc7e09
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
-rw-r--r-- | src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp index 73743a819c..6edca83b73 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp @@ -188,8 +188,14 @@ void ResourceItemDelegate::paint(QPainter *painter, QSize ResourceItemDelegate::sizeHint(const QStyleOptionViewItem &/*option*/, const QModelIndex &index) const { - QIcon icon(m_model->fileIcon(index)); - return icon.availableSizes().front() + QSize(25, 4); + QSize result = QSize(25, 4); + const QIcon icon(m_model->fileIcon(index)); + if (!icon.isNull()) { + const QList<QSize> sizes = icon.availableSizes(); + if (!sizes.isEmpty()) + result += sizes.front(); + } + return result; } void ResourceItemDelegate::setModel(QFileSystemModel *model) |