Commit 46df72b7 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Adapt build system for building against qt6

parent 615fade6
Pipeline #121413 passed with stage
in 5 minutes and 5 seconds
......@@ -82,8 +82,8 @@ set_package_properties(Qt5TextToSpeech PROPERTIES DESCRIPTION
TYPE OPTIONAL
)
if(TARGET Qt5::TextToSpeech)
set(HAVE_TEXT_TO_SPEECH_SUPPORT FALSE)
#add_definitions(-DHAVE_TEXT_TO_SPEECH_SUPPORT)
set(HAVE_TEXT_TO_SPEECH_SUPPORT TRUE)
add_definitions(-DHAVE_TEXT_TO_SPEECH_SUPPORT)
endif()
if (QT_MAJOR_VERSION STREQUAL "6")
......
......@@ -171,7 +171,7 @@ target_link_libraries(KF5PimTextEdit
if (HAVE_TEXT_TO_SPEECH_SUPPORT)
target_link_libraries(KF5PimTextEdit
PRIVATE
Qt::TextToSpeech
Qt${QT_MAJOR_VERSION}::TextToSpeech
)
endif()
set_target_properties(KF5PimTextEdit PROPERTIES
......
......@@ -3,7 +3,7 @@
macro(add_composer_ng_test _source)
ecm_add_test(${_source}
NAME_PREFIX "kpimtextedit-composerng-"
LINK_LIBRARIES Qt::Test KF5::PimTextEdit KF5::XmlGui KF5::IconThemes
LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::PimTextEdit KF5::XmlGui KF5::IconThemes
)
endmacro()
......
......@@ -2,5 +2,5 @@
# SPDX-License-Identifier: BSD-3-Clause
ecm_add_tests(textgotolinewidgettest.cpp
NAME_PREFIX "kpimtextedit-plaintext-"
LINK_LIBRARIES KF5::PimTextEdit Qt::Test Qt::Widgets
LINK_LIBRARIES KF5::PimTextEdit Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Widgets
)
Supports Markdown
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