Merge branch 'lxqt:master' into gam3/HideQuit

Author: gam3

CMakeLists.txt

@@ -28,6 +28,11 @@ find_package(LayerShellQt ${SHELLQT_MINIMUM_VERSION} REQUIRED)
 find_package(KF6WindowSystem ${KF6_MINIMUM_VERSION} REQUIRED)
 find_package(lxqt2-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
 
+if (Qt6Gui_VERSION VERSION_GREATER_EQUAL "6.10.0")
+    find_package(Qt6GuiPrivate REQUIRED)
+    find_package(Qt6WaylandClientPrivate REQUIRED)
+endif()
+
 # right now we declare it as required
 find_package(X11 REQUIRED)
 set(HAVE_X11 1)
@@ -87,11 +92,6 @@ message(STATUS "Editing screenshots in external editor support: " ${SG_EXT_EDIT}
 message(STATUS "Enable D-Bus notifications: " ${SG_DBUS_NOTIFY})
 message(STATUS "Update source translation translations/*.ts files: " ${UPDATE_TRANSLATIONS})
 
-# docs
-# CMAKE_INSTALL_FULL_DOCDIR = CMAKE_INSTALL_PREFIX/CMAKE_INSTALL_DATADIR/doc/PROJECT_NAME
-message(STATUS "Documentation directory: " ${CMAKE_INSTALL_FULL_DOCDIR})
-add_definitions(-DSG_DOCDIR="${CMAKE_INSTALL_FULL_DOCDIR}")
-
 # app icon path
 add_definitions(-DSG_ICONPATH="${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps/screengrab.svg")
 
@@ -217,8 +217,6 @@ qt6_generate_wayland_protocol_client_sources(screengrab FILES
 
 # installing
 install(TARGETS screengrab RUNTIME DESTINATION bin)
-# install html docs
-install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/docs/html" DESTINATION "${CMAKE_INSTALL_FULL_DOCDIR}")
 # install config files
 install(FILES ${SCREENGRAB_CONFIG_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME})
 # install desktop files

README.md

@@ -50,8 +50,6 @@ You can use some or all of these parameters to customise your build.
 (usually - ~/.config/${app_name) ). Default setting: ON. In previous versions the
 config files were stored in ~/.screengrab (Set this parameter to "OFF" to store the config files here).
  * **-DSG_DBUS_NOTIFY** - Enable D-Bus notifications.
- * **-DSG_DOCDIR** - Name for the directory of user's documentation. Default setting:  "screengrab".
-Dfault setting: OFF.
  * **-DDEV_VERSION** - Set a dev-version here, maybe git describe $foo. Default not set.
 
 #### Build notes
@@ -71,7 +69,7 @@ package manager to search for string 'screengrab'.
 
 ## LICENSE
 
-Screengrab is licensed under the GPL v2. See file LICENSE in docs directory for more information
+Screengrab is licensed under the GPL v2. See file COPYING in the source directory for more information.
 
 
 ## Copyright