diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2017-05-23 16:47:59 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2017-05-23 16:49:12 +0100 |
| commit | 0b235886b80baf7fea900b6ecc8721e49bcbb590 (patch) | |
| tree | eb044efea335abd3b90ccabdc45ee540f8b0c156 | |
| parent | 015a7f81bb3eb0d6f30f1e15062dbca388927f1e (diff) | |
| download | libmediaart-0b235886b80baf7fea900b6ecc8721e49bcbb590.tar.gz | |
Remove --enable-nemo and always use Qt5 'minimal' backend
The 'minimal' Qt platform abstraction seems to be available on most
platforms, it's not Nemo-specific. So we can use it unconditionally.
This is the only thing affected by --enable-nemo so we can remove that
configure flag.
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | libmediaart/extractqt.cpp | 5 |
2 files changed, 0 insertions, 23 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..2a2359a 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 @@ -62,10 +60,7 @@ media_art_plugin_init (gint 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); |