[LyX/master] Comment the QtZlib workaround

Scott Kostyshak skostysh at lyx.org
Sun Dec 18 20:17:44 UTC 2022


commit f9178fa278d8073dbe7d5d4ec731f11069aae8b8
Author: Scott Kostyshak <skostysh at lyx.org>
Date:   Sun Dec 18 16:12:08 2022 -0500

    Comment the QtZlib workaround
---
 CMakeLists.txt |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d2435b8..146556c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -834,6 +834,12 @@ if(LYX_USE_QT MATCHES "QT6|QT5")
 		if (LYX_USE_QT MATCHES "QT6")
 			get_target_property(QT_MOC_EXECUTABLE Qt6::moc LOCATION)
 			find_package(Qt6 COMPONENTS Core5Compat REQUIRED)
+			# We don't know why QtZlib is included, and ideally we
+			# would have a different fix than relying on this
+			# variable (which as "Private" in the name indicates,
+			# it might be a fragile workaround).
+			# See ML discussion here:
+			# https://www.mail-archive.com/search?l=mid&q=CAGU9VOqpkngYBumnNh%3DcuzQ585GsS7TJbhHa903nJSfy-davRg%40mail.gmail.com
 			list(REMOVE_ITEM Qt6Core5Compat_INCLUDE_DIRS ${_Qt6ZlibPrivate_OWN_INCLUDE_DIRS})
 			include_directories(${Qt6Core5Compat_INCLUDE_DIRS})
 			set(QtCore5CompatLibrary Qt6::Core5Compat)


More information about the lyx-cvs mailing list