From caf296500da2b3a4f947dc0590069ab8bae18641 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Wed, 21 May 2014 20:54:52 +0300 Subject: [PATCH] QmlDesigner: Fix order of initialization m_resIconSize is passed to m_iconProvider's ctor, so it should be initialized first. Change-Id: I7a5dfb648cce029869b1e8a36eee761a5bd46faf Reviewed-by: Marco Bubke --- .../qmldesigner/components/itemlibrary/itemlibrarywidget.cpp | 2 +- .../qmldesigner/components/itemlibrary/itemlibrarywidget.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp index 34e1155faf6..9f67f4d5a95 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp @@ -59,9 +59,9 @@ namespace QmlDesigner { ItemLibraryWidget::ItemLibraryWidget(QWidget *parent) : QFrame(parent), - m_iconProvider(m_resIconSize), m_itemIconSize(24, 24), m_resIconSize(24, 24), + m_iconProvider(m_resIconSize), m_itemsView(new QQuickView()), m_resourcesView(new Internal::ItemLibraryTreeView(this)), m_filterFlag(QtBasic), diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h index 7aecb949820..a60fffa3948 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h @@ -121,9 +121,9 @@ private slots: void setCurrentIndexOfStackedWidget(int index); private: - ItemLibraryFileIconProvider m_iconProvider; QSize m_itemIconSize; QSize m_resIconSize; + ItemLibraryFileIconProvider m_iconProvider; QPointer m_itemLibraryInfo;