Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

src/shared/qrceditor/resourcefile.cpp

@@ -930,6 +930,7 @@ bool ResourceModel::reload()
     const bool result = m_resource_file.load();
     if (result)
         setDirty(false);
+    reset();
     return result;
 }
 

src/shared/qrceditor/resourceview.cpp

@@ -489,9 +489,7 @@ bool ResourceView::load(QString fileName)
     if (!fi.exists())
         return false;
 
-    const bool result = m_qrcModel->reload();
-    reset();
-    return result;
+    return m_qrcModel->reload();
 }
 
 bool ResourceView::save(void)