diff options
| author | txtsd <code@ihavea.quest> | 2023-03-08 21:18:53 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-08 21:18:53 +0530 |
| commit | 3bd4ad7c93486e29c4dccc17d5d42719b452fd08 (patch) | |
| tree | c1a833e20bb34578cc0969b7cbdd035da6c3ca2f | |
| parent | 6bdd6ce57106d45efe2cf97eedcd43f8a69322c5 (diff) | |
| parent | a8ffdeca2b1592bc13f11ab4203b94bf6d8ae1d2 (diff) | |
| download | PrismLauncher-3bd4ad7c93486e29c4dccc17d5d42719b452fd08.tar.gz PrismLauncher-3bd4ad7c93486e29c4dccc17d5d42719b452fd08.tar.bz2 PrismLauncher-3bd4ad7c93486e29c4dccc17d5d42719b452fd08.zip | |
Merge pull request #918 from Scrumplex/qt6-default
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | flatpak/org.prismlauncher.PrismLauncher.yml | 1 | ||||
| -rw-r--r-- | nix/default.nix | 2 | ||||
| -rw-r--r-- | snap/snapcraft.yaml | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 40936e44..05c69c89 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -174,7 +174,7 @@ set(Launcher_SUBREDDIT_URL "https://www.reddit.com/r/PrismLauncher/" CACHE STRIN # Builds set(Launcher_FORCE_BUNDLED_LIBS OFF CACHE BOOL "Prevent using system libraries, if they are available as submodules") -set(Launcher_QT_VERSION_MAJOR "5" CACHE STRING "Major Qt version to build against") +set(Launcher_QT_VERSION_MAJOR "6" CACHE STRING "Major Qt version to build against") # API Keys # NOTE: These API keys are here for convenience. If you rebrand this software or intend to break the terms of service diff --git a/flatpak/org.prismlauncher.PrismLauncher.yml b/flatpak/org.prismlauncher.PrismLauncher.yml index 071772c6..0524946f 100644 --- a/flatpak/org.prismlauncher.PrismLauncher.yml +++ b/flatpak/org.prismlauncher.PrismLauncher.yml @@ -32,6 +32,7 @@ modules: config-opts: - -DLauncher_BUILD_PLATFORM=flatpak - -DCMAKE_BUILD_TYPE=Debug + - -DLauncher_QT_VERSION_MAJOR=5 build-options: env: JAVA_HOME: /usr/lib/sdk/openjdk17/jvm/openjdk-17 diff --git a/nix/default.nix b/nix/default.nix index f6ab1332..99bb2231 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional (lib.versionAtLeast qtbase.version "6") qtwayland; cmakeFlags = lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ] - ++ lib.optionals (lib.versionAtLeast qtbase.version "6") [ "-DLauncher_QT_VERSION_MAJOR=6" ]; + ++ lib.optionals (lib.versionOlder qtbase.version "6") [ "-DLauncher_QT_VERSION_MAJOR=5" ]; dontWrapQtApps = true; postUnpack = '' diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 8e647eea..d4eb646c 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -39,6 +39,7 @@ parts: - "-DCMAKE_BUILD_TYPE=RelWithDebInfo" - "-DENABLE_LTO=ON" - "-DLauncher_BUILD_PLATFORM=snap" + - "-DLauncher_QT_VERSION_MAJOR=5" apps: prismlauncher: |