diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d98b5561..8e5043cad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,58 +1,60 @@
 cmake_minimum_required (VERSION 3.0)
 
 project (kdebase)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
 
 # additional cmake files
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 find_package(KDE1 REQUIRED)
 
+include(Qt1Macros)
+
 set(KDEBASE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 
 set(BOOTSTRAP OFF)
 
 include_directories(common)
 
 add_definitions( -DHAVE_CONFIG_H )
 
 if(CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} -Wno-write-strings")
     set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -fpermissive -std=c++98")
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
 endif()
 
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(CURSES ncurses)
 pkg_check_modules(JPEG jpeg)
 
 add_subdirectory(kcheckpass)
 add_subdirectory(kfm)
 add_subdirectory(mimetypes)
 add_subdirectory(kdehelp)
 add_subdirectory(kfontmanager)
 add_subdirectory(kfind)
 if(CURSES_FOUND)
 add_subdirectory(kvt)
 endif()
 add_subdirectory(kwm)
 add_subdirectory(kpanel)
 add_subdirectory(kwmcom)
 add_subdirectory(kwmmodules)
 add_subdirectory(krootwm)
 #add_subdirectory(kdm)
 #add_subdirectory(kscreensaver)
 add_subdirectory(kmenuedit)
 add_subdirectory(kaudio)
 add_subdirectory(kcontrol)
 #add_subdirectory(kappfinder)
 add_subdirectory(pics)
 add_subdirectory(applnk)
 add_subdirectory(doc)
 add_subdirectory(config)
 add_subdirectory(kstart)
 add_subdirectory(kikbd)
 add_subdirectory(konsole)
 add_subdirectory(po)
diff --git a/kaudio/CMakeLists.txt b/kaudio/CMakeLists.txt
index e45c065fd..0f660f5b0 100644
--- a/kaudio/CMakeLists.txt
+++ b/kaudio/CMakeLists.txt
@@ -1,34 +1,33 @@
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 set(KAUDIO_SRCS kaudioserver.cpp)
 set(MAUDIO_SRCS io_oss.cpp maudio.cpp sample.cpp)
 set(KAUDIO_MOC democlient.moc kplayaudio.moc)
 set(KPLAYAUDIO_SRCS kplayaudio.cpp)
 
 QT1_WRAP_MOC(MOC_FILES kplayaudio.moc)
 QT1_WRAP_MOC(DEMO_MOC_FILES democlient.moc)
 
 add_executable(kaudioserver ${KAUDIO_SRCS})
 target_link_libraries(kaudioserver
     ${QT_LIBRARIES}
     ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_MEDIATOOL}
     )
 
 add_executable(kplayaudio ${KPLAYAUDIO_SRCS} ${MOC_FILES})
 target_link_libraries(kplayaudio
-    ${QT_LIBRARIES}
-    ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
     ${KDE1_KFILE}
     ${KDE1_KFM}
     ${KDE1_MEDIATOOL}
+    Qt::Qt1
+    ${X11_LIBRARIES}
     )
 
 install(TARGETS kaudioserver kplayaudio RUNTIME DESTINATION ${KDE1_BINDIR})
 install(FILES  maudio.html DESTINATION ${KDE1_HTMLDIR}/en/kmedia)
diff --git a/kcheckpass/CMakeLists.txt b/kcheckpass/CMakeLists.txt
index 45e5b7c67..5a2342332 100644
--- a/kcheckpass/CMakeLists.txt
+++ b/kcheckpass/CMakeLists.txt
@@ -1,12 +1,11 @@
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${PNG_INCLUDE_DIR}
     )
 
 set(KCHECKPASS_SRCS kcheckpass.c checkpass_etcpasswd.c
     checkpass_pam.c checkpass_shadow.c checkpass_osfc2passwd.c)
 
 add_executable(kcheckpass ${KCHECKPASS_SRCS})
-target_link_libraries(kcheckpass crypt)
+target_link_libraries(kcheckpass crypt Qt::Qt1)
 
 install(TARGETS kcheckpass RUNTIME  DESTINATION ${KDE1_BINDIR})
diff --git a/kcontrol/bell/CMakeLists.txt b/kcontrol/bell/CMakeLists.txt
index b9519cea4..e118e5693 100644
--- a/kcontrol/bell/CMakeLists.txt
+++ b/kcontrol/bell/CMakeLists.txt
@@ -1,25 +1,24 @@
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 set(BELL_SRCS
     main.cpp bell.cpp kslidercontrol.cpp
 )
 
 set(BELL_MOC
     bell.moc kslidercontrol.moc
 )
 QT1_WRAP_MOC(MOC_FILES ${BELL_MOC})
 
 add_executable(kcmbell ${BELL_SRCS} ${MOC_FILES})
 target_link_libraries(kcmbell
-    ${QT_LIBRARIES}
+    Qt::Qt1
     ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
     )
 
 install(TARGETS kcmbell RUNTIME DESTINATION ${KDE1_BINDIR})
 
 install_icon(bell.xpm "")
diff --git a/kcontrol/display/CMakeLists.txt b/kcontrol/display/CMakeLists.txt
index eb4eaf326..4d742a967 100644
--- a/kcontrol/display/CMakeLists.txt
+++ b/kcontrol/display/CMakeLists.txt
@@ -1,37 +1,36 @@
 add_subdirectory(kcs)
 if(JPEG_FOUND)
     add_subdirectory(ad)
 endif()
 add_subdirectory(pics)
 
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 set(DISPLAY_SRCS
 backgnd.cpp display.cpp
 		colorscm.cpp savescm.cpp scrnsave.cpp
 		general.cpp main.cpp widgetcanvas.cpp
 		fontchooser.cpp kresourceman.cpp
 )
 
 set(DISPLAY_MOC
 backgnd.moc display.moc colorscm.moc savescm.moc
 		scrnsave.moc general.moc widgetcanvas.moc fontchooser.moc
 		kresourceman.moc
 )
 QT1_WRAP_MOC(MOC_FILES ${DISPLAY_MOC})
 
 add_executable(kcmdisplay ${DISPLAY_SRCS} ${MOC_FILES})
 target_link_libraries(kcmdisplay
-    ${QT_LIBRARIES}
+    Qt::Qt1
     ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
     ${KDE1_KFILE}
     ${KDE1_KFM}
     ${KDE1_KIMGIO}
     )
 
 install(TARGETS kcmdisplay RUNTIME DESTINATION ${KDE1_BINDIR})
