diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2016-07-01 19:22:32 +0100 |
|---|---|---|
| committer | Jan Schmidt <jan@centricular.com> | 2016-08-16 02:33:37 +1000 |
| commit | 653c4301df6fac57e3095a3e10fb87888f869f6f (patch) | |
| tree | a11e84dc5cba0ab86e8807bc0b8caa99e7b726bb | |
| parent | cdba73a99a87f7ce77ed610aae1d2679502649ea (diff) | |
| download | gstreamer-plugins-bad-653c4301df6fac57e3095a3e10fb87888f869f6f.tar.gz | |
qt: fix build some more when QPA is not available
Compiler would complain about include directory that didn't
exist because QPA_INCLUDE_PATH gets subst-ed regardless
(and if it didn't we'd have just an empty -I argument).
https://bugzilla.gnome.org/show_bug.cgi?id=767553
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | ext/qt/Makefile.am | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 7a75866d6..3a9c8095a 100644 --- a/configure.ac +++ b/configure.ac @@ -2845,7 +2845,7 @@ AG_GST_CHECK_FEATURE(QT, [Qt elements], qt, [ QT_VERSION="`$PKG_CONFIG --modversion Qt5Core`" QPA_INCLUDE_PATH=`$PKG_CONFIG --variable=includedir Qt5Core`/QtGui/${QT_VERSION}/QtGui AS_IF([test -f "$QPA_INCLUDE_PATH/qpa/qplatformnativeinterface.h"], [ - AC_SUBST(QPA_INCLUDE_PATH) + QT_CFLAGS="$QT_CFLAGS -I$QPA_INCLUDE_PATH" HAVE_QT_QPA_HEADER="yes" ], [AC_MSG_NOTICE([Cannot find QPA])]) if test "x$GST_GL_HAVE_WINDOW_X11" = "x1" -a "x$GST_GL_HAVE_PLATFORM_GLX" = "x1"; then diff --git a/ext/qt/Makefile.am b/ext/qt/Makefile.am index eab3e97ec..5fdd90a05 100644 --- a/ext/qt/Makefile.am +++ b/ext/qt/Makefile.am @@ -26,7 +26,6 @@ libgstqtsink_la_SOURCES = \ libgstqtsink_la_CXXFLAGS = \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ - -I$(QPA_INCLUDE_PATH) \ $(GST_CXXFLAGS) \ $(GST_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ |