Merge branch 'master' of https://github.com/uwerat/qskinny

CMakeLists.txt

@@ -125,7 +125,6 @@ install(
     FILES
         ${CMAKE_BINARY_DIR}/_QSkinny/${PACKAGE_NAME}Config.cmake
         ${CMAKE_BINARY_DIR}/_QSkinny/${PACKAGE_NAME}ConfigVersion.cmake
-        ${QSK_CMAKE_DIR}/QskTools.cmake
     DESTINATION
         ${PACKAGE_LOCATION}
     COMPONENT

cmake/QSkinnyConfig.cmake

@@ -1 +1,3 @@
 include("${CMAKE_CURRENT_LIST_DIR}/QSkinnyTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/QskTools.cmake" OPTIONAL)
+include("${CMAKE_CURRENT_LIST_DIR}/QmlExportTargets.cmake" OPTIONAL)

cmake/QskBuildFunctions.cmake

@@ -115,11 +115,3 @@ function(qsk_add_shaders target)
         PREFIX "/qskinny/shaders" ${ARGV} OUTPUTS ${outfiles} )
 
 endfunction()
-
-function(qsk_update_package_config_file target)
-
-    file(APPEND
-        ${CMAKE_BINARY_DIR}/_QSkinny/QSkinnyConfig.cmake
-        "include(\"\${CMAKE_CURRENT_LIST_DIR}/${target}.cmake\")\n")
-
-endfunction()

doc/tutorials/03-writing-your-first-application.asciidoc

@@ -13,7 +13,8 @@ layout: docs
 In this chapter we will write a simple QSkinny application on Linux from scratch.
 As a prerequisite, a recent Qt version (>= 5.15) should be available. On debian bullseye we need to install
 these packages `build-essential cmake qtbase5-dev qtbase5-private-dev qtdeclarative5-dev qtdeclarative5-private-dev libqt5svg5-dev`.
-For Qt6 you need the corresponding packages.
+On Debian these packages need to be installed for Qt6: `build-essential cmake
+qtbase6-dev qtbase6-private-dev qtdeclarative6-dev qtdeclarative6-private-dev libqt6svg-dev qt6-shadertools`.
 
 Then we can build and install QSkinny to `/opt/qskinny` with the following commands:
 

qmlexport/CMakeLists.txt

@@ -42,5 +42,3 @@ install(EXPORT ${PACKAGE_NAME}Targets
         ${PACKAGE_NAMESPACE}
     DESTINATION
         ${PACKAGE_LOCATION})
-
-qsk_update_package_config_file(${PACKAGE_NAME}Targets)

tools/CMakeLists.txt

@@ -1,4 +1,10 @@
 if(TARGET Qt::Svg)
     add_subdirectory(svg2qvg)
-    qsk_update_package_config_file(QskTools)
+    install(
+        FILES
+            ${QSK_CMAKE_DIR}/QskTools.cmake
+        DESTINATION
+            ${PACKAGE_LOCATION}
+        COMPONENT
+            Devel)
 endif()