sparrowwallet/zbar-windows
sparrowwallet/zbar-windows
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure.ac: drop support for Qt4.

Browse Source 
Building with Qt4 doesn't work anymore. So, remove the
checks from configure.ac, and the corresponding
zbar-qt.pc.in file.

Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Mauro Carvalho Chehab 2022-05-29 17:54:54 +02:00
parent c95186c69d
commit 4703c4e531
2 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
configure.ac
View File

@ -654,13 +654,6 @@ AC_ARG_WITH([qt],
[],
[with_qt="yes"])
dnl Qt5
AC_ARG_WITH([qt5],
[AS_HELP_STRING([--without-qt5],
[If --with-qt, ignore support for Qt5 widget])],
[],
[with_qt5="yes"])
dnl Qt6
AC_ARG_WITH([qt6],
[AS_HELP_STRING([--with-qt6],
@ -679,22 +672,15 @@ AS_IF([test "x$with_qt" != "xno"],
qt_pkgconfig_file="zbar-qt5.pc"
],
[with_qt6="no"]))
AS_IF([(test "x$with_qt6" = "xno") && (test "x$with_qt5" != "xno")],
AS_IF([test "x$with_qt6" = "xno"],
PKG_CHECK_MODULES([QT],
[Qt5Core >= 5 Qt5Gui >= 5 Qt5Widgets >= 5.0 Qt5X11Extras >= 5.0],
[MOC=`pkg-config Qt5 --variable=moc`
QT_VERSION=`$PKG_CONFIG Qt5 --modversion`
qt_pkgconfig_file="zbar-qt5.pc"
],
[with_qt5="no"]))
AS_IF([(test "x$with_qt6" = "xno") && (test "x$with_qt5" = "xno")],
PKG_CHECK_MODULES([QT],
[Qt >= 4 QtGui >= 4],
[MOC=`pkg-config Qt --variable=moc`
QT_VERSION=`$PKG_CONFIG Qt --modversion`
qt_pkgconfig_file="zbar-qt.pc"
],
[with_qt="no"]))])
[with_qt="no"]))
])
AC_ARG_VAR([MOC], [full path to Qt moc program])

12
zbar-qt.pc.in
View File

@ -1,12 +0,0 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: zbar-qt
Description: bar code scanning and decoding Qt4 widget
URL: http://zbar.sourceforge.net
Version: @VERSION@
Requires: zbar, QtCore >= 4, QtGui >= 4
Libs: -L${libdir} -lzbarqt
Cflags: -I${includedir}