diff options
Diffstat (limited to 'libmediaart')
| -rw-r--r-- | libmediaart/extractqt.cpp | 12 | ||||
| -rw-r--r-- | libmediaart/meson.build | 2 |
2 files changed, 1 insertions, 13 deletions
diff --git a/libmediaart/extractqt.cpp b/libmediaart/extractqt.cpp index 580f3dd..1e8e1b3 100644 --- a/libmediaart/extractqt.cpp +++ b/libmediaart/extractqt.cpp @@ -26,11 +26,7 @@ #include <QBuffer> #include <QImageReader> #include <QImageWriter> -#ifdef HAVE_QT5 #include <QCoreApplication> -#else -#include <QApplication> -#endif #include <QColor> #include <QPainter> @@ -40,11 +36,7 @@ G_BEGIN_DECLS -#ifdef HAVE_QT5 static QCoreApplication *app = NULL; -#else /* HAVE_QT4 (we fallback to Qt4) */ -static QApplication *app = NULL; -#endif /* HAVE_QT5 */ static gint max_width_in_bytes = 0; @@ -58,15 +50,11 @@ media_art_plugin_init (gint max_width) max_width_in_bytes = max_width; -#ifdef HAVE_QT5 if (QCoreApplication::instance()) { // avoid a new instance if already running inside a qt app return; } app = new QCoreApplication (argc, argv); -#else /* HAVE_QT4 (we fallback to Qt4) */ - app = new QApplication (argc, argv, QApplication::Tty); -#endif /* HAVE_QT5 */ } void diff --git a/libmediaart/meson.build b/libmediaart/meson.build index c43fb9e..56e00ab 100644 --- a/libmediaart/meson.build +++ b/libmediaart/meson.build @@ -17,7 +17,7 @@ libmediaart_sources = [ if image_library_name == 'gdk-pixbuf-2.0' libmediaart_sources += 'extractpixbuf.c' -elif image_library_name == 'QtGui' or image_library_name == 'Qt5Gui' +elif image_library_name == 'Qt5Gui' add_languages('cpp', required : true) libmediaart_sources += 'extractqt.cpp' else |