[Python-modules-commits] [pyqt5] 03/06: Fixes for the OpenGL detection needed by changes in Qt v5.8.0

[Dmitry Shachnev]

This is an automated email from the git hooks/post-receive script.

mitya57 pushed a commit to branch buster
in repository pyqt5.

commit aa9edd51decd034cb3f14685404517169ff8a592
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Jul 22 10:11:07 2017 +0300

    Fixes for the OpenGL detection needed by changes in Qt v5.8.0
    
    Origin: upstream, changeset bf6caed84fd3 (from 5.8.2 release)
    Patch-Name: opengl_detection.diff
---
 configure.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.py b/configure.py
index 474aafc..c84c58a 100644
--- a/configure.py
+++ b/configure.py
@@ -618,7 +618,7 @@ class TargetConfiguration:
 
         out_file = 'qtdetail.out'
 
-        source = '''#include <QCoreApplication>
+        source = '''#include <QGuiApplication>
 #include <QFile>
 #include <QLibraryInfo>
 #include <QTextStream>
@@ -676,7 +676,7 @@ int main(int argc, char **argv)
 #if defined(QT_NO_OPENGL)
     out << "PyQt_OpenGL\\n";
     out << "PyQt_Desktop_OpenGL\\n";
-#elif defined(QT_OPENGL_ES_2)
+#elif defined(QT_OPENGL_ES) || defined(QT_OPENGL_ES_2) || defined(QT_OPENGL_ES_3)
     out << "PyQt_Desktop_OpenGL\\n";
 #endif
 
@@ -696,7 +696,7 @@ int main(int argc, char **argv)
 }
 ''' % out_file
 
-        cmd = compile_qt_program(self, verbose, 'qtdetail', source, 'QtCore',
+        cmd = compile_qt_program(self, verbose, 'qtdetail', source, 'QtGui',
                 debug=debug)
 
         if cmd is None:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pyqt5.git