forked from qt-creator/qt-creator
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
This commit is contained in:
@@ -930,6 +930,7 @@ bool ResourceModel::reload()
|
|||||||
const bool result = m_resource_file.load();
|
const bool result = m_resource_file.load();
|
||||||
if (result)
|
if (result)
|
||||||
setDirty(false);
|
setDirty(false);
|
||||||
|
reset();
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -489,9 +489,7 @@ bool ResourceView::load(QString fileName)
|
|||||||
if (!fi.exists())
|
if (!fi.exists())
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
const bool result = m_qrcModel->reload();
|
return m_qrcModel->reload();
|
||||||
reset();
|
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ResourceView::save(void)
|
bool ResourceView::save(void)
|
||||||
|
Reference in New Issue
Block a user