Use Qt:: directly

CMakeLists.txt

@@ -82,7 +82,7 @@ set_package_properties(Qt5TextToSpeech PROPERTIES DESCRIPTION
     "Add support for text to speech"
     TYPE OPTIONAL
 )
-if(TARGET Qt${QT_MAJOR_VERSION}::TextToSpeech)
+if(TARGET Qt::TextToSpeech)
     add_definitions(-DHAVE_TEXT_TO_SPEECH_SUPPORT)
     set(KPIMTEXTEDIT_TEXT_TO_SPEECH TRUE)
 endif()

autotests/CMakeLists.txt

@@ -5,20 +5,20 @@ include(ECMAddTests)
 ecm_add_test(textutilstest.cpp textutilstest.h
     TEST_NAME textutilstest
     NAME_PREFIX "kpimtextedit-"
-    LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Widgets KF5::Codecs KF5PimTextEdit KF5::TextWidgets KF5::XmlGui)
+    LINK_LIBRARIES Qt::Test Qt::Widgets KF5::Codecs KF5PimTextEdit KF5::TextWidgets KF5::XmlGui)
 
 ecm_add_test(editorutiltest.cpp editorutiltest.h
     TEST_NAME editorutiltest
     NAME_PREFIX "kpimtextedit-"
-    LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Widgets KF5::Codecs KF5PimTextEdit KF5::TextWidgets KF5::XmlGui)
+    LINK_LIBRARIES Qt::Test Qt::Widgets KF5::Codecs KF5PimTextEdit KF5::TextWidgets KF5::XmlGui)
 
 ecm_add_test(emoticonunicodetabtest.cpp emoticonunicodetabtest.h
     TEST_NAME emoticonunicodetabtest
     NAME_PREFIX "kpimtextedit-"
-    LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Widgets KF5::Codecs KF5PimTextEdit KF5::TextWidgets KF5::XmlGui)
+    LINK_LIBRARIES Qt::Test Qt::Widgets KF5::Codecs KF5PimTextEdit KF5::TextWidgets KF5::XmlGui)
 
 ecm_add_test(slidecontainertest.cpp slidecontainertest.h
     TEST_NAME slidecontainertest
     NAME_PREFIX kpimtextedit-widget
-    LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Gui KF5::PimTextEdit Qt${QT_MAJOR_VERSION}::Widgets
+    LINK_LIBRARIES Qt::Test Qt::Gui KF5::PimTextEdit Qt::Widgets
     )

src/CMakeLists.txt

