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