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