Skip to content
Permalink
Browse files
[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.
  • Loading branch information
John Brooks committed Apr 9, 2014
1 parent ec40b18 commit 439ea03a0562b725d2887c2933ec15cab9b5074a
Showing with 1 addition and 5 deletions.
  1. +1 −5 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))

0 comments on commit 439ea03

Please sign in to comment.