diff --git a/kcontrol/display/ad/CMakeLists.txt b/kcontrol/display/ad/CMakeLists.txt
index 7fdd49458..ea0e1242c 100644
--- a/kcontrol/display/ad/CMakeLists.txt
+++ b/kcontrol/display/ad/CMakeLists.txt
@@ -1,19 +1,18 @@
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 add_executable(krdb krdb.cpp)
 target_link_libraries(kfind
-    ${QT_LIBRARIES}
+    Qt::Qt1
     ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
     )
 
 install(TARGETS krdb RUNTIME DESTINATION ${KDE1_BINDIR})
 install(FILES
 AAAAAAGeneral.ad AAAMotif.ad AAATk.ad AAAXaw.ad Editres.ad
 	Emacs.ad ML.ad Nedit.ad Netscape.ad XCalc.ad XTerm.ad XV.ad
 	XWp.ad RVPlayer.ad 
     DESTINATION ${KDE1_DATADIR}/kdisplay/app-defaults)
diff --git a/kcontrol/info/CMakeLists.txt b/kcontrol/info/CMakeLists.txt
index 1c5001283..98e66ce33 100644
--- a/kcontrol/info/CMakeLists.txt
+++ b/kcontrol/info/CMakeLists.txt
@@ -1,25 +1,24 @@
 add_subdirectory(pics)
 
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 set(INFO_SRCS
     main.cpp memory.cpp
 )
 
 set(INFO_MOC
     memory.moc info.moc
 )
 QT1_WRAP_MOC(MOC_FILES ${INFO_MOC})
 
 add_executable(kcminfo ${INFO_SRCS} ${MOC_FILES})
 target_link_libraries(kcminfo
-    ${QT_LIBRARIES}
+    Qt::Qt1
     ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
     )
 
 install(TARGETS kcminfo RUNTIME DESTINATION ${KDE1_BINDIR})
diff --git a/kcontrol/input/CMakeLists.txt b/kcontrol/input/CMakeLists.txt
index c61d98919..757fe4b4b 100644
--- a/kcontrol/input/CMakeLists.txt
+++ b/kcontrol/input/CMakeLists.txt
@@ -1,26 +1,26 @@
 include_directories(
-    ${QT_INCLUDE_DIR}
+    Qt::Qt1
     ${KDE1_INCLUDE_DIR}
     )
 
 set(INPUT_SRCS
 main.cpp mouse.cpp keyboard.cpp kslidercontrol.cpp
 )
 
 set(INPUT_MOC
 mouse.moc keyboard.moc kslidercontrol.moc
 )
 QT1_WRAP_MOC(MOC_FILES ${INPUT_MOC})
 
 add_executable(kcminput ${INPUT_SRCS} ${MOC_FILES})
 target_link_libraries(kcminput
-    ${QT_LIBRARIES}
+    Qt::Qt1
     ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
     )
 
 install(TARGETS kcminput RUNTIME DESTINATION ${KDE1_BINDIR})
 
 install_icon(mouse.xpm "")
 install_icon(keyboard.xpm "")
diff --git a/kcontrol/kcontrol/CMakeLists.txt b/kcontrol/kcontrol/CMakeLists.txt
index d5b5e57a2..c606b005e 100644
--- a/kcontrol/kcontrol/CMakeLists.txt
+++ b/kcontrol/kcontrol/CMakeLists.txt
@@ -1,24 +1,23 @@
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 set(KCONTROL_SRCS
 configlist.cpp main.cpp toplevel.cpp kdelnk.cpp mainwidget.cpp kswallow.cpp
 )
 set(KCONTROL_MOC toplevel.moc kdelnk.moc mainwidget.moc configlist.moc kswallow.moc)
 
 QT1_WRAP_MOC(MOC_FILES ${KCONTROL_MOC})
 
 add_executable(kcontrol ${KCONTROL_SRCS} ${MOC_FILES})
 target_link_libraries(kcontrol
-    ${QT_LIBRARIES}
+    Qt::Qt1
     ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
     )
 
 install(TARGETS kcontrol RUNTIME DESTINATION ${KDE1_BINDIR})
 
 install_icon(kcontrol.xpm "")
diff --git a/kcontrol/kdm/CMakeLists.txt b/kcontrol/kdm/CMakeLists.txt
index f4b56dd6b..b4bc42769 100644
--- a/kcontrol/kdm/CMakeLists.txt
+++ b/kcontrol/kdm/CMakeLists.txt
@@ -1,31 +1,30 @@
 add_subdirectory(doc)
 add_subdirectory(pics)
 
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 set(KDM_SRCS
 main.cpp utils.cpp kdm-appear.cpp kdm-font.cpp kdm-bgnd.cpp
 	kdm-users.cpp kdm-sess.cpp klangcombo.cpp kdropsite.cpp
 )
 
 set(KDM_MOC
 kdm-appear.moc kdm-font.moc kdm-bgnd.moc kdm-users.moc kdm-sess.moc
 	klangcombo.moc kdropsite.moc
 )
 QT1_WRAP_MOC(MOC_FILES ${KDM_MOC})
 
 add_executable(kdmconfig ${KDM_SRCS} ${MOC_FILES})
 target_link_libraries(kdmconfig
-    ${QT_LIBRARIES}
+    Qt::Qt1
     ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
     ${KDE1_KFM}
     ${KDE1_KFILE}
     ${KDE1_KIMGIO}
     )
 
 install(TARGETS kdmconfig RUNTIME DESTINATION ${KDE1_BINDIR})
diff --git a/kcontrol/keys/CMakeLists.txt b/kcontrol/keys/CMakeLists.txt
index e3cc98cae..add0a9ca9 100644
--- a/kcontrol/keys/CMakeLists.txt
+++ b/kcontrol/keys/CMakeLists.txt
@@ -1,23 +1,22 @@
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 set(KEYS_SRCS
 main.cpp keyconfig.cpp savescm.cpp
 )
 
 set(KEYS_MOC
 keyconfig.moc savescm.moc  
 )
 QT1_WRAP_MOC(MOC_FILES ${KEYS_MOC})
 
 add_executable(kcmkeys ${KEYS_SRCS} ${MOC_FILES})
 target_link_libraries(kcmkeys
-    ${QT_LIBRARIES}
+    Qt::Qt1
     ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
     )
 
 install(TARGETS kcmkeys RUNTIME DESTINATION ${KDE1_BINDIR})
diff --git a/kcontrol/kfm/CMakeLists.txt b/kcontrol/kfm/CMakeLists.txt
index 5f3075d3f..19e13ede0 100644
--- a/kcontrol/kfm/CMakeLists.txt
+++ b/kcontrol/kfm/CMakeLists.txt
@@ -1,23 +1,22 @@
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 set(KFM_SRCS
 main.cpp htmlopts.cpp miscopts.cpp  kproxydlg.cpp khttpoptdlg.cpp useragentdlg.cpp kcookiesdlg.cpp rootopts.cpp
 )
 
 set(KFM_MOC
 htmlopts.moc miscopts.moc  kproxydlg.moc khttpoptdlg.moc useragentdlg.moc kcookiesdlg.moc rootopts.moc
 )
 QT1_WRAP_MOC(MOC_FILES ${KFM_MOC})
 
 add_executable(kcmkfm ${KFM_SRCS} ${MOC_FILES})
 target_link_libraries(kcmkfm
-    ${QT_LIBRARIES}
+    Qt::Qt1
     ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
     )
 
 install(TARGETS kcmkfm RUNTIME DESTINATION ${KDE1_BINDIR})
diff --git a/kcontrol/kpanel/CMakeLists.txt b/kcontrol/kpanel/CMakeLists.txt
index 39c4f1603..4594131e8 100644
--- a/kcontrol/kpanel/CMakeLists.txt
+++ b/kcontrol/kpanel/CMakeLists.txt
@@ -1,25 +1,24 @@
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 set(KPANEL_SRCS
 main.cpp panel.cpp desktops.cpp options.cpp disknav.cpp
 )
 
 set(KPANEL_MOC
 panel.moc desktops.moc options.moc disknav.moc
 )
 QT1_WRAP_MOC(MOC_FILES ${KPANEL_MOC})
 
 add_executable(kcmkpanel ${KPANEL_SRCS} ${MOC_FILES})
 target_link_libraries(kcmkpanel
-    ${QT_LIBRARIES}
+    Qt::Qt1
     ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
     )
 
 install(TARGETS kcmkpanel RUNTIME DESTINATION ${KDE1_BINDIR})
 
 install_icon(kcmkpanel.xpm "")
diff --git a/kcontrol/kwm/CMakeLists.txt b/kcontrol/kwm/CMakeLists.txt
index e47b1eba8..d457e5939 100644
--- a/kcontrol/kwm/CMakeLists.txt
+++ b/kcontrol/kwm/CMakeLists.txt
@@ -1,25 +1,24 @@
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 set(KWM_SRCS
     main.cpp bell.cpp kslidercontrol.cpp
 )
 
 set(KWM_MOC
     bell.moc kslidercontrol.moc
 )
 QT1_WRAP_MOC(MOC_FILES ${KWM_MOC})
 
 add_executable(kcmbell ${KWM_SRCS} ${MOC_FILES})
 target_link_libraries(kcmbell
-    ${QT_LIBRARIES}
+    Qt::Qt1
     ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
     )
 
 install(TARGETS kcmbell RUNTIME DESTINATION ${KDE1_BINDIR})
 
 install_icon(kwm "")
diff --git a/kcontrol/locale/CMakeLists.txt b/kcontrol/locale/CMakeLists.txt
index d8eb215e1..13cb5f480 100644
--- a/kcontrol/locale/CMakeLists.txt
+++ b/kcontrol/locale/CMakeLists.txt
@@ -1,27 +1,26 @@
 add_subdirectory(pics)
 
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 set(LOCALE_SRCS
 main.cpp locale.cpp klangcombo.cpp
 )
 
 set(LOCALE_MOC
 locale.moc klangcombo.moc
 )
 QT1_WRAP_MOC(MOC_FILES ${LOCALE_MOC})
 
 add_executable(kcmlocale ${LOCALE_SRCS} ${MOC_FILES})
 target_link_libraries(kcmlocale
-    ${QT_LIBRARIES}
+    Qt::Qt1
     ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
     )
 
 install(TARGETS kcmlocale RUNTIME DESTINATION ${KDE1_BINDIR})
 
 install_icon(locale.xpm "")
diff --git a/kcontrol/samba/CMakeLists.txt b/kcontrol/samba/CMakeLists.txt
index c48335833..9554d7085 100644
--- a/kcontrol/samba/CMakeLists.txt
+++ b/kcontrol/samba/CMakeLists.txt
@@ -1,25 +1,24 @@
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 set(SAMBA_SRCS
     main.cpp bell.cpp kslidercontrol.cpp
 )
 
 set(SAMBA_MOC
     bell.moc kslidercontrol.moc
 )
 QT1_WRAP_MOC(MOC_FILES ${SAMBA_MOC})
 
 add_executable(kcmbell ${SAMBA_SRCS} ${MOC_FILES})
 target_link_libraries(kcmbell
-    ${QT_LIBRARIES}
+    Qt::Qt1
     ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
     )
 
 install(TARGETS kcmbell RUNTIME DESTINATION ${KDE1_BINDIR})
 
 install_icon(samba "")
