redstrate/novus
1
Fork 0
mirror of https://github.com/redstrate/Novus.git synced 2025-05-19 06:47:44 +00:00
Code Activity

Remove Qt5Compat requirement

Browse source 
It's not needed anyway
This commit is contained in:
Joshua Goins 2024-04-23 19:05:41 -04:00
parent 86df60c141
commit 469d4183dc
4 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/cmake-multi-platform.yml vendored
View file

@ -99,7 +99,7 @@ jobs:
cmake -B ${{ steps.strings.outputs.build-output-dir }}-ki18n -DCMAKE_PREFIX_PATH=${{ steps.strings.outputs.prefix-dir }} -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -S ki18n -DCMAKE_INSTALL_PREFIX=${{ steps.strings.outputs.prefix-dir }} -DBUILD_TESTING=OFF cmake -B ${{ steps.strings.outputs.build-output-dir }}-ki18n -DCMAKE_PREFIX_PATH=${{ steps.strings.outputs.prefix-dir }} -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -S ki18n -DCMAKE_INSTALL_PREFIX=${{ steps.strings.outputs.prefix-dir }} -DBUILD_TESTING=OFF
cmake --build ${{ steps.strings.outputs.build-output-dir }}-ki18n cmake --build ${{ steps.strings.outputs.build-output-dir }}-ki18n
- name: Configure CMake - name: Configure
run: > run: >
cmake -B ${{ steps.strings.outputs.build-output-dir }} cmake -B ${{ steps.strings.outputs.build-output-dir }}
-DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}

2
CMakeLists.txt
View file

@ -31,7 +31,7 @@ ecm_setup_version(${PROJECT_VERSION}
VERSION_HEADER ${CMAKE_CURRENT_BINARY_DIR}/novus-version.h VERSION_HEADER ${CMAKE_CURRENT_BINARY_DIR}/novus-version.h
) )
find_package(Qt6 ${QT_MIN_VERSION} COMPONENTS Core Widgets Concurrent Core5Compat Sql HttpServer Network CONFIG REQUIRED) find_package(Qt6 ${QT_MIN_VERSION} COMPONENTS Core Widgets Concurrent Sql HttpServer Network CONFIG REQUIRED)
find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS CoreAddons Config XmlGui Archive I18n) find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS CoreAddons Config XmlGui Archive I18n)
find_package(Vulkan REQUIRED) find_package(Vulkan REQUIRED)
find_package(glm REQUIRED) find_package(glm REQUIRED)

3
argcracker/CMakeLists.txt
View file

@ -9,8 +9,7 @@ target_sources(novus-argcracker
target_link_libraries(novus-argcracker target_link_libraries(novus-argcracker
PRIVATE PRIVATE
Physis::Physis Physis::Physis
Qt6::Core Qt6::Core)
Qt6::Core5Compat)
if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
target_compile_definitions(novus-argcracker PUBLIC MACOS) target_compile_definitions(novus-argcracker PUBLIC MACOS)

3
argcracker/src/main.cpp
View file

@ -3,7 +3,6 @@
#include <QDebug> #include <QDebug>
#include <QString> #include <QString>
#include <QStringRef>
#include <physis.hpp> #include <physis.hpp>
@ -54,7 +53,7 @@ inline QString decryptGameArg(uint32_t tickCount, const QString &sqexString)
Blowfish *session = physis_blowfish_initialize(reinterpret_cast<uint8_t *>(buffer), 9); Blowfish *session = physis_blowfish_initialize(reinterpret_cast<uint8_t *>(buffer), 9);
QStringRef base64String(&sqexString, 12, sqexString.length() - 5 - 12); QStringView base64String = sqexString.mid(12, sqexString.length() - 5 - 12);
QByteArray base64Decoded = QByteArray base64Decoded =
QByteArray::fromBase64(base64String.toUtf8(), QByteArray::Base64Option::Base64UrlEncoding | QByteArray::Base64Option::OmitTrailingEquals); QByteArray::fromBase64(base64String.toUtf8(), QByteArray::Base64Option::Base64UrlEncoding | QByteArray::Base64Option::OmitTrailingEquals);