cmake plugin cleanups

This commit is contained in:
Daniel Brunner
2018-10-14 15:35:34 +02:00
parent a9a6234ca2
commit 48469594a1
2 changed files with 10 additions and 4 deletions

View File

@@ -16,7 +16,13 @@ set(FORMS
updaterdialog.ui updaterdialog.ui
) )
add_library(zeiterfassung-plugins-updaterplugin SHARED ${HEADERS} ${SOURCES} ${FORMS}) set(OTHER_FILES
updaterplugin.json
)
add_library(zeiterfassung-plugins-updaterplugin SHARED ${HEADERS} ${SOURCES} ${FORMS} ${OTHER_FILES})
set_target_properties(zeiterfassung-plugins-updaterplugin PROPERTIES OUTPUT_NAME updaterplugin PREFIX "")
target_link_libraries(zeiterfassung-plugins-updaterplugin Qt5::Core Qt5::Gui Qt5::Widgets zeiterfassungguilib zeiterfassungnetworklib) target_link_libraries(zeiterfassung-plugins-updaterplugin Qt5::Core Qt5::Gui Qt5::Widgets zeiterfassungguilib zeiterfassungnetworklib)

View File

@@ -5,6 +5,8 @@
#include <QCoreApplication> #include <QCoreApplication>
#include <QLocale> #include <QLocale>
#include "utils/fileutils.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "zeiterfassungsettings.h" #include "zeiterfassungsettings.h"
#include "zeiterfassungapi.h" #include "zeiterfassungapi.h"
@@ -18,9 +20,7 @@ UpdaterPlugin::UpdaterPlugin(QObject *parent) :
{ {
qDebug() << "called"; qDebug() << "called";
static auto dir = QDir(QCoreApplication::applicationDirPath()).absoluteFilePath(QStringLiteral("translations")); if(m_translator.load(QLocale(), QStringLiteral("updaterplugin"), QStringLiteral("_"), translationsDir()))
if(m_translator.load(QLocale(), QStringLiteral("updaterplugin"), QStringLiteral("_"), dir))
{ {
if(!QCoreApplication::installTranslator(&m_translator)) if(!QCoreApplication::installTranslator(&m_translator))
{ {