diff --git a/kcontrol/sample/CMakeLists.txt b/kcontrol/sample/CMakeLists.txt
index 030519690..bdf2db77b 100644
--- a/kcontrol/sample/CMakeLists.txt
+++ b/kcontrol/sample/CMakeLists.txt
@@ -1,25 +1,24 @@
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 set(SAMPLE_SRCS
     main.cpp bell.cpp kslidercontrol.cpp
 )
 
 set(SAMPLE_MOC
     bell.moc kslidercontrol.moc
 )
 QT1_WRAP_MOC(MOC_FILES ${SAMPLE_MOC})
 
 add_executable(kcmbell ${SAMPLE_SRCS} ${MOC_FILES})
 target_link_libraries(kcmbell
-    ${QT_LIBRARIES}
+    Qt::Qt1
     ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
     )
 
 install(TARGETS kcmbell RUNTIME DESTINATION ${KDE1_BINDIR})
 
 install_icon(sample.xpm "")
diff --git a/kcontrol/syssound/CMakeLists.txt b/kcontrol/syssound/CMakeLists.txt
index 12729e31f..d3427e1cd 100644
--- a/kcontrol/syssound/CMakeLists.txt
+++ b/kcontrol/syssound/CMakeLists.txt
@@ -1,25 +1,24 @@
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 set(SYSSOUND_SRCS
     main.cpp bell.cpp kslidercontrol.cpp
 )
 
 set(SYSSOUND_MOC
     bell.moc kslidercontrol.moc
 )
 QT1_WRAP_MOC(MOC_FILES ${SYSSOUND_MOC})
 
 add_executable(kcmbell ${SYSSOUND_SRCS} ${MOC_FILES})
 target_link_libraries(kcmbell
-    ${QT_LIBRARIES}
+    Qt::Qt1
     ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
     )
 
 install(TARGETS kcmbell RUNTIME DESTINATION ${KDE1_BINDIR})
 
 install_icon(bell.xpm "")
diff --git a/kcontrol/themes/CMakeLists.txt b/kcontrol/themes/CMakeLists.txt
index 86dc0904b..c17b5e331 100644
--- a/kcontrol/themes/CMakeLists.txt
+++ b/kcontrol/themes/CMakeLists.txt
@@ -1,32 +1,31 @@
 add_subdirectory(Themes)
 
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 set(THEMES_SRCS
 theme.cpp installer.cpp main.cpp kwmcom.cpp options.cpp widgetcanvas.cpp about.cpp groupdetails.cpp themecreator.cpp newthemedlg.cpp
 )
 
 set(THEMES_MOC
 theme.moc installer.moc colors.moc widgetcanvas.moc options.moc about.moc groupdetails.moc themecreator.moc
 )
 QT1_WRAP_MOC(MOC_FILES ${THEMES_MOC})
 
 add_executable(kthememgr ${THEMES_SRCS} ${MOC_FILES})
 target_link_libraries(kthememgr
-    ${QT_LIBRARIES}
+    Qt::Qt1
     ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
     ${KDE1_KFILE}
     ${KDE1_KFM}
     ${KDE1_KIMGIO}
     )
 
 install(TARGETS kthememgr RUNTIME DESTINATION ${KDE1_BINDIR})
 
 install_icon(kthememgr.xpm "")
 install(FILES kthememgr.kdelnk DESTINATION ${KDE1_APPSDIR}/Settings/Desktop)
 install(FILES theme.mappings DESTINATION ${KDE1_DATADIR}/kthememgr)
diff --git a/kdehelp/CMakeLists.txt b/kdehelp/CMakeLists.txt
index 083026882..bc9b37572 100644
--- a/kdehelp/CMakeLists.txt
+++ b/kdehelp/CMakeLists.txt
@@ -1,30 +1,29 @@
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 set(KDEHELP_SRCS main.cpp helpwin.cpp info.cpp error.cpp misc.cpp
     options.cpp man.cpp bookmark.cpp cgi.cpp mainwidget.cpp
     history.cpp booktoken.cpp finddlg.cpp)
 
 set(KDEHELP_MOC bookmark.moc cgi.moc finddlg.moc.moc helpwin.moc mainwidget.moc options.moc)
 
 QT1_WRAP_CPP(MOC_FILES ${KDEHELP_MOC})
 
 add_executable(kdehelp ${KDEHELP_SRCS} ${MOC_FILES})
 target_link_libraries(kdehelp
-    ${QT_LIBRARIES}
-    ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KHTMLW}
     ${KDE1_KFILE}
     ${KDE1_KIMGIO}
     ${KDE1_KDEUI}
     ${KDE1_KFM}
     ${KDE1_JSCRIPT}
+    Qt::Qt1
+    ${X11_LIBRARIES}
     )
 
 install(TARGETS kdehelp RUNTIME DESTINATION ${KDE1_BINDIR})
 
 install(FILES mini-kdehelp.xpm DESTINATION ${KDE1_MINIDIR} RENAME kdehelp.xpm)
 install(FILES large-kdehelp.xpm DESTINATION ${KDE1_ICONDIR}/large RENAME kdehelp.xpm)
diff --git a/kfind/CMakeLists.txt b/kfind/CMakeLists.txt
index 4c1956833..5c1509011 100644
--- a/kfind/CMakeLists.txt
+++ b/kfind/CMakeLists.txt
@@ -1,30 +1,29 @@
 add_subdirectory(pics)
 
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 set(KFIND_SRCS
     kfarch.cpp kfdird.cpp kfindtop.cpp  kftabdlg.cpp
     kfsave.cpp kftypes.cpp kfoptions.cpp kfwin.cpp kfind.cpp
     main.cpp moc.cpp)
 
 set(KFIND_MOC kfdird.moc kfwin.moc kfindtop.moc
     kftabdlg.moc kfoptions.moc kfind.moc)
 
 QT1_WRAP_MOC(MOC_FILES ${KFIND_MOC})
 
 add_executable(kfind ${KFIND_SRCS} ${MOC_FILES})
 target_link_libraries(kfind
-    ${QT_LIBRARIES}
-    ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
     ${KDE1_KFM}
     ${KDE1_KFILE}
+    Qt::Qt1
+    ${X11_LIBRARIES}
     )
 
 install(TARGETS kfind RUNTIME DESTINATION ${KDE1_BINDIR})
 
 install_icon(kfind.xpm "")
