fix cpack and qt6 compatibility

Author: bas524

CMakeLists.txt

@@ -13,11 +13,11 @@ set(CMAKE_AUTORCC ON)
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-set(Qt5_in_use true)
-find_package(Qt5 COMPONENTS Widgets QUIET)
+set(QtVer Qt5)
+find_package(${QtVer} COMPONENTS Widgets QUIET)
 if (NOT Qt5_FOUND)
-  set(Qt5_in_use false)
-  find_package(Qt6 COMPONENTS Widgets REQUIRED)
+  set(QtVer Qt6)
+  find_package(${QtVer} COMPONENTS Widgets REQUIRED)
 endif ()
 
 if (APPLE)
@@ -39,11 +39,9 @@ set(SOURCES
     finfdialog.ui
     )
 target_sources(Qldd PRIVATE ${SOURCES})
-if (Qt5_in_use)
-  target_link_libraries(Qldd PRIVATE Qt5::Widgets)
-else ()
-  target_link_libraries(Qldd PRIVATE Qt6::Widgets)
-endif ()
+
+target_link_libraries(Qldd PRIVATE ${QtVer}::Widgets)
+
 install(TARGETS Qldd
         RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
         BUNDLE DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
@@ -72,14 +70,16 @@ if(APPLE)
                           MACOSX_BUNDLE_BUNDLE_VERSION "${PROJECT_VERSION}"
                           MACOSX_BUNDLE_COPYRIGHT "Copyright (c) 2020 bas524@yandex.ru"
                           )
-     add_custom_command(TARGET Qldd
+    if (${QtVer} STREQUAL Qt5)
+      add_custom_command(TARGET Qldd
                         POST_BUILD
                         COMMAND plutil -replace NSHighResolutionCapable -bool true Qldd.app/Contents/Info.plist
                         )
+      endif()
 endif()
 
 set(desktop.path applications)
-set(desktop.files resources/example.desktop)
+set(desktop.files resources/qldd.desktop)
 set(icon.path icons/hicolor/64x64/apps)
 set(icon.files resources/icon64.png)
 set(iconsvg.path icons/hicolor/scalable/apps)

Packaging.cmake

@@ -1,6 +1,6 @@
 
-find_package(Qt5Core REQUIRED)
-get_target_property(_qmake_executable Qt5::qmake IMPORTED_LOCATION)
+find_package(${QtVer}Core REQUIRED)
+get_target_property(_qmake_executable ${QtVer}::qmake IMPORTED_LOCATION)
 get_filename_component(_qt_bin_dir "${_qmake_executable}" DIRECTORY)
 find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${_qt_bin_dir}")
 find_program(LINUXDEPLOYQT_EXECUTABLE linuxdeployqt linuxdeployqt-continuous-x86_64.AppImage HINTS "${_qt_bin_dir}")

qldd.cpp

@@ -137,7 +137,7 @@ void QLdd::fillDependency(QTreeWidget &treeWidget) {
       for (const QString &v : qAsConst(sl)) {
         if (!v.trimmed().isEmpty()) {
           if (v.contains("not found")) {
-            tmp->setTextColor(0, redC);
+            tmp->setForeground(0, QBrush(redC));
             tmp->setText(0, tmp->text(0) + " " + v);
             tmp->setToolTip(0, tmp->text(0));
           } else {