forked from qt-creator/qt-creator
Remove Qt version checks.
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:
@@ -29,11 +29,7 @@
|
||||
#include "iosdevicemanager.h"
|
||||
|
||||
#include <qglobal.h>
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
|
||||
#include <QApplication>
|
||||
#else
|
||||
#include <QGuiApplication>
|
||||
#endif
|
||||
#include <QTextStream>
|
||||
#include <QDebug>
|
||||
#include <QXmlStreamWriter>
|
||||
@@ -504,11 +500,7 @@ IosTool::IosTool(QObject *parent):
|
||||
gdbServer(0),
|
||||
qmlServer(0)
|
||||
{
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
|
||||
outFile.open(stdout, QIODevice::WriteOnly, QFile::DontCloseHandle);
|
||||
#else
|
||||
outFile.open(stdout, QIODevice::WriteOnly, QFileDevice::DontCloseHandle);
|
||||
#endif
|
||||
out.setAutoFormatting(true);
|
||||
out.setCodec("UTF-8");
|
||||
}
|
||||
@@ -886,11 +878,7 @@ int main(int argc, char *argv[])
|
||||
qtArgc = 1;
|
||||
}
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
|
||||
QApplication a(qtArgc, &qtArg);
|
||||
#else
|
||||
QGuiApplication a(qtArgc, &qtArg);
|
||||
#endif
|
||||
IosTool tool;
|
||||
tool.run(args);
|
||||
int res = a.exec();
|
||||
|
||||
Reference in New Issue
Block a user