qt_cv_libname=
for libname in $qt_guilibs \
'-framework QtCore -framework QtConcurrent -framework QtSvg -framework QtWidgets -framework QtMacExtras -framework QtGui'\
+ '-framework QtCore -framework QtConcurrent -framework QtCore5Compat -framework QtSvg -framework QtSvgWidgets -framework QtWidgets -framework QtGui'\
'-framework QtCore -framework QtGui'
do
QT_TRY_LINK($libname)
fi
qt_ext="qt$qt_major"
- if test -n "$qt_cv_bin" ; then
+ if test -n "$qt_cv_libexec" ; then
+ AC_PATH_PROGS($1, [$2], [], $qt_cv_libexec)
+ elif test -n "$qt_cv_bin" ; then
AC_PATH_PROGS($1, [$2], [], $qt_cv_bin)
elif qtchooser -l 2>/dev/null | grep -q ^$qt_ext\$ >/dev/null ; then
AC_PATH_PROG(qtc_path, qtchooser, [], [$PATH])
CPPFLAGS="$save_CPPFLAGS $QT_CORE_INCLUDES"
AC_CHECK_HEADER(QtGui/qtgui-config.h,
[lyx_qt5_config=QtGui/qtgui-config.h],
- [lyx_qt5_config=qconfig.h],[-])
+ [lyx_qt5_config=qconfig.h])
AC_CHECK_HEADER(QtGui/private/qtgui-config_p.h,
[lyx_qt6_config=QtGui/private/qtgui-config_p.h],
- [lyx_qt6_config=qconfig.h],[-])
+ [lyx_qt6_config=qconfig.h])
AC_MSG_CHECKING([whether Qt uses the X Window system])
if test x$USE_QT6 = xyes ; then
dnl FIXME: Check whether defining QPA_XCB makes sense with Qt6
QT_FIND_TOOL([QT_RCC], [rcc])
dnl Safety check
- mocqtver=`$QT_MOC -v 2>&1 | sed -e 's/.*\([[0-9]]\.[[0-9]]*\.[[0-9]]\).*/\1/'`
+ mocqtver=`$QT_MOC -v 2>&1 | sed -e 's/.*\([[0-9]]\.[[0-9]]*\.[[0-9]]*\).*/\1/'`
if test "x$mocqtver" != "x$QTLIB_VERSION"; then
LYX_WARNING([The found moc compiler is for Qt $mocqtver but the Qt library version is $QTLIB_VERSION.])
fi
QT_CORE_LDFLAGS=
if test -n "$qt_cv_includes"; then
QT_INCLUDES="-I$qt_cv_includes"
- for i in Qt QtCore QtGui QtWidgets QtSvg QtConcurrent QtMacExtras; do
+ for i in Qt QtCore QtGui QtWidgets QtSvg QtConcurrent QtSvgWidgets QtCore5Compat QtMacExtras; do
QT_INCLUDES="$QT_INCLUDES -I$qt_cv_includes/$i"
+ if test "$lyx_use_packaging" = "macosx" ; then
+ QT_INCLUDES="$QT_INCLUDES -I$qt_cv_libraries/${i}.framework/Headers"
+ fi
done
QT_CORE_INCLUDES="-I$qt_cv_includes -I$qt_cv_includes/QtCore"
fi
case "$qt_cv_libraries" in
- *framework*)
- QT_LDFLAGS="-F$qt_cv_libraries"
- QT_CORE_LDFLAGS="-F$qt_cv_libraries"
- ;;
"")
;;
*)
- QT_LDFLAGS="-L$qt_cv_libraries"
- QT_CORE_LDFLAGS="-L$qt_cv_libraries"
+ if test "$lyx_use_packaging" = "macosx" ; then
+ QT_INCLUDES="$QT_INCLUDES -F$qt_cv_libraries"
+ QT_CORE_INCLUDES="$QT_CORE_INCLUDES -I$qt_cv_libraries/QtCore.framework/Headers -F$qt_cv_libraries"
+ QT_LDFLAGS="-F$qt_cv_libraries"
+ QT_CORE_LDFLAGS="-F$qt_cv_libraries"
+ else
+ QT_LDFLAGS="-L$qt_cv_libraries"
+ QT_CORE_LDFLAGS="-L$qt_cv_libraries"
+ fi
;;
esac
AC_SUBST(QT_INCLUDES)
AC_DEFUN([QT6_QMAKE_CONFIG],
[
+ dnl Use first suitable qmake in PATH
+ AC_CHECK_PROGS([QT_QMAKE], [qmake-qt6 qmake6], [qmake], $PATH)
AC_MSG_CHECKING([for Qt6])
- dnl Use first qmake in PATH
- ver=`qmake -v | grep -o "Qt version ."`
- qmake6=""
- if test "$ver" = "Qt version 6"; then
- qmake6="qmake"
- else
- ver=`qmake6 -v | grep -o "Qt version ."`
- if test "$ver" = "Qt version 6"; then
- qmake6="qmake6"
- fi
- fi
- if test -n "$qmake6" ; then
+ qtver=`$QT_QMAKE -v | grep -o "Qt version ."`
+ if test "$qtver" = "Qt version 6"; then
+ qt_cv_libexec=`$QT_QMAKE -query QT_INSTALL_LIBEXECS`
dnl Use a .pro file for getting qmake's variables
lyx_test_qt_dir=`mktemp -d`
lyx_test_qt_pro="$lyx_test_qt_dir/test.pro"
percent.target = %
percent.commands = @echo -n "\$(\$(@))\ "
QMAKE_EXTRA_TARGETS += percent
+QMAKE_PROJECT_DEPTH = 0
EOF1
- $qmake6 $lyx_test_qt_pro -o $lyx_test_qt_mak 1>/dev/null 2>&1
+ $QT_QMAKE $lyx_test_qt_pro -o $lyx_test_qt_mak 1>/dev/null 2>&1
QT_CORE_INCLUDES=`cd $lyx_test_qt_dir; make -s -f $lyx_test_qt_mak INCPATH | sed 's/-I\. //g'`
qt_corelibs=`cd $lyx_test_qt_dir; make -s -f $lyx_test_qt_mak LIBS`
QT_CORE_LDFLAGS=`echo $qt_corelibs | tr ' ' '\n' | grep -e "^-L" | tr '\n' ' '`
if test -z "$QT_CORE_LDFLAGS"; then
- QT_CORE_LDFLAGS="-L`$qmake6 -query QT_INSTALL_LIBS`"
+ QT_CORE_LDFLAGS="-L`$QT_QMAKE -query QT_INSTALL_LIBS`"
QT_CORE_LIB="$qt_corelibs"
else
QT_CORE_LIB=`echo $qt_corelibs | tr ' ' '\n' | grep -e "^-l" | tr '\n' ' '`
qtHaveModule(core): QT += core
qtHaveModule(core5compat): QT += core5compat
qtHaveModule(concurrent): QT += concurrent
-qtHaveModule(gui): QT += gui
+qtHaveModule(gui): QT += gui gui-private
qtHaveModule(svg): QT += svg
+qtHaveModule(svgwidgets): QT += svgwidgets
qtHaveModule(widgets): QT += widgets
percent.target = %
percent.commands = @echo -n "\$(\$(@))\ "
QMAKE_EXTRA_TARGETS += percent
+QMAKE_PROJECT_DEPTH = 0
EOF2
- $qmake6 $lyx_test_qt_pro -o $lyx_test_qt_mak 1>/dev/null 2>&1
+ $QT_QMAKE $lyx_test_qt_pro -o $lyx_test_qt_mak 1>/dev/null 2>&1
QT_INCLUDES=`cd $lyx_test_qt_dir; make -s -f $lyx_test_qt_mak INCPATH | sed 's/-I\. //g'`
qt_guilibs=`cd $lyx_test_qt_dir; make -s -f $lyx_test_qt_mak LIBS`
QT_LDFLAGS=`echo $qt_guilibs | tr ' ' '\n' | grep -e "^-L" | tr '\n' ' '`
if test -z "$QT_LDFLAGS"; then
- QT_LDFLAGS="-L`$qmake6 -query QT_INSTALL_LIBS`"
+ QT_LDFLAGS="-L`$QT_QMAKE -query QT_INSTALL_LIBS`"
QT_LIB="$qt_guilibs"
else
- QT_LIB=`echo $qt_guilibs | tr ' ' '\n' | grep -e "^-l" | tr '\n' ' '`
+ QT_LIB=`echo $qt_guilibs | tr ' ' '\n' | grep -v "^-L" | tr '\n' ' '`
fi
- QTLIB_VERSION=`$qmake6 -v | grep "Qt version" | sed -e 's/.*\([[0-9]]\.[[0-9]]*\.[[0-9]]\).*/\1/'`
+ QTLIB_VERSION=`$QT_QMAKE -v | grep "Qt version" | sed -e 's/.*\([[0-9]]\.[[0-9]]*\.[[0-9]]\).*/\1/'`
if test -z "$QT_LIB"; then
AC_MSG_RESULT(no)
else
projects / lyx.git / blobdiff