Merge commit 'origin/1.3'

This commit is contained in:
con
2009-11-05 19:00:23 +01:00
34 changed files with 297 additions and 138 deletions

View File

@@ -114,7 +114,7 @@ QString ToolChain::toolChainName(ToolChainType tc)
// case LinuxICC:
// return QCoreApplication::translate("ToolChain", "Intel C++ Compiler (Linux)");
case MinGW:
return QCoreApplication::translate("ToolChain", "MinGW");
return QString::fromLatin1("MinGW");
case MSVC:
return QCoreApplication::translate("ToolChain", "Microsoft Visual C++");
case WINCE: