Merge remote-tracking branch 'origin/4.3'

Change-Id: I01d7d8aa282f2bca94f85f55c832c76672e229f7
This commit is contained in:
Eike Ziller
2017-04-25 16:15:04 +02:00
28 changed files with 41044 additions and 64 deletions

View File

@@ -1397,6 +1397,7 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments,
m_snapshotHandler = new SnapshotHandler;
m_snapshotView = new SnapshotTreeView(m_snapshotHandler);
m_snapshotView->setSettings(settings, "Debugger.SnapshotView");
m_snapshotView->setIconSize(QSize(10, 10));
m_snapshotView->setModel(m_snapshotHandler->model());
m_snapshotWindow = addSearch(m_snapshotView, tr("Snapshots"), DOCKWIDGET_SNAPSHOTS);