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

6
src/libs/qmljs/qmljsplugindumper.cpp
View File

@@ -262,11 +262,7 @@ static void printParseWarnings(const QString &libraryPath, const QString &warnin
static QString qmlPluginDumpErrorMessage(QProcess *process)
{
QString errorMessage;
#if QT_VERSION >= 0x050000
const QString binary = QDir::toNativeSeparators(process->program());
#else
const QString binary = QLatin1String("qmlplugindump");
#endif
switch (process->error()) {
case QProcess::FailedToStart:
errorMessage = PluginDumper::tr("\"%1\" failed to start: %2").arg(binary, process->errorString());
@@ -286,9 +282,7 @@ static QString qmlPluginDumpErrorMessage(QProcess *process)
errorMessage = PluginDumper::tr("\"%1\" returned exit code %2.").arg(binary).arg(process->exitCode());
break;
}
#if QT_VERSION >= 0x050000
errorMessage += QLatin1Char('\n') + PluginDumper::tr("Arguments: %1").arg(process->arguments().join(QLatin1Char(' ')));
#endif
if (process->error() != QProcess::FailedToStart) {
const QString stdErr = QString::fromLocal8Bit(process->readAllStandardError());
if (!stdErr.isEmpty()) {