see attached patch
Regrds, Treeve
From 5323391d347b23ed73985717006377a79fb99625 Mon Sep 17 00:00:00 2001
From: Treeve Jelbert <tre...@sourcemage.org>
Date: Sat, 18 Apr 2015 09:48:00 +0200
Subject: [PATCH] build fixes for qt5-5 use ki18n and KDELibs4Support
---
CMakeLists.txt | 2 +-
src/CMakeLists.txt | 2 ++
src/common/KoReportData.h | 1 +
src/plugins/barcode/CMakeLists.txt | 2 ++
4 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca20b9d..c74eebb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,7 @@ set(REQUIRED_QT_VERSION "5.2.0")
# Required components to build this framework
# TODO move Widgets/KF5WidgetsAddons-dependent part to a libKReportDesigner
find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Widgets Xml
PrintSupport)
-find_package(KF5 5.7.0 REQUIRED CoreAddons WidgetsAddons GuiAddons Kross)
+find_package(KF5 5.7.0 REQUIRED CoreAddons WidgetsAddons GuiAddons Kross
FrameworkIntegration KDELibs4Support I18n)
find_package(KProperty 2.96.0 REQUIRED)
set(KREPORT_PLUGIN_INSTALL_DIR ${PLUGIN_INSTALL_DIR}/kreport)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c7afd54..5b461c5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -153,6 +153,8 @@ target_link_libraries(KReport
#KF5::KIOFileWidgets
#KF5::KIOWidgets
#KF5::KIONTLM
+ KF5::KDELibs4Support
+ KF5::I18n
)
set_target_properties(KReport
diff --git a/src/common/KoReportData.h b/src/common/KoReportData.h
index 1a432e4..fbde930 100644
--- a/src/common/KoReportData.h
+++ b/src/common/KoReportData.h
@@ -18,6 +18,7 @@
#define __KOREPORTDATA_H__
#include <QStringList>
+#include <QVariant>
#include "kreport_export.h"
diff --git a/src/plugins/barcode/CMakeLists.txt
b/src/plugins/barcode/CMakeLists.txt
index c91441f..188c1a4 100644
--- a/src/plugins/barcode/CMakeLists.txt
+++ b/src/plugins/barcode/CMakeLists.txt
@@ -22,6 +22,8 @@ kcoreaddons_desktop_to_json(kreport_barcodeplugin
kreport_barcodeplugin.desktop)
target_link_libraries(kreport_barcodeplugin
PUBLIC
KReport
+ PRIVATE
+ KF5::I18n
)
install(TARGETS kreport_barcodeplugin DESTINATION
${KREPORT_PLUGIN_INSTALL_DIR})
--
2.4.1
_______________________________________________
calligra-devel mailing list
calligra-devel@kde.org
https://mail.kde.org/mailman/listinfo/calligra-devel
