| Message ID | 20200619145719.2352019-8-angelo@amarulasolutions.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Cups revamp | expand |
On Fri, 19 Jun 2020 16:57:19 +0200 Angelo Compagnucci <angelo@amarulasolutions.com> wrote: > From: Michael Trimarchi <michael@amarulasolutions.com> > > Cups support in QT should be enable if CUPS is available system wide. > > Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com> > Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com> > --- > package/qt5/qt5base/qt5base.mk | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) Applied to master, thanks. Thomas
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 42d77306cc..c6b459a0e1 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -23,7 +23,6 @@ QT5BASE_INSTALL_STAGING = YES # feature enabled QT5BASE_CONFIGURE_OPTS += \ -optimized-qmake \ - -no-cups \ -no-iconv \ -system-zlib \ -system-pcre \ @@ -108,6 +107,13 @@ ifeq ($(BR2_PACKAGE_HAS_UDEV),y) QT5BASE_DEPENDENCIES += udev endif +ifeq ($(BR2_PACKAGE_CUPS), y) +QT5BASE_DEPENDENCIES += cups +QT5BASE_CONFIGURE_OPTS += -cups +else +QT5BASE_CONFIGURE_OPTS += -no-cups +endif + # Qt5 SQL Plugins ifeq ($(BR2_PACKAGE_QT5BASE_SQL),y) ifeq ($(BR2_PACKAGE_QT5BASE_MYSQL),y)