Merge remote branch 'origin/1.3'

2009-12-04 21:20:20 +01:00
parent b08a349da9 e408159bfe
commit 5628f945fb
2 changed files with 4 additions and 2 deletions
--- 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);
 }