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

Remove Qt version checks.

Browse Source 
Qt 5.3 is the minimum requirement these days. Remove all fallback code
from sources and project files.

Change-Id: If6188a471197acadda4d6baee71804ba1a8026c6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Christian Kandeler
2014-08-29 13:18:41 +02:00
parent 6f58e5b798
commit 847f10e9cc
63 changed files with 68 additions and 788 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -614,14 +614,7 @@ bool SynchronousProcess::readDataFromProcess(QProcess &p, int timeOutMS,
}
// Prompt user, pretend we have data if says 'No'.
const bool hang = !hasData && !finished;
if (hang && showTimeOutMessageBox) {
QString binary;
#if QT_VERSION >= 0x050000
binary = p.program();
#endif
if (!askToKill(binary))
hasData = true;
}
hasData = hang && showTimeOutMessageBox && !askToKill(p.program());
} while (hasData && !finished);
if (syncDebug)
qDebug() << "<readDataFromProcess" << finished;