diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 37975a2..3447810 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -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 --build ${{ steps.strings.outputs.build-output-dir }}-ki18n - - name: Configure CMake + - name: Configure run: > cmake -B ${{ steps.strings.outputs.build-output-dir }} -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} diff --git a/CMakeLists.txt b/CMakeLists.txt index c557fb4..d048170 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,7 +31,7 @@ ecm_setup_version(${PROJECT_VERSION} 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(Vulkan REQUIRED) find_package(glm REQUIRED) diff --git a/argcracker/CMakeLists.txt b/argcracker/CMakeLists.txt index 48b4630..df8ba14 100644 --- a/argcracker/CMakeLists.txt +++ b/argcracker/CMakeLists.txt @@ -9,8 +9,7 @@ target_sources(novus-argcracker target_link_libraries(novus-argcracker PRIVATE Physis::Physis - Qt6::Core - Qt6::Core5Compat) + Qt6::Core) if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") target_compile_definitions(novus-argcracker PUBLIC MACOS) diff --git a/argcracker/src/main.cpp b/argcracker/src/main.cpp index b9f5bc9..956e6a1 100644 --- a/argcracker/src/main.cpp +++ b/argcracker/src/main.cpp @@ -3,7 +3,6 @@ #include #include -#include #include @@ -54,7 +53,7 @@ inline QString decryptGameArg(uint32_t tickCount, const QString &sqexString) Blowfish *session = physis_blowfish_initialize(reinterpret_cast(buffer), 9); - QStringRef base64String(&sqexString, 12, sqexString.length() - 5 - 12); + QStringView base64String = sqexString.mid(12, sqexString.length() - 5 - 12); QByteArray base64Decoded = QByteArray::fromBase64(base64String.toUtf8(), QByteArray::Base64Option::Base64UrlEncoding | QByteArray::Base64Option::OmitTrailingEquals);