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