diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2017-09-07 09:39:13 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2017-09-07 09:39:13 +0100 |
| commit | fcf8b6bb908ea32073fce3b355f6cc89a67bc52c (patch) | |
| tree | a52f55abf8c3c65c7b0bac0345562a89b3a68b8f | |
| parent | 039fc654688c9df0ce8a4d480092192ebbe43802 (diff) | |
qt: fix build with qmake
Move the package defines for GST_PLUGIN_DEFINE from the
command line into the source file to avoid quoting issues
(-DPACKAGE_NAME="foo" means the quotes won't actually make
it to the compiler and then it no longer gets a string constant).
| -rw-r--r-- | ext/qt/gstplugin.cc | 8 | ||||
| -rw-r--r-- | ext/qt/qtplugin.pro | 9 |
2 files changed, 10 insertions, 7 deletions
diff --git a/ext/qt/gstplugin.cc b/ext/qt/gstplugin.cc index 1fb1b3e1c..79fb18189 100644 --- a/ext/qt/gstplugin.cc +++ b/ext/qt/gstplugin.cc @@ -44,6 +44,14 @@ plugin_init (GstPlugin * plugin) return TRUE; } +#ifndef GST_PACKAGE_NAME +#define GST_PACKAGE_NAME "GStreamer Bad Plug-ins (qmake)" +#define GST_PACKAGE_ORIGIN "Unknown package origin" +#define GST_LICENSE "LGPL" +#define PACKAGE "gst-plugins-bad (qmake)" +#define PACKAGE_VERSION "1.13.0.1" +#endif + GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, qmlgl, diff --git a/ext/qt/qtplugin.pro b/ext/qt/qtplugin.pro index af1d8ddc1..ad0fa01df 100644 --- a/ext/qt/qtplugin.pro +++ b/ext/qt/qtplugin.pro @@ -13,12 +13,7 @@ PKGCONFIG = \ DEFINES += \ GST_USE_UNSTABLE_API \ - HAVE_QT_WIN32 \ - 'GST_PACKAGE_NAME=\"GStreamer Bad Plug-ins (qmake)\"' \ - 'GST_PACKAGE_ORIGIN=\"Unknown package origin\"' \ - 'GST_LICENSE=\"LGPL\"' \ - 'PACKAGE=\"gst-plugins-bad (qmake)\"' \ - 'PACKAGE_VERSION=\"1.9.0.1\"' + HAVE_QT_WIN32 SOURCES += \ gstplugin.cc \ @@ -36,4 +31,4 @@ INCLUDEPATH += \ $$(GSTREAMER_ROOT)/include \ $$[QT_INSTALL_PREFIX]/include/QtGui/$$[QT_VERSION]/QtGui/ -
\ No newline at end of file + |