CXXFLAGS="$CXXFLAGS $QT_INCLUDES $QT_LDFLAGS"
qt_corelibs="-lQtCore -lQtCore4"
qt_guilibs="'-lQtCore -lQtGui' '-lQtCore4 -lQtGui4'"
- if test $USE_QT5 = "yes" ; then
+ if test $USE_QT6 = "yes" ; then
+ qt_corelibs="-lQt6Core -lQt6Core5Compat"
+ qt_guilibs="-lQt6Core -lQt6Core5Compat -lQt6Concurrent -lQt6Gui -lQt6Svg -lQt6Widgets"
+ else
qt_corelibs="-lQt5Core"
qt_guilibs="-lQt5Core -lQt5Concurrent -lQt5Gui -lQt5Svg -lQt5Widgets"
fi
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)
])
if test -z "$qt_cv_libname"; then
- if test x$USE_QT5 = xyes ; then
- AC_MSG_RESULT([failed, retrying with Qt4])
+ if test x$USE_QT6 = xyes ; then
+ AC_MSG_RESULT([failed, retrying with Qt5])
else
AC_MSG_RESULT([failed])
AC_MSG_ERROR([cannot compile a simple Qt executable. Check you have the right \$QTDIR.])
AC_DEFUN([QT_FIND_TOOL],
[
$1=
- qt_ext=qt4
- if test "x$USE_QT5" != "xno" ; then
- qt_ext=qt5
+ qt_major=5
+ if test "x$USE_QT6" != "xno" ; then
+ qt_major=6
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])
fi
fi
if test -z "$$1"; then
- AC_CHECK_PROGS($1, [$2-$qt_ext $2],[],$PATH)
+ AC_CHECK_PROGS($1, [$2-$qt_ext $2$qt_major $2],[],$PATH)
fi
if test -z "$$1"; then
AC_MSG_ERROR([cannot find $2 binary.])
AC_DEFUN([QT_DO_IT_ALL],
[
dnl this variable is precious
- AC_ARG_VAR(QTDIR, [the place where the Qt files are, e.g. /usr/lib/qt4])
+ AC_ARG_VAR(QTDIR, [the place where the Qt files are, e.g. /usr/lib/qt5])
AC_ARG_WITH(qt-dir, [AS_HELP_STRING([--with-qt-dir], [where the root of Qt is installed])],
[ qt_cv_dir=`eval echo "$withval"/` ])
dnl Check if it possible to do a pkg-config
PKG_PROG_PKG_CONFIG
- if test -n "$PKG_CONFIG" ; then
- QT_DO_PKG_CONFIG
- fi
- if test "$pkg_failed" != "no" ; then
- QT_DO_MANUAL_CONFIG
+ dnl Not possible with Qt6 (QTBUG-86080)
+ if test x$USE_QT6 = xno ; then
+ if test -n "$PKG_CONFIG" ; then
+ QT_DO_PKG_CONFIG
+ fi
+ if test "$pkg_failed" != "no" ; then
+ QT_DO_MANUAL_CONFIG
+ fi
+ else
+ QT6_QMAKE_CONFIG
+ if test -z "$QT_LIB"; then
+ QT_DO_MANUAL_CONFIG
+ fi
fi
if test -z "$QT_LIB"; then
- dnl Try again with Qt4 if configuring for Qt5 fails
- if test x$USE_QT5 = xyes ; then
- USE_QT5=no
- AC_SUBST([USE_QT5])
+ dnl Try again with Qt5 and if configuring for Qt6/5 fails
+ if test x$USE_QT6 = xyes ; then
+ USE_QT6=no
+ AC_SUBST([USE_QT6])
if test -n "$PKG_CONFIG" ; then
QT_DO_PKG_CONFIG
fi
[AC_MSG_ERROR([LyX requires at least version $1 of Qt. Only version $QTLIB_VERSION has been found.])
])
+ case $QTLIB_VERSION in
+ 6.*) if test $enable_stdlib_debug = "yes" ; then
+ LYX_WARNING([Compiling LyX with stdlib-debug and Qt6 library may lead to
+ crashes. Consider dropping --enable-stdlib-debug.])
+ fi;;
+ esac
+
+
save_CPPFLAGS=$CPPFLAGS
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])
AC_MSG_CHECKING([whether Qt uses the X Window system])
- if test x$USE_QT5 = xyes ; then
+ if test x$USE_QT6 = xyes ; then
+ dnl FIXME: Check whether defining QPA_XCB makes sense with Qt6
+ AC_PREPROC_IFELSE([AC_LANG_SOURCE([
+ [#include <$lyx_qt6_config>]
+ [#if !defined(QT_FEATURE_xcb) || QT_FEATURE_xcb < 0]
+ [#error Fail]
+ [#endif]])],
+ [AC_MSG_RESULT(yes)
+ AC_DEFINE(QPA_XCB, 1, [Define if Qt uses the X Window System])],
+ [AC_MSG_RESULT(no)])
+ else
AC_EGREP_CPP(xcb,
[#include <$lyx_qt5_config>
QT_QPA_DEFAULT_PLATFORM_NAME],
[AC_MSG_RESULT(yes)
AC_DEFINE(QPA_XCB, 1, [Define if Qt uses the X Window System])],
[AC_MSG_RESULT(no)])
- else
- AC_PREPROC_IFELSE([AC_LANG_SOURCE([
- [#include <qglobal.h>],
- [#ifndef Q_WS_X11],
- [#error Fail],
- [#endif]])],
- qt_use_x11=yes,
- qt_use_x11=no)
- AC_MSG_RESULT($qt_use_x11)
- if test "x$qt_use_x11" = "xyes"; then
- QT_LIB="$QT_LIB -lX11"
- fi
fi
CPPFLAGS=$save_CPPFLAGS
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
PKG_CONFIG_PATH=$qt_cv_dir/lib:$qt_cv_dir/lib/pkgconfig:$PKG_CONFIG_PATH
export PKG_CONFIG_PATH
fi
- qt_corelibs="QtCore"
- qt_guilibs="QtCore QtGui QtSvg"
- if test "x$USE_QT5" != "xno" ; then
- qt_corelibs="Qt5Core"
- qt_guilibs="Qt5Core Qt5Concurrent Qt5Gui Qt5Svg Qt5Widgets"
- lyx_use_x11extras=false
- PKG_CHECK_EXISTS(Qt5X11Extras, [lyx_use_x11extras=true], [])
- if $lyx_use_x11extras; then
- qt_guilibs="$qt_guilibs Qt5X11Extras xcb"
- AC_DEFINE(HAVE_QT5_X11_EXTRAS, 1,
- [Define if you have the Qt5X11Extras module])
- fi
- lyx_use_winextras=false
- PKG_CHECK_EXISTS(Qt5WinExtras, [lyx_use_winextras=true], [])
- if $lyx_use_winextras; then
- qt_guilibs="$qt_guilibs Qt5WinExtras"
- fi
- lyx_use_macextras=false
- PKG_CHECK_EXISTS(Qt5MacExtras, [lyx_use_macextras=true], [])
- if $lyx_use_macextras; then
- qt_guilibs="$qt_guilibs Qt5MacExtras"
- fi
+ qt_corelibs="Qt5Core"
+ qt_guilibs="Qt5Core Qt5Concurrent Qt5Gui Qt5Svg Qt5Widgets"
+ lyx_use_x11extras=false
+ PKG_CHECK_EXISTS(Qt5X11Extras, [lyx_use_x11extras=true], [])
+ if $lyx_use_x11extras; then
+ qt_guilibs="$qt_guilibs Qt5X11Extras xcb"
+ AC_DEFINE(HAVE_QT5_X11_EXTRAS, 1,
+ [Define if you have the Qt5X11Extras module])
+ fi
+ lyx_use_winextras=false
+ PKG_CHECK_EXISTS(Qt5WinExtras, [lyx_use_winextras=true], [])
+ if $lyx_use_winextras; then
+ qt_guilibs="$qt_guilibs Qt5WinExtras"
+ fi
+ lyx_use_macextras=false
+ PKG_CHECK_EXISTS(Qt5MacExtras, [lyx_use_macextras=true], [])
+ if $lyx_use_macextras; then
+ qt_guilibs="$qt_guilibs Qt5MacExtras"
fi
PKG_CHECK_MODULES(QT_CORE, $qt_corelibs,,[:])
if test "$pkg_failed" = "no" ; then
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)
QT_GET_VERSION
fi
])
+
+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])
+ 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"
+ lyx_test_qt_mak="$lyx_test_qt_dir/Makefile"
+ cat > $lyx_test_qt_pro << EOF1
+qtHaveModule(core): QT += core
+qtHaveModule(core5compat): QT += core5compat
+percent.target = %
+percent.commands = @echo -n "\$(\$(@))\ "
+QMAKE_EXTRA_TARGETS += percent
+QMAKE_PROJECT_DEPTH = 0
+EOF1
+ $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`$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' ' '`
+ fi
+ if test -z "$QT_CORE_LIB"; then
+ AC_MSG_RESULT(no)
+ else
+ AC_SUBST(QT_CORE_INCLUDES)
+ AC_SUBST(QT_CORE_LDFLAGS)
+ AC_SUBST(QT_CORE_LIB)
+ cat > $lyx_test_qt_pro << EOF2
+qtHaveModule(core): QT += core
+qtHaveModule(core5compat): QT += core5compat
+qtHaveModule(concurrent): QT += concurrent
+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
+ $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`$QT_QMAKE -query QT_INSTALL_LIBS`"
+ QT_LIB="$qt_guilibs"
+ else
+ QT_LIB=`echo $qt_guilibs | tr ' ' '\n' | grep -v "^-L" | tr '\n' ' '`
+ fi
+ 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
+ AC_MSG_RESULT(yes)
+ AC_SUBST(QT_INCLUDES)
+ AC_SUBST(QT_LDFLAGS)
+ AC_SUBST(QT_LIB)
+ AC_SUBST(QTLIB_VERSION)
+ fi
+ fi
+ rm $lyx_test_qt_pro $lyx_test_qt_mak $lyx_test_qt_dir/.qmake.stash
+ rmdir $lyx_test_qt_dir
+ else
+ AC_MSG_RESULT(no)
+ fi
+])
projects / lyx.git / blobdiff