qmlgl: qualify Qt includes with their module and remove module include dir from the...

it is perfectly legal to use the <module/class> style of includes with Qt
and it avoids the need for having the module's include dir in the include path

diff --git a/ext/qt/gstqtgl.h b/ext/qt/gstqtgl.h
index 13761ae..339f318 100644 (file)
--- a/ext/qt/gstqtgl.h
+++ b/ext/qt/gstqtgl.h
@@ -47,7 +47,7 @@
 
 #if defined(QT_OPENGL_ES_2)
 #define GLsync gst_qt_GLsync
-#include <QOpenGLContext>
-#include <QOpenGLFunctions>
+#include <QtGui/QOpenGLContext>
+#include <QtGui/QOpenGLFunctions>
 #undef GLsync
 #endif /* defined(QT_OPENGL_ES_2) */

diff --git a/ext/qt/qtplugin.pro b/ext/qt/qtplugin.pro
index d2c06c4..647449f 100644 (file)
--- a/ext/qt/qtplugin.pro
+++ b/ext/qt/qtplugin.pro
@@ -39,6 +39,4 @@ HEADERS += \
     qtitem.h
 
 INCLUDEPATH += \
-    $$(GSTREAMER_ROOT)/include \
-    $$[QT_INSTALL_PREFIX]/include/QtGui/$$[QT_VERSION]/QtGui/
-
+    $$(GSTREAMER_ROOT)/include