diff --git a/kfm/CMakeLists.txt b/kfm/CMakeLists.txt
index 7d8e23150..2ac0cc2fa 100644
--- a/kfm/CMakeLists.txt
+++ b/kfm/CMakeLists.txt
@@ -1,63 +1,62 @@
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 add_subdirectory(kfmwarn)
 add_subdirectory(client)
 add_subdirectory(kioslave)
 add_subdirectory(pics)
 add_subdirectory(Desktop)
 add_subdirectory(kfmexec)
 add_subdirectory(config)
 
 set(KFM_SRCS
 	kfmgui.cpp kfmview.cpp kbind.cpp main.cpp
 	kfmdlg.cpp bookmark.cpp kfmprops.cpp kfmserver_ipc.cpp
 	kfmserver_ipc2.cpp kfmserver.cpp kioserver.cpp kioserver_ipc.cpp
 	kioserver_ipc2.cpp kfmipc.cpp root.cpp kfmman.cpp kiojob.cpp
 	htmlcache.cpp autostart.cpp kfmtree.cpp
 	krenamewin.cpp passworddialog.cpp kURLcompletion.cpp debug.cpp kfmw.cpp
 	kfmpaths.cpp kfmjob.cpp kfmexec.cpp kmimemagic.cpp kfinder.cpp utils.cpp
 	open-with.cpp finddlg.cpp kcookiejar.cpp kcookiewin.cpp popup.cpp kintlist.cpp)
 
 set(KFM_MOC
 	kfmgui.h kfmview.h kbind.h
 	kfmdlg.h bookmark.h kfmprops.h kfmserver_ipc.h
 	kfmserver.h kioserver.h kioserver_ipc.h
 	root.h kfmman.h kiojob.h
 	htmlcache.h kfmtree.h
 	krenamewin.h passworddialog.h kURLcompletion.h kfmw.h
 	kfmjob.h kfmexec.h kfinder.h
 	open-with.h finddlg.h kcookiewin.h popup.h)
 
 
 QT1_WRAP_HEADER(MOC_FILES ${KFM_MOC})
 
 add_executable(kfm ${KFM_SRCS} ${MOC_FILES})
 target_link_libraries(kfm
-    ${QT_LIBRARIES}
-    ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
     ${KDE1_KHTMLW}
     ${KDE1_JSCRIPT}
     ${KDE1_KFM}
     ${KDE1_KIMGIO}
     ${KDE1_KFILE}
+    Qt::Qt1
+    ${X11_LIBRARIES}
     )
 
 install(TARGETS kfm RUNTIME DESTINATION ${KDE1_BINDIR})
 
 install(FILES directory.trash directory.autostart directory.templates directory.desktop DESTINATION ${KDE1_DATADIR}/kfm)
 
 install(FILES kfmsu kfmsu2 startkde kde unpack
     PERMISSIONS WORLD_EXECUTE WORLD_READ
     DESTINATION ${KDE1_BINDIR})
 
 install(FILES config/kfmrc config/desktop DESTINATION ${KDE1_CONFDIR})
 install(FILES magic DESTINATION ${KDE1_MIMEDIR})
 
 install_icon(kfm.xpm "")
 install_icon(link.xpm "")
diff --git a/kfm/client/CMakeLists.txt b/kfm/client/CMakeLists.txt
index 5df8d95a9..b58ca9a03 100644
--- a/kfm/client/CMakeLists.txt
+++ b/kfm/client/CMakeLists.txt
@@ -1,18 +1,17 @@
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 set(KFMCLINET_SRCS kfmclient.cpp ../debug.cpp)
 
 add_executable(kfmclient ${KFMCLINET_SRCS} ${MOC_FILES})
 target_link_libraries(kfmclient
-    ${QT_LIBRARIES}
+    Qt::Qt1
     ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
     ${KDE1_KFM}
     ${KDE1_KFILE}
     )
 
 install(TARGETS kfmclient RUNTIME DESTINATION ${KDE1_BINDIR})
diff --git a/kfm/kfmexec/CMakeLists.txt b/kfm/kfmexec/CMakeLists.txt
index bb2eb5563..bbfca5853 100644
--- a/kfm/kfmexec/CMakeLists.txt
+++ b/kfm/kfmexec/CMakeLists.txt
@@ -1,19 +1,18 @@
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 set(KFMWARN_SRCS main.cpp)
 
 QT1_WRAP_MOC(MOC_FILES main.moc)
 
 add_executable(kfmexec ${KFMWARN_SRCS} ${MOC_FILES})
 target_link_libraries(kfmexec
-    ${QT_LIBRARIES}
-    ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KFM}
+    Qt::Qt1
+    ${X11_LIBRARIES}
     )
 
 install(TARGETS kfmexec RUNTIME DESTINATION ${KDE1_BINDIR})
 
diff --git a/kfm/kfmwarn/CMakeLists.txt b/kfm/kfmwarn/CMakeLists.txt
index a68aa332b..2baa1885b 100644
--- a/kfm/kfmwarn/CMakeLists.txt
+++ b/kfm/kfmwarn/CMakeLists.txt
@@ -1,16 +1,15 @@
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 set(KFMWARN_SRCS main.cpp)
 
 add_executable(kfmwarn ${KFMWARN_SRCS})
 target_link_libraries(kfmwarn
-    ${QT_LIBRARIES}
     ${X11_LIBRARIES}
     ${KDE1_KDECORE}
+    Qt::Qt1
     )
 
 install(TARGETS kfmwarn RUNTIME DESTINATION ${KDE1_BINDIR})
 
diff --git a/kfm/kioslave/CMakeLists.txt b/kfm/kioslave/CMakeLists.txt
index af59c2648..5ef1982e9 100644
--- a/kfm/kioslave/CMakeLists.txt
+++ b/kfm/kioslave/CMakeLists.txt
@@ -1,24 +1,23 @@
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 set(KIOSLAVE_SRCS
 kioslave_ipc.cpp kioslave_ipc2.cpp main.cpp xview.cpp
 	ipc.cpp protocol.cpp http.cpp file.cpp ftp.cpp manage.cpp icon.cpp
 	slave.cpp tar.cpp subprotocol.cpp cgi.cpp gzip.cpp ftp_proxy.cpp ../debug.cpp)
 
 set(KIOSLAVE_MOC kioslave_ipc.moc main.moc http.moc file.moc tar.moc ftp.moc protocol.moc subprotocol.moc cgi.moc gzip.moc icon.moc ftp_proxy.moc)
 
 QT1_WRAP_MOC(MOC_FILES ${KIOSLAVE_MOC})
 
 add_executable(kioslave ${KIOSLAVE_SRCS} ${MOC_FILES})
 target_link_libraries(kioslave
-    ${QT_LIBRARIES}
-    ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
     ${KDE1_KIMGIO}
+    Qt::Qt1
+    ${X11_LIBRARIES}
     )
 
 install(TARGETS kioslave RUNTIME DESTINATION ${KDE1_BINDIR})
diff --git a/kfontmanager/CMakeLists.txt b/kfontmanager/CMakeLists.txt
index a6a6f6893..bb4b75e26 100644
--- a/kfontmanager/CMakeLists.txt
+++ b/kfontmanager/CMakeLists.txt
@@ -1,22 +1,21 @@
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 set(KFONTMANAGER_SRCS
     main.cpp kfontmanager.cpp kfontlist.cpp kfontexplorer.cpp)
 set(KFONTMANAGER_MOC kfontmanager.moc kfontlist.moc kfontexplorer.moc)
 
 QT1_WRAP_MOC(MOC_FILES ${KFONTMANAGER_MOC})
 
 add_executable(kfontmanager ${KFONTMANAGER_SRCS} ${MOC_FILES})
 target_link_libraries(kfontmanager
-    m
-    ${QT_LIBRARIES}
-    ${X11_LIBRARIES}
     ${KDE1_KDECORE}
+    Qt::Qt1
+    ${X11_LIBRARIES}
+    m
     )
 
 install(TARGETS kfontmanager RUNTIME DESTINATION ${KDE1_BINDIR})
 
 install_icon(kfontmanager.xpm "")
diff --git a/kikbd/CMakeLists.txt b/kikbd/CMakeLists.txt
index 0a9b8d186..a65d1255b 100644
--- a/kikbd/CMakeLists.txt
+++ b/kikbd/CMakeLists.txt
@@ -1,41 +1,40 @@
 add_subdirectory(doc)
 add_subdirectory(maps)
 
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 set(KIKBD_SRCS kikbd.cpp keytrans.cpp keymap.cpp kikbdconf.cpp
     kobjconf.cpp kconfobjs.cpp)
 
 set(KIKBD_MOC kconfobjs.moc kobjconf.moc keymap.moc kikbd.moc kikbdconf.moc widgets.moc)
 
 QT1_WRAP_MOC(MOC_FILES ${KIKBD_MOC})
 
 add_executable(kikbd ${KIKBD_SRCS} ${MOC_FILES})
 target_link_libraries(kikbd
-    ${QT_LIBRARIES}
-    ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
+    Qt::Qt1
+    ${X11_LIBRARIES}
     )
 
 install(TARGETS kikbd RUNTIME DESTINATION ${KDE1_BINDIR})
 
 set(KCMIKBD_SRCS widgets.cpp kcmikbd.cpp kikbdconf.cpp kobjconf.cpp kconfobjs.cpp)
 
 add_executable(kcmikbd ${KCMIKBD_SRCS} ${MOC_FILES})
 target_link_libraries(kcmikbd
-    ${QT_LIBRARIES}
-    ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
+    Qt::Qt1
+    ${X11_LIBRARIES}
     )
 
 install(TARGETS kcmikbd RUNTIME DESTINATION ${KDE1_BINDIR})
 
 install_icon(kikbd.xpm.xpm "")
 install(FILES kikbd.kdelnk DESTINATION ${KDE1_APPSDIR}/System)
 install(FILES kcmikbd.kdelnk DESTINATION ${KDE1_APPSDIR}/Settings/Input_Devices)
 install(FILES kikbdrc DESTINATION ${KDE1_CONFDIR})
diff --git a/kmenuedit/CMakeLists.txt b/kmenuedit/CMakeLists.txt
index ff751ffb6..a6a27d4aa 100644
--- a/kmenuedit/CMakeLists.txt
+++ b/kmenuedit/CMakeLists.txt
@@ -1,35 +1,34 @@
 add_subdirectory(icons)
 
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 set(KMENUEDIT_SRCS
 kmenuedit.cpp main.cpp pmenu.cpp
 	cpopmenu.cpp confmenu.cpp button.cpp IconPathDialog.cpp
 	IconPathDialogData.cpp DesktopPathDialog.cpp
 	DesktopPathDialogData.cpp entrydialog.cpp
 	MenuNameDialog.cpp MenuNameDialogData.cpp )
 
 set(KMENUEDIT_MOC
 kmenuedit.moc pmenu.moc cpopmenu.moc confmenu.moc
 	button.moc IconPathDialog.moc IconPathDialogData.moc
 	DesktopPathDialog.moc DesktopPathDialogData.moc
 	entrydialog.moc	MenuNameDialog.moc MenuNameDialogData.moc)
 
 QT1_WRAP_MOC(MOC_FILES ${KMENUEDIT_MOC})
 
 add_executable(kmenuedit ${KMENUEDIT_SRCS} ${MOC_FILES})
 target_link_libraries(kmenuedit
-    ${QT_LIBRARIES}
-    ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
     ${KDE1_KFM}
     ${KDE1_KFILE}
+    Qt::Qt1
+    ${X11_LIBRARIES}
     )
 
 install(TARGETS kmenuedit RUNTIME DESTINATION ${KDE1_BINDIR})
 
 install_icon(kmenuedit.xpm "")
diff --git a/konsole/src/CMakeLists.txt b/konsole/src/CMakeLists.txt
index cec5094be..5de858d48 100644
--- a/konsole/src/CMakeLists.txt
+++ b/konsole/src/CMakeLists.txt
@@ -1,31 +1,31 @@
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 
 #install(FILES kimgio.h DESTINATION ${KDE1_INCLUDES})
 
 set(KONSOLE_SRCS main.C schema.C session.C)
 
 set(KONSOLE_MOC
     TEWidget.moc
     TEmuVt102.moc
     session.moc
     main.moc
     TEmulation.moc
     TEShell.moc)
 
 QT1_WRAP_HEADER(MOC_FILES ${KONSOLE_MOC})
 
 set(LIBKONSOLE_SRCS TEWidget.C TEmuVt102.C TEScreen.C TEmulation.C TEShell.C)
 add_library(libkonsole STATIC ${LIBKONSOLE_SRCS} ${MOC_FILES})
+target_link_libraries(libkonsole Qt::Qt1)
 set_target_properties(libkonsole PROPERTIES CMAKE_EXE_LINKER_FLAGS "-version-info 9:1.9")
 #set_target_properties(konsole PROPERTIES VERSION 0.1.9 SOVERSION 9)
 
 add_executable(konsole ${KONSOLE_SRCS})
-target_link_libraries(konsole libkonsole ${QT_LIBRARIES} ${X11_LIBRARIES} ${KDE1_KDECORE} ${KDE1_KIMGIO} ${KDE1_KDEUI})
+target_link_libraries(konsole libkonsole Qt::Qt1 ${X11_LIBRARIES} ${KDE1_KDECORE} ${KDE1_KIMGIO} ${KDE1_KDEUI})
 install(TARGETS konsole RUNTIME DESTINATION ${KDE1_BINDIR})
 
 
diff --git a/kpanel/CMakeLists.txt b/kpanel/CMakeLists.txt
index 4a84314b0..cb5281ec3 100644
--- a/kpanel/CMakeLists.txt
+++ b/kpanel/CMakeLists.txt
@@ -1,26 +1,25 @@
 add_subdirectory(pics)
 
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 set(KPANEL_SRCS  kpanel.C props.C layout.C tools.C main.C events.C pmenu.C pfilemenu.C)
 
 set(KPANEL_MOC kpanel.moc pmenu.moc)
 
 QT1_WRAP_MOC(MOC_FILES ${KPANEL_MOC})
 
 add_executable(kpanel ${KPANEL_SRCS} ${MOC_FILES})
 target_link_libraries(kpanel
-    ${QT_LIBRARIES}
-    ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
     ${KDE1_KFM}
+    Qt::Qt1
+    ${X11_LIBRARIES}
     )
 
 install(TARGETS kpanel RUNTIME DESTINATION ${KDE1_BINDIR})
 
 install(FILES personal.kdelnk DESTINATION ${KDE1_DATADIR}/kpanel/default RENAME personal_directory)
 install(FILES Home.kdelnk Desktop.kdelnk DESTINATION ${KDE1_DATADIR}/kpanel/default)
diff --git a/krootwm/CMakeLists.txt b/krootwm/CMakeLists.txt
index e2a1bed23..e9ef99b29 100644
--- a/krootwm/CMakeLists.txt
+++ b/krootwm/CMakeLists.txt
@@ -1,21 +1,20 @@
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 set(KROOTWM_SRCS krootwm.C)
 
 set(KROOTWM_MOC krootwm.moc)
 
 QT1_WRAP_MOC(MOC_FILES ${KROOTWM_MOC})
 
 add_executable(krootwm ${KROOTWM_SRCS} ${MOC_FILES})
 target_link_libraries(krootwm
-    ${QT_LIBRARIES}
-    ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
     ${KDE1_KFM}
+    Qt::Qt1
+    ${X11_LIBRARIES}
     )
 
 install(TARGETS krootwm RUNTIME DESTINATION ${KDE1_BINDIR})
diff --git a/kstart/CMakeLists.txt b/kstart/CMakeLists.txt
index c5fc0ed07..9b5f5777c 100644
--- a/kstart/CMakeLists.txt
+++ b/kstart/CMakeLists.txt
@@ -1,21 +1,20 @@
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 set(KSTART_SRCS kstart.C)
 
 set(KSTART_MOC kstart.moc)
 
 QT1_WRAP_MOC(MOC_FILES ${KSTART_MOC})
 
 add_executable(kstart ${KSTART_SRCS} ${MOC_FILES})
 target_link_libraries(kstart
-    ${QT_LIBRARIES}
-    ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
+    Qt::Qt1
+    ${X11_LIBRARIES}
     )
 
 install(TARGETS kstart RUNTIME DESTINATION ${KDE1_BINDIR})
 
diff --git a/kvt/CMakeLists.txt b/kvt/CMakeLists.txt
index 4b5650f59..922214cd9 100644
--- a/kvt/CMakeLists.txt
+++ b/kvt/CMakeLists.txt
@@ -1,26 +1,25 @@
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     ${CURSES_INCLUDE_DIRS}
     )
 
 set(KVT_SRCS command.c screen.c utmp.c
 	xsetup.c debug.c resources.c main.C
 	grkelot.c)
 
 set(KVT_MOC main.moc)
 
 QT1_WRAP_MOC(MOC_FILES ${KVT_MOC})
 
 add_executable(kvt ${KVT_SRCS} ${MOC_FILES})
 target_link_libraries(kvt
-    ${QT_LIBRARIES}
-    ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
+    Qt::Qt1
+    ${X11_LIBRARIES}
     ${CURSES_LIBRARIES}
     )
 
 install(TARGETS kvt RUNTIME DESTINATION ${KDE1_BINDIR})
 
 install_icon(kvt.xpm "")
diff --git a/kwm/CMakeLists.txt b/kwm/CMakeLists.txt
index 7650803e2..b6d5fd2cd 100644
--- a/kwm/CMakeLists.txt
+++ b/kwm/CMakeLists.txt
@@ -1,30 +1,29 @@
 add_subdirectory(pics)
 
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 set(KWM_SRCS client.C manager.C main.C minicli.C warning.C drag.C
     logout.C taskmgr.C kURLcompletion.cpp gradientFill.C )
 
 set( METASOURCES client.moc manager.moc main.moc minicli.moc
     warning.moc logout.moc taskmgr.moc kURLcompletion.moc )
 
 QT1_WRAP_MOC(MOC_SRCS ${METASOURCES})
 
 add_executable(kwm ${KWM_SRCS} ${MOC_SRCS})
 target_link_libraries(kwm 
-    ${QT_LIBRARIES} 
-    ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KHTMLW}
     ${KDE1_KFILE}
     ${KDE1_KIMGIO}
     ${KDE1_KDEUI}
     ${KDE1_KFM}
     ${KDE1_JSCRIPT}
+    Qt::Qt1
+    ${X11_LIBRARIES}
     )
 
 install(TARGETS kwm RUNTIME DESTINATION ${KDE1_BINDIR})
 install_icon(kwm.xpm "")
diff --git a/kwmcom/CMakeLists.txt b/kwmcom/CMakeLists.txt
index b774a54ab..55ef98af7 100644
--- a/kwmcom/CMakeLists.txt
+++ b/kwmcom/CMakeLists.txt
@@ -1,17 +1,16 @@
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 set(KWMCCOM_SRCS kwmcom.C)
 
 QT1_WRAP_MOC(MOC_FILES ${KWMCCOM_MOC})
 
 add_executable(kwmcom ${KWMCCOM_SRCS} ${MOC_FILES})
 target_link_libraries(kwmcom
-    ${QT_LIBRARIES}
-    ${X11_LIBRARIES}
     ${KDE1_KDECORE}
+    Qt::Qt1
+    ${X11_LIBRARIES}
     )
 
 install(TARGETS kwmcom RUNTIME DESTINATION ${KDE1_BINDIR})
diff --git a/kwmmodules/kbgndwm/CMakeLists.txt b/kwmmodules/kbgndwm/CMakeLists.txt
index 0b4bfd9a8..1c3ce9156 100644
--- a/kwmmodules/kbgndwm/CMakeLists.txt
+++ b/kwmmodules/kbgndwm/CMakeLists.txt
@@ -1,21 +1,20 @@
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 set(KBGNWM_SRCS main.cpp kbgndwm.cpp bg.cpp)
 
 set(KBGNWM_MOC kbgndwm.moc bg.moc)
 
 QT1_WRAP_MOC(MOC_FILES ${KBGNWM_MOC})
 
 add_executable(kbgndwm ${KBGNWM_SRCS} ${MOC_FILES})
 target_link_libraries(kbgndwm
-    ${QT_LIBRARIES}
+    Qt::Qt1
     ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
     ${KDE1_KIMGIO}
     )
 
 install(TARGETS kbgndwm RUNTIME DESTINATION ${KDE1_BINDIR})
diff --git a/kwmmodules/kpager/CMakeLists.txt b/kwmmodules/kpager/CMakeLists.txt
index b39c61690..3f2b7bbeb 100644
--- a/kwmmodules/kpager/CMakeLists.txt
+++ b/kwmmodules/kpager/CMakeLists.txt
@@ -1,28 +1,27 @@
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 set(KPAGER_SRCS
 windowdrag.cpp ktrianglebutton.cpp desktop.cpp kpagerclient.cpp kpager.cpp main.cpp
 )
 
 set(KPAGER_MOC
 desktop.h kpager.h kpagerclient.h ktrianglebutton.h version.h windowdrag.h
 )
 
 QT1_WRAP_CPP(MOC_FILES ${KPAGER_MOC})
 
 add_executable(kpager ${KPAGER_SRCS} ${MOC_FILES})
 target_link_libraries(kpager
-    ${QT_LIBRARIES}
+    Qt::Qt1
     ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
     ${KDE1_KIMGIO}
     ${KDE1_KFILE}
     ${KDE1_KFM}
     )
 
 install(TARGETS kpager RUNTIME DESTINATION ${KDE1_BINDIR})
 install(FILES kpager.kdelnk DESTINATION ${KDE1_APPSDIR}/System)
diff --git a/kwmmodules/kwmsound/CMakeLists.txt b/kwmmodules/kwmsound/CMakeLists.txt
index f05829db1..8a2541516 100644
--- a/kwmmodules/kwmsound/CMakeLists.txt
+++ b/kwmmodules/kwmsound/CMakeLists.txt
@@ -1,21 +1,20 @@
 include_directories(
-    ${QT_INCLUDE_DIR}
     ${KDE1_INCLUDE_DIR}
     )
 
 set(KWMSOUND_SRCS kwmsound.C)
 
 set(KWMSOUND_MOC kwmsound.moc)
 
 QT1_WRAP_MOC(MOC_FILES ${KWMSOUND_MOC})
 
 add_executable(kwmsound ${KWMSOUND_SRCS} ${MOC_FILES})
 target_link_libraries(kwmsound
-    ${QT_LIBRARIES}
+    Qt::Qt1
     ${X11_LIBRARIES}
     ${KDE1_KDECORE}
     ${KDE1_KDEUI}
     ${KDE1_MEDIATOOL}
     )
 
 install(TARGETS kwmsound RUNTIME DESTINATION ${KDE1_BINDIR})