From aa5a5c62774c9187817b0abde868c8fdb245127b Mon Sep 17 00:00:00 2001 From: Daniel Brunner <0xFEEDC0DE64@gmail.com> Date: Sun, 14 Oct 2018 15:34:29 +0200 Subject: [PATCH] cmake plugin cleanups --- CMakeLists.txt | 8 +++++++- absenceplugin.cpp | 6 +++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c79a60f..ee94aa9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,13 @@ set(FORMS absencedialog.ui ) -add_library(zeiterfassung-plugins-absenceplugin SHARED ${HEADERS} ${SOURCES} ${RESOURCES} ${FORMS}) +set(OTHER_FILES + absenceplugin.json +) + +add_library(zeiterfassung-plugins-absenceplugin SHARED ${HEADERS} ${SOURCES} ${RESOURCES} ${FORMS} ${OTHER_FILES}) + +set_target_properties(zeiterfassung-plugins-absenceplugin PROPERTIES OUTPUT_NAME absenceplugin PREFIX "") target_link_libraries(zeiterfassung-plugins-absenceplugin Qt5::Core Qt5::Gui Qt5::Widgets zeiterfassungguilib zeiterfassungnetworklib) diff --git a/absenceplugin.cpp b/absenceplugin.cpp index 2e09928..a117cf9 100644 --- a/absenceplugin.cpp +++ b/absenceplugin.cpp @@ -6,6 +6,8 @@ #include #include +#include "utils/fileutils.h" + #include "mainwindow.h" #include "stripswidget.h" @@ -16,9 +18,7 @@ AbsencePlugin::AbsencePlugin(QObject *parent) : { qDebug() << "called"; - static auto dir = QDir(QCoreApplication::applicationDirPath()).absoluteFilePath(QStringLiteral("translations")); - - if(m_translator.load(QLocale(), QStringLiteral("absenceplugin"), QStringLiteral("_"), dir)) + if(m_translator.load(QLocale(), QStringLiteral("absenceplugin"), QStringLiteral("_"), translationsDir())) { if(!QCoreApplication::installTranslator(&m_translator)) {