From 673530e008914d3e348e5a5410d37bb459e0018f Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 2 Mar 2022 01:20:06 +0200 Subject: [PATCH 27/27] Make Qt6-mode the default See osdn #43942 Signed-off-by: Marko Lindqvist --- INSTALL | 16 ++++++++-------- configure.ac | 12 ++++++------ doc/README.packaging | 7 ++++--- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/INSTALL b/INSTALL index 0d89b8b541..b7638eef9c 100644 --- a/INSTALL +++ b/INSTALL @@ -4,7 +4,7 @@ Installing Freeciv: 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 06-Feb-22. +Last minor update was 02-Mar-22. There may be a localized version of this file in the ./doc directory, named INSTALL. (e.g., INSTALL.de). @@ -313,8 +313,8 @@ following order: pkg-config, Glib, Atk, Pango, Gdk-Pixbuf, Gtk+. - C++ compiler. Qt-client is written in C++, so you need appropriate compiler. - Compiler needs to support c++11 standard, or, - in case of --with-qtver=qt6 build, c++17 standard + Compiler needs to support c++17 standard, or, + in case of --with-qtver=qt5 build, just c++11 standard In Freeciv development, g++ has been the primary C++ compiler. Also clang++ has been used. @@ -330,11 +330,11 @@ following order: pkg-config, Glib, Atk, Pango, Gdk-Pixbuf, Gtk+. environment variable MOCCMD, e.g., ./configure MOCCMD="/home/freeciv/local-qt/bin/moc" --enable-client=qt - - Qt5Core, Qt5Gui, and Qt5Widgets libraries and headers. - At least version 5.11 is required. - If one builds with configure option --with-qtver=qt6, - required libraries and headers are Qt6Core, Qt6Gui, and Qt6Widgets - and at least version 6.0 of Qt is required. + - Qt6Core, Qt6Gui, and Qt6Widgets libraries and headers. + At least version 6.0 is required. + If one configures with Qt5 compatibility switch --with-qtver=qt5, + required libraries and headers are Qt5Core, Qt5Gui, and Qt5Widgets + and at least version 5.11 of Qt is required. 2. Generating Makefiles diff --git a/configure.ac b/configure.ac index 4a7c3ce7c5..e93274125d 100644 --- a/configure.ac +++ b/configure.ac @@ -706,17 +706,17 @@ dnl Should we build experimental versions of Qt programs? dnl This needs to be before C++ compiler check FC_WORKING_CXX, and dnl that in turn needs to be before FC_DEBUG that will depend on compiler dnl when setting compiler flags. -AC_ARG_WITH([qt6], - AS_HELP_STRING([--with-qt6], [build Qt6 versions of Qt programs]), +AC_ARG_WITH([qt5], + AS_HELP_STRING([--with-qt5], [build Qt5 versions of Qt programs]), [case "${withval}" in - yes) qt_default="Qt6" ;; - *) qt_default="Qt5" ;; + yes) qt_default="Qt5" ;; + *) qt_default="Qt6" ;; esac]) if test "x$qt_default" = "x" ; then - qt_default="Qt5" + qt_default="Qt6" else - AC_MSG_WARN([--with-qt6 deprecated. Please use --with-qtver=qt6 instead]) + AC_MSG_WARN([--with-qt5 deprecated. Please use --with-qtver=qt5 instead]) fi AC_ARG_WITH([qtver], diff --git a/doc/README.packaging b/doc/README.packaging index 27e887b7ae..6890351f1c 100644 --- a/doc/README.packaging +++ b/doc/README.packaging @@ -31,9 +31,10 @@ Updating from 3.0 to 3.1 the official autotools one * Tex AI module gets statically linked in by default, if threading implementation supports it. -* Minimum Qt5 requirement for Qt-client, Qt modpack installer, and - Ruledit is 5.11. -* New configure option --with-qtver=qt6 builds Qt6 versions of Qt programs +* Qt-client, Qt modpack installer, and ruledit are built against + Qt6 by default. One can still build against Qt5 by giving + configure option --with-qtver=qt5 +* Minimum Qt5 requirement is 5.11. * Support for zstd compressed savegames added, requires libzstd and headers * Minimum Python requirement for code generation scripts is 3.4 now. -- 2.34.1