mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-22 13:18:28 +00:00
0c7bd9a57f
The full path of the tools is retained only if the Qt directory is specified using --with-qt-dir. Now, when qtchooser was detected it was blindly assumed that the corresponding system tools were being used. These tools discriminate between Qt4 and Qt5 through the option -qt=qt4 or -qt=qt5. However, the original Qt tools don't understand these options, so that if they come first in the PATH, configuration fails. So, only use those options if we are reasonably sure that the system Qt is wanted. This is achieved by comparing the paths of qtchooser and tools as, typically, they are located in the same directory. In this way, if one prepends the bin directory of a custom Qt build to PATH (and accordingly adjusts PKG_CONFIG_PATH), configuration succeeds even if --with-qt-dir is not specified. |
||
---|---|---|
.. | ||
.gitignore | ||
common.am | ||
config.rpath | ||
lyxinclude.m4 | ||
lyxpython.m4 | ||
Makefile.am | ||
pkg.m4 | ||
qt4.m4 | ||
spell.m4 |