diff --git a/src/plugins/projectexplorer/gccparser.cpp b/src/plugins/projectexplorer/gccparser.cpp index f4a1e7be750e13600a103451dca349e90b0d2418..bc6fc6cadfcd904ad1b7df200e36db3048277a11 100644 --- a/src/plugins/projectexplorer/gccparser.cpp +++ b/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); } diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp index e18d6ec5a016507d91489568d1735c583f8c512b..a359ed2e3c0340eb0e4cdc38abad70a75fd67d2d 100644 --- a/src/plugins/qt4projectmanager/qt4nodes.cpp +++ b/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;