From a2cc7ba54a6845494c43a2754aaca0f6ff8a5edd Mon Sep 17 00:00:00 2001
From: Martin Schultz <Martin.Schultz@rwth-aachen.de>
Date: Tue, 10 Apr 2018 14:23:53 +0200
Subject: [PATCH] changed options and settings for opengl profile and version
 selection, so they are not always overwritten

---
 OpenFlipper.cc          |  1 -
 common/GlobalOptions.cc | 12 ++++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/OpenFlipper.cc b/OpenFlipper.cc
index 2ce8f900..12844cd4 100644
--- a/OpenFlipper.cc
+++ b/OpenFlipper.cc
@@ -358,7 +358,6 @@ CommandLineParseResult parseCommandLine(QCommandLineParser &parser, QString *err
  parser.addOption(samplesOption);
  
  QCommandLineOption profileOption("profile",QCoreApplication::translate("main","Request OpenGL context profile <profile> with profile set as compat or core"),QCoreApplication::translate("main","< compat | core >"));
- profileOption.setDefaultValue("compat");
  parser.addOption(profileOption);
  const QCommandLineOption helpOption = parser.addHelpOption();
  const QCommandLineOption versionOption = parser.addVersionOption();
diff --git a/common/GlobalOptions.cc b/common/GlobalOptions.cc
index 41d63284..d6aaa944 100644
--- a/common/GlobalOptions.cc
+++ b/common/GlobalOptions.cc
@@ -410,7 +410,12 @@ QPair<int,int> glVersion(){
   if(versionOverride_)
     return version_;
   else
-    return OpenFlipperSettings().value("Core/OpenGL/Version",QVariant::fromValue(QPair<int,int>(4,6))).value<QPair<int,int>>();
+  {
+    // unfortunately QVariant cant store QPair directly, we could try std::pair but its good for now
+    int major = OpenFlipperSettings().value("Core/OpenGL/VersionMajor", 4).value<int>();
+    int minor = OpenFlipperSettings().value("Core/OpenGL/VersionMinor", 6).value<int>();
+    return QPair<int, int>(major,minor);
+  }
 }
 
 /// Store opengl version setting
@@ -423,7 +428,10 @@ void glVersion(const QPair<int,int> & _version, bool _temporary)
     versionOverride_ = true;
   }
   else
-    OpenFlipperSettings().setValue("Core/OpenGL/Version",QVariant::fromValue(_version));
+  {
+    OpenFlipperSettings().setValue("Core/OpenGL/VersionMajor",_version.first);
+    OpenFlipperSettings().setValue("Core/OpenGL/VersionMinor",_version.second);
+  }
 }
 /// Store opengl MSAA sample count
 void samples(int _samples, bool _temporary) {
-- 
GitLab