Commit 5628f945 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

Merge remote branch 'origin/1.3'

parents b08a349d e408159b
...@@ -45,7 +45,7 @@ GccParser::GccParser() ...@@ -45,7 +45,7 @@ GccParser::GccParser()
m_regExpLinker.setMinimal(true); m_regExpLinker.setMinimal(true);
//make[4]: Entering directory `/home/kkoehne/dev/ide-explorer/src/plugins/qtscripteditor' //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); m_makeDir.setMinimal(true);
} }
......
...@@ -584,8 +584,10 @@ void Qt4PriFileNode::changeFiles(const FileType fileType, ...@@ -584,8 +584,10 @@ void Qt4PriFileNode::changeFiles(const FileType fileType,
*notChanged = filePaths; *notChanged = filePaths;
// Check for modified editors // Check for modified editors
if (!saveModifiedEditors(m_projectFilePath)) if (!saveModifiedEditors(m_projectFilePath)) {
delete reader;
return; return;
}
// Check if file is readonly // Check if file is readonly
ProEditorModel proModel; ProEditorModel proModel;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment