✨ Support for Qt6 (#29)

* fix(cmake): add support for Qt6 * fix(plugin): default capabilities fix
roniemartinez · Feb 15, 2022 · 2d60608 · 2d60608
1 parent f78713f
commit 2d60608
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -24,9 +24,11 @@ endif()
 get_filename_component(QT_QMAKE_PATH ${QT_QMAKE_EXECUTABLE} PATH)
 
 set(QT_ROOT ${QT_QMAKE_PATH}/)
-set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${QT_QMAKE_PATH}/../lib/cmake/Qt5)
+set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${QT_QMAKE_PATH}/../lib/cmake/Qt${QT_VERSION_MAJOR})
 
-find_package(Qt5 COMPONENTS Core Gui REQUIRED)
+
+find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui REQUIRED)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
@@ -36,7 +38,10 @@ file(GLOB LIBQPSD_HEADERS "*.h")
 SET(CMAKE_DEBUG_POSTFIX "d")
 
 add_library(${PROJECT_NAME} MODULE ${LIBQPSD_SOURCES} ${LIBQPSD_HEADERS})
-target_link_libraries(${PROJECT_NAME} Qt5::Core Qt5::Gui)
+target_link_libraries(${PROJECT_NAME}
+    Qt${QT_VERSION_MAJOR}::Core
+    Qt${QT_VERSION_MAJOR}::Gui
+)
 
 set_target_properties(${PROJECT_NAME} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_BINARY_DIR}/libs)
 set_target_properties(${PROJECT_NAME} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_BINARY_DIR}/libs)

diff --git a/qpsdplugin.cpp b/qpsdplugin.cpp
@@ -43,7 +43,7 @@ QImageIOPlugin::Capabilities QPsdPlugin::capabilities(
         return Capabilities(CanRead);//TODO: add CanWrite support
 
     if (!(format.isEmpty() && device->isOpen()))
-        return 0;
+        return { };
 
     Capabilities cap;
     if (device->isReadable() && QPsdHandler::canRead(device))