forked from qt-creator/qt-creator
Merge remote branch 'origin/2.0'
Conflicts: doc/qtcreator.qdoc
This commit is contained in:
@@ -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()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user