Commit 4b7bf8ed authored by Boudewijn Rempt's avatar Boudewijn Rempt

Disable QtQuick on macOS

The touch docker isn't that awesome on systems without a touch
screen and running the qml plugin saves cached compiled files
in the app bundle and that breaks signing. So disable this
until I've found out how to make Qt Quick on macOS save its
generated files in the user's home folder.

CCBUG:394188
parent ded6d088
......@@ -314,6 +314,7 @@ set_package_properties(Qt5Multimedia PROPERTIES
macro_bool_to_01(Qt5Multimedia_FOUND HAVE_QT_MULTIMEDIA)
configure_file(config-qtmultimedia.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-qtmultimedia.h )
if (NOT APPLE)
find_package(Qt5Quick ${MIN_QT_VERSION})
set_package_properties(Qt5Quick PROPERTIES
DESCRIPTION "QtQuick"
......@@ -329,7 +330,7 @@ set_package_properties(Qt5QuickWidgets PROPERTIES
URL "http://www.qt.io/"
TYPE OPTIONAL
PURPOSE "Optionally used for the touch gui for Krita")
endif()
if (NOT WIN32 AND NOT APPLE)
......
......@@ -17,7 +17,7 @@ add_subdirectory( ui )
add_subdirectory( vectorimage )
add_subdirectory( impex )
add_subdirectory( libkis )
if (HAVE_QT_QUICK)
if (NOT APPLE AND HAVE_QT_QUICK)
add_subdirectory( libqml )
endif()
......@@ -22,7 +22,7 @@ add_subdirectory(animation)
add_subdirectory(presethistory)
add_subdirectory(svgcollectiondocker)
add_subdirectory(histogram)
if(HAVE_QT_QUICK)
if(NOT APPLE AND HAVE_QT_QUICK)
add_subdirectory(touchdocker)
option(ENABLE_CPU_THROTTLE "Build the CPU Throttle Docker" OFF)
if (ENABLE_CPU_THROTTLE)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment