Update CMakeLists to use Qt6

2 files changed, 41 insertions, 50 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6df5a647..0eb98dc9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,7 +5,7 @@ ADD_SUBDIRECTORY( data )
 
 ### ------- SETTING REKONQ FILES..
 add_definitions(-DQT_STATICPLUGIN)
-QT4_WRAP_CPP(wk_HEADERS_MOC qwebkitplatformplugin.h)
+#QT4_WRAP_CPP(wk_HEADERS_MOC qwebkitplatformplugin.h)
 
 # src files
 set(rekonq_KDEINIT_SRCS
@@ -120,31 +120,6 @@ set(rekonq_KDEINIT_SRCS
     #----------------------------------------
     kspellplugin.cpp
     ${wk_HEADERS_MOC}
-)
-
-
-# Nepomuk OPTIONAL src files
-IF(NepomukCore_FOUND)
-    SET( rekonq_KDEINIT_SRCS
-            ${rekonq_KDEINIT_SRCS}
-            urlbar/resourcelinkdialog.cpp
-            urlbar/newresourcedialog.cpp
-            nepomuk/utils/simpleresourcemodel.cpp
-            nepomuk/utils/resourcemodel.cpp
-    )
-ENDIF(NepomukCore_FOUND)
-
-
-# Opera sync optional src files
-IF(HAVE_QCA2 AND HAVE_QTOAUTH)
-    SET( rekonq_KDEINIT_SRCS
-            ${rekonq_KDEINIT_SRCS}
-            sync/operasynchandler.cpp
-    )
-ENDIF(HAVE_QCA2 AND HAVE_QTOAUTH)
-
-# ui files
-KDE4_ADD_UI_FILES( rekonq_KDEINIT_SRCS
     # ----------------------------------------
     adblock/blocked_elements.ui
     adblock/settings_adblock.ui
@@ -172,9 +147,29 @@ KDE4_ADD_UI_FILES( rekonq_KDEINIT_SRCS
     cleardata.ui
     session.ui
     webappcreation.ui
- )
+)
+
+
+# Nepomuk OPTIONAL src files
+IF(NepomukCore_FOUND)
+    SET( rekonq_KDEINIT_SRCS
+            ${rekonq_KDEINIT_SRCS}
+            urlbar/resourcelinkdialog.cpp
+            urlbar/newresourcedialog.cpp
+            nepomuk/utils/simpleresourcemodel.cpp
+            nepomuk/utils/resourcemodel.cpp
+    )
+ENDIF(NepomukCore_FOUND)
 
 
+# Opera sync optional src files
+IF(HAVE_QCA2 AND HAVE_QTOAUTH)
+    SET( rekonq_KDEINIT_SRCS
+            ${rekonq_KDEINIT_SRCS}
+            sync/operasynchandler.cpp
+    )
+ENDIF(HAVE_QCA2 AND HAVE_QTOAUTH)
+
 ### ------------- INCLUDING DIRECTORIES...
 
 INCLUDE_DIRECTORIES (   ${CMAKE_CURRENT_SOURCE_DIR}
@@ -228,32 +223,23 @@ ADD_DEFINITIONS ( ${KDE4_DEFINITIONS} )
 
 ### -------------- ADDING APPLICATION ICON...
 
-KDE4_ADD_APP_ICON( rekonq_KDEINIT_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../icons/hi*-app-rekonq.png )
+#KDE4_ADD_APP_ICON( rekonq_KDEINIT_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../icons/hi*-app-rekonq.png )
 
 
 ### -------------- ADDING APPLICATION KCFG FILES...
 
-KDE4_ADD_KCFG_FILES( rekonq_KDEINIT_SRCS rekonq.kcfgc )
+#KDE4_ADD_KCFG_FILES( rekonq_KDEINIT_SRCS rekonq.kcfgc )
 
 
 ### --------------- ADDING EXECUTABLE...
 
-KDE4_ADD_KDEINIT_EXECUTABLE( rekonq ${rekonq_KDEINIT_SRCS} main.cpp )
+#KDE4_ADD_KDEINIT_EXECUTABLE( rekonq ${rekonq_KDEINIT_SRCS} main.cpp )
+add_executable(rekonq ${rekonq_KDEINIT_SRCS} main.cpp)
 
 
 ### --------------- TARGETTING LINK LIBRARIES...
 
-TARGET_LINK_LIBRARIES (     kdeinit_rekonq
-                            ${QT_LIBRARIES}
-                            ${QT_QTSCRIPT_LIBRARY}
-                            ${QT_QTWEBKIT_LIBRARY}
-                            ${KDE4_KDEWEBKIT_LIBS}
-                            ${KDE4_KUTILS_LIBS}
-                            ${KDE4_KDEUI_LIBS}
-                            ${KDE4_KIO_LIBS}
-                            ${KDE4_KPARTS_LIBS}
-                            ${KDE4_SOLID_LIBS}
-)
+target_link_libraries(rekonq Qt6::Widgets Qt6::WebEngineWidgets)
 
 # Nepomuk optional target link libraries
 IF(SOPRANO_FOUND AND NepomukCore_FOUND)
@@ -281,13 +267,13 @@ ENDIF(HAVE_QCA2 AND HAVE_QTOAUTH)
 
 ### ------------ INSTALL FILES...
 
-INSTALL( TARGETS rekonq ${INSTALL_TARGETS_DEFAULT_ARGS} )
-INSTALL( TARGETS kdeinit_rekonq  ${INSTALL_TARGETS_DEFAULT_ARGS} )
+#INSTALL( TARGETS rekonq ${INSTALL_TARGETS_DEFAULT_ARGS} )
+#INSTALL( TARGETS kdeinit_rekonq  ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 # kwebapp script install (provided for retro-compatibility...)
 #FILE( COPY data/kwebapp DESTINATION ${BIN_INSTALL_DIR}
 #        FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 
-INSTALL( FILES rekonq.kcfg  DESTINATION  ${KCFG_INSTALL_DIR} )
-INSTALL( FILES webwindow/rekonqui.rc  DESTINATION  ${DATA_INSTALL_DIR}/rekonq )
+#INSTALL( FILES rekonq.kcfg  DESTINATION  ${KCFG_INSTALL_DIR} )
+#INSTALL( FILES webwindow/rekonqui.rc  DESTINATION  ${DATA_INSTALL_DIR}/rekonq )
 
diff --git a/src/data/CMakeLists.txt b/src/data/CMakeLists.txt
index cda545f0..51fd0bf6 100644
--- a/src/data/CMakeLists.txt
+++ b/src/data/CMakeLists.txt
@@ -10,21 +10,24 @@ INSTALL(
     webkit-icon.png
     autoscroll.png
     background.png
-    DESTINATION ${DATA_INSTALL_DIR}/rekonq/pics
+    DESTINATION ${CMAKE_INSTALL_DATADIR}/rekonq/pics
 )
+message(STATUS "install ${CMAKE_INSTALL_DATADIR}/rekonq/pics")
 
 # default bookmarks
 INSTALL(
     FILES
     defaultbookmarks.xbel
-    DESTINATION ${DATA_INSTALL_DIR}/rekonq
+    DESTINATION ${CMAKE_INSTALL_DATADIR}/rekonq
 )
+message(STATUS "install ${CMAKE_INSTALL_DATADIR}/rekonq")
 
 # .desktop file
 INSTALL(
     PROGRAMS rekonq.desktop
-    DESTINATION ${XDG_APPS_INSTALL_DIR}
+    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}
 )
+message(STATUS "install ${CMAKE_INSTALL_DATAROOTDIR}")
 
 # htmls
 INSTALL(
@@ -33,13 +36,15 @@ INSTALL(
     home.html
     jquery-1.7.2.min.js
     jquery-ui-1.8.20.custom.min.js
-    DESTINATION ${DATA_INSTALL_DIR}/rekonq/htmls
+    DESTINATION ${CMAKE_INSTALL_DATADIR}/rekonq/htmls
 )
+message(STATUS "install ${CMAKE_INSTALL_DATAROOTDIR}/rekonq/htmls")
 
 # adblock default settings
 INSTALL(
     FILES
     adblockrc
-    DESTINATION ${DATA_INSTALL_DIR}/rekonq
+    DESTINATION ${CMAKE_INSTALL_DATADIR}/rekonq
 )
+message(STATUS "install ${CMAKE_INSTALL_DATAROOTDIR}/rekonq")