Merge remote branch 'origin/2.0'

Conflicts:
	doc/qtcreator.qdoc
This commit is contained in:
con
2010-07-13 11:34:44 +02:00
22 changed files with 327 additions and 66 deletions

View File

@@ -207,6 +207,8 @@ void AttachCoreDialog::setCoreFile(const QString &fileName)
//
///////////////////////////////////////////////////////////////////////
#ifndef Q_OS_WIN
static bool isUnixProcessId(const QString &procname)
{
for (int i = 0; i != procname.size(); ++i)
@@ -288,6 +290,7 @@ static QList<ProcData> unixProcessList()
}
return rc;
}
#endif // Q_OS_WIN
static QList<ProcData> processList()
{