Project

General

Profile

Feature #1300 ยป 0043-Make-Qt6-6.4-the-minimum-requirement.patch

Marko Lindqvist, 04/17/2025 03:31 AM

View differences:

doc/INSTALL.autotools
This file describes how to compile and install Freeciv. Last time we
made sure this file is up to date was 16-Jul-06.
Last minor update was 18-Jan-25.
Last minor update was 17-Apr-25.
There may be a localized version of this file in the ./doc directory,
named INSTALL.<locale> (e.g., INSTALL.de).
......
../src/configure MOCCMD="/home/freeciv/local-qt/bin/moc" --enable-client=qt
- Qt6Core, Qt6Gui, and Qt6Widgets libraries and headers.
At least version 6.0 is required.
At least version 6.4 is required.
2. Generating Makefiles
doc/README.packaging
* Qt5 support removed
* Minimum meson requirement for builds made with it is 0.63.0
* Minimum Python requirement for code generation scripts is 3.7
* Minimum Qt6 version for building Qt-client, Qt modpack installer,
and Ruledit is 6.4.
----------------------------------------------------------------------
Compatibility of modified versions
m4/qt.m4
AC_DEFUN([FC_QT],
[
case "x$1" in
xqt6|xQt6|x) FC_QT6([0x060000], [6.0])
xqt6|xQt6|x) FC_QT6([0x060400], [6.4])
FC_QT_CPPFLAGS="$FC_QT6_CPPFLAGS"
FC_QT_CXXFLAGS="$FC_QT6_CXXFLAGS"
FC_QT_LIBS="$FC_QT6_LIBS"
meson.build
qt_opts = 'cpp_std=c++17'
qt_cppflags = ['-std=c++17', '-fPIC']
else
qt_minver='0x060000'
qt_minver='0x060400'
add_global_arguments('-DQT_DISABLE_DEPRECATED_BEFORE=' + qt_minver, language : 'cpp')
qt_opts = 'cpp_std=c++17'
qt_cppflags = ['-std=c++17', '-fPIC']
......
if not qtfine
if qtver == 'qt6'
error('Qt6 >= 6.0 required for qt-client in Qt6 mode, but not found')
error('Qt6 >= 6.4 required for qt-client in Qt6 mode, but not found')
elser
error('Qt6 >= 6.7 required for qt-client in Qt6x mode, but not found')
endif
......
if not qtfine
if qtver == 'qt6'
error('Qt6 >= 6.0 required for qt-modpack-installer in Qt6 mode, but not found')
error('Qt6 >= 6.4 required for qt-modpack-installer in Qt6 mode, but not found')
else
error('Qt6 >= 6.7 required for qt-modpack-installer in Qt6x mode, but not found')
endif
......
if not qtfine
if qtver == 'qt6'
error('Qt6 >= 6.0 required for ruledit in Qt6 mode, but not found')
error('Qt6 >= 6.4 required for ruledit in Qt6 mode, but not found')
else
error('Qt6 >= 6.7 required for ruledit in Qt6x mode, but not found')
endif
    (1-1/1)