feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote branch 'origin/1.3'

Browse Source
This commit is contained in:
Oswald Buddenhagen
2009-12-04 21:20:20 +01:00
parent b08a349da9 e408159bfe
commit 5628f945fb
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/gccparser.cpp
View File

@@ -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);
} }

4
src/plugins/qt4projectmanager/qt4nodes.cpp
View File

@@ -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;