Commit 927827c3 authored by Martin Schultz's avatar Martin Schultz

fixed bad automerge which caused a segfault

parent 3af877ca
......@@ -492,23 +492,6 @@ int main(int argc, char **argv)
QApplication::setColorSpec( QApplication::CustomColor );
#if QT_VERSION >= 0x050500
switch (parseCommandLine(parser, &errorMessage)) {
case CommandLineOk:
break;
case CommandLineError:
fputs(qPrintable(errorMessage), stderr);
fputs("\n\n", stderr);
fputs(qPrintable(parser.helpText()), stderr);
return 1;
case CommandLineVersionRequested:
printf("%s %s\n", qPrintable(QCoreApplication::applicationName()),
qPrintable(QCoreApplication::applicationVersion()));
return 0;
case CommandLineHelpRequested:
parser.showHelp();
Q_UNREACHABLE();
}
QSurfaceFormat format;
format.setVersion(4, 4);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment