Feature #959 » 0038-Qt6x-Make-Qt-6.7-the-minimum-requirement.patch
| client/gui-qt/chatline.cpp | ||
|---|---|---|
|
this, &chatwdg::toggle_size);
|
||
|
connect(remove_links, &QAbstractButton::clicked, this, &chatwdg::rm_links);
|
||
|
#ifdef FC_QT6X_MODE
|
||
|
#if QT_VERSION >= 0x060700
|
||
|
connect(cb, &QCheckBox::checkStateChanged, this, &chatwdg::state_changed);
|
||
|
#else // QT >= 6.7
|
||
|
connect(cb, &QCheckBox::stateChanged, this, &chatwdg::state_changed_depr);
|
||
|
#endif // QT >= 6.7
|
||
|
#else // FC_QT6X_MODE
|
||
|
connect(cb, &QCheckBox::stateChanged, this, &chatwdg::state_changed_depr);
|
||
|
#endif // FC_QT6X_MODE
|
||
| client/gui-qt/citydlg.cpp | ||
|---|---|---|
|
cma_celeb_checkbox = new QCheckBox;
|
||
|
slider_grid->addWidget(cma_celeb_checkbox, i + 1, 2 , 1 , 1);
|
||
|
#ifdef FC_QT6X_MODE
|
||
|
#if QT_VERSION >= 0x060700
|
||
|
connect(cma_celeb_checkbox,
|
||
|
&QCheckBox::checkStateChanged, this, &city_dialog::cma_toggle_changed);
|
||
|
#else // QT >= 6.7
|
||
|
connect(cma_celeb_checkbox,
|
||
|
&QCheckBox::stateChanged, this, &city_dialog::cma_toggle_changed_depr);
|
||
|
#endif // QT >= 6.7
|
||
|
#else // FC_QT6X_MODE
|
||
|
connect(cma_celeb_checkbox,
|
||
|
&QCheckBox::stateChanged, this, &city_dialog::cma_toggle_changed_depr);
|
||
| ... | ... | |
|
cma_max_growth = new QCheckBox;
|
||
|
slider_grid->addWidget(cma_max_growth, i + 1, 2 , 1 , 1);
|
||
|
#ifdef FC_QT6X_MODE
|
||
|
#if QT_VERSION >= 0x060700
|
||
|
connect(cma_max_growth,
|
||
|
&QCheckBox::checkStateChanged, this, &city_dialog::cma_toggle_changed);
|
||
|
#else // QT >= 6.7
|
||
|
connect(cma_max_growth,
|
||
|
&QCheckBox::stateChanged, this, &city_dialog::cma_toggle_changed_depr);
|
||
|
#endif // QT >= 6.7
|
||
|
#else // FC_QT6X_MODE
|
||
|
connect(cma_max_growth,
|
||
|
&QCheckBox::stateChanged, this, &city_dialog::cma_toggle_changed_depr);
|
||
| client/gui-qt/gotodlg.cpp | ||
|---|---|---|
|
connect(goto_city, &QAbstractButton::clicked, this, &goto_dialog::go_to_city);
|
||
|
connect(airlift_city, &QAbstractButton::clicked, this, &goto_dialog::airlift_to);
|
||
|
#ifdef FC_QT6X_MODE
|
||
|
#if QT_VERSION >= 0x060700
|
||
|
connect(show_all, &QCheckBox::checkStateChanged,
|
||
|
this, &goto_dialog::checkbox_changed);
|
||
|
#else // QT >= 6.7
|
||
|
connect(show_all, &QCheckBox::stateChanged,
|
||
|
this, &goto_dialog::checkbox_changed_depr);
|
||
|
#endif // QT >= 6.7
|
||
|
#else // FC_QT6X_MODE
|
||
|
connect(show_all, &QCheckBox::stateChanged,
|
||
|
this, &goto_dialog::checkbox_changed_depr);
|
||
| client/gui-qt/pages.cpp | ||
|---|---|---|
|
&QItemSelectionModel::selectionChanged, this,
|
||
|
&fc_client::slot_selection_changed);
|
||
|
#ifdef FC_QT6X_MODE
|
||
|
#if QT_VERSION >= 0x060700
|
||
|
connect(show_preview, &QCheckBox::checkStateChanged, this,
|
||
|
&fc_client::state_preview);
|
||
|
#else // QT >= 6.7
|
||
|
connect(show_preview, &QCheckBox::stateChanged, this,
|
||
|
&fc_client::state_preview_depr);
|
||
|
#endif // QT >= 6.7
|
||
|
#else // FC_QT6X_MODE
|
||
|
connect(show_preview, &QCheckBox::stateChanged, this,
|
||
|
&fc_client::state_preview_depr);
|
||
| 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([0x060600], [6.6])
|
||
|
xqt6x|xQt6x) FC_QT6([0x060700], [6.7])
|
||
|
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='0x060600'
|
||
|
qt_minver='0x060700'
|
||
|
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.6 required for qt-client in Qt6x mode, but not found')
|
||
|
error('Qt6 >= 6.7 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.6 required for qt-modpack-installer in Qt6x mode, but not found')
|
||
|
error('Qt6 >= 6.7 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.6 required for ruledit in Qt6x mode, but not found')
|
||
|
error('Qt6 >= 6.7 required for ruledit in Qt6x mode, but not found')
|
||
|
else
|
||
|
error('Qt5 >= 5.15 required for ruledit in Qt5 mode, but not found')
|
||
|
endif
|
||
- « Previous
- 1
- 2
- Next »