From 4c35c2e5767a4b987254eae2a56c8af839b83fc9 Mon Sep 17 00:00:00 2001 From: gudauu Date: Sun, 4 Aug 2024 13:16:02 -0400 Subject: [PATCH] Update OS X build doc qt version --- CMakeLists.txt | 2 +- docs/build-source-code.rst | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a7da3dad6..c59c0df196 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,7 +43,7 @@ endif() set(CMAKE_AUTOMOC ON) -OPTION(WITH_QT6 "Enable Qt 6" OFF) +OPTION(WITH_QT6 "Enable Qt 6" ON) if (WITH_QT6) set(QT_DEFAULT_MAJOR_VERSION 6) find_package(Qt6Widgets 6.1.0 REQUIRED) diff --git a/docs/build-source-code.rst b/docs/build-source-code.rst index 498e28d893..0ee4419e78 100644 --- a/docs/build-source-code.rst +++ b/docs/build-source-code.rst @@ -142,7 +142,7 @@ In older versions, create solution manually by running ``cmake -G "Visual Studio Building and Packaging for OS X ------------------------------- -On OS X, required Qt 5 libraries and utilities can be easily installed with `Homebrew `__. +On OS X, required Qt 6 libraries and utilities can be easily installed with `Homebrew `__. :: @@ -164,10 +164,20 @@ Build with the following commands: :: - cmake -DCMAKE_PREFIX_PATH="$(brew --prefix qt5)" . + cmake -DCMAKE_PREFIX_PATH="$(brew --prefix qt6)" . cmake --build . cpack +To build with Qt 5 (make sure to install qt@5 yourself): + +:: + + + cmake -DCMAKE_PREFIX_PATH="$(brew --prefix qt5)" -DWITH_QT6=OFF . + cmake --build . + cpack + + This will produce a self-contained application bundle ``CopyQ.app`` which can then be copied or moved into ``/Applications``.