Commit 54304854 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Fix some compile error against qt6 (missing porting libkexiv2 to qt6)

parent 501484ec
Pipeline #175287 passed with stage
in 1 minute and 8 seconds
......@@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 3.16)
project(kdegraphics-thumbnailers)
set(QT_MIN_VERSION "5.15.0")
set(KF5_MIN_VERSION "5.83.0")
set(KF5_MIN_VERSION "5.90.0")
set(KDE_COMPILERSETTINGS_LEVEL "5.82")
find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
......@@ -12,10 +13,9 @@ include(KDECMakeSettings)
include(KDECompilerSettings NO_POLICY_SCOPE)
include(FeatureSummary)
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Gui)
find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Gui)
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS KIO)
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Archive)
add_definitions(-DQT_USE_QSTRINGBUILDER)
option(DISABLE_MOBIPOCKET "Disable the mobipocket thumbnailer." OFF)
......
......@@ -9,9 +9,9 @@ target_sources(blenderthumbnail PRIVATE
target_link_libraries(blenderthumbnail
KF5::KIOWidgets
KF5::Archive
Qt5::Core
Qt::Core
)
## install the plugin
install(TARGETS blenderthumbnail DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES blenderthumbnail.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
install(FILES blenderthumbnail.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR})
......@@ -14,9 +14,9 @@ find_package(KF5 REQUIRED
)
add_library(mobithumbnail MODULE ${mobithumbnail_SRCS})
target_link_libraries(mobithumbnail KF5::KIOCore KF5::KIOWidgets Qt5::Gui qmobipocket)
target_link_libraries(mobithumbnail KF5::KIOCore KF5::KIOWidgets Qt::Gui qmobipocket)
install(TARGETS mobithumbnail DESTINATION ${KDE_INSTALL_PLUGINDIR})
########### install files ###############
install( FILES mobithumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
install( FILES mobithumbnail.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR} )
......@@ -8,9 +8,9 @@ target_sources(gsthumbnail PRIVATE
target_link_libraries(gsthumbnail
KF5::KIOWidgets
Qt5::Gui
Qt::Gui
)
install(TARGETS gsthumbnail DESTINATION ${KDE_INSTALL_PLUGINDIR} )
install(FILES gsthumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR})
install(FILES gsthumbnail.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR})
......@@ -561,9 +561,9 @@ bool GSCreator::getEPSIPreview(const QString &path, long start, long
// skip over the rest of the BeginPreview comment
while ((offset < previewsize) &&
previewstr[offset] != '\n' &&
previewstr[offset] != '\r') offset++;
while ((offset < previewsize) && previewstr[offset] != '%') offset++;
previewstr[offset] != QLatin1Char('\n') &&
previewstr[offset] != QLatin1Char('\r')) offset++;
while ((offset < previewsize) && previewstr[offset] != QLatin1Char('%')) offset++;
unsigned int imagedepth;
switch (depth) {
......
......@@ -10,11 +10,11 @@ target_link_libraries(rawthumbnail
KF5::KIOWidgets
KF5::KDcraw
KF5::KExiv2
Qt5::Gui
Qt::Gui
)
## install the plugin
install(TARGETS rawthumbnail DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES rawthumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR})
install(FILES rawthumbnail.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR})
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment