Merge branch 'master' into 1.4

This commit is contained in:
Arin Alexander 2016-09-16 03:32:32 +04:00
commit 2b8422a9f3

View File

@ -142,7 +142,6 @@ void QObjectPropertyModel::slotObjectDestroyed(QObject *obj)
m_objects.removeOne(obj); m_objects.removeOne(obj);
if (m_object == obj){ if (m_object == obj){
m_object=0; m_object=0;
if (!m_objects.isEmpty()) m_object=m_objects.at(0);
initModel(); initModel();
} }
} }