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