From e279903857ec8aef1fe5f477c6cb5ace7b6a629e Mon Sep 17 00:00:00 2001 From: George Kiagiadakis Date: Sat, 19 Jan 2019 15:19:26 +0100 Subject: [PATCH] qmlgl: qualify Qt includes with their module and remove module include dir from the .pro file it is perfectly legal to use the style of includes with Qt and it avoids the need for having the module's include dir in the include path --- ext/qt/gstqtgl.h | 4 ++-- ext/qt/qtplugin.pro | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ext/qt/gstqtgl.h b/ext/qt/gstqtgl.h index 13761aea59..339f318e36 100644 --- 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 -#include +#include +#include #undef GLsync #endif /* defined(QT_OPENGL_ES_2) */ diff --git a/ext/qt/qtplugin.pro b/ext/qt/qtplugin.pro index d2c06c4ac8..647449ff93 100644 --- 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