Compare commits

...

4 Commits

2 changed files with 9 additions and 3 deletions

View File

@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12)
project(KImageFormats) project(KImageFormats)
include(FeatureSummary) include(FeatureSummary)
find_package(ECM 5.11.0 NO_MODULE) find_package(ECM 5.13.0 NO_MODULE)
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules") set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules")
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
@ -17,14 +17,14 @@ include(KDECMakeSettings)
include(CheckIncludeFiles) include(CheckIncludeFiles)
set(REQUIRED_QT_VERSION 5.2.0) set(REQUIRED_QT_VERSION 5.3.0)
find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
# EPS support depends on the gs utility; non-UNIX systems are unlikely to have # EPS support depends on the gs utility; non-UNIX systems are unlikely to have
# this available in PATH # this available in PATH
set(BUILD_EPS_PLUGIN FALSE) set(BUILD_EPS_PLUGIN FALSE)
if (UNIX) if (UNIX)
find_package(Qt5PrintSupport 5.2.0 NO_MODULE) find_package(Qt5PrintSupport ${REQUIRED_QT_VERSION} NO_MODULE)
set_package_properties(Qt5PrintSupport PROPERTIES set_package_properties(Qt5PrintSupport PROPERTIES
PURPOSE "Required for the QImage plugin for EPS images" PURPOSE "Required for the QImage plugin for EPS images"
TYPE OPTIONAL TYPE OPTIONAL

View File

@ -17,7 +17,13 @@
#include <QProcess> #include <QProcess>
#include <QTemporaryFile> #include <QTemporaryFile>
#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
// logging category for this framework, default: log stuff >= warning
Q_LOGGING_CATEGORY(EPSPLUGIN, "epsplugin", QtWarningMsg)
#else
Q_LOGGING_CATEGORY(EPSPLUGIN, "epsplugin") Q_LOGGING_CATEGORY(EPSPLUGIN, "epsplugin")
#endif
//#define EPS_PERFORMANCE_DEBUG 1 //#define EPS_PERFORMANCE_DEBUG 1
#define BBOX_BUFLEN 200 #define BBOX_BUFLEN 200