Merge remote branch 'origin/1.3'

src/plugins/projectexplorer/gccparser.cpp

@@ -45,7 +45,7 @@ GccParser::GccParser()
     m_regExpLinker.setMinimal(true);
 
     //make[4]: Entering directory `/home/kkoehne/dev/ide-explorer/src/plugins/qtscripteditor'
-    m_makeDir.setPattern("^make.*: (\\w+) directory .(.+).$");
+    m_makeDir.setPattern("^(?:mingw32-)?make.*: (\\w+) directory .(.+).$");
     m_makeDir.setMinimal(true);
 }
 

src/plugins/qt4projectmanager/qt4nodes.cpp

@@ -584,8 +584,10 @@ void Qt4PriFileNode::changeFiles(const FileType fileType,
     *notChanged = filePaths;
 
     // Check for modified editors
-    if (!saveModifiedEditors(m_projectFilePath))
+    if (!saveModifiedEditors(m_projectFilePath)) {
+        delete reader;
         return;
+    }
 
     // Check if file is readonly
     ProEditorModel proModel;