diff --git a/.ci/compile.sh b/.ci/compile.sh
index ee846897b..0a109b4f4 100755
--- a/.ci/compile.sh
+++ b/.ci/compile.sh
@@ -188,6 +188,8 @@ if [[ $RUNNER_OS == macOS ]]; then
# we use find to get the first subfolder with the name "macos"
# this works independent of the qt version as there should be only one version installed on the runner at a time
export QTDIR
+ # Add QTDIR to CMAKE_PREFIX_PATH so CMake can find Qt6
+ export CMAKE_PREFIX_PATH="$QTDIR:$CMAKE_PREFIX_PATH"
if [[ $TARGET_MACOS_VERSION ]]; then
# CMAKE_OSX_DEPLOYMENT_TARGET is a vanilla cmake flag needed to compile to target macOS version
diff --git a/.ci/update_translation_source_strings.sh b/.ci/update_translation_source_strings.sh
index 884858e70..859baccbd 100755
--- a/.ci/update_translation_source_strings.sh
+++ b/.ci/update_translation_source_strings.sh
@@ -31,7 +31,7 @@ if [[ ! -e $FILE ]]; then
fi
# print version
-if ! lupdate -version; then
+if ! /usr/lib/qt6/bin/lupdate -version; then
echo "failed to run lupdate" >&2
exit 4;
fi
@@ -39,7 +39,7 @@ fi
# run lupdate, duplicating the output in stderr and saving it
# for convenience we ignore that $DIRS will be split on spaces
# shellcheck disable=SC2086
-if ! got="$(lupdate $DIRS -ts "$FILE" | tee /dev/stderr)"; then
+if ! got="$(/usr/lib/qt6/bin/lupdate $DIRS -ts "$FILE" | tee /dev/stderr)"; then
echo "failed to update $FILE with $DIRS" >&2
exit 4;
fi
diff --git a/.github/workflows/translations-push.yml b/.github/workflows/translations-push.yml
index c4d3f61fb..e90dc0151 100644
--- a/.github/workflows/translations-push.yml
+++ b/.github/workflows/translations-push.yml
@@ -26,13 +26,13 @@ jobs:
shell: bash
run: |
sudo apt-get update
- sudo apt-get install -y --no-install-recommends qttools5-dev-tools
+ sudo apt-get install -y --no-install-recommends qt6-l10n-tools
- name: "Update Cockatrice translation source"
- env:
- FILE: cockatrice/cockatrice_en@source.ts
id: cockatrice
shell: bash
+ env:
+ FILE: cockatrice/cockatrice_en@source.ts
run: >
DIRS="cockatrice/src $(find . -maxdepth 1 -type d -name 'libcockatrice_*')"
.ci/update_translation_source_strings.sh
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c10e1db68..e651e88d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,8 +5,7 @@
# This file sets all the variables shared between the projects
# like the installation path, compilation flags etc..
-# cmake 3.16 is required if using qt6
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.25)
# Early detect ccache
option(USE_CCACHE "Cache the build results with ccache" ON)
@@ -52,12 +51,11 @@ if(WIN32 OR USE_VCPKG)
# Use vcpkg toolchain on Windows (and on macOS in CI)
set(CMAKE_TOOLCHAIN_FILE
${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake
- CACHE STRING "Vcpkg toolchain file"
+ CACHE FILEPATH "Vcpkg toolchain file"
)
# Qt path set by user or env var
if(QTDIR
OR DEFINED ENV{QTDIR}
- OR DEFINED ENV{QTDIR32}
OR DEFINED ENV{QTDIR64}
)
@@ -67,7 +65,7 @@ if(WIN32 OR USE_VCPKG)
CACHE PATH "Path to Qt (e.g. C:/Qt/5.7/msvc2015_64)"
)
message(
- WARNING "QTDIR variable is missing. Please set this variable to specify path to Qt (e.g. C:/Qt/5.7/msvc2015_64)"
+ WARNING "QTDIR variable is missing. Please set this variable to specify path to Qt (e.g. C:/Qt/5.7/msvc2015_64)"
)
endif()
endif()
@@ -151,7 +149,7 @@ if(MSVC)
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
add_compile_definitions(_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING)
-elseif(CMAKE_COMPILER_IS_GNUCXX)
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
# linux/gcc, bsd/gcc, windows/mingw
include(CheckCXXCompilerFlag)
@@ -174,7 +172,7 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
-Wno-error=delete-non-virtual-dtor
-Wno-error=sign-compare
-Wno-error=missing-declarations
- -Wno-error=sfinae-incomplete # GCC 16+: Qt MOC + protobuf forward decls trigger this
+ -Wno-error=sfinae-incomplete # GCC 16+: Qt MOC + protobuf forward decls trigger this
)
foreach(FLAG ${ADDITIONAL_DEBUG_FLAGS})
@@ -200,13 +198,6 @@ endif()
find_package(Threads REQUIRED)
-# Determine 32 or 64 bit build
-if(CMAKE_SIZEOF_VOID_P EQUAL 8)
- set(_lib_suffix 64)
-else()
- set(_lib_suffix 32)
-endif()
-
if(DEFINED QTDIR${_lib_suffix})
list(APPEND CMAKE_PREFIX_PATH "${QTDIR${_lib_suffix}}")
elseif(DEFINED QTDIR)
@@ -221,9 +212,12 @@ message(STATUS "Update Translations: ${UPDATE_TRANSLATIONS}")
include(FindQtRuntime)
+find_package(Qt6 6.4 REQUIRED)
+
set(CMAKE_AUTOMOC TRUE)
-# Find other needed libraries
+## Find other needed libraries
+# Find Protobuf
find_package(Protobuf CONFIG)
if(NOT Protobuf_FOUND)
find_package(Protobuf REQUIRED)
@@ -233,7 +227,7 @@ if(${Protobuf_VERSION} VERSION_LESS "3.21.0.0" AND NOT EXISTS "${Protobuf_PROTOC
message(FATAL_ERROR "No protoc command found!")
endif()
-#Find OpenSSL
+# Find OpenSSL
if(WIN32)
find_package(OpenSSL REQUIRED)
if(OPENSSL_FOUND)
@@ -246,7 +240,7 @@ if(WIN32)
endif()
endif()
-#Find VCredist
+# Find VCredist
if(MSVC)
find_package(VCredistRuntime)
endif()
@@ -282,8 +276,6 @@ if(UNIX)
set(CPACK_RPM_MAIN_COMPONENT "cockatrice")
if(Qt6_FOUND)
set(CPACK_RPM_PACKAGE_REQUIRES "protobuf, qt6-qttools, qt6-qtsvg, qt6-qtmultimedia, qt6-qtimageformats")
- elseif(Qt5_FOUND)
- set(CPACK_RPM_PACKAGE_REQUIRES "protobuf, qt5-qttools, qt5-qtsvg, qt5-qtmultimedia")
endif()
set(CPACK_RPM_PACKAGE_GROUP "Amusements/Games")
set(CPACK_RPM_PACKAGE_URL "http://github.com/Cockatrice/Cockatrice")
@@ -305,8 +297,6 @@ if(UNIX)
if(Qt6_FOUND)
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt6multimedia6, libqt6svg6, qt6-qpa-plugins, qt6-image-formats-plugins")
set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "libqt6sql6-mysql") # for connecting servatrice to a mysql db
- elseif(Qt5_FOUND)
- set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt5multimedia5-plugins, libqt5svg5")
endif()
endif()
endif()
@@ -367,7 +357,6 @@ if(TEST)
add_subdirectory(tests)
endif()
-if(Qt6_FOUND AND Qt6_VERSION_MINOR GREATER_EQUAL 3)
- # Qt6.3+ requires project finalization to support translations
+if(Qt6_FOUND)
qt6_finalize_project()
endif()
diff --git a/README.md b/README.md
index 9a27601cd..f22df461f 100644
--- a/README.md
+++ b/README.md
@@ -158,7 +158,6 @@ The following flags (with their non-default values) can be passed to `cmake`:
| `-DWARNING_AS_ERROR=0` | Don't treat compilation warnings as errors in debug mode |
| `-DUPDATE_TRANSLATIONS=1` | Configure `make` to update the translation .ts files for new strings in the source code
**Note:** `make clean` will remove the .ts files |
| `-DTEST=1` | Enable regression tests
**Note:** `make test` to run tests, *googletest* will be downloaded if not available |
-| `-DFORCE_USE_QT5=1` | Skip looking for Qt6 before trying to find Qt5 |
# Run
diff --git a/cmake/FindQtRuntime.cmake b/cmake/FindQtRuntime.cmake
index 485affe52..eecb1fcc8 100644
--- a/cmake/FindQtRuntime.cmake
+++ b/cmake/FindQtRuntime.cmake
@@ -1,8 +1,7 @@
# Find a compatible Qt version
-# Inputs: WITH_SERVER, WITH_CLIENT, WITH_ORACLE, FORCE_USE_QT5
+# Inputs: WITH_SERVER, WITH_CLIENT, WITH_ORACLE
# Optional Input: QT6_DIR -- Hint as to where Qt6 lives on the system
-# Optional Input: QT5_DIR -- Hint as to where Qt5 lives on the system
-# Output: COCKATRICE_QT_VERSION_NAME -- Example values: Qt5, Qt6
+# Output: COCKATRICE_QT_VERSION_NAME -- Example values: Qt6
# Output: SERVATRICE_QT_MODULES
# Output: COCKATRICE_QT_MODULES
# Output: ORACLE_QT_MODULES
@@ -39,54 +38,32 @@ set(REQUIRED_QT_COMPONENTS ${REQUIRED_QT_COMPONENTS} ${_SERVATRICE_NEEDED} ${_CO
)
list(REMOVE_DUPLICATES REQUIRED_QT_COMPONENTS)
-if(NOT FORCE_USE_QT5)
- # Linguist is now a component in Qt6 instead of an external package
- find_package(
- Qt6 6.4.2
- COMPONENTS ${REQUIRED_QT_COMPONENTS} Linguist
- QUIET HINTS ${Qt6_DIR}
- )
-endif()
+# Find Qt and all required components, as well as Linguist
+find_package(
+ Qt6
+ COMPONENTS ${REQUIRED_QT_COMPONENTS} Linguist
+ QUIET HINTS ${Qt6_DIR}
+)
+
if(Qt6_FOUND)
set(COCKATRICE_QT_VERSION_NAME Qt6)
+ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
- list(FIND Qt6LinguistTools_TARGETS Qt6::lrelease QT6_LRELEASE_INDEX)
- if(QT6_LRELEASE_INDEX EQUAL -1)
- message(WARNING "Qt6 lrelease not found.")
- endif()
-
- list(FIND Qt6LinguistTools_TARGETS Qt6::lupdate QT6_LUPDATE_INDEX)
- if(QT6_LUPDATE_INDEX EQUAL -1)
- message(WARNING "Qt6 lupdate not found.")
- endif()
-else()
- find_package(
- Qt5 5.15.2
- COMPONENTS ${REQUIRED_QT_COMPONENTS}
- QUIET HINTS ${Qt5_DIR}
- )
- if(Qt5_FOUND)
- set(COCKATRICE_QT_VERSION_NAME Qt5)
- else()
- message(FATAL_ERROR "No suitable version of Qt was found")
- endif()
-
- # Qt5 Linguist is in a separate package
- find_package(Qt5LinguistTools QUIET)
- if(Qt5LinguistTools_FOUND)
- if(NOT Qt5_LRELEASE_EXECUTABLE)
- message(WARNING "Qt5 lrelease not found.")
+ if(Qt6LinguistTools_FOUND)
+ list(FIND Qt6LinguistTools_TARGETS Qt6::lrelease QT6_LRELEASE_INDEX)
+ if(QT6_LRELEASE_INDEX EQUAL -1)
+ message(WARNING "Qt6 lrelease not found.")
endif()
- if(NOT Qt5_LUPDATE_EXECUTABLE)
- message(WARNING "Qt5 lupdate not found.")
+
+ list(FIND Qt6LinguistTools_TARGETS Qt6::lupdate QT6_LUPDATE_INDEX)
+ if(QT6_LUPDATE_INDEX EQUAL -1)
+ message(WARNING "Qt6 lupdate not found.")
endif()
else()
message(WARNING "Linguist Tools not found, cannot handle translations")
endif()
-endif()
-
-if(Qt5_POSITION_INDEPENDENT_CODE OR Qt6_FOUND)
- set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+else()
+ message(FATAL_ERROR "Qt6 not found")
endif()
# Establish Qt Plugins directory & Library directories
@@ -99,9 +76,6 @@ if(Qt6_FOUND)
# Mac needs a bit more help finding all necessary components
list(APPEND QT_LIBRARY_DIR "/usr/local/lib")
endif()
-elseif(Qt5_FOUND)
- get_filename_component(QT_PLUGINS_DIR "${Qt5Core_DIR}/../../../plugins" ABSOLUTE)
- get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE)
endif()
message(DEBUG "QT_PLUGINS_DIR = ${QT_PLUGINS_DIR}")
message(DEBUG "QT_LIBRARY_DIR = ${QT_LIBRARY_DIR}")
diff --git a/cmake/NSIS.template.in b/cmake/NSIS.template.in
index 5af116470..3d844c309 100644
--- a/cmake/NSIS.template.in
+++ b/cmake/NSIS.template.in
@@ -57,21 +57,13 @@ Page Custom PortableModePageCreate PortableModePageLeave
Function .onInit
-${If} ${NSIS_IS_64_BIT} == 1 #NSIS 64bit
+${If} ${NSIS_IS_64_BIT} == 1 # NSIS 64bit
${IfNot} ${RunningX64}
MessageBox MB_OK|MB_ICONSTOP "This version of Cockatrice requires a 64-bit Windows system."
Abort
${EndIf}
StrCpy $NormalDestDir "$ProgramFiles64\Cockatrice"
SetRegView 64
-${Else} #NSIS 32bit
- ${If} ${RunningX64}
- MessageBox MB_OK|MB_ICONEXCLAMATION \
- "You are about to install a 32-bit version of Cockatrice on a 64-bit Windows system.$\n\
- We advise you to use the correct 64-bit installer instead to get around potential issues.$\n$\n\
- Download from our webpage: https://cockatrice.github.io"
- ${EndIf}
- StrCpy $NormalDestDir "$ProgramFiles\Cockatrice"
${EndIf}
StrCpy $PortableDestDir "$Desktop\CockatricePortable"
@@ -175,27 +167,14 @@ Function AutoUninstallIfNeeded
SetShellVarContext all
-; --- 32-bit uninstall ---
-SetRegView 32
+SetRegView 64
ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "QuietUninstallString"
-StrCmp $R0 "" done32
-DetailPrint "Removing previous version (32-bit)..."
+StrCmp $R0 "" done64
+DetailPrint "Removing previous version..."
ExecWait '$R0'
-done32:
-
-; --- 64-bit uninstall ---
-${If} ${RunningX64}
- SetRegView 64
- ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "QuietUninstallString"
-
- StrCmp $R0 "" done64
- DetailPrint "Removing previous version (64-bit)..."
- ExecWait '$R0'
-
- done64:
-${EndIf}
+done64:
FunctionEnd
@@ -244,45 +223,23 @@ ${EndIf}
${If} $PortableMode = 0
SetShellVarContext all
- # uninstall 32bit version
- SetRegView 32
+ SetRegView 64
- ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "UninstallString"
- StrCmp $R0 "" done32
+ ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "UninstallString"
+ StrCmp $R0 "" done64
- ${If} $ReinstallMode = 0
- MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "A previous version of Cockatrice must be uninstalled before installing the new one." IDOK uninst32
+ ${If} $ReinstallMode = 0
+ MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "A previous version of Cockatrice must be uninstalled before installing the new one." IDOK uninst64
Abort
${Else}
- Goto uninst32
+ Goto uninst64
${EndIf}
- uninst32:
- ClearErrors
- ExecWait "$R0"
+ uninst64:
+ ClearErrors
+ ExecWait "$R0"
- done32:
-
- # uninstall 64bit version
- ${If} ${NSIS_IS_64_BIT} == 1
- SetRegView 64
-
- ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "UninstallString"
- StrCmp $R0 "" done64
-
- ${If} $ReinstallMode = 0
- MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "A previous version of Cockatrice must be uninstalled before installing the new one." IDOK uninst64
- Abort
- ${Else}
- Goto uninst64
- ${EndIf}
-
- uninst64:
- ClearErrors
- ExecWait "$R0"
-
- done64:
- ${EndIf}
+ done64:
${Else}
Abort
@@ -345,14 +302,6 @@ ${If} $PortableMode = 0
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "VersionMajor" "@CPACK_PACKAGE_VERSION_MAJOR@"
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "VersionMinor" "@CPACK_PACKAGE_VERSION_MINOR@"
- IfFileExists "$INSTDIR\vc_redist.x86.exe" VcRedist86Exists PastVcRedist86Check
- VcRedist86Exists:
- ExecWait '"$INSTDIR\vc_redist.x86.exe" /passive /norestart'
- DetailPrint "Wait to ensure unlock of vc_redist file after installation..."
- Sleep 3000
- Delete "$INSTDIR\vc_redist.x86.exe"
- PastVcRedist86Check:
-
IfFileExists "$INSTDIR\vc_redist.x64.exe" VcRedist64Exists PastVcRedist64Check
VcRedist64Exists:
ExecWait '"$INSTDIR\vc_redist.x64.exe" /passive /norestart'
diff --git a/cmake/gtest-CMakeLists.txt.in b/cmake/gtest-CMakeLists.txt.in
index 2062d7f8c..7f3925337 100644
--- a/cmake/gtest-CMakeLists.txt.in
+++ b/cmake/gtest-CMakeLists.txt.in
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.16)
project(gtest-download LANGUAGES NONE)
diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index 60ba06593..96282857c 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -401,8 +401,6 @@ endif(APPLE)
if(Qt6_FOUND)
qt6_add_resources(cockatrice_RESOURCES_RCC ${cockatrice_RESOURCES})
-elseif(Qt5_FOUND)
- qt5_add_resources(cockatrice_RESOURCES_RCC ${cockatrice_RESOURCES})
endif()
# Declare path variables
@@ -429,44 +427,7 @@ if(Qt6_FOUND)
${cockatrice_MOC_SRCS}
MANUAL_FINALIZATION
)
-elseif(Qt5_FOUND)
- # Qt5 Translations need to be linked at executable creation time
- if(Qt5LinguistTools_FOUND)
- if(UPDATE_TRANSLATIONS)
- qt5_create_translation(cockatrice_QM ${translate_SRCS} ${cockatrice_TS})
- else()
- qt5_add_translation(cockatrice_QM ${cockatrice_TS})
- endif()
- endif()
- add_executable(
- cockatrice WIN32 MACOSX_BUNDLE ${cockatrice_MOC_SRCS} ${cockatrice_QM} ${cockatrice_RESOURCES_RCC}
- ${cockatrice_SOURCES}
- )
- if(UNIX)
- if(APPLE)
- install(FILES ${cockatrice_QM} DESTINATION ${COCKATRICE_MAC_QM_INSTALL_DIR})
- else()
- install(FILES ${cockatrice_QM} DESTINATION ${COCKATRICE_UNIX_QM_INSTALL_DIR})
- endif()
- elseif(WIN32)
- install(FILES ${cockatrice_QM} DESTINATION ${COCKATRICE_WIN32_QM_INSTALL_DIR})
- endif()
-endif()
-if(Qt5_FOUND)
- target_link_libraries(
- cockatrice
- libcockatrice_card
- libcockatrice_deck_list
- libcockatrice_filters
- libcockatrice_utility
- libcockatrice_network
- libcockatrice_models
- libcockatrice_rng
- libcockatrice_settings
- ${COCKATRICE_QT_MODULES}
- )
-else()
target_link_libraries(
cockatrice
PUBLIC libcockatrice_card
@@ -509,7 +470,7 @@ if(APPLE)
set(plugin_dest_dir cockatrice.app/Contents/Plugins)
set(qtconf_dest_dir cockatrice.app/Contents/Resources)
- # Qt plugins: audio (Qt5), iconengines, imageformats, multimedia (Qt6), platforms, printsupport (Qt5), styles, tls (Qt6)
+ # Qt plugins: iconengines, imageformats, multimedia (Qt6), platforms, styles, tls (Qt6)
install(
DIRECTORY "${QT_PLUGINS_DIR}/"
DESTINATION ${plugin_dest_dir}
@@ -517,12 +478,10 @@ if(APPLE)
FILES_MATCHING
PATTERN "*.dSYM" EXCLUDE
PATTERN "*_debug.dylib" EXCLUDE
- PATTERN "audio/*.dylib"
PATTERN "iconengines/*.dylib"
PATTERN "imageformats/*.dylib"
PATTERN "multimedia/*.dylib"
PATTERN "platforms/*.dylib"
- PATTERN "printsupport/*.dylib"
PATTERN "styles/*.dylib"
PATTERN "tls/*.dylib"
)
@@ -576,14 +535,12 @@ if(WIN32)
PATTERN "*.ini"
)
- # Qt plugins: audio (Qt5), iconengines, imageformats, multimedia (Qt6) platforms, printsupport (Qt5), styles, tls (Qt6)
+ # Qt plugins: iconengines, imageformats, multimedia (Qt6) platforms, styles, tls (Qt6)
install(
DIRECTORY "${QT_PLUGINS_DIR}/"
DESTINATION ${plugin_dest_dir}
COMPONENT Runtime
FILES_MATCHING
- PATTERN "audio/qtaudio_wasapi.dll"
- PATTERN "audio/qtaudio_windows.dll"
PATTERN "iconengines/qsvgicon.dll"
PATTERN "imageformats/*.dll"
PATTERN "mediaservice/dsengine.dll"
@@ -593,7 +550,6 @@ if(WIN32)
PATTERN "platforms/qminimal.dll"
PATTERN "platforms/qoffscreen.dll"
PATTERN "platforms/qwindows.dll"
- PATTERN "printsupport/windowsprintersupport.dll"
PATTERN "styles/qcertonlybackend.dll"
PATTERN "styles/qopensslbackend.dll"
PATTERN "styles/qschannelbackend.dll"
diff --git a/cockatrice/src/client/network/update/client/release_channel.cpp b/cockatrice/src/client/network/update/client/release_channel.cpp
index 260167bc8..338cd5ccc 100644
--- a/cockatrice/src/client/network/update/client/release_channel.cpp
+++ b/cockatrice/src/client/network/update/client/release_channel.cpp
@@ -59,7 +59,7 @@ bool ReleaseChannel::downloadMatchesCurrentOS(const QString &fileName)
char arch[255];
size_t len = sizeof(arch);
if (sysctlbyname("machdep.cpu.brand_string", arch, &len, nullptr, 0) == 0) {
- // Intel mac is only supported on macOS 13 versions
+ // Intel Mac is only supported on macOS 13 versions
if (QString::fromUtf8(arch).contains("Intel")) {
return 13;
}
@@ -74,13 +74,9 @@ bool ReleaseChannel::downloadMatchesCurrentOS(const QString &fileName)
return rel_maj == sys_maj;
#elif defined(Q_OS_WIN)
-#if Q_PROCESSOR_WORDSIZE == 4
- return fileName.contains("32bit");
-#elif Q_PROCESSOR_WORDSIZE == 8
+#if Q_PROCESSOR_WORDSIZE == 8 // 64-bit
const QString &version = QSysInfo::productVersion();
- if (version.startsWith("7") || version.startsWith("8")) {
- return fileName.contains("Win7");
- } else {
+ if (version.startsWith("10")) {
return fileName.contains("Win10");
}
#else
diff --git a/cockatrice/src/client/sound_engine.cpp b/cockatrice/src/client/sound_engine.cpp
index e592b5ea0..7a4a4f7d2 100644
--- a/cockatrice/src/client/sound_engine.cpp
+++ b/cockatrice/src/client/sound_engine.cpp
@@ -2,13 +2,10 @@
#include "settings/cache_settings.h"
+#include
#include
#include
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
-#include
-#endif
-
#define DEFAULT_THEME_NAME "Default"
#define TEST_SOUND_FILENAME "player_join"
@@ -40,10 +37,8 @@ void SoundEngine::soundEnabledChanged()
qCInfo(SoundEngineLog) << "SoundEngine: enabling sound with" << audioData.size() << "sounds";
if (!player) {
player = new QMediaPlayer;
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
audioOutput = new QAudioOutput(player);
player->setAudioOutput(audioOutput);
-#endif
}
} else {
qCInfo(SoundEngineLog) << "SoundEngine: disabling sound";
@@ -71,13 +66,8 @@ void SoundEngine::playSound(const QString &fileName)
player->stop();
int volumeSliderValue = SettingsCache::instance().getMasterVolume();
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
player->audioOutput()->setVolume(qreal(volumeSliderValue) / 100);
player->setSource(QUrl::fromLocalFile(audioData[fileName]));
-#else
- player->setVolume(volumeSliderValue);
- player->setMedia(QUrl::fromLocalFile(audioData[fileName]));
-#endif
player->play();
}
diff --git a/cockatrice/src/game/player/player_actions.cpp b/cockatrice/src/game/player/player_actions.cpp
index df9eb8a1d..9c644a26c 100644
--- a/cockatrice/src/game/player/player_actions.cpp
+++ b/cockatrice/src/game/player/player_actions.cpp
@@ -1352,11 +1352,7 @@ void PlayerActions::actSetPT(QList selectedCards, const QString &pt)
const auto oldpt = CardItem::parsePT(card->getPT());
int ptIter = 0;
for (const auto &_item : ptList) {
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
if (_item.typeId() == QMetaType::Type::Int) {
-#else
- if (_item.type() == QVariant::Int) {
-#endif
int oldItem = ptIter < oldpt.size() ? oldpt.at(ptIter).toInt() : 0;
newpt += '/' + QString::number(oldItem + _item.toInt());
} else {
diff --git a/cockatrice/src/game_graphics/player/player_list_widget.cpp b/cockatrice/src/game_graphics/player/player_list_widget.cpp
index 6b1cf6cc6..4268e1019 100644
--- a/cockatrice/src/game_graphics/player/player_list_widget.cpp
+++ b/cockatrice/src/game_graphics/player/player_list_widget.cpp
@@ -25,11 +25,7 @@ bool PlayerListItemDelegate::editorEvent(QEvent *event,
if ((event->type() == QEvent::MouseButtonPress) && index.isValid()) {
auto *const mouseEvent = static_cast(event);
if (mouseEvent->button() == Qt::RightButton) {
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
static_cast(parent())->showContextMenu(mouseEvent->globalPosition().toPoint(), index);
-#else
- static_cast(parent())->showContextMenu(mouseEvent->globalPos(), index);
-#endif
return true;
}
}
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp
index bd427a6c8..62d727704 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp
@@ -312,13 +312,7 @@ bool CardPictureLoader::hasCustomArt()
// Check if there is at least one non-directory file in the pics path, other
// than in the "downloadedPics" subdirectory.
while (it.hasNext()) {
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 3, 0))
QFileInfo dir(it.nextFileInfo());
-#else
- // nextFileInfo() is only available in Qt 6.3+, for previous versions, we build
- // the QFileInfo from a QString which requires more system calls.
- QFileInfo dir(it.next());
-#endif
if (it.fileName() == "downloadedPics") {
continue;
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp
index 3bfd9ce7d..69b8301a9 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp
@@ -246,11 +246,7 @@ QSize CardInfoPictureWidget::sizeHint() const
* @brief Starts the hover timer to show the enlarged pixmap on hover.
* @param event The enter event.
*/
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
void CardInfoPictureWidget::enterEvent(QEnterEvent *event)
-#else
-void CardInfoPictureWidget::enterEvent(QEvent *event)
-#endif
{
QWidget::enterEvent(event); // Call the base class implementation
diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h
index 1f065eed9..4fe84ed0b 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h
@@ -48,11 +48,7 @@ signals:
protected:
void resizeEvent(QResizeEvent *event) override;
void paintEvent(QPaintEvent *) override;
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
- void enterEvent(QEnterEvent *event) override; // Qt6 signature
-#else
- void enterEvent(QEvent *event) override; // Qt5 signature
-#endif
+ void enterEvent(QEnterEvent *event) override;
void leaveEvent(QEvent *event) override;
void moveEvent(QMoveEvent *event) override;
void mouseMoveEvent(QMouseEvent *event) override;
diff --git a/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp b/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp
index f7bb5ac35..250fe1ad3 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp
@@ -147,11 +147,7 @@ bool ResizablePanel::eventFilter(QObject *obj, QEvent *event)
if (event->type() == QEvent::MouseButtonPress) {
auto *mouseEvent = static_cast(event);
if (mouseEvent->button() == Qt::LeftButton) {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
dragStartPos = mouseEvent->globalPosition().toPoint();
-#else
- dragStartPos = mouseEvent->globalPos();
-#endif
isDraggingPanel = false;
dragButton->setCursor(Qt::ClosedHandCursor);
}
@@ -159,11 +155,7 @@ bool ResizablePanel::eventFilter(QObject *obj, QEvent *event)
} else if (event->type() == QEvent::MouseMove) {
auto *mouseEvent = static_cast(event);
if (mouseEvent->buttons() & Qt::LeftButton) {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QPoint currentPos = mouseEvent->globalPosition().toPoint();
-#else
- QPoint currentPos = mouseEvent->globalPos();
-#endif
int distance = (currentPos - dragStartPos).manhattanLength();
if (distance >= 5 && !isDraggingPanel) {
isDraggingPanel = true;
@@ -182,22 +174,14 @@ bool ResizablePanel::eventFilter(QObject *obj, QEvent *event)
if (obj == resizeHandle) {
if (event->type() == QEvent::MouseButtonPress) {
auto *mouseEvent = static_cast(event);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
resizeStartY = mouseEvent->globalPosition().y();
-#else
- resizeStartY = mouseEvent->globalPos().y();
-#endif
isResizing = true;
resizeStartHeight = currentHeight;
resizeHandle->grabMouse();
return true;
} else if (event->type() == QEvent::MouseMove && isResizing) {
auto *mouseEvent = static_cast(event);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
int deltaY = mouseEvent->globalPosition().y() - resizeStartY;
-#else
- int deltaY = mouseEvent->globalPos().y() - resizeStartY;
-#endif
int newHeight = resizeStartHeight + deltaY;
int minAllowed = getMinimumAllowedHeight();
@@ -221,11 +205,7 @@ void ResizablePanel::dragEnterEvent(QDragEnterEvent *event)
{
if (event->mimeData()->hasFormat("application/x-resizablepanel")) {
event->acceptProposedAction();
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
showDropIndicator(event->position().y());
-#else
- showDropIndicator(event->pos().y());
-#endif
}
}
@@ -233,13 +213,8 @@ void ResizablePanel::dragMoveEvent(QDragMoveEvent *event)
{
if (event->mimeData()->hasFormat("application/x-resizablepanel")) {
event->acceptProposedAction();
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
showDropIndicator(event->position().y());
lastDragPos = mapToGlobal(event->position().toPoint());
-#else
- showDropIndicator(event->pos().y());
- lastDragPos = mapToGlobal(event->pos());
-#endif
if (!autoScrollTimer->isActive()) {
autoScrollTimer->start();
@@ -265,11 +240,7 @@ void ResizablePanel::dropEvent(QDropEvent *event)
ResizablePanel *draggedPanel = reinterpret_cast(ptr);
if (draggedPanel && draggedPanel != this) {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
bool insertBefore = (event->position().y() < height() / 2);
-#else
- bool insertBefore = (event->pos().y() < height() / 2);
-#endif
emit dropRequested(draggedPanel, this, insertBefore);
event->acceptProposedAction();
}
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp
index bc846bf3d..8eed083e1 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp
@@ -321,11 +321,7 @@ void DlgSelectSetForCards::dropEvent(QDropEvent *event)
{
QByteArray itemData = event->mimeData()->data("application/x-setentrywidget");
QString draggedSetName = QString::fromUtf8(itemData);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QPoint adjustedPos = event->position().toPoint() + QPoint(0, scrollArea->verticalScrollBar()->value());
-#else
- QPoint adjustedPos = event->pos() + QPoint(0, scrollArea->verticalScrollBar()->value());
-#endif
int dropIndex = -1;
for (int i = 0; i < listLayout->count(); ++i) {
QWidget *widget = listLayout->itemAt(i)->widget();
@@ -491,11 +487,7 @@ void SetEntryWidget::mousePressEvent(QMouseEvent *event)
}
}
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
void SetEntryWidget::enterEvent(QEnterEvent *event)
-#else
-void SetEntryWidget::enterEvent(QEvent *event)
-#endif
{
QWidget::enterEvent(event); // Call the base class handler
// Highlight the widget by changing the background color only for the widget itself
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.h b/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.h
index 92f285aa0..4528552d0 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.h
@@ -87,11 +87,7 @@ public:
public slots:
void mousePressEvent(QMouseEvent *event) override;
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
void enterEvent(QEnterEvent *event) override;
-#else
- void enterEvent(QEvent *event) override;
-#endif
void leaveEvent(QEvent *event) override;
void dragMoveEvent(QDragMoveEvent *event) override;
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.cpp b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.cpp
index d9e108e6a..04315d0ce 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.cpp
@@ -207,11 +207,7 @@ void BarChartWidget::mouseMoveEvent(QMouseEvent *e)
if (hoveredSegment >= 0) {
const auto &s = segments[hoveredSegment];
QString text = QString("%1: %2 cards\n\n%3").arg(s.category).arg(s.value).arg(s.cards.join("\n"));
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QToolTip::showText(e->globalPosition().toPoint(), text, this);
-#else
- QToolTip::showText(e->globalPos(), text, this);
-#endif
} else {
QToolTip::hideText();
}
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.cpp b/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.cpp
index 12ab5bb3b..1087c621e 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.cpp
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.cpp
@@ -83,19 +83,11 @@ void ColorBar::paintEvent(QPaintEvent *)
}
}
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
void ColorBar::enterEvent(QEnterEvent *event)
{
Q_UNUSED(event);
isHovered = true;
}
-#else
-void ColorBar::enterEvent(QEvent *event)
-{
- Q_UNUSED(event);
- isHovered = true;
-}
-#endif
void ColorBar::leaveEvent(QEvent *)
{
@@ -108,13 +100,8 @@ void ColorBar::mouseMoveEvent(QMouseEvent *event)
return;
}
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
int x = int(event->position().x());
QPoint gp = event->globalPosition().toPoint();
-#else
- int x = event->pos().x();
- QPoint gp = event->globalPos();
-#endif
QString text = tooltipForPosition(x);
if (!text.isEmpty()) {
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.h b/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.h
index 100f95310..1d435cec1 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.h
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.h
@@ -76,17 +76,10 @@ protected:
*/
void paintEvent(QPaintEvent *event) override;
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
/**
- * @brief Handles mouse hover entering (Qt6 version).
+ * @brief Handles mouse hover entering.
*/
void enterEvent(QEnterEvent *event) override;
-#else
- /**
- * @brief Handles mouse hover entering (Qt5 version).
- */
- void enterEvent(QEvent *event) override;
-#endif
/**
* @brief Handles mouse hover leaving.
diff --git a/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp b/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp
index 9bad32bda..03c69373a 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp
@@ -134,9 +134,5 @@ void SegmentedBarWidget::mouseMoveEvent(QMouseEvent *e)
const Segment &s = segments[idx];
QString text = QString("%1: %2 cards\n%3").arg(s.category).arg(s.value).arg(s.cards.join(", "));
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QToolTip::showText(e->globalPosition().toPoint(), text, this);
-#else
- QToolTip::showText(e->globalPos(), text, this);
-#endif
}
diff --git a/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.cpp b/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.cpp
index b129fbe18..b71b24a40 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.cpp
+++ b/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.cpp
@@ -82,11 +82,9 @@ void ColorPie::paintEvent(QPaintEvent *)
QString label = QString("%1%").arg(int(ratio * 100 + 0.5));
QFontMetrics fm(p.font());
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
+
int labelWidth = fm.horizontalAdvance(label);
-#else
- int labelWidth = fm.width(label);
-#endif
+
QRectF textRect(labelPos.x() - labelWidth / 2.0, labelPos.y() - fm.height() / 2.0, labelWidth, fm.height());
p.setPen(Qt::black);
@@ -96,19 +94,11 @@ void ColorPie::paintEvent(QPaintEvent *)
}
}
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
void ColorPie::enterEvent(QEnterEvent *event)
{
Q_UNUSED(event);
isHovered = true;
}
-#else
-void ColorPie::enterEvent(QEvent *event)
-{
- Q_UNUSED(event);
- isHovered = true;
-}
-#endif
void ColorPie::leaveEvent(QEvent *)
{
@@ -121,13 +111,8 @@ void ColorPie::mouseMoveEvent(QMouseEvent *event)
return;
}
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QPoint p = event->position().toPoint();
QPoint gp = event->globalPosition().toPoint();
-#else
- QPoint p = event->pos();
- QPoint gp = event->globalPos();
-#endif
QString text = tooltipForPoint(p);
if (!text.isEmpty()) {
diff --git a/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.h b/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.h
index 7d71ea3b9..60d8e18f2 100644
--- a/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.h
+++ b/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.h
@@ -22,11 +22,7 @@ public:
protected:
void paintEvent(QPaintEvent *) override;
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
void enterEvent(QEnterEvent *event) override;
-#else
- void enterEvent(QEvent *event) override;
-#endif
void leaveEvent(QEvent *) override;
void mouseMoveEvent(QMouseEvent *event) override;
diff --git a/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp
index 05e269174..579106540 100644
--- a/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp
@@ -141,11 +141,7 @@ bool AllZonesCardAmountWidget::isNonZero()
*
* @param event The event information for the mouse entry.
*/
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
void AllZonesCardAmountWidget::enterEvent(QEnterEvent *event)
-#else
-void AllZonesCardAmountWidget::enterEvent(QEvent *event)
-#endif
{
QWidget::enterEvent(event);
update();
diff --git a/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h b/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h
index de4a984be..325dd1c1b 100644
--- a/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h
@@ -26,11 +26,7 @@ public:
int getTokensboardAmount();
bool isNonZero();
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
void enterEvent(QEnterEvent *event) override;
-#else
- void enterEvent(QEvent *event) override;
-#endif
public slots:
void adjustFontSize(int scalePercentage);
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
index dd5f6dd7f..b7144735e 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
@@ -105,11 +105,7 @@ void PrintingSelectorCardOverlayWidget::resizeEvent(QResizeEvent *event)
*
* @param event The event triggered when the mouse enters the widget.
*/
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
void PrintingSelectorCardOverlayWidget::enterEvent(QEnterEvent *event)
-#else
-void PrintingSelectorCardOverlayWidget::enterEvent(QEvent *event)
-#endif
{
QWidget::enterEvent(event);
deckEditor->updateCard(rootCard);
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h
index 52a43d220..228393c9c 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h
@@ -26,11 +26,7 @@ public:
protected:
void resizeEvent(QResizeEvent *event) override;
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
void enterEvent(QEnterEvent *event) override;
-#else
- void enterEvent(QEvent *event) override;
-#endif
void leaveEvent(QEvent *event) override;
void mousePressEvent(QMouseEvent *event) override;
void customMenu(QPoint point);
diff --git a/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp b/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp
index badc437ee..3e631bd8f 100644
--- a/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp
+++ b/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp
@@ -103,11 +103,7 @@ void SettingsButtonWidget::onPopupClosed() const
void SettingsButtonWidget::mousePressEvent(QMouseEvent *event)
{
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
if (popup->isVisible() && !popup->geometry().contains(event->globalPosition().toPoint())) {
-#else
- if (popup->isVisible() && !popup->geometry().contains(event->globalPos())) {
-#endif
popup->close();
}
QWidget::mousePressEvent(event);
diff --git a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp b/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp
index 46a3dff40..e95b9f606 100644
--- a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp
+++ b/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp
@@ -70,11 +70,7 @@ void ReplayTimelineWidget::paintEvent(QPaintEvent * /* event */)
void ReplayTimelineWidget::mousePressEvent(QMouseEvent *event)
{
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
int newTime = static_cast((qint64)maxTime * (qint64)event->position().x() / width());
-#else
- int newTime = static_cast((qint64)maxTime * (qint64)event->x() / width());
-#endif
// don't buffer rewinds from clicks, since clicks usually don't happen fast enough to require buffering
skipToTime(newTime, false);
}
diff --git a/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp b/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp
index ccbbe9246..0a51d75c9 100644
--- a/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp
+++ b/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp
@@ -529,23 +529,13 @@ void ChatView::showSystemPopup(const QString &userName)
QColor ChatView::getCustomMentionColor()
{
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 4, 0))
QColor customColor = QColor::fromString("#" + SettingsCache::instance().getChatMentionColor());
-#else
- QColor customColor;
- customColor.setNamedColor("#" + SettingsCache::instance().getChatMentionColor());
-#endif
return customColor.isValid() ? customColor : DEFAULT_MENTION_COLOR;
}
QColor ChatView::getCustomHighlightColor()
{
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 4, 0))
QColor customColor = QColor::fromString("#" + SettingsCache::instance().getChatMentionColor());
-#else
- QColor customColor;
- customColor.setNamedColor("#" + SettingsCache::instance().getChatMentionColor());
-#endif
return customColor.isValid() ? customColor : DEFAULT_MENTION_COLOR;
}
@@ -578,11 +568,7 @@ void ChatView::redactMessages(const QString &userName, int amount)
}
}
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
void ChatView::enterEvent(QEnterEvent * /*event*/)
-#else
-void ChatView::enterEvent(QEvent * /*event*/)
-#endif
{
setMouseTracking(true);
}
@@ -639,12 +625,9 @@ void ChatView::mousePressEvent(QMouseEvent *event)
{
switch (hoveredItemType) {
case HoveredCard: {
- if ((event->button() == Qt::MiddleButton) || (event->button() == Qt::LeftButton))
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+ if ((event->button() == Qt::MiddleButton) || (event->button() == Qt::LeftButton)) {
emit showCardInfoPopup(event->globalPosition().toPoint(), {hoveredContent});
-#else
- emit showCardInfoPopup(event->globalPos(), {hoveredContent});
-#endif
+ }
break;
}
case HoveredUser: {
@@ -654,11 +637,7 @@ void ChatView::mousePressEvent(QMouseEvent *event)
switch (event->button()) {
case Qt::RightButton: {
UserLevelFlags userLevel(hoveredContent.left(delimiterIndex).toInt());
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
userContextMenu->showContextMenu(event->globalPosition().toPoint(), userName, userLevel, this);
-#else
- userContextMenu->showContextMenu(event->globalPos(), userName, userLevel, this);
-#endif
break;
}
case Qt::LeftButton: {
diff --git a/cockatrice/src/interface/widgets/server/chat_view/chat_view.h b/cockatrice/src/interface/widgets/server/chat_view/chat_view.h
index c5ae2b81a..506605d24 100644
--- a/cockatrice/src/interface/widgets/server/chat_view/chat_view.h
+++ b/cockatrice/src/interface/widgets/server/chat_view/chat_view.h
@@ -103,11 +103,7 @@ public:
void redactMessages(const QString &userName, int amount);
protected:
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
void enterEvent(QEnterEvent *event) override;
-#else
- void enterEvent(QEvent *event) override;
-#endif
void leaveEvent(QEvent *event) override;
void mouseMoveEvent(QMouseEvent *event) override;
void mousePressEvent(QMouseEvent *event) override;
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp b/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp
index 09480b1a1..4bf6de336 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp
@@ -339,11 +339,7 @@ bool UserListItemDelegate::editorEvent(QEvent *event,
if ((event->type() == QEvent::MouseButtonPress) && index.isValid()) {
QMouseEvent *const mouseEvent = static_cast(event);
if (mouseEvent->button() == Qt::RightButton) {
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
static_cast(parent())->showContextMenu(mouseEvent->globalPosition().toPoint(), index);
-#else
- static_cast(parent())->showContextMenu(mouseEvent->globalPos(), index);
-#endif
return true;
}
}
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.cpp
index 70156df79..c35c2d0b8 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.cpp
@@ -137,11 +137,7 @@ void ArchidektApiResponseDeckEntryDisplayWidget::mousePressEvent(QMouseEvent *ev
actRequestNavigationToDeck();
}
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
void ArchidektApiResponseDeckEntryDisplayWidget::enterEvent(QEnterEvent *event)
-#else
-void ArchidektApiResponseDeckEntryDisplayWidget::enterEvent(QEvent *event)
-#endif
{
QWidget::enterEvent(event);
backgroundPlateWidget->setFocused(true);
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.h
index 365a99c9c..7d0526fd4 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.h
@@ -97,12 +97,7 @@ public slots:
protected:
void mousePressEvent(QMouseEvent *event) override;
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
- void enterEvent(QEnterEvent *event) override; ///< Qt6 hover enter
-#else
- void enterEvent(QEvent *event) override; ///< Qt5 hover enter
-#endif
+ void enterEvent(QEnterEvent *event) override;
void leaveEvent(QEvent *event) override;
private:
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
index 9d45f254b..9d294f10c 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.cpp
@@ -65,11 +65,7 @@ void EdhrecApiResponseCardDetailsDisplayWidget::mousePressEvent(QMouseEvent *eve
}
}
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
void EdhrecApiResponseCardDetailsDisplayWidget::enterEvent(QEnterEvent *event)
-#else
-void EdhrecApiResponseCardDetailsDisplayWidget::enterEvent(QEvent *event)
-#endif
{
QWidget::enterEvent(event);
backgroundPlateWidget->setFocused(true);
diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h
index 5daf32412..2c81e155a 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_details_display_widget.h
@@ -39,11 +39,7 @@ private:
protected slots:
void mousePressEvent(QMouseEvent *event) override;
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
- void enterEvent(QEnterEvent *event) override; ///< Qt6 hover enter
-#else
- void enterEvent(QEvent *event) override; ///< Qt5 hover enter
-#endif
+ void enterEvent(QEnterEvent *event) override;
void leaveEvent(QEvent *event) override;
};
diff --git a/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp b/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
index 52309d94b..45512ce68 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
@@ -38,18 +38,6 @@
#include
#include
-QRect MacOSTabFixStyle::subElementRect(SubElement element, const QStyleOption *option, const QWidget *widget) const
-{
- if (element != SE_TabBarTabText) {
- return QProxyStyle::subElementRect(element, option, widget);
- }
-
- // Skip over QProxyStyle handling subElementRect,
- // This fixes an issue with Qt 5.10 on OSX where the labels for tabs with a button and an icon
- // get cut-off too early
- return QCommonStyle::subElementRect(element, option, widget);
-}
-
CloseButton::CloseButton(QWidget *parent) : QAbstractButton(parent)
{
setFocusPolicy(Qt::NoFocus);
@@ -65,11 +53,7 @@ QSize CloseButton::sizeHint() const
return {width, height};
}
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
void CloseButton::enterEvent(QEnterEvent *event)
-#else
-void CloseButton::enterEvent(QEvent *event)
-#endif
{
update();
QAbstractButton::enterEvent(event);
@@ -117,12 +101,6 @@ TabSupervisor::TabSupervisor(AbstractClient *_client, QMenu *tabsMenu, QWidget *
setMovable(true);
setIconSize(QSize(15, 15));
-#if defined(Q_OS_MAC)
- // This is necessary to fix an issue on macOS with qt5.10,
- // where tabs with icons and buttons get drawn incorrectly
- tabBar()->setStyle(new MacOSTabFixStyle);
-#endif
-
userListManager = new UserListManager(client, this);
// connect tab changes
diff --git a/cockatrice/src/interface/widgets/tabs/tab_supervisor.h b/cockatrice/src/interface/widgets/tabs/tab_supervisor.h
index 3eac144b7..d645bc7d7 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_supervisor.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_supervisor.h
@@ -21,7 +21,6 @@
#include
#include
#include
-#include
#include
class TabCardArtRules;
@@ -52,13 +51,6 @@ class ServerInfo_User;
class GameReplay;
class DeckList;
-class MacOSTabFixStyle : public QProxyStyle
-{
- Q_OBJECT
-public:
- QRect subElementRect(SubElement, const QStyleOption *, const QWidget *) const override;
-};
-
class CloseButton : public QAbstractButton
{
Q_OBJECT
@@ -71,11 +63,7 @@ public:
}
protected:
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
void enterEvent(QEnterEvent *event) override;
-#else
- void enterEvent(QEvent *event) override;
-#endif
void leaveEvent(QEvent *event) override;
void paintEvent(QPaintEvent *event) override;
};
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp
index 06dc9dd84..668383663 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp
@@ -71,11 +71,7 @@ void DeckPreviewWidget::resizeEvent(QResizeEvent *event)
}
}
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
void DeckPreviewWidget::enterEvent(QEnterEvent *event)
-#else
-void DeckPreviewWidget::enterEvent(QEvent *event)
-#endif
{
QWidget::enterEvent(event);
diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h
index 0ed64e9e2..de66c194b 100644
--- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h
@@ -72,11 +72,7 @@ public slots:
void resizeEvent(QResizeEvent *event) override;
protected:
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
- void enterEvent(QEnterEvent *event) override; // Qt6 signature
-#else
- void enterEvent(QEvent *event) override; // Qt5 signature
-#endif
+ void enterEvent(QEnterEvent *event) override;
private:
void updateLastModifiedTime();
diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp
index ad68d4be9..b8793bc78 100644
--- a/cockatrice/src/main.cpp
+++ b/cockatrice/src/main.cpp
@@ -128,11 +128,7 @@ void installNewTranslator()
QString lang = SettingsCache::instance().getLang();
QString qtNameHint = "qt_" + lang;
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
QString qtTranslationPath = QLibraryInfo::path(QLibraryInfo::TranslationsPath);
-#else
- QString qtTranslationPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
-#endif
bool qtTranslationLoaded = qtTranslator->load(qtNameHint, qtTranslationPath);
if (!qtTranslationLoaded) {
@@ -277,9 +273,6 @@ int main(int argc, char *argv[])
// force shortcuts to be shown/hidden in right-click menus, regardless of system defaults
qApp->setAttribute(Qt::AA_DontShowShortcutsInContextMenus, !SettingsCache::instance().getShowShortcuts());
-#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
- app.setAttribute(Qt::AA_UseHighDpiPixmaps);
-#endif
app.exec();
qCInfo(MainLog) << "Event loop finished, terminating...";
diff --git a/libcockatrice_card/CMakeLists.txt b/libcockatrice_card/CMakeLists.txt
index dd3799e33..ac8c7cdeb 100644
--- a/libcockatrice_card/CMakeLists.txt
+++ b/libcockatrice_card/CMakeLists.txt
@@ -21,8 +21,6 @@ set(HEADERS
if(Qt6_FOUND)
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
- qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
endif()
add_library(
diff --git a/libcockatrice_card/libcockatrice/card/card_info_comparator.cpp b/libcockatrice_card/libcockatrice/card/card_info_comparator.cpp
index 821cc8675..4133b7de0 100644
--- a/libcockatrice_card/libcockatrice/card/card_info_comparator.cpp
+++ b/libcockatrice_card/libcockatrice/card/card_info_comparator.cpp
@@ -25,22 +25,13 @@ bool CardInfoComparator::operator()(const CardInfoPtr &a, const CardInfoPtr &b)
bool CardInfoComparator::compareVariants(const QVariant &a, const QVariant &b) const
{
- // Determine the type of QVariant based on Qt version
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
if (a.typeId() != b.typeId()) {
-#else
- if (a.type() != b.type()) {
-#endif
// If they are not the same type, compare as strings
return a.toString() < b.toString();
}
// Perform type-specific comparison
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
switch (static_cast(a.typeId())) {
-#else
- switch (static_cast(a.type())) {
-#endif
case static_cast(QMetaType::Int):
return a.toInt() < b.toInt();
case static_cast(QMetaType::Double):
diff --git a/libcockatrice_deck_list/CMakeLists.txt b/libcockatrice_deck_list/CMakeLists.txt
index 5ccdb5f66..20a5185df 100644
--- a/libcockatrice_deck_list/CMakeLists.txt
+++ b/libcockatrice_deck_list/CMakeLists.txt
@@ -16,8 +16,6 @@ set(HEADERS
if(Qt6_FOUND)
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
- qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
endif()
add_library(
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp
index d41713302..d9d2450de 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp
@@ -13,14 +13,6 @@
#include
#include
-#if QT_VERSION < 0x050600
-// qHash on QRegularExpression was added in 5.6, FIX IT
-uint qHash(const QRegularExpression &key, uint seed) noexcept
-{
- return qHash(key.pattern(), seed); // call qHash on pattern QString instead
-}
-#endif
-
static const QString CURRENT_SIDEBOARD_PLAN_KEY = "";
bool DeckList::Metadata::isEmpty() const
diff --git a/libcockatrice_filters/CMakeLists.txt b/libcockatrice_filters/CMakeLists.txt
index 74566ca05..55809d5fd 100644
--- a/libcockatrice_filters/CMakeLists.txt
+++ b/libcockatrice_filters/CMakeLists.txt
@@ -8,8 +8,6 @@ set(HEADERS libcockatrice/filters/filter_card.h libcockatrice/filters/filter_str
if(Qt6_FOUND)
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
- qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
endif()
add_library(
diff --git a/libcockatrice_interfaces/CMakeLists.txt b/libcockatrice_interfaces/CMakeLists.txt
index 4f34f7985..33dee842d 100644
--- a/libcockatrice_interfaces/CMakeLists.txt
+++ b/libcockatrice_interfaces/CMakeLists.txt
@@ -14,8 +14,6 @@ set(HEADERS
if(Qt6_FOUND)
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
- qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
endif()
add_library(libcockatrice_interfaces STATIC ${MOC_SOURCES})
diff --git a/libcockatrice_models/libcockatrice/models/database/CMakeLists.txt b/libcockatrice_models/libcockatrice/models/database/CMakeLists.txt
index 950d6d79f..1f0331690 100644
--- a/libcockatrice_models/libcockatrice/models/database/CMakeLists.txt
+++ b/libcockatrice_models/libcockatrice/models/database/CMakeLists.txt
@@ -14,8 +14,6 @@ set(HEADERS
if(Qt6_FOUND)
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
- qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
endif()
add_library(
diff --git a/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt b/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt
index 851636a35..0c90b8004 100644
--- a/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt
+++ b/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt
@@ -6,8 +6,6 @@ set(HEADERS deck_list_model.h deck_list_sort_filter_proxy_model.h)
if(Qt6_FOUND)
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
- qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
endif()
add_library(
diff --git a/libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt
index 2753246de..b9f4c8c9c 100644
--- a/libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt
+++ b/libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt
@@ -8,8 +8,6 @@ set(SOURCES abstract_client.cpp)
if(Qt6_FOUND)
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
- qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
endif()
add_library(libcockatrice_network_client_abstract STATIC ${MOC_SOURCES} ${SOURCES})
diff --git a/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt
index d12a324dc..210a09ac3 100644
--- a/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt
+++ b/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt
@@ -8,8 +8,6 @@ set(SOURCES local_client.cpp)
if(Qt6_FOUND)
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
- qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
endif()
add_library(libcockatrice_network_client_local STATIC ${MOC_SOURCES} ${SOURCES})
diff --git a/libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt
index 0548700e4..fb164763c 100644
--- a/libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt
+++ b/libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt
@@ -8,8 +8,6 @@ set(SOURCES remote_client.cpp)
if(Qt6_FOUND)
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
- qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
endif()
add_library(libcockatrice_network_client_remote STATIC ${MOC_SOURCES} ${SOURCES})
diff --git a/libcockatrice_network/libcockatrice/network/server/local/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/server/local/CMakeLists.txt
index 80fb379a4..6e9dfc77b 100644
--- a/libcockatrice_network/libcockatrice/network/server/local/CMakeLists.txt
+++ b/libcockatrice_network/libcockatrice/network/server/local/CMakeLists.txt
@@ -8,8 +8,6 @@ set(SOURCES local_server.cpp local_server_interface.cpp)
if(Qt6_FOUND)
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
- qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
endif()
add_library(libcockatrice_network_server_local STATIC ${MOC_SOURCES} ${SOURCES})
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/server/remote/CMakeLists.txt
index e883baa0d..48a882e9b 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/CMakeLists.txt
+++ b/libcockatrice_network/libcockatrice/network/server/remote/CMakeLists.txt
@@ -25,8 +25,6 @@ set(HEADERS
if(Qt6_FOUND)
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
- qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
endif()
add_library(
diff --git a/libcockatrice_rng/CMakeLists.txt b/libcockatrice_rng/CMakeLists.txt
index 6ff2a4537..7b091686a 100644
--- a/libcockatrice_rng/CMakeLists.txt
+++ b/libcockatrice_rng/CMakeLists.txt
@@ -6,8 +6,6 @@ set(HEADERS libcockatrice/rng/rng_abstract.h libcockatrice/rng/rng_sfmt.h libcoc
if(Qt6_FOUND)
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
- qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
endif()
add_library(
diff --git a/libcockatrice_settings/CMakeLists.txt b/libcockatrice_settings/CMakeLists.txt
index 3afe6e00a..a86cd51ea 100644
--- a/libcockatrice_settings/CMakeLists.txt
+++ b/libcockatrice_settings/CMakeLists.txt
@@ -17,8 +17,6 @@ set(HEADERS
if(Qt6_FOUND)
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
- qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
endif()
add_library(
diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt
index a51982625..5029b9081 100644
--- a/oracle/CMakeLists.txt
+++ b/oracle/CMakeLists.txt
@@ -66,8 +66,6 @@ set(oracle_RESOURCES oracle.qrc)
# ------------------------
if(Qt6_FOUND)
qt6_add_resources(oracle_RESOURCES_RCC ${oracle_RESOURCES})
-elseif(Qt5_FOUND)
- qt5_add_resources(oracle_RESOURCES_RCC ${oracle_RESOURCES})
endif()
# ------------------------
@@ -117,25 +115,6 @@ if(Qt6_FOUND)
${oracle_MOC_SRCS}
MANUAL_FINALIZATION
)
-elseif(Qt5_FOUND)
- # Qt5 Translations need to be linked at executable creation time
- if(Qt5LinguistTools_FOUND)
- if(UPDATE_TRANSLATIONS)
- qt5_create_translation(oracle_QM ${translate_SRCS} ${oracle_TS})
- else()
- qt5_add_translation(oracle_QM ${oracle_TS})
- endif()
- endif()
- add_executable(oracle WIN32 MACOSX_BUNDLE ${oracle_MOC_SRCS} ${oracle_QM} ${oracle_RESOURCES_RCC} ${oracle_SOURCES})
- if(UNIX)
- if(APPLE)
- install(FILES ${oracle_QM} DESTINATION ${ORACLE_MAC_QM_INSTALL_DIR})
- else()
- install(FILES ${oracle_QM} DESTINATION ${ORACLE_UNIX_QM_INSTALL_DIR})
- endif()
- elseif(WIN32)
- install(FILES ${oracle_QM} DESTINATION ${ORACLE_WIN32_QM_INSTALL_DIR})
- endif()
endif()
# ------------------------
diff --git a/oracle/src/main.cpp b/oracle/src/main.cpp
index 5def0c887..27e5723c1 100644
--- a/oracle/src/main.cpp
+++ b/oracle/src/main.cpp
@@ -24,11 +24,7 @@ void installNewTranslator()
QString lang = SettingsCache::instance().getLang();
QString qtNameHint = "qt_" + lang;
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
QString qtTranslationPath = QLibraryInfo::path(QLibraryInfo::TranslationsPath);
-#else
- QString qtTranslationPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
-#endif
bool qtTranslationLoaded = qtTranslator->load(qtNameHint, qtTranslationPath);
if (!qtTranslationLoaded) {
diff --git a/oracle/src/qt-json/json.cpp b/oracle/src/qt-json/json.cpp
index 2fffd0f70..97a7048c2 100644
--- a/oracle/src/qt-json/json.cpp
+++ b/oracle/src/qt-json/json.cpp
@@ -109,12 +109,8 @@ QByteArray Json::serialize(const QVariant &data, bool &success)
{
str = "null";
}
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
else if ((data.typeId() == QMetaType::Type::QVariantList) ||
(data.typeId() == QMetaType::Type::QStringList)) // variant is a list?
-#else
- else if ((data.type() == QVariant::List) || (data.type() == QVariant::StringList)) // variant is a list?
-#endif
{
QList values;
const QVariantList list = data.toList();
@@ -129,11 +125,7 @@ QByteArray Json::serialize(const QVariant &data, bool &success)
str = "[ " + join(values, ", ") + " ]";
}
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
else if ((data.typeId() == QMetaType::Type::QVariantHash)) // variant is a list?
-#else
- else if (data.type() == QVariant::Hash) // variant is a hash?
-#endif
{
const QVariantHash vhash = data.toHash();
QHashIterator it(vhash);
@@ -155,11 +147,7 @@ QByteArray Json::serialize(const QVariant &data, bool &success)
str += join(pairs, ", ");
str += " }";
}
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
else if ((data.typeId() == QMetaType::Type::QVariantMap)) // variant is a list?
-#else
- else if (data.type() == QVariant::Map) // variant is a map?
-#endif
{
const QVariantMap vmap = data.toMap();
QMapIterator it(vmap);
@@ -177,39 +165,23 @@ QByteArray Json::serialize(const QVariant &data, bool &success)
str += join(pairs, ", ");
str += " }";
}
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
else if ((data.typeId() == QMetaType::Type::QString) ||
(data.typeId() == QMetaType::Type::QByteArray)) // variant is a list?
-#else
- else if ((data.type() == QVariant::String) || (data.type() == QVariant::ByteArray)) // a string or a byte array?
-#endif
{
str = sanitizeString(data.toString()).toUtf8();
}
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
else if (data.typeId() == QMetaType::Type::Double)
-#else
- else if (data.type() == QVariant::Double) // double?
-#endif
{
str = QByteArray::number(data.toDouble(), 'g', 20);
if (!str.contains(".") && !str.contains("e")) {
str += ".0";
}
}
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
else if (data.typeId() == QMetaType::Type::Bool)
-#else
- else if (data.type() == QVariant::Bool) // boolean value?
-#endif
{
str = data.toBool() ? "true" : "false";
}
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
else if (data.typeId() == QMetaType::Type::ULongLong)
-#else
- else if (data.type() == QVariant::ULongLong) // large unsigned number?
-#endif
{
str = QByteArray::number(data.value());
} else if (data.canConvert()) // any signed number?
diff --git a/servatrice/CMakeLists.txt b/servatrice/CMakeLists.txt
index 6e4191beb..e97a6156c 100644
--- a/servatrice/CMakeLists.txt
+++ b/servatrice/CMakeLists.txt
@@ -45,8 +45,6 @@ endif(APPLE)
if(Qt6_FOUND)
qt6_add_resources(servatrice_RESOURCES_RCC ${servatrice_RESOURCES})
-elseif(Qt5_FOUND)
- qt5_add_resources(servatrice_RESOURCES_RCC ${servatrice_RESOURCES})
endif()
set(QT_DONT_USE_QTGUI TRUE)
diff --git a/servatrice/src/smtp/qxthmac.cpp b/servatrice/src/smtp/qxthmac.cpp
index 3b7489f72..744977a0c 100644
--- a/servatrice/src/smtp/qxthmac.cpp
+++ b/servatrice/src/smtp/qxthmac.cpp
@@ -167,11 +167,7 @@ bool QxtHmac::verify(const QByteArray& otherInner)
void QxtHmac::addData(const char* data, int length)
{
Q_ASSERT(qxt_d().opad.size());
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 3, 0))
qxt_d().ihash->addData(QByteArrayView(data, length));
-#else
- qxt_d().ihash->addData(data, length);
-#endif
qxt_d().result.clear();
}
diff --git a/servatrice/src/smtp/qxtsmtp.cpp b/servatrice/src/smtp/qxtsmtp.cpp
index 6326b101d..c81e0955c 100644
--- a/servatrice/src/smtp/qxtsmtp.cpp
+++ b/servatrice/src/smtp/qxtsmtp.cpp
@@ -54,13 +54,8 @@ QxtSmtp::QxtSmtp(QObject *parent) : QObject(parent)
// QObject::connect(socket(), SIGNAL(encrypted()), &qxt_d(), SLOT(ehlo()));
QObject::connect(socket(), SIGNAL(connected()), this, SIGNAL(connected()));
QObject::connect(socket(), SIGNAL(disconnected()), this, SIGNAL(disconnected()));
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
QObject::connect(socket(), SIGNAL(errorOccurred(QAbstractSocket::SocketError)), &qxt_d(),
SLOT(socketError(QAbstractSocket::SocketError)));
-#else
- QObject::connect(socket(), SIGNAL(error(QAbstractSocket::SocketError)), &qxt_d(),
- SLOT(socketError(QAbstractSocket::SocketError)));
-#endif
QObject::connect(this, SIGNAL(authenticated()), &qxt_d(), SLOT(sendNext()));
QObject::connect(socket(), SIGNAL(readyRead()), &qxt_d(), SLOT(socketRead()));
}