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

Allow infinite timeout in synchronousprocess, make openProjects public.

Browse Source
This commit is contained in:
Friedemann Kleint
2009-07-20 12:42:22 +02:00
parent 5053855581
commit 7ff46c0e53
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/utils/synchronousprocess.cpp
View File

@@ -38,6 +38,8 @@
#include <QtGui/QApplication>
#include <limits.h>
enum { debug = 0 };
enum { defaultMaxHangTimerCount = 10 };
@@ -167,12 +169,16 @@ SynchronousProcess::~SynchronousProcess()
void SynchronousProcess::setTimeout(int timeoutMS)
{
m_d->m_maxHangTimerCount = qMax(2, timeoutMS / 1000);
if (timeoutMS >= 0) {
m_d->m_maxHangTimerCount = qMax(2, timeoutMS / 1000);
} else {
m_d->m_maxHangTimerCount = INT_MAX;
}
}
int SynchronousProcess::timeout() const
{
return 1000 * m_d->m_maxHangTimerCount;
return m_d->m_maxHangTimerCount == INT_MAX ? -1 : 1000 * m_d->m_maxHangTimerCount;
}
void SynchronousProcess::setStdOutCodec(QTextCodec *c)