prevent Qt6 from defining UNICODE (Qt6.1.1 and upwards)

[features.git] / src / graphics / CMakeLists.txt

diff --git a/src/graphics/CMakeLists.txt b/src/graphics/CMakeLists.txt
index c6e9d5870f66187957e8404da4f5af15994b6da3..fcdeb2418683d5c5af7621e0533661e2ccb5dda0 100644 (file)
--- a/src/graphics/CMakeLists.txt
+++ b/src/graphics/CMakeLists.txt
@@ -13,7 +13,7 @@ lyx_add_msvc_pch(graphics)
 
 include_directories(${TOP_SRC_DIR}/src/graphics)
 lyx_automoc(${TOP_SRC_DIR}/src/graphics/PreviewLoader.cpp)
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDES})
 
 if(NOT LYX_MERGE_FILES)
        add_library(graphics ${library_type} ${graphics_sources} ${graphics_headers})
@@ -21,7 +21,7 @@ else()
        lyx_const_touched_files(_allinone  graphics_sources)
        add_library(graphics ${library_type} ${_allinone_files})
 endif()
-set_target_properties(graphics PROPERTIES FOLDER "applications/LyX")
+set_target_properties(graphics PROPERTIES FOLDER "applications/LyX" QT_NO_UNICODE_DEFINES TRUE)
 qt_use_modules(graphics Core)
 
 lyx_add_gcc_pch(graphics)