From 97540dfcb80318a218786c4679f20fabfe5ef1e8 Mon Sep 17 00:00:00 2001
From: Ho-Ro <Ho-Ro@users.noreply.github.com>
Date: Thu, 14 Feb 2019 09:00:55 +0100
Subject: [PATCH] Quit shortcut Ctrl-Q, GLSL 150 -> 120 according
 https://github.com/coozoo/openhantek/commit/01b42d3db2921a0aa83ea6808147ea6257de3f28

Signed-off-by: Ho-Ro <Ho-Ro@users.noreply.github.com>
---
 openhantek/src/glscope.cpp   | 10 +++++-----
 openhantek/src/mainwindow.ui |  3 +++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/openhantek/src/glscope.cpp b/openhantek/src/glscope.cpp
index f6b0e71f..3b154ab9 100644
--- a/openhantek/src/glscope.cpp
+++ b/openhantek/src/glscope.cpp
@@ -202,8 +202,8 @@ void GlScope::initializeGL() {
     )";
 
     const char *vshaderDesktop = R"(
-          #version 150
-          in highp vec3 vertex;
+          #version 120 //150
+          attribute vec3 vertex; //in highp vec3 vertex;
           uniform mat4 matrix;
           void main()
           {
@@ -212,10 +212,10 @@ void GlScope::initializeGL() {
           }
     )";
     const char *fshaderDesktop = R"(
-          #version 150
+          #version 120 //150
           uniform highp vec4 colour;
-          out vec4 flatColor;
-          void main() { flatColor = colour; }
+          //out vec4 flatColor;
+          void main() { gl_FragColor = colour; } //{ flatColor = colour; }
     )";
 
     qDebug() << "compile shaders";
diff --git a/openhantek/src/mainwindow.ui b/openhantek/src/mainwindow.ui
index ae006798..6e426ecc 100644
--- a/openhantek/src/mainwindow.ui
+++ b/openhantek/src/mainwindow.ui
@@ -114,6 +114,9 @@
    <property name="text">
     <string>Exit</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+Q</string>
+   </property>
   </action>
   <action name="actionDigital_phosphor">
    <property name="checkable">