From 439ea03a0562b725d2887c2933ec15cab9b5074a Mon Sep 17 00:00:00 2001 From: John Brooks Date: Wed, 9 Apr 2014 14:15:51 -0600 Subject: [PATCH] [mms-engine] Avoid using qmake to detect Qt version qtchooser systems will only have a default choice for qmake when a default package is installed, which we can't depend on. There is no reason to keep Qt4 support here. --- mms-lib/Config.mak | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/mms-lib/Config.mak b/mms-lib/Config.mak index b4c2c56..ff8201c 100644 --- a/mms-lib/Config.mak +++ b/mms-lib/Config.mak @@ -13,11 +13,7 @@ RESIZE_DEFINES = -DMMS_RESIZE_IMAGEMAGICK RESIZE_CFLAGS = $(shell pkg-config --cflags $(RESIZE_PKG)) else ifeq ($(MMS_RESIZE),Qt) - ifeq ($(shell qmake --version | grep "Using Qt version 5"),) - RESIZE_PKG = QtGui - else - RESIZE_PKG = Qt5Gui - endif + RESIZE_PKG = Qt5Gui RESIZE_LIBS = -lstdc++ RESIZE_DEFINES = -DMMS_RESIZE_QT RESIZE_CPPFLAGS = $(shell pkg-config --cflags $(RESIZE_PKG))