diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2017-05-23 16:47:59 +0100 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2017-08-09 17:12:02 +0200 |
| commit | 9c2091d67d581fed07dae8dc4b0e0541bc6be3f8 (patch) | |
| tree | f60eeddfe5f93ceb4d82ef3928aff9faecae032c | |
| parent | 8ef56aab48f47e16ba297812b2eebfd8ac863d50 (diff) | |
| download | libmediaart-9c2091d67d581fed07dae8dc4b0e0541bc6be3f8.tar.gz | |
Remove --enable-nemo
This flag was just enabling a codepath that sets QT_QPA_PLATFORM=minimal
in the environment before constructing a QCoreApplication instance.
This code path has no effect anyway: QT_QPA_PLATFORM only has an effect
if you are using QGuiApplication.
https://bugzilla.gnome.org/show_bug.cgi?id=783562
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | libmediaart/extractqt.cpp | 7 |
2 files changed, 0 insertions, 25 deletions
diff --git a/configure.ac b/configure.ac index 2d913d3..9993b4e 100644 --- a/configure.ac +++ b/configure.ac @@ -304,22 +304,6 @@ LIBMEDIAART_CFLAGS="$LIBMEDIAART_CFLAGS $BACKEND_CFLAGS" LIBMEDIAART_LIBS="$LIBMEDIAART_LIBS $BACKEND_LIBS" AC_SUBST(LIBMEDIAART_BACKEND) -################################################################# -# Check if we should install nemo specific features -################################################################# - -AC_ARG_ENABLE(nemo, - AS_HELP_STRING([--enable-nemo], - [enable nemo specific [[default=no]]]), - [enable_nemo="$enableval"], - [enable_nemo=no]) - -AM_CONDITIONAL(HAVE_NEMO, test "x$enable_nemo" = "xyes") - -if test "x$enable_nemo" = "xyes" ; then - AC_DEFINE(HAVE_NEMO, 1, [Define if we enable Nemo specific features]) -fi - #################################################################### # Should we build GLib based unit tests #################################################################### @@ -373,6 +357,4 @@ Build Configuration: Enable documentation: $enable_gtk_doc Support media art processing: $selected_for_media_art - - Support Nemo $enable_nemo " diff --git a/libmediaart/extractqt.cpp b/libmediaart/extractqt.cpp index dda324f..6114270 100644 --- a/libmediaart/extractqt.cpp +++ b/libmediaart/extractqt.cpp @@ -36,9 +36,7 @@ #include <glib.h> -#ifdef HAVE_NEMO #include <stdlib.h> -#endif G_BEGIN_DECLS @@ -61,11 +59,6 @@ media_art_plugin_init (gint max_width) max_width_in_bytes = max_width; #ifdef HAVE_QT5 - -#ifdef HAVE_NEMO - setenv("QT_QPA_PLATFORM", "minimal", 1); -#endif /* HAVE_NEMO */ - app = new QCoreApplication (argc, argv); #else /* HAVE_QT4 (we fallback to Qt4) */ app = new QApplication (argc, argv, QApplication::Tty); |