From 927827c3c83f0221e5e06a5f2570ffddc43581f5 Mon Sep 17 00:00:00 2001
From: Martin Schultz <Martin.Schultz@rwth-aachen.de>
Date: Tue, 5 Sep 2017 16:33:39 +0200
Subject: [PATCH] fixed bad automerge which caused a segfault

---
 OpenFlipper.cc | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/OpenFlipper.cc b/OpenFlipper.cc
index e4013275..5aad25ad 100644
--- a/OpenFlipper.cc
+++ b/OpenFlipper.cc
@@ -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);
-- 
GitLab