feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix order of initialization

Browse Source 
m_resIconSize is passed to m_iconProvider's ctor, so it should
be initialized first.

Change-Id: I7a5dfb648cce029869b1e8a36eee761a5bd46faf
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
This commit is contained in:
Orgad Shaneh
2014-05-21 20:54:52 +03:00
committed by Orgad Shaneh
parent 6f5c2ea5b0
commit caf296500d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
View File

@@ -59,9 +59,9 @@ namespace QmlDesigner {
ItemLibraryWidget::ItemLibraryWidget(QWidget *parent) : ItemLibraryWidget::ItemLibraryWidget(QWidget *parent) :
QFrame(parent), QFrame(parent),
m_iconProvider(m_resIconSize),
m_itemIconSize(24, 24), m_itemIconSize(24, 24),
m_resIconSize(24, 24), m_resIconSize(24, 24),
m_iconProvider(m_resIconSize),
m_itemsView(new QQuickView()), m_itemsView(new QQuickView()),
m_resourcesView(new Internal::ItemLibraryTreeView(this)), m_resourcesView(new Internal::ItemLibraryTreeView(this)),
m_filterFlag(QtBasic), m_filterFlag(QtBasic),

2
src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
View File

@@ -121,9 +121,9 @@ private slots:
void setCurrentIndexOfStackedWidget(int index); void setCurrentIndexOfStackedWidget(int index);
private: private:
ItemLibraryFileIconProvider m_iconProvider;
QSize m_itemIconSize; QSize m_itemIconSize;
QSize m_resIconSize; QSize m_resIconSize;
ItemLibraryFileIconProvider m_iconProvider;
QPointer<ItemLibraryInfo> m_itemLibraryInfo; QPointer<ItemLibraryInfo> m_itemLibraryInfo;