From kde-commits  Tue Nov 19 16:34:05 2013
From: Mark Kretschmann <kretschmann () kde ! org>
Date: Tue, 19 Nov 2013 16:34:05 +0000
To: kde-commits
Subject: [amarok] /: Remove QGLFunctions as it's only needed for OpenGL/ES and might crash.
Message-Id: <E1VioFZ-0004E3-Oj () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=138487885724934

Git commit 221e9696f83f317dda9e5428312eff7028e1466a by Mark Kretschmann.
Committed on 19/11/2013 at 16:30.
Pushed by markey into branch 'master'.

Remove QGLFunctions as it's only needed for OpenGL/ES and might crash.

BUG: 327150
FIXED-IN: 2.8.1
BACKPORT

M  +1    -0    ChangeLog
M  +0    -2    src/context/applets/analyzer/AnalyzerBase.cpp
M  +1    -2    src/context/applets/analyzer/AnalyzerBase.h

http://commits.kde.org/amarok/221e9696f83f317dda9e5428312eff7028e1466a

diff --git a/ChangeLog b/ChangeLog
index ad84f5b..107aa48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,7 @@ VERSION 2.9-Beta 1
      compilers currently supported by KDE.
 =

   BUGFIXES:
+   * Fix OpenGL related crash. (BR 327150)
    * Always show preview in Organize Files dialog, hide complicated option=
s behind
      a button. (BR 327201)
    * Fix sound glitch with fade-out on pause and GStreamer. (BR 323729)
diff --git a/src/context/applets/analyzer/AnalyzerBase.cpp b/src/context/ap=
plets/analyzer/AnalyzerBase.cpp
index 0e649f8..b17b560 100644
--- a/src/context/applets/analyzer/AnalyzerBase.cpp
+++ b/src/context/applets/analyzer/AnalyzerBase.cpp
@@ -56,8 +56,6 @@ Analyzer::Base::Base( QWidget *parent )
     //initialize openGL context before managing GL calls
     makeCurrent();
 =

-    initializeGLFunctions();
-
     connectSignals();
 }
 =

diff --git a/src/context/applets/analyzer/AnalyzerBase.h b/src/context/appl=
ets/analyzer/AnalyzerBase.h
index 0497428..883d38c 100644
--- a/src/context/applets/analyzer/AnalyzerBase.h
+++ b/src/context/applets/analyzer/AnalyzerBase.h
@@ -25,7 +25,6 @@
 =

 #include "fht.h"     //stack allocated
 =

-#include <QGLFunctions>
 #include <QGLWidget>
 =

 #include <vector>    //included for convenience
@@ -36,7 +35,7 @@
 namespace Analyzer
 {
 =

-class Base : public QGLWidget, protected QGLFunctions
+class Base : public QGLWidget
 {
     Q_OBJECT
=20