@@ -171,7 +171,7 @@ target_link_libraries(KF5PimTextEdit
 if (KPIMTEXTEDIT_TEXT_TO_SPEECH)
     target_link_libraries(KF5PimTextEdit
         PRIVATE
-        Qt${QT_MAJOR_VERSION}::TextToSpeech
+        Qt::TextToSpeech
         )
 endif()
 set_target_properties(KF5PimTextEdit PROPERTIES

src/composer-ng/autotests/CMakeLists.txt

@@ -6,7 +6,7 @@ macro(add_composer_ng_test _source)
     ecm_add_test(${_source} ${_name}.h
         TEST_NAME ${_name}
         NAME_PREFIX "kpimtextedit-composerng-"
-        LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::PimTextEdit KF5::XmlGui KF5::IconThemes
+        LINK_LIBRARIES Qt::Test KF5::PimTextEdit KF5::XmlGui KF5::IconThemes
     )
 endmacro()
 

src/designer/CMakeLists.txt

@@ -39,7 +39,7 @@ ecm_add_qtdesignerplugin(kpimtexteditwidgets
     KPIMTextEdit::RichTextComposerWidget
     LINK_LIBRARIES
     KF5::PimTextEdit
-    Qt${QT_MAJOR_VERSION}::Widgets
+    Qt::Widgets
     INSTALL_DESTINATION "${KDE_INSTALL_QTPLUGINDIR}/designer"
     COMPONENT Devel
     )

src/emoticon/autotests/CMakeLists.txt

@@ -8,7 +8,7 @@ macro( emoticontest _source )
   add_test(NAME ${_name} COMMAND ${_name} )
   ecm_mark_as_test(kpimtextedit-${_name})
 
-  target_link_libraries( ${_name} Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Widgets KF5::Codecs KF5PimTextEdit)
+  target_link_libraries( ${_name} Qt::Test Qt::Widgets KF5::Codecs KF5PimTextEdit)
 endmacro()
 
 emoticontest(emoticontexteditselectortest.cpp)

src/grantleebuilder/autotests/CMakeLists.txt

@@ -4,11 +4,11 @@ add_definitions( -DGRANTLEEBUILDER_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data" )
 ecm_add_test(texthtmlbuildertest.cpp texthtmlbuildertest.h
     TEST_NAME texthtmlbuildertest
     NAME_PREFIX "kpimtextedit-grantleebuilder-"
-    LINK_LIBRARIES KF5::PimTextEdit Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Widgets 
+    LINK_LIBRARIES KF5::PimTextEdit Qt::Test Qt::Widgets 
 )
 
 ecm_add_test(plaintextmarkupbuildertest.cpp plaintextmarkupbuildertest.h
     TEST_NAME plaintextmarkupbuildertest
     NAME_PREFIX "kpimtextedit-grantleebuilder-"
-    LINK_LIBRARIES KF5::PimTextEdit Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Widgets
+    LINK_LIBRARIES KF5::PimTextEdit Qt::Test Qt::Widgets
 )

src/texteditor/commonwidget/autotests/CMakeLists.txt

@@ -5,7 +5,7 @@ macro(add_kpimtextedit_commonwidget_unittest _source)
     get_filename_component(_name ${_source} NAME_WE)
     ecm_add_test(${_source} ${_name}.h TEST_NAME ${_name}
         NAME_PREFIX "kpimtextedit-plaintext-"
-        LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::PimTextEdit Qt${QT_MAJOR_VERSION}::Widgets
+        LINK_LIBRARIES Qt::Test KF5::PimTextEdit Qt::Widgets
         )
 endmacro()
 

src/texteditor/plaintexteditor/autotests/CMakeLists.txt

@@ -3,11 +3,11 @@
 ecm_add_test(plaintexteditortest.cpp plaintexteditortest.h
     TEST_NAME plaintexteditortest
     NAME_PREFIX "kpimtextedit-plaintexteditor-"
-    LINK_LIBRARIES KF5::PimTextEdit KF5::KIOWidgets Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Widgets
+    LINK_LIBRARIES KF5::PimTextEdit KF5::KIOWidgets Qt::Test Qt::Widgets
 )
 
 ecm_add_test(plaintexteditfindbartest.cpp plaintexteditfindbartest.h
     TEST_NAME plaintexteditfindbartest
     NAME_PREFIX "kpimtextedit-plaintexteditor-"
-    LINK_LIBRARIES KF5::PimTextEdit KF5::KIOWidgets Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Widgets
+    LINK_LIBRARIES KF5::PimTextEdit KF5::KIOWidgets Qt::Test Qt::Widgets
 )

src/texteditor/plaintexteditor/tests/CMakeLists.txt

@@ -2,5 +2,5 @@
 # SPDX-License-Identifier: BSD-3-Clause
 add_executable(plaintexteditor_gui plaintexteditor_gui.cpp)
 target_link_libraries(plaintexteditor_gui
-  KF5::PimTextEdit KF5::CoreAddons Qt${QT_MAJOR_VERSION}::Widgets KF5::I18n
+  KF5::PimTextEdit KF5::CoreAddons Qt::Widgets KF5::I18n
 )

src/texteditor/richtexteditor/autotests/CMakeLists.txt

@@ -2,10 +2,10 @@
 # SPDX-License-Identifier: BSD-3-Clause
 ecm_add_test(richtexteditortest.cpp richtexteditortest.h TEST_NAME richtexteditortest
     NAME_PREFIX "kpimtextedit-richtesteditor-"
-    LINK_LIBRARIES KF5::PimTextEdit Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Widgets
+    LINK_LIBRARIES KF5::PimTextEdit Qt::Test Qt::Widgets
 )
 
 ecm_add_test(richtexteditfindbartest.cpp richtexteditfindbartest.h TEST_NAME richtexteditfindbartest
     NAME_PREFIX "kpimtextedit-plaintexteditor-"
-    LINK_LIBRARIES KF5::PimTextEdit Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Widgets
+    LINK_LIBRARIES KF5::PimTextEdit Qt::Test Qt::Widgets
 )

src/texteditor/richtexteditor/tests/CMakeLists.txt

@@ -2,6 +2,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 add_executable(richtexteditor_gui richtexteditor_gui.cpp)
 target_link_libraries(richtexteditor_gui
-  KF5::PimTextEdit KF5::CoreAddons Qt${QT_MAJOR_VERSION}::Widgets KF5::I18n
+  KF5::PimTextEdit KF5::CoreAddons Qt::Widgets KF5::I18n
 )
 

src/texttospeech/autotests/CMakeLists.txt

@@ -4,7 +4,7 @@ macro(add_kpimtextedit_texttospeech_unittest _source)
     get_filename_component(_name ${_source} NAME_WE)
     ecm_add_test(${_source} ${_name}.h TEST_NAME ${_name}
         NAME_PREFIX "kpimtextedit-texttospeech-"
-        LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::PimTextEdit Qt${QT_MAJOR_VERSION}::Widgets
+        LINK_LIBRARIES Qt::Test KF5::PimTextEdit Qt::Widgets
         )
 endmacro()
 

src/texttospeech/tests/CMakeLists.txt

@@ -2,21 +2,21 @@
 # SPDX-License-Identifier: BSD-3-Clause
 add_executable(texttospeechwidget_gui texttospeechwidget_gui.cpp)
 target_link_libraries(texttospeechwidget_gui
-    KF5::PimTextEdit KF5::CoreAddons Qt${QT_MAJOR_VERSION}::Widgets KF5::I18n
+    KF5::PimTextEdit KF5::CoreAddons Qt::Widgets KF5::I18n
     )
 
 add_executable(texttospeechgui texttospeechgui.cpp)
 target_link_libraries(texttospeechgui
-    KF5::PimTextEdit KF5::CoreAddons Qt${QT_MAJOR_VERSION}::Widgets KF5::I18n
+    KF5::PimTextEdit KF5::CoreAddons Qt::Widgets KF5::I18n
     )
 
 add_executable(texttospeechconfiggui texttospeechconfiggui.cpp)
 target_link_libraries(texttospeechconfiggui
-    KF5::PimTextEdit KF5::CoreAddons Qt${QT_MAJOR_VERSION}::Widgets KF5::I18n
+    KF5::PimTextEdit KF5::CoreAddons Qt::Widgets KF5::I18n
     )
 
 add_executable(texttospeechconfigdialoggui texttospeechconfigdialoggui.cpp)
 target_link_libraries(texttospeechconfigdialoggui
-    KF5::PimTextEdit KF5::CoreAddons Qt${QT_MAJOR_VERSION}::Widgets KF5::I18n
+    KF5::PimTextEdit KF5::CoreAddons Qt::Widgets KF5::I18n
     )
 

tests/CMakeLists.txt

@@ -3,27 +3,27 @@
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../src ${CMAKE_CURRENT_BINARY_DIR}/../src)
 #####
 add_executable(inserthtmldialog_demo inserthtmldialog_demo.cpp)
-set(inserthtmldialog_demo_LIBS KF5PimTextEdit Qt${QT_MAJOR_VERSION}::Widgets KF5::SyntaxHighlighting)
+set(inserthtmldialog_demo_LIBS KF5PimTextEdit Qt::Widgets KF5::SyntaxHighlighting)
 target_link_libraries(inserthtmldialog_demo ${inserthtmldialog_demo_LIBS})
 #####
 add_executable(slidecontainer_gui slidecontainer_gui.cpp)
 target_link_libraries(slidecontainer_gui
-    Qt${QT_MAJOR_VERSION}::Core
-    Qt${QT_MAJOR_VERSION}::Gui
-    Qt${QT_MAJOR_VERSION}::Widgets
+    Qt::Core
+    Qt::Gui
+    Qt::Widgets
     KF5PimTextEdit
     )
 
 #####
 add_executable(showemoticonunicodetab_gui showemoticonunicodetab_gui.cpp)
-set(showemoticonunicodetab_gui_LIBS KF5PimTextEdit Qt${QT_MAJOR_VERSION}::Widgets)
+set(showemoticonunicodetab_gui_LIBS KF5PimTextEdit Qt::Widgets)
 target_link_libraries(showemoticonunicodetab_gui ${showemoticonunicodetab_gui_LIBS})
 #####
 add_executable(testgeneratehtmlbuildergui_gui testgeneratehtmlbuildergui.cpp testgeneratehtmlbuildergui.h)
-set(testgeneratehtmlbuildergui_gui_LIBS KF5PimTextEdit Qt${QT_MAJOR_VERSION}::Widgets )
+set(testgeneratehtmlbuildergui_gui_LIBS KF5PimTextEdit Qt::Widgets )
 target_link_libraries(testgeneratehtmlbuildergui_gui ${testgeneratehtmlbuildergui_gui_LIBS})
 
 #####
 add_executable(testgenerateplaintextbuilder_gui testgenerateplaintextbuildergui.cpp testgenerateplaintextbuildergui.h)
-set(testgenerateplaintextbuilder_gui_LIBS KF5PimTextEdit Qt${QT_MAJOR_VERSION}::Widgets )
+set(testgenerateplaintextbuilder_gui_LIBS KF5PimTextEdit Qt::Widgets )
 target_link_libraries(testgenerateplaintextbuilder_gui ${testgenerateplaintextbuilder_gui_LIBS})