[libmediaart/meson: 1/2] Remove --enable-nemo and always use Qt5 'minimal' backend
- From: Sam Thursfield <sthursfield src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libmediaart/meson: 1/2] Remove --enable-nemo and always use Qt5 'minimal' backend
- Date: Thu, 8 Jun 2017 17:50:40 +0000 (UTC)
commit 103bad0798c82d630595d7a432c727469706a84e
Author: Sam Thursfield <sam afuera me uk>
Date: Thu Jun 8 18:50:10 2017 +0100
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.
configure.ac | 18 ------------------
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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]