Project

General

Profile

Download (2.45 KB)

Feature #1417 » 0039-Make-Qt6-6.8-minimum-requirement-for-Qt6x-client.patch

S3_3 - Marko Lindqvist, 05/20/2025 06:26 AM

View differences:

m4/qt.m4
FC_QT_CXXFLAGS="$FC_QT6_CXXFLAGS"
FC_QT_LIBS="$FC_QT6_LIBS"
fc_qt_usable="$fc_qt6_usable" ;;
xqt6x|xQt6x) FC_QT6([0x060700], [6.7])
xqt6x|xQt6x) FC_QT6([0x060800], [6.8])
FC_QT_CPPFLAGS="$FC_QT6_CPPFLAGS"
FC_QT_CXXFLAGS="$FC_QT6_CXXFLAGS"
FC_QT_LIBS="$FC_QT6_LIBS"
meson.build
qt_opts = []
qt_cppflags = '-fPIC'
elif qtver == 'qt6x'
qt_minver='0x060700'
qt_minver='0x060800'
add_global_arguments('-DQT_DISABLE_DEPRECATED_BEFORE=' + qt_minver, language : 'cpp')
priv_conf_data.set('FC_QT6X_MODE', 1)
qt_opts = 'cpp_std=c++17'
......
if qtver == 'qt6'
error('Qt6 >= 6.0 required for qt-client in Qt6 mode, but not found')
elif qtver == 'qt6x'
error('Qt6 >= 6.7 required for qt-client in Qt6x mode, but not found')
error('Qt6 >= 6.8 required for qt-client in Qt6x mode, but not found')
else
error('Qt5 >= 5.15 required for qt-client in Qt5 mode, but not found')
endif
......
if qtver == 'qt6'
error('Qt6 >= 6.0 required for qt-modpack-installer in Qt6 mode, but not found')
elif qtver == 'qt6x'
error('Qt6 >= 6.7 required for qt-modpack-installer in Qt6x mode, but not found')
error('Qt6 >= 6.8 required for qt-modpack-installer in Qt6x mode, but not found')
else
error('Qt5 >= 5.15 required for qt-modpack-installer in Qt5 mode, but not found')
endif
......
if qtver == 'qt6'
error('Qt6 >= 6.0 required for ruledit in Qt6 mode, but not found')
elif qtver == 'qt6x'
error('Qt6 >= 6.7 required for ruledit in Qt6x mode, but not found')
error('Qt6 >= 6.8 required for ruledit in Qt6x mode, but not found')
else
error('Qt5 >= 5.15 required for ruledit in Qt5 mode, but not found')
endif
(2-